Automatic translation importstable/cm-12.1-YOG4P

Change-Id: I5b196688774e74606d3555cacd697adecd1e211a
Ticket: RM-154

112 files changed, 7484 insertions, 301 deletions

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index a8e24b91d..8cefe8968 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Wys ikoon</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Wys \'n ikoon in die statusbalk wanneer \'n alarm ingestel is</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Toenemende volume</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profiel <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Geen profiel geselekteer nie</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Voeg by</string>
   <string name="cities_add_city_title">Voeg stad by</string>
   <string name="cities_add_city_city">Stad:</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">Verwyder stad</string>
   <string name="cities_delete_city_msg">Wil jy <xliff:g id="city">%s</xliff:g> verwyder?</string>
   <string name="cities_delete_city_failed">Kan nie die stad verwyder nie</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Druk van die volume knoppies sal <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Omdraai aksie</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Die omdraai van jou tablet sal <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Die omdraai van jou foon sal <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Skud aksie</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Die skud van jou tablet sal <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Die skud van jou foon sal <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">sluimer die alarm</string>
   <string name="action_summary_dismiss">verwyder die alarm</string>
   <string name="action_summary_do_nothing">Doen niks</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Kies alarm tipe</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Luitoon</string>
   <string name="alarm_type_playlist">Speellys</string>
   <string name="alarm_type_random">Willekeurig</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Alarm volume is af</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Kies alarm</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Luitoon</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Musiek</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Standaard luitoon</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Kon nie permanente toestemming verleen aan luitoon (uri)</string>
   <string name="menu_item_widget_settings">Legstuk instellings</string>
   <string name="activity_not_found">Aktiwiteit nie gevind!</string>
-  <string name="permlab_write_alarms">verander direk jou wekkers</string>
-  <string name="permdesc_write_alarms">Laat \'n toep toe om by te voeg, te verander of al jou alarms te verwyder.</string>
-  <string name="permlab_manage_alarms">verander geskeduleerde wekkers</string>
-  <string name="permdesc_manage_alarms">Laat \'n toep toe om geskeduleerde wekkers aan en af te skakel.</string>
-  <string name="permlab_read_alarms">toegang na geskeduleerde wekkers</string>
-  <string name="permdesc_read_alarms">Laat \'n toep toe om jou geskeduleerde wekkers te lees.</string>
-  <string name="alarm_modification_service_desc">Laat \'n diens toe om wekkers te verander deur derde partye.</string>
 </resources>
diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-am/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index f1dc621d0..5c3c30c0f 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -16,44 +16,64 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">إظهار الرمز</string>
-  <string name="show_status_bar_icon_summary">إظهار رمز في شريط المعلومات عندما يتم تعيين التحذير</string>
-  <string name="alarm_increasing_volume">زيادة حجم الصوت</string>
-  <string name="profile_description">الملف الشخصي <xliff:g id="profile">%s</xliff:g></string>
-  <string name="profile_no_selected">لا ملف شخصي محدد</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <string name="show_status_bar_icon_summary">إظهار رمز في شريط الحالة عند تعيين التنبيه</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <string name="alarm_increasing_volume">رفع مستوى الصوت</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <string name="profile_description">ملف تعريف <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
+  <string name="profile_no_selected">لا ملف تعريفي محدد</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">إضافة</string>
   <string name="cities_add_city_title">إضافة مدينة</string>
   <string name="cities_add_city_city">المدينة:</string>
   <string name="cities_add_city_timezone">المنطقة الزمنية:</string>
-  <string name="cities_add_city_gps_cd">اضغط لتحدد المدينة الحالي</string>
-  <string name="cities_add_loading">تحميل\u2026</string>
-  <string name="cities_add_searching">يبحث\u2026</string>
-  <string name="cities_add_gps_no_results">نظام تحديد المواقع لم يرجع بي أية نتائج موقع</string>
-  <string name="cities_add_gps_not_available">نظام تحديد المواقع غير متوفرة</string>
-  <string name="cities_add_already_exists">المدينة موجود بالفعل في قاعدة البيانات</string>
-  <string name="cities_add_city_failed">لا يمكن إنشاء المدينة</string>
+  <string name="cities_add_city_gps_cd">اضغط لتعريب المدينة الحالي</string>
+  <string name="cities_add_loading">جاري التحميل\u2026</string>
+  <string name="cities_add_searching">جاري البحث\u2026</string>
+  <string name="cities_add_gps_no_results">نظام تحديد المواقع العالمي لم يصل إلى أي نتائج عن الموقع</string>
+  <string name="cities_add_gps_not_available">نظام تحديد المواقع العالمي غير متاح</string>
+  <string name="cities_add_already_exists">المدينة موجودة بالفعل في قاعدة البيانات</string>
+  <string name="cities_add_city_failed">يتعذر إنشاء المدينة</string>
   <string name="cities_delete_city_title">حذف المدينة</string>
   <string name="cities_delete_city_msg">هل تريد حذف <xliff:g id="city">%s</xliff:g>؟</string>
-  <string name="cities_delete_city_failed">لا يمكن حذف المدينة</string>
+  <string name="cities_delete_city_failed">يتعذر حذف المدينة</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">الضغط على أزرار الصوت سيترتب عليه <xliff:g id="action">%s</xliff:g></string>
-  <string name="flip_action_title">انعكاس العمل</string>
-  <string name="flip_action_summary" product="tablet">بدل الى الكمبيوتر اللوحي أسفل سوف <xliff:g id="action"> %s </xliff:g></string>
-  <string name="flip_action_summary" product="default">بدل الى الهاتف أسفل <xliff:g id="action"> %s </xliff:g></string>
-  <string name="shake_action_title">اهتز يعمل</string>
-  <string name="shake_action_summary" product="tablet">تهتز إرادة الكمبيوتر المحمول <xliff:g id="action"> %s </xliff:g></string>
-  <string name="shake_action_summary" product="default">تهتز إرادة الهاتف <xliff:g id="action"> %s </xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
+  <string name="flip_action_title">إجراء الانعكاس</string>
+  <!-- Setting summary for the flip action setting. -->
+  <string name="flip_action_summary" product="tablet">قلب الجهاز اللوحي لأسفل سوف<xliff:g id="action">%s</xliff:g></string>
+  <string name="flip_action_summary" product="default">تبديل الى الهاتف لأسفل <xliff:g id="action"> %s </xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
+  <string name="shake_action_title">إجراء الاهتزاز</string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">اهتزاز الجهاز اللوحي سيؤدي إلى <xliff:g id="action">%s</xliff:g></string>
+  <string name="shake_action_summary" product="default">اهتزاز الهاتف سوف <xliff:g id="action"> %s </xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">تأجيل المنبه</string>
   <string name="action_summary_dismiss">رفض المنبه</string>
   <string name="action_summary_do_nothing">لا تفعل شيئا</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">اختر نوع التنبيه</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">نغمة رنين</string>
   <string name="alarm_type_playlist">قائمة التشغيل</string>
   <string name="alarm_type_random">عشوائياً</string>
-  <string name="warn_silent_alarm_title">صوت التنبيه على الصامت</string>
+  <!-- Warn Silent Alarm title -->
+  <string name="warn_silent_alarm_title">صوت التنبيه في الوضع الصامت</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">حدد المنبه</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">نغمة الرنين</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">موسيقى</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">النغمة الافتراضية</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">فشل أخذ إذن دائم للنغمة</string>
   <string name="menu_item_widget_settings">إعدادات التطبيق المصغر</string>
   <string name="activity_not_found">لم يتم العثور على النشاط!</string>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
new file mode 100644
index 000000000..a0bcd93be
--- /dev/null
+++ b/res/values-as-rIN/cm_strings.xml
@@ -0,0 +1,80 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <string name="show_status_bar_icon_title">আইকন প্ৰদৰ্শন কৰক</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <string name="show_status_bar_icon_summary">এলাৰ্ম ছেট কৰিলে ষ্টেটাচ বাৰত এটা আইকন প্ৰদৰ্শন কৰক</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <string name="alarm_increasing_volume">বৰ্দ্ধিত ভলিউম</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <string name="profile_description">প্ৰ\'ফাইল <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
+  <string name="profile_no_selected">কোনো প্ৰ\'ফাইল চয়ন কৰা নাই</string>
+  <!-- User-defined cities -->
+  <string name="menu_item_add">যোগ দিয়ক</string>
+  <string name="cities_add_city_title">চহৰ যোগ কৰক</string>
+  <string name="cities_add_city_city">চহৰ:</string>
+  <string name="cities_add_city_timezone">সময়জ\'ন:</string>
+  <string name="cities_add_city_gps_cd">আপোনাৰ বৰ্তমান চহৰ স্থানীয়কৰণ কৰিবলৈ</string>
+  <string name="cities_add_loading">লোডিং\u2026</string>
+  <string name="cities_add_searching">বিচাৰি থকা হৈছে\u2026</string>
+  <string name="cities_add_gps_no_results">GPS কুৱেৰিয়ে কোনো অৱস্থান তথ্য প্ৰদান কৰা নাই</string>
+  <string name="cities_add_gps_not_available">GPS উপলব্ধ নহয়</string>
+  <string name="cities_add_already_exists">চহৰখন ইতিমধ্যে ডাটাবেচত বিদ্যমান</string>
+  <string name="cities_add_city_failed">চহৰ সৃষ্টি কৰিব নোৱাৰে</string>
+  <string name="cities_delete_city_title">চহৰ বিলোপ কৰক</string>
+  <string name="cities_delete_city_msg">আপুনি <xliff:g id="city">%s</xliff:g> বিলোপ কৰিব বিচাৰেনে?</string>
+  <string name="cities_delete_city_failed">চহৰ বিলোপ কৰিব</string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">ভলিউম বুটাম টিপিলে হ\'ব <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
+  <string name="flip_action_title">ওলোটোৱা ক্ৰিয়া</string>
+  <!-- Setting summary for the flip action setting. -->
+  <string name="flip_action_summary" product="tablet">টেবলেট কম্পিউটাৰ ওলোটালে হ\'ব <xliff:g id="action">%s</xliff:g></string>
+  <string name="flip_action_summary" product="default">ফোনটো ওলোটালে হ\'ব<xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
+  <string name="shake_action_title">জোকাৰা ক্ৰিয়া</string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">টেবলেট কম্পিউটাৰ জোকাৰিলে হ\'ব <xliff:g id="action">%s</xliff:g></string>
+  <string name="shake_action_summary" product="default">ফোনটো জোকাৰিলে হ\'ব <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">এলাৰ্ম স্নুজ কৰক</string>
+  <string name="action_summary_dismiss">এলাৰ্ম অগ্ৰাহ্য কৰক</string>
+  <string name="action_summary_do_nothing">একো নকৰিব</string>
+  <!-- Alarm picker dialog title -->
+  <string name="alarm_picker_title">এলাৰ্মৰ প্ৰকাৰ পচন্দ কৰক</string>
+  <!-- Alarm types -->
+  <string name="alarm_type_ringtone">ৰিংটোন</string>
+  <string name="alarm_type_playlist">প্লে-সূচী</string>
+  <string name="alarm_type_random">ৰেণ্ড\'মভাবে</string>
+  <!-- Warn Silent Alarm title -->
+  <string name="warn_silent_alarm_title">এলাৰ্ম ভলিউম নীৰৱ হৈ আছে</string>
+  <!-- Select the source of the alarm -->
+  <string name="alarm_select">এলাৰ্ম চয়ন কৰক</string>
+  <!-- Select the ringtone as alarm -->
+  <string name="alarm_select_ringtone">ৰিংটোন</string>
+  <!-- Select the alarm from external device -->
+  <string name="alarm_select_external">মিউজিক</string>
+  <!-- Ringtone selection default -->
+  <string name="ringtone_default">ৰিংটোন ডিফল্ট কৰা</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">ৰিঙটোনৰ বাবে নিৰবিচ্ছিন্ন অনুমতি লবলৈ ব্যৰ্থ হৈছে</string>
+  <string name="menu_item_widget_settings">উইজেট ছেটিংচ</string>
+  <string name="activity_not_found">ক্ৰিয়া-কলাপটো পোৱা নগ\'ল!</string>
+</resources>
diff --git a/res/values-as-rIN/strings.xml b/res/values-as-rIN/strings.xml
new file mode 100644
index 000000000..2ca9c3e5b
--- /dev/null
+++ b/res/values-as-rIN/strings.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label shown on launcher icon -->
+  <!-- Label for the this application displayed on-screen when this application must be represented to the user. -->
+  <!-- Title for AlarmClock activity -->
+  <!-- Label for the Alarms activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Menu item on Alarm Clock screen: Add alarm -->
+  <!-- Menu item on Alarm Clock screen: Desk clock -->
+  <!-- Menu item on Alarm Clock screen: Edit alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Delete alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Enable alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Disable alarm -->
+  <!-- Delete alarm confirmation dialog message. -->
+  <!-- Menu item on Alarm Clock screen: Show clock -->
+  <!-- Menu item on Alarm Clock screen: Hide clock -->
+  <!-- Setting label on Set alarm screen: Label -->
+  <!-- Default label to display for an alarm -->
+  <!-- Preference category on Alarm Settings screen: Set alarm -->
+  <!-- Also label for the old Alarms dialog activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting labels on Set alarm screen: Vibration on or off -->
+  <!-- Setting labels on Set alarm screen: Repeat -->
+  <!-- Setting labels on Set alarm screen: Select alarm ringtone  -->
+  <!-- Label on expanded alarm edit view. -->
+  <!-- Setting labels on Set alarm screen: Set time  -->
+  <!-- Label shown when user is setting up non-repeating alarm for tomorrow [CHAR LIMIT=15] -->
+  <!-- Label shown when user is setting up non-repeating alarm for later today [CHAR LIMIT=15] -->
+  <!-- The text shown above the clock when alarm is alerting [CHAR LIMIT=10] -->
+  <!-- The text shown as an option to dismiss an alerting alarm [CHAR LIMIT=5] -->
+  <!-- Button labels on the alarm dialog: Dismiss -->
+  <!-- Button labels on the pre-dismiss alarm notifications: Dismiss now -->
+  <!-- Alarm Alert screen: this message is shown after an alarm rung
+         unattended for a number of minutes.  It tells the user that
+         the alarm has been silenced.-->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the number of minutes in two separate lines. For example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the word 'Snoozed' in two separate lines or example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user dismissed an alerting alarm [CHAR LIMIT=15] -->
+  <!-- Button labels on the alarm dialog: Snooze -->
+  <!-- Toast that appears after Alarm is snoozed from the Alarm
+         dialog. Says the alarm will snooze for xxx minutes.  -->
+  <!-- Text to appear inside a notification while an alarm is snoozing. -->
+  <!-- Text to appear in the notification title while an alarm is about to go off. -->
+  <!-- Text to appear in when trying to view a missed alarm that has been deleted -->
+  <!-- 0: nothing
+         1: days
+         2:      hours
+         3: days hours
+         4:            minutes
+         5: days       minutes
+         6:      hours minutes
+         7: days hours minutes
+    -->
+  <!-- Timer notification: how long from now until timer goes off. -->
+  <!-- Alarm confirmation toast: Describes how long from now until
+         alarm fires -->
+  <!-- Alarm confirmation toast: singular day -->
+  <!-- Alarm confirmation toast: plural days -->
+  <!-- Alarm confirmation toast: singular hour -->
+  <!-- Alarm confirmation toast: plural hours -->
+  <!-- Alarm confirmation toast: singular minute  -->
+  <!-- Alarm confirmation toast: plural minutes  -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to repeat every day -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to never repeat -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: concatenate days with
+         this character, i.e. "Mon, Tue, Wed" -->
+  <!-- Appears at the top of the Clock Picker screen: Tell user to
+         select a clock to display -->
+  <!-- Label for analog clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- Help activity name -->
+  <!-- Settings activity name -->
+  <!-- Label for the Settings activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting title for changing the snooze duration. -->
+  <!-- Auto silence preference title -->
+  <!-- Auto silence summary string set based on the preference value. -->
+  <!-- Auto silence summary when turned off -->
+  <!-- Entries listed in the ListPreference when invoking the auto silence
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the auto_silence_entries above. -->
+  <!-- Done button when editing an alarm. -->
+  <!-- Revert button when editing an alarm. -->
+  <!-- Delete button when editing an alarm. -->
+  <!-- Setting title for changing the alarm volume. -->
+  <!-- Summary for the alarm preference when silent is chosen. -->
+  <!-- Text to display in the small text of the notification -->
+  <!-- Text to display in the notification ticker and label -->
+  <!-- Text to display in the notification when the alarm has been snoozed -->
+  <!-- Title of the setting to change hardware button behavior. This string
+         should be changed for each piece of hardware. [CHAR LIMIT=20] -->
+  <!-- Dialog title of the volume and power setting. -->
+  <!-- Entries listed in the setting for the side-button action. -->
+  <!-- Values for the side-button setting. -->
+  <!-- Title of the ringtone setting. -->
+  <!-- Accessibility labels for Clock activity buttons -->
+  <!-- Accessibility labels for alarm buttons -->
+  <!-- What to show the user if the weather widget exists but fails to
+         respond. This is a sign of an error; if the weather widget is not
+         present on the device, we show nothing at all. -->
+  <!-- A description for the DeskClock alarm sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- String displayed as the alert summary while loading the alert name from
+         the media player. [CHAR LIMIT=NONE] -->
+  <!-- A description for the DeskClock timer sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- Label on the main screen control used to set alarm [CHAR LIMIT=30]-->
+  <!-- Label on the main screen control used to set alarm when there is already an existing alarm [CHAR LIMIT=30]-->
+  <!--  ActionBar strings -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Alarm page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Timer page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Clock page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Stopwatch page -->
+  <!-- Clock view buttons strings-->
+  <!-- Describes the purpose of the button to start the activity to add/edit/delete alarms -->
+  <!-- Describes the purpose of the button which provides a list of cities for the world clock settings -->
+  <!-- Describes the purpose of the button which pops up a menu of setting choices -->
+  <!-- Menu item on most screens to get to more settings -->
+  <!-- Menu item on most screens to get to the help information -->
+  <!-- Menu item on clock screen to enter night mode. -->
+  <!-- Menu item on Cities screen to sort by GMT offset -->
+  <!-- Menu item on Cities screen to sort by alphabetical order -->
+  <!-- Label for selected cities in Cities list view -->
+  <!-- Stop Watch strings -->
+  <!-- Describes the purpose of the button to resume running a stopwatch -->
+  <!-- Describes the purpose of the button to begin running a stopwatch -->
+  <!-- Describes the purpose of the button to pause a stopwatch. -->
+  <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
+  <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
+  <!-- Describes the purpose of the button to share the stopwatch value.
+         Also used as title for chooser when sharing stopwatch results. -->
+  <!-- Abbreviation for temporal hours [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal minutes [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal seconds [CHAR LIMIT=1] -->
+  <!-- Accessibility strings -->
+  <!--  Stopwatch share strings -->
+  <!-- Sentence within the message created to share the total time recorded within the stopwatch -->
+  <!-- Header within the message created to share a list of lap times (a new line is appended to this) -->
+  <!-- Label to enumerate the number of laps in the notification the user has counted -->
+  <!-- Formatted stopwatch time -->
+  <!-- Formatted stopwatch time for laps shared using the share button -->
+  <!-- Label to enumerate the number of laps the user has counted -->
+  <!-- Stopwatch accessibility strings -->
+  <!-- timer strings -->
+  <!-- Describes the purpose of the button to add a new timer -->
+  <!-- Describes the purpose of the button to begin or continue running a timer -->
+  <!-- Describes the purpose of the button to delete a timer. -->
+  <!-- Describes the purpose of the button increase the remaining time on a timer by one minute. -->
+  <!-- Like "timer_plus_one", but with 'minute' abbreviated for the notification. -->
+  <!-- Describes the purpose of the button to stop the timer. -->
+  <!-- Describes the purpose of the button to stop and delete the timer. -->
+  <!-- Describes the purpose of the button to return the timer to it's original starting value. -->
+  <!-- Describes the purpose of the button to discard the current dialog values. Will also close the dialog if other time's exist -->
+  <!-- Notification content shown when a timer has completed and has no more time remaining -->
+  <!-- Label associated with a notification for a Timer -->
+  <!-- Toast content shown when user attempts to create a new timer when there are already 4 timers -->
+  <!-- Jocular content that user may append when sharing the lap times -->
+  <!-- Title with the clock on the main page displaying the user's regular timezone (shows when automatic_home_clock enabled) -->
+  <!-- Label for the Cities activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Settings strings -->
+  <!-- Header in the preferences settings for the section pertaining to clocks on the main fragment -->
+  <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->
+  <!-- Entries listed in the ListPreference when invoking the clock style
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the clock_style_entries above. -->
+  <!-- Title for an option that will automtically show a clock representing the user's regular timezone on the main fragment whenever the user leaves their regular timezone-->
+  <!-- Describes the functionality provided by the automatic_home_clock option -->
+  <!-- Title in the preferences change the time zone for the user's home -->
+  <!-- Title in a list dialog box to pick a time zone for the user's home -->
+  <!-- Textual content of the button to discard the current dialog values and close the dialog -->
+  <!-- Textual content of the button to update an alarm with the current dialog values -->
+  <!--  place holder for am/pm label when it is not set -->
+  <!-- add 00 as minutes to the time when pressing this button -->
+  <!-- add 30 as minutes to the time when pressing this button -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. CHAR LIMIT=25] -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. -->
+  <!-- Header in the preferences settings for the section pertaining to alarms -->
+  <!-- Describes the running service for the stopwatch -->
+  <!-- Desription for the stopped stop watch -->
+  <!-- Text instruction for dismiss alarm on alarm lock screen. The dismiss button will still
+         be on the right even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Text instruction for snooze alarm on alarm lock screen. The snooze button will still
+         be on the left even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Notification title when timer is stopped. -->
+  <!-- Notification title when multiple timers are stopped. -->
+  <!-- Notification text when multiple timers are stopped. -->
+  <!-- Notification title when at least one timer, of those in use, is counting down. -->
+  <!-- Notification text when at least one timer, of those in use, is counting down. -->
+  <!-- screensaver settings strings -->
+  <!-- Label for the screen saver activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Title for check box to pick intensity of display diminuation during dream mode -->
+  <!-- Describes intensity of display diminuation during dream mode -->
+  <!-- Description of the down caret in the alarm alert screen to expand the alarm content to edit perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up caret in the alarm alert screen to collapse the alarm content to summary perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to undo change to alarm -->
+  <!-- Toast content when an alarm was deleted  -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- Description of field showing the next alarm time in the clock page, for accessibility. -->
+  <!-- Displays the number of alarms selected from the list of alarms. -->
+  <!-- message used by the talkback accessebility app to say that something was deleted -->
+  <!-- Alarm deletion confirmation message-->
+  <!-- Timer deletion confirmation -->
+  <!-- world clock deletion confirmation -->
+  <!-- Label for digital clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- format strings for clocks -->
+  <!-- Font size for AM/PM should match widget_label_font_size -->
+  <!-- Font size for AM/PM should match bottom_text_size -->
+  <!-- Font size for AM/PM should match label_font_size -->
+  <!-- Font size for AM/PM should match alarm_label_size -->
+  <!-- String for no alarms -->
+  <!-- String for no alarms set [CHAR LIMIT=24] -->
+  <!-- String for no enabled alarms in timeline view [CHAR LIMIT=30] -->
+</resources>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index fdb627b62..b73397ad3 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Amosar iconu</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Amosar un iconu na barra d\'estáu cuando heba dalguna alarma afitada</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Volume ascendente</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Perfil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Nengún perfil esbilláu</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Amestar</string>
   <string name="cities_add_city_title">Amestar ciudá</string>
   <string name="cities_add_city_city">Ciudá:</string>
@@ -35,24 +41,40 @@
   <string name="cities_delete_city_title">Desaniciar ciudá</string>
   <string name="cities_delete_city_msg">¿Quies desaniciar <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Imposible desaniciar la ciudá</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Al primir los botones de volume <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Aición al voltiar</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Al voltiar la tablet,  <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Al voltiar el teléfonu, <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Aición al ximelgar</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Al ximelgar la tablet, <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Al ximelgar el teléfonu, <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">repitir l\'alarma</string>
   <string name="action_summary_dismiss">descartar l\'alarma</string>
   <string name="action_summary_do_nothing">nun facer un res</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Escueyi\'l tipu d\'alarma</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Tonu de llamada</string>
   <string name="alarm_type_playlist">Llista de reproducción</string>
   <string name="alarm_type_random">Al debalu</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">El volume l\'alarma ta en silenciu</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Seleicionar alarma</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Tonu</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Música</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Tonu predetermináu</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Fallu al obtener permisu persistente pal tonu de llamada</string>
+  <string name="menu_item_widget_settings">Axustes de Widgets</string>
+  <string name="activity_not_found">¡Nun s\'alcontraron actividaes!</string>
 </resources>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 22f5ba8b7..4c247933d 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -15,53 +15,119 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label shown on launcher icon -->
+  <!-- Label for the this application displayed on-screen when this application must be represented to the user. -->
   <string name="app_label">Reló</string>
+  <!-- Title for AlarmClock activity -->
+  <!-- Label for the Alarms activity displayed on-screen when that activity must be represented to the user. -->
   <string name="alarm_list_title">Alarmes</string>
+  <!-- Menu item on Alarm Clock screen: Add alarm -->
   <string name="add_alarm">Amestar alarma</string>
+  <!-- Menu item on Alarm Clock screen: Desk clock -->
   <string name="menu_desk_clock">Reló d\'escritoriu</string>
+  <!-- Menu item on Alarm Clock screen: Edit alarm -->
   <string name="menu_edit_alarm">Editar alarma</string>
+  <!-- Context Menu Item on Alarm Settings screen: Delete alarm -->
   <string name="delete_alarm">Desaniciar alarma</string>
+  <!-- Context Menu Item on Alarm Settings screen: Enable alarm -->
   <string name="enable_alarm">Activar alarma</string>
+  <!-- Context Menu Item on Alarm Settings screen: Disable alarm -->
   <string name="disable_alarm">Desactivar alarma</string>
+  <!-- Delete alarm confirmation dialog message. -->
   <string name="delete_alarm_confirm">¿Desaniciar esta alarma?</string>
+  <!-- Menu item on Alarm Clock screen: Show clock -->
   <string name="show_clock">Amosar reló</string>
+  <!-- Menu item on Alarm Clock screen: Hide clock -->
   <string name="hide_clock">Anubrir reló</string>
+  <!-- Setting label on Set alarm screen: Label -->
   <string name="label">Nome l\'alarma</string>
+  <!-- Default label to display for an alarm -->
   <string name="default_label">Alarma</string>
+  <!-- Preference category on Alarm Settings screen: Set alarm -->
+  <!-- Also label for the old Alarms dialog activity displayed on-screen when that activity must be represented to the user. -->
   <string name="set_alarm">Afitar alarma</string>
+  <!-- Setting labels on Set alarm screen: Vibration on or off -->
   <string name="alarm_vibrate">Vibración</string>
+  <!-- Setting labels on Set alarm screen: Repeat -->
   <string name="alarm_repeat">Repetir</string>
+  <!-- Setting labels on Set alarm screen: Select alarm ringtone  -->
   <string name="alert">Tonu d\'alarma</string>
+  <!-- Label on expanded alarm edit view. -->
   <string name="ringtone">Tonu de llamada</string>
+  <!-- Setting labels on Set alarm screen: Set time  -->
   <string name="time">Hora</string>
+  <!-- Label shown when user is setting up non-repeating alarm for tomorrow [CHAR LIMIT=15] -->
   <string name="alarm_tomorrow">Mañana</string>
+  <!-- Label shown when user is setting up non-repeating alarm for later today [CHAR LIMIT=15] -->
   <string name="alarm_today">Güei</string>
+  <!-- The text shown above the clock when alarm is alerting [CHAR LIMIT=10] -->
   <string name="alarm_alert_wake_up">Espertar\u0021</string>
+  <!-- The text shown as an option to dismiss an alerting alarm [CHAR LIMIT=5] -->
   <string name="alarm_alert_off_action_text">Non</string>
+  <!-- Button labels on the alarm dialog: Dismiss -->
   <string name="alarm_alert_dismiss_text">Descartar</string>
+  <!-- Button labels on the pre-dismiss alarm notifications: Dismiss now -->
   <string name="alarm_alert_dismiss_now_text">Inorar agora</string>
+  <!-- Alarm Alert screen: this message is shown after an alarm rung
+         unattended for a number of minutes.  It tells the user that
+         the alarm has been silenced.-->
   <string name="alarm_missed_title">Alarma perdida</string>
   <string name="alarm_missed_text"><xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g></string>
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the number of minutes in two separate lines. For example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
   <string name="alarm_alert_snoozed_text">Snoozed</string>
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the word 'Snoozed' in two separate lines or example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
   <plurals name="alarm_alert_snooze_duration">
+    <!-- Duration for one minute -->
     <item quantity="one">1 min</item>
+    <!-- Duration for more than one minute -->
     <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> mins</item>
   </plurals>
+  <!-- The text shown after user dismissed an alerting alarm [CHAR LIMIT=15] -->
   <string name="alarm_alert_off_text">Alarma apagada</string>
+  <!-- Button labels on the alarm dialog: Snooze -->
   <string name="alarm_alert_snooze_text">Posponer</string>
+  <!-- Toast that appears after Alarm is snoozed from the Alarm
+         dialog. Says the alarm will snooze for xxx minutes.  -->
   <plurals name="alarm_alert_snooze_set">
+    <!-- Duration for one minute -->
     <item quantity="one">Pospuesta 1 minutu.</item>
+    <!-- Duration for more than one minute -->
     <item quantity="other">Pospuesta <xliff:g id="MINUTES">%d</xliff:g> minutos.</item>
   </plurals>
+  <!-- Text to appear inside a notification while an alarm is snoozing. -->
   <string name="alarm_alert_snooze_until">Repetir a les <xliff:g id="TIME">%s</xliff:g></string>
+  <!-- Text to appear in the notification title while an alarm is about to go off. -->
   <string name="alarm_alert_predismiss_title">Próxima alarma</string>
+  <!-- Text to appear in when trying to view a missed alarm that has been deleted -->
   <string name="missed_alarm_has_been_deleted">Desaniciáronse les alarmes perdíes</string>
+  <!-- 0: nothing
+         1: days
+         2:      hours
+         3: days hours
+         4:            minutes
+         5: days       minutes
+         6:      hours minutes
+         7: days hours minutes
+    -->
+  <!-- Timer notification: how long from now until timer goes off. -->
   <string-array name="timer_notifications">
     <item>Queda menos de 1 minutu</item>
     <item>Queden <xliff:g id="HOURS">%1$s</xliff:g></item>
     <item>Queden <xliff:g id="MINUTES">%2$s</xliff:g></item>
     <item>Queden <xliff:g id="HOURS">%1$s</xliff:g> y <xliff:g id="MINUTES">%2$s</xliff:g></item>
   </string-array>
+  <!-- Alarm confirmation toast: Describes how long from now until
+         alarm fires -->
   <string-array name="alarm_set">
     <item>L\'alarma va sonar en menos d\'un minutu.</item>
     <item>L\'alarma va sonar en <xliff:g id="DAYS">%1$s</xliff:g>.</item>
@@ -72,31 +138,62 @@
     <item>L\'alarma va sonar en <xliff:g id="HOURS">%2$s</xliff:g> y <xliff:g id="MINUTES">%3$s</xliff:g>.</item>
     <item>L\'alarma va sonar en <xliff:g id="DAYS">%1$s</xliff:g>, <xliff:g id="HOURS">%2$s</xliff:g> y <xliff:g id="MINUTES">%3$s</xliff:g>.</item>
   </string-array>
+  <!-- Alarm confirmation toast: singular day -->
   <string name="day">"1 día"</string>
+  <!-- Alarm confirmation toast: plural days -->
   <string name="days">"<xliff:g id="DAYS">%s</xliff:g> díes"</string>
+  <!-- Alarm confirmation toast: singular hour -->
   <string name="hour">1 hora</string>
+  <!-- Alarm confirmation toast: plural hours -->
   <string name="hours"><xliff:g id="HOURS">%s</xliff:g> hores</string>
+  <!-- Alarm confirmation toast: singular minute  -->
   <string name="minute">"1 minutu"</string>
+  <!-- Alarm confirmation toast: plural minutes  -->
   <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> minutos"</string>
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to repeat every day -->
   <string name="every_day">Tolos díes</string>
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to never repeat -->
   <string name="never">Enxamás</string>
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: concatenate days with
+         this character, i.e. "Mon, Tue, Wed" -->
   <string name="day_concat">", "</string>
+  <!-- Appears at the top of the Clock Picker screen: Tell user to
+         select a clock to display -->
   <string name="clock_instructions">Esbillar un reló</string>
+  <!-- Label for analog clock gadget displayed on-screen when that gadget is represented to the user. -->
   <string name="analog_gadget">Reló analóxicu</string>
+  <!-- Help activity name -->
   <string name="help">ayuda</string>
+  <!-- Settings activity name -->
+  <!-- Label for the Settings activity displayed on-screen when that activity must be represented to the user. -->
   <string name="settings">Axustes</string>
+  <!-- Setting title for changing the snooze duration. -->
   <string name="snooze_duration_title">Repetir alarma dempués de</string>
   <plurals name="snooze_duration">
+    <!-- Duration for one minute -->
     <item quantity="one">1 minutu</item>
+    <!-- Duration for more than one minute -->
     <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minutos</item>
   </plurals>
   <plurals name="snooze_picker_label">
+    <!-- Duration for one minute -->
     <item quantity="one">minutu</item>
+    <!-- Duration for more than one minute -->
     <item quantity="other">minutos</item>
   </plurals>
+  <!-- Auto silence preference title -->
   <string name="auto_silence_title">Silenciar dempués de</string>
+  <!-- Auto silence summary string set based on the preference value. -->
   <string name="auto_silence_summary"><xliff:g id="MINUTES">%d</xliff:g> minutos</string>
+  <!-- Auto silence summary when turned off -->
   <string name="auto_silence_never">Enxamás</string>
+  <!-- Entries listed in the ListPreference when invoking the auto silence
+         preference. -->
   <string-array name="auto_silence_entries">
     <item>1 minute</item>
     <item>5 minutes</item>
@@ -106,88 +203,172 @@
     <item>25 minutes</item>
     <item>Nunca</item>
   </string-array>
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the auto_silence_entries above. -->
+  <!-- Done button when editing an alarm. -->
   <string name="done">Fecho</string>
+  <!-- Revert button when editing an alarm. -->
   <string name="revert">Revertir</string>
+  <!-- Delete button when editing an alarm. -->
   <string name="delete">Desaniciar</string>
+  <!-- Setting title for changing the alarm volume. -->
   <string name="alarm_volume_title">Volume de l\'alarma</string>
+  <!-- Summary for the alarm preference when silent is chosen. -->
   <string name="silent_alarm_summary">Silenciu</string>
+  <!-- Text to display in the small text of the notification -->
   <string name="alarm_notify_text">Posponer o inorar alarma</string>
+  <!-- Text to display in the notification ticker and label -->
   <string name="alarm_notify_snooze_label"><xliff:g id="LABEL">%s</xliff:g> (pospuesta)</string>
+  <!-- Text to display in the notification when the alarm has been snoozed -->
   <string name="alarm_notify_snooze_text">L\'alarma va sonar a les <xliff:g id="TIME">%s</xliff:g>. Toca pa encaboxar.</string>
+  <!-- Title of the setting to change hardware button behavior. This string
+         should be changed for each piece of hardware. [CHAR LIMIT=20] -->
   <string name="volume_button_setting_title">Botones de volume</string>
+  <!-- Dialog title of the volume and power setting. -->
   <string name="volume_button_dialog_title">Aición de los botones</string>
+  <!-- Entries listed in the setting for the side-button action. -->
   <string-array name="volume_button_setting_entries">
     <item>Posponer l\'alarma</item>
     <item>Descartar l\'alarma</item>
     <item>Nun facer un res</item>
   </string-array>
+  <!-- Values for the side-button setting. -->
+  <!-- Title of the ringtone setting. -->
   <string name="default_ringtone_setting_title">Afitar tonu predetermináu</string>
+  <!-- Accessibility labels for Clock activity buttons -->
   <string name="alarm_button_description">Alarmes</string>
   <string name="gallery_button_description">Galería</string>
   <string name="music_button_description">Música</string>
   <string name="nightmode_button_description">Atenuar</string>
   <string name="home_button_description">Llanzador</string>
   <string name="desk_clock_button_description">Reló</string>
+  <!-- Accessibility labels for alarm buttons -->
   <string name="label_description">Nome</string>
   <string name="ringtone_description">Tonu de llamada</string>
+  <!-- What to show the user if the weather widget exists but fails to
+         respond. This is a sign of an error; if the weather widget is not
+         present on the device, we show nothing at all. -->
   <string name="weather_fetch_failure">La información meteorolóxica nun ta disponible nesti momentu.</string>
+  <!-- A description for the DeskClock alarm sound playback service.
+         [CHAR LIMIT=NONE] -->
   <string name="alarm_klaxon_service_desc">Reproducción d\'alarmes definíes en Reló</string>
+  <!-- String displayed as the alert summary while loading the alert name from
+         the media player. [CHAR LIMIT=NONE] -->
   <string name="loading_ringtone">Cargando tonu…</string>
+  <!-- A description for the DeskClock timer sound playback service.
+         [CHAR LIMIT=NONE] -->
   <string name="timer_ring_service_desc">Reproducción de temporizadores definíos nel reló</string>
+  <!-- Label on the main screen control used to set alarm [CHAR LIMIT=30]-->
   <string name="control_set_alarm">Afitar alarma</string>
+  <!-- Label on the main screen control used to set alarm when there is already an existing alarm [CHAR LIMIT=30]-->
   <string name="control_set_alarm_with_existing"><xliff:g id="time">%s</xliff:g></string>
+  <!--  ActionBar strings -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Alarm page -->
   <string name="menu_alarm">Alarma</string>
+  <!-- Describes the purpose of the tab button which which switches the activity to the Timer page -->
   <string name="menu_timer">Temporizador</string>
+  <!-- Describes the purpose of the tab button which which switches the activity to the Clock page -->
   <string name="menu_clock">Reló</string>
+  <!-- Describes the purpose of the tab button which which switches the activity to the Stopwatch page -->
   <string name="menu_stopwatch">Cronómetru</string>
+  <!-- Clock view buttons strings-->
+  <!-- Describes the purpose of the button to start the activity to add/edit/delete alarms -->
   <string name="button_alarms">Amestar alarma</string>
+  <!-- Describes the purpose of the button which provides a list of cities for the world clock settings -->
   <string name="button_cities">Ciudaes</string>
+  <!-- Describes the purpose of the button which pops up a menu of setting choices -->
   <string name="button_menu">Más opciones</string>
+  <!-- Menu item on most screens to get to more settings -->
   <string name="menu_item_settings">Axustes</string>
+  <!-- Menu item on most screens to get to the help information -->
   <string name="menu_item_help">Ayuda</string>
+  <!-- Menu item on clock screen to enter night mode. -->
   <string name="menu_item_night_mode">Mou nocherniegu</string>
+  <!-- Menu item on Cities screen to sort by GMT offset -->
   <string name="menu_item_sort_by_gmt_offset">Ordenar por hora</string>
+  <!-- Menu item on Cities screen to sort by alphabetical order -->
   <string name="menu_item_sort_by_name">Ordenar por nome</string>
+  <!-- Label for selected cities in Cities list view -->
   <string name="selected_cities_label">Ciudaes esbillaes</string>
+  <!-- Stop Watch strings -->
+  <!-- Describes the purpose of the button to resume running a stopwatch -->
   <string name="sw_resume_button">Reanudar</string>
+  <!-- Describes the purpose of the button to begin running a stopwatch -->
   <string name="sw_start_button">Aniciar</string>
+  <!-- Describes the purpose of the button to pause a stopwatch. -->
   <string name="sw_stop_button">Detener</string>
+  <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
   <string name="sw_lap_button">Amestar vuelta</string>
+  <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
   <string name="sw_reset_button">Llimpiar</string>
+  <!-- Describes the purpose of the button to share the stopwatch value.
+         Also used as title for chooser when sharing stopwatch results. -->
   <string name="sw_share_button">Compartir</string>
+  <!-- Abbreviation for temporal hours [CHAR LIMIT=1] -->
   <string name="hours_label">h</string>
+  <!-- Abbreviation for temporal minutes [CHAR LIMIT=1] -->
   <string name="minutes_label">m</string>
+  <!-- Abbreviation for temporal seconds [CHAR LIMIT=1] -->
   <string name="seconds_label">s</string>
+  <!-- Accessibility strings -->
   <string name="hours_label_description">hores</string>
   <string name="minutes_label_description">minutos</string>
   <string name="seconds_label_description">segundos</string>
+  <!--  Stopwatch share strings -->
+  <!-- Sentence within the message created to share the total time recorded within the stopwatch -->
   <string name="sw_share_main">Hora: <xliff:g id="TIME">%s</xliff:g></string>
+  <!-- Header within the message created to share a list of lap times (a new line is appended to this) -->
   <string name="sw_share_laps">Duración de les vueltes:</string>
+  <!-- Label to enumerate the number of laps in the notification the user has counted -->
   <string name="sw_notification_lap_number">Fase <xliff:g id="NUMBER">%d</xliff:g></string>
+  <!-- Formatted stopwatch time -->
+  <!-- Formatted stopwatch time for laps shared using the share button -->
+  <!-- Label to enumerate the number of laps the user has counted -->
+  <!-- Stopwatch accessibility strings -->
   <plurals name="Nhours_description">
+    <!-- 1 hour -->
     <item quantity="one">1 hora</item>
+    <!-- more -->
     <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> hores</item>
   </plurals>
   <plurals name="Nminutes_description">
+    <!-- 1 minute -->
     <item quantity="one">1 minutu</item>
+    <!-- more -->
     <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> minutos</item>
   </plurals>
   <plurals name="Nseconds_description">
+    <!-- 1 second -->
     <item quantity="one">1 segundu</item>
+    <!-- more -->
     <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> segundos</item>
   </plurals>
+  <!-- timer strings -->
+  <!-- Describes the purpose of the button to add a new timer -->
   <string name="timer_add_timer">Amestar temporizador</string>
+  <!-- Describes the purpose of the button to begin or continue running a timer -->
   <string name="timer_start">Aniciar</string>
+  <!-- Describes the purpose of the button to delete a timer. -->
   <string name="timer_delete">Desaniciar</string>
+  <!-- Describes the purpose of the button increase the remaining time on a timer by one minute. -->
   <string name="timer_plus_one">Amestar 1 minutu</string>
+  <!-- Like "timer_plus_one", but with 'minute' abbreviated for the notification. -->
   <string name="timer_plus_1_min">Añadir 1 min</string>
+  <!-- Describes the purpose of the button to stop the timer. -->
   <string name="timer_stop">Detener</string>
+  <!-- Describes the purpose of the button to stop and delete the timer. -->
   <string name="timer_done">Fecho</string>
+  <!-- Describes the purpose of the button to return the timer to it's original starting value. -->
   <string name="timer_reset">Llimpiar</string>
+  <!-- Describes the purpose of the button to discard the current dialog values. Will also close the dialog if other time's exist -->
   <string name="timer_cancel">Encaboxar</string>
+  <!-- Notification content shown when a timer has completed and has no more time remaining -->
   <string name="timer_times_up">Tiempu agotáu</string>
+  <!-- Label associated with a notification for a Timer -->
   <string name="timer_notification_label">Temporizador</string>
+  <!-- Toast content shown when user attempts to create a new timer when there are already 4 timers -->
   <string name="timers_max_count_reached">4 vegaes máximo</string>
+  <!-- Jocular content that user may append when sharing the lap times -->
   <string-array name="sw_share_strings" translatable="true">
     <item>Yes el rei de la velocidá.</item>
     <item>Esfruta de los frutos del to trabayu.</item>
@@ -201,27 +382,48 @@
     <item>Velocidá fotónica</item>
   </string-array>
   <plurals name="timers_num">
+    <!-- 1 timer -->
     <item quantity="one">Un minutu</item>
+    <!-- more -->
     <item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> temporizadores</item>
   </plurals>
+  <!-- Title with the clock on the main page displaying the user's regular timezone (shows when automatic_home_clock enabled) -->
   <string name="home_label">Casa</string>
+  <!-- Label for the Cities activity displayed on-screen when that activity must be represented to the user. -->
   <string name="cities_activity_title">Ciudaes</string>
+  <!-- Settings strings -->
+  <!-- Header in the preferences settings for the section pertaining to clocks on the main fragment -->
   <string name="clock_settings">Reló</string>
+  <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->
   <string name="clock_style">Estilu</string>
+  <!-- Entries listed in the ListPreference when invoking the clock style
+         preference. -->
   <string-array name="clock_style_entries">
     <item>Analóxicu</item>
     <item>Dixital</item>
   </string-array>
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the clock_style_entries above. -->
+  <!-- Title for an option that will automtically show a clock representing the user's regular timezone on the main fragment whenever the user leaves their regular timezone-->
   <string name="automatic_home_clock">Reló de la to ciudá automáticu</string>
+  <!-- Describes the functionality provided by the automatic_home_clock option -->
   <string name="automatic_home_clock_summary">Cuando viaxes a una zona con una hora diferente, amiesta un reló pa la hora de la to ciudá</string>
+  <!-- Title in the preferences change the time zone for the user's home -->
   <string name="home_time_zone">Estaya horaria llocal</string>
+  <!-- Title in a list dialog box to pick a time zone for the user's home -->
   <string name="home_time_zone_title">Estaya horaria llocal</string>
+  <!-- Textual content of the button to discard the current dialog values and close the dialog -->
   <string name="time_picker_cancel">Encaboxar</string>
+  <!-- Textual content of the button to update an alarm with the current dialog values -->
   <string name="time_picker_set">Aceutar</string>
   <string name="time_picker_time_seperator">:</string>
+  <!--  place holder for am/pm label when it is not set -->
   <string name="time_picker_ampm_label">--</string>
+  <!-- add 00 as minutes to the time when pressing this button -->
   <string name="time_picker_00_label">:00</string>
+  <!-- add 30 as minutes to the time when pressing this button -->
   <string name="time_picker_30_label">:30</string>
+  <!-- Choices for timezones, must be kept in sync with timezone_values. CHAR LIMIT=25] -->
   <string-array name="timezone_labels">
     <item>"Islles Marshall"</item>
     <item>"Islles Midway"</item>
@@ -309,36 +511,78 @@
     <item>"Tonga"</item>
     <item>"Xakarta"</item>
   </string-array>
+  <!-- Choices for timezones, must be kept in sync with timezone_values. -->
+  <!-- Header in the preferences settings for the section pertaining to alarms -->
   <string name="alarm_settings">Alarmes</string>
+  <!-- Describes the running service for the stopwatch -->
   <string name="stopwatch_service_desc">Serviciu de cronómetru pa executar la notificación</string>
+  <!-- Desription for the stopped stop watch -->
   <string name="swn_stopped">Deteníu</string>
+  <!-- Text instruction for dismiss alarm on alarm lock screen. The dismiss button will still
+         be on the right even on RTL languages so please do not reverse this during
+         translation. -->
   <string name="description_direction_right">Eslizar el deu hacia mandrecha pa descartar</string>
+  <!-- Text instruction for snooze alarm on alarm lock screen. The snooze button will still
+         be on the left even on RTL languages so please do not reverse this during
+         translation. -->
   <string name="description_direction_left">Eslizar el deu hacia manzorga pa posponer</string>
+  <!-- Notification title when timer is stopped. -->
   <string name="timer_stopped">Temporizador deteníu</string>
+  <!-- Notification title when multiple timers are stopped. -->
   <string name="timers_stopped"><xliff:g id="NUMBER">%d</xliff:g> temporizadores deteníos</string>
+  <!-- Notification text when multiple timers are stopped. -->
   <string name="all_timers_stopped_notif">Toca pa ver los tos temporizadores</string>
+  <!-- Notification title when at least one timer, of those in use, is counting down. -->
   <string name="timers_in_use"><xliff:g id="NUMBER">%d</xliff:g> temporizadores</string>
+  <!-- Notification text when at least one timer, of those in use, is counting down. -->
   <string name="next_timer_notif">Próximu temporizador: <xliff:g id="TIME_REMAINING">%s</xliff:g></string>
+  <!-- screensaver settings strings -->
+  <!-- Label for the screen saver activity displayed on-screen when that activity must be represented to the user. -->
   <string name="screensaver_settings">Axustes del curiapantalles</string>
+  <!-- Title for check box to pick intensity of display diminuation during dream mode -->
   <string name="night_mode_title">Mou nocherniegu</string>
+  <!-- Describes intensity of display diminuation during dream mode -->
   <string name="night_mode_summary">Pantalla amatagada (pa espacios escuros)</string>
+  <!-- Description of the down caret in the alarm alert screen to expand the alarm content to edit perspective. [CHAR LIMIT=NONE] -->
   <string name="expand_alarm">Espander alarma</string>
+  <!-- Description of the up caret in the alarm alert screen to collapse the alarm content to summary perspective. [CHAR LIMIT=NONE] -->
   <string name="collapse_alarm">Contrayer alarma</string>
+  <!-- Description of the button to undo change to alarm -->
   <string name="alarm_undo">desfacer</string>
+  <!-- Toast content when an alarm was deleted  -->
   <string name="alarm_deleted">Alarma desaniciada</string>
+  <!-- slash between date and next alarm in the clock -->
   <string name="slash"> / </string>
+  <!-- slash between date and next alarm in the clock -->
   <string name="world_day_of_week_label">/ <xliff:g id="LABEL">%s</xliff:g></string>
+  <!-- Description of field showing the next alarm time in the clock page, for accessibility. -->
   <string name="next_alarm_description">Próxima alarma: <xliff:g id="ALARM_TIME">%s</xliff:g></string>
+  <!-- Displays the number of alarms selected from the list of alarms. -->
   <string name="alarms_selected">Seleicionaes: <xliff:g id="ALARMS">%d</xliff:g></string>
+  <!-- message used by the talkback accessebility app to say that something was deleted -->
   <string name="deleted_message">Desaniciáu</string>
+  <!-- Alarm deletion confirmation message-->
   <plurals name="alarm_delete_confirmation">
+    <!-- Confirmation for one alarm -->
     <item quantity="one">¿Desaniciar alarma seleicionada?</item>
+    <!-- Confirmation more than one alarm  -->
     <item quantity="other">¿Desaniciar alarmes seleicionaes?</item>
   </plurals>
+  <!-- Timer deletion confirmation -->
   <string name="timer_delete_confirmation">¿Desaniciar esti temporizador?</string>
+  <!-- world clock deletion confirmation -->
   <string name="city_delete_confirmation">¿Desaniciar esta ciudá?</string>
+  <!-- Label for digital clock gadget displayed on-screen when that gadget is represented to the user. -->
   <string name="digital_gadget">Reló dixital</string>
+  <!-- format strings for clocks -->
+  <!-- Font size for AM/PM should match widget_label_font_size -->
+  <!-- Font size for AM/PM should match bottom_text_size -->
+  <!-- Font size for AM/PM should match label_font_size -->
+  <!-- Font size for AM/PM should match alarm_label_size -->
+  <!-- String for no alarms -->
   <string name="no_alarms">Nun hai alarmes</string>
+  <!-- String for no alarms set [CHAR LIMIT=24] -->
   <string name="no_alarms_set">Nun s\'afitaron alarmes</string>
+  <!-- String for no enabled alarms in timeline view [CHAR LIMIT=30] -->
   <string name="no_upcoming_alarms">NUN HAI ALARMES VINIENTES</string>
 </resources>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index 70160888c..1a68d3af8 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -16,19 +16,65 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Nişanı göstər</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <string name="show_status_bar_icon_summary">Zəngli saat tənzimlənəndə durum sətrində nişanı göstər</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <string name="alarm_increasing_volume">Artan səs</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Profil seçilməyib</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Əlavə et</string>
   <string name="cities_add_city_title">Şəhər əlavə et</string>
   <string name="cities_add_city_city">Şəhər:</string>
+  <string name="cities_add_city_timezone">Saat qurşağı:</string>
+  <string name="cities_add_city_gps_cd">Hazırki şəhərinizi yerliləşdirmək üçün toxunun</string>
   <string name="cities_add_loading">Yüklənir\u2026</string>
   <string name="cities_add_searching">Axtarılır\u2026</string>
+  <string name="cities_add_gps_no_results">GPS sorğusu ilə yer tapılmadı</string>
+  <string name="cities_add_gps_not_available">GPS işləmir</string>
   <string name="cities_add_already_exists">Şəhər artıq verilənlər bazasında mövcuddur</string>
+  <string name="cities_add_city_failed">Şəhər yaradıla bilmir</string>
   <string name="cities_delete_city_title">Şəhəri sil</string>
   <string name="cities_delete_city_msg"><xliff:g id="city">%s</xliff:g> şəhərini silmək istəyirsən?</string>
   <string name="cities_delete_city_failed">Şəhər silinə bilmir</string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">Səs düymələri <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
+  <string name="flip_action_title">Çevirmə hərəkəti</string>
+  <!-- Setting summary for the flip action setting. -->
+  <string name="flip_action_summary" product="tablet">Planşeti tərsinə çevirəndə <xliff:g id="action">%s</xliff:g></string>
+  <string name="flip_action_summary" product="default">Telefonu tərsinə çevirəndə <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
+  <string name="shake_action_title">Silkələmə hərəkəti</string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">Planşeti silkələyəndə <xliff:g id="action">%s</xliff:g></string>
+  <string name="shake_action_summary" product="default">Telefonu silkələyəndə <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">zəngli saatı təxirə salacaq</string>
+  <string name="action_summary_dismiss">zəngli saatı bağlayacaq</string>
   <string name="action_summary_do_nothing">heçnə etmə</string>
-  <string name="alarm_type_ringtone">Melodiya</string>
+  <!-- Alarm picker dialog title -->
+  <string name="alarm_picker_title">Zəngli saat növünü seçin</string>
+  <!-- Alarm types -->
+  <string name="alarm_type_ringtone">Zəng səsi</string>
+  <string name="alarm_type_playlist">Çalma siyahısı</string>
+  <string name="alarm_type_random">Təsadüfi</string>
+  <!-- Warn Silent Alarm title -->
+  <string name="warn_silent_alarm_title">Zəngli saat səssizdədir</string>
+  <!-- Select the source of the alarm -->
+  <string name="alarm_select">Zəngli saatı seç</string>
+  <!-- Select the ringtone as alarm -->
+  <string name="alarm_select_ringtone">Zəng səsi</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Musiqi</string>
+  <!-- Ringtone selection default -->
+  <string name="ringtone_default">İlkin zəng səsi</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">Zəng səsi üçün davamlı icazə alına bilmədi</string>
+  <string name="menu_item_widget_settings">Widget tənzimləmələri</string>
+  <string name="activity_not_found">Fəaliyyət tapılmadı!</string>
 </resources>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
new file mode 100644
index 000000000..dee7597e0
--- /dev/null
+++ b/res/values-be/cm_strings.xml
@@ -0,0 +1,80 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <string name="show_status_bar_icon_title">Паказваць значок</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <string name="show_status_bar_icon_summary">Адлюстроўваць значок у радку стану пры ўсталяваным будзільніку</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <string name="alarm_increasing_volume">Нарастальная гучнасць</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <string name="profile_description">Профіль <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
+  <string name="profile_no_selected">Профіль не абраны</string>
+  <!-- User-defined cities -->
+  <string name="menu_item_add">Дадаць</string>
+  <string name="cities_add_city_title">Дадаць горад</string>
+  <string name="cities_add_city_city">Горад:</string>
+  <string name="cities_add_city_timezone">Часавы пояс:</string>
+  <string name="cities_add_city_gps_cd">Націсніце для вызначэння вашага горада</string>
+  <string name="cities_add_loading">Загрузка…\u2026</string>
+  <string name="cities_add_searching">Пошук\u2026</string>
+  <string name="cities_add_gps_no_results">Не атрымоўваецца вызначыць месцазнаходжанне па GPS</string>
+  <string name="cities_add_gps_not_available">GPS недаступны</string>
+  <string name="cities_add_already_exists">Горад ужо дададзены ў базу дадзеных</string>
+  <string name="cities_add_city_failed">Не атрымоўваецца дадаць горад</string>
+  <string name="cities_delete_city_title">Выдаліць горад</string>
+  <string name="cities_delete_city_msg">Вы сапраўды хочаце выдаліць <xliff:g id="city">%s</xliff:g>?</string>
+  <string name="cities_delete_city_failed">Не атрымоўваецца выдаліць горад</string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">Пры націску на кнопкі гучнасці <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
+  <string name="flip_action_title">Пераварот</string>
+  <!-- Setting summary for the flip action setting. -->
+  <string name="flip_action_summary" product="tablet">Пры пераварочванні планшэта <xliff:g id="action">%s</xliff:g></string>
+  <string name="flip_action_summary" product="default">Пры пераварочванні тэлефона <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
+  <string name="shake_action_title">Падтрасанне</string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">Пры падтрасанні планшэта <xliff:g id="action">%s</xliff:g></string>
+  <string name="shake_action_summary" product="default">Пры падтрасанні тэлефона <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">адкласці сігнал будзільніка</string>
+  <string name="action_summary_dismiss">адключыць будзільнік</string>
+  <string name="action_summary_do_nothing">Нічога не рабіць</string>
+  <!-- Alarm picker dialog title -->
+  <string name="alarm_picker_title">Гук будзільніка</string>
+  <!-- Alarm types -->
+  <string name="alarm_type_ringtone">Рынгтон</string>
+  <string name="alarm_type_playlist">Плэйліст</string>
+  <string name="alarm_type_random">Выпадковая мелодыя</string>
+  <!-- Warn Silent Alarm title -->
+  <string name="warn_silent_alarm_title">Гук будзільніка адключаны</string>
+  <!-- Select the source of the alarm -->
+  <string name="alarm_select">Выбар сігналу</string>
+  <!-- Select the ringtone as alarm -->
+  <string name="alarm_select_ringtone">Рынгтон</string>
+  <!-- Select the alarm from external device -->
+  <string name="alarm_select_external">Музыка</string>
+  <!-- Ringtone selection default -->
+  <string name="ringtone_default">Рынгтон па змаўчаннi</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">Не атрымалася задаць мелодыю ў якасці сігналу</string>
+  <string name="menu_item_widget_settings">Налады віджэтаў</string>
+  <string name="activity_not_found">Дадатак не знойдзены!</string>
+</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
new file mode 100644
index 000000000..afb3dfdef
--- /dev/null
+++ b/res/values-be/strings.xml
@@ -0,0 +1,248 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label shown on launcher icon -->
+  <!-- Label for the this application displayed on-screen when this application must be represented to the user. -->
+  <!-- Title for AlarmClock activity -->
+  <!-- Label for the Alarms activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Menu item on Alarm Clock screen: Add alarm -->
+  <!-- Menu item on Alarm Clock screen: Desk clock -->
+  <!-- Menu item on Alarm Clock screen: Edit alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Delete alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Enable alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Disable alarm -->
+  <!-- Delete alarm confirmation dialog message. -->
+  <!-- Menu item on Alarm Clock screen: Show clock -->
+  <string name="show_clock">Паказаць гадзіны</string>
+  <!-- Menu item on Alarm Clock screen: Hide clock -->
+  <string name="hide_clock">Схаваць гадзіны</string>
+  <!-- Setting label on Set alarm screen: Label -->
+  <!-- Default label to display for an alarm -->
+  <!-- Preference category on Alarm Settings screen: Set alarm -->
+  <!-- Also label for the old Alarms dialog activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting labels on Set alarm screen: Vibration on or off -->
+  <!-- Setting labels on Set alarm screen: Repeat -->
+  <!-- Setting labels on Set alarm screen: Select alarm ringtone  -->
+  <!-- Label on expanded alarm edit view. -->
+  <!-- Setting labels on Set alarm screen: Set time  -->
+  <!-- Label shown when user is setting up non-repeating alarm for tomorrow [CHAR LIMIT=15] -->
+  <!-- Label shown when user is setting up non-repeating alarm for later today [CHAR LIMIT=15] -->
+  <!-- The text shown above the clock when alarm is alerting [CHAR LIMIT=10] -->
+  <!-- The text shown as an option to dismiss an alerting alarm [CHAR LIMIT=5] -->
+  <!-- Button labels on the alarm dialog: Dismiss -->
+  <!-- Button labels on the pre-dismiss alarm notifications: Dismiss now -->
+  <!-- Alarm Alert screen: this message is shown after an alarm rung
+         unattended for a number of minutes.  It tells the user that
+         the alarm has been silenced.-->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the number of minutes in two separate lines. For example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the word 'Snoozed' in two separate lines or example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user dismissed an alerting alarm [CHAR LIMIT=15] -->
+  <!-- Button labels on the alarm dialog: Snooze -->
+  <!-- Toast that appears after Alarm is snoozed from the Alarm
+         dialog. Says the alarm will snooze for xxx minutes.  -->
+  <!-- Text to appear inside a notification while an alarm is snoozing. -->
+  <!-- Text to appear in the notification title while an alarm is about to go off. -->
+  <!-- Text to appear in when trying to view a missed alarm that has been deleted -->
+  <!-- 0: nothing
+         1: days
+         2:      hours
+         3: days hours
+         4:            minutes
+         5: days       minutes
+         6:      hours minutes
+         7: days hours minutes
+    -->
+  <!-- Timer notification: how long from now until timer goes off. -->
+  <!-- Alarm confirmation toast: Describes how long from now until
+         alarm fires -->
+  <!-- Alarm confirmation toast: singular day -->
+  <!-- Alarm confirmation toast: plural days -->
+  <!-- Alarm confirmation toast: singular hour -->
+  <!-- Alarm confirmation toast: plural hours -->
+  <!-- Alarm confirmation toast: singular minute  -->
+  <!-- Alarm confirmation toast: plural minutes  -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to repeat every day -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to never repeat -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: concatenate days with
+         this character, i.e. "Mon, Tue, Wed" -->
+  <!-- Appears at the top of the Clock Picker screen: Tell user to
+         select a clock to display -->
+  <!-- Label for analog clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- Help activity name -->
+  <!-- Settings activity name -->
+  <!-- Label for the Settings activity displayed on-screen when that activity must be represented to the user. -->
+  <string name="settings">Налады</string>
+  <!-- Setting title for changing the snooze duration. -->
+  <!-- Auto silence preference title -->
+  <!-- Auto silence summary string set based on the preference value. -->
+  <!-- Auto silence summary when turned off -->
+  <!-- Entries listed in the ListPreference when invoking the auto silence
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the auto_silence_entries above. -->
+  <!-- Done button when editing an alarm. -->
+  <!-- Revert button when editing an alarm. -->
+  <!-- Delete button when editing an alarm. -->
+  <!-- Setting title for changing the alarm volume. -->
+  <!-- Summary for the alarm preference when silent is chosen. -->
+  <!-- Text to display in the small text of the notification -->
+  <!-- Text to display in the notification ticker and label -->
+  <!-- Text to display in the notification when the alarm has been snoozed -->
+  <!-- Title of the setting to change hardware button behavior. This string
+         should be changed for each piece of hardware. [CHAR LIMIT=20] -->
+  <!-- Dialog title of the volume and power setting. -->
+  <!-- Entries listed in the setting for the side-button action. -->
+  <!-- Values for the side-button setting. -->
+  <!-- Title of the ringtone setting. -->
+  <!-- Accessibility labels for Clock activity buttons -->
+  <!-- Accessibility labels for alarm buttons -->
+  <!-- What to show the user if the weather widget exists but fails to
+         respond. This is a sign of an error; if the weather widget is not
+         present on the device, we show nothing at all. -->
+  <!-- A description for the DeskClock alarm sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- String displayed as the alert summary while loading the alert name from
+         the media player. [CHAR LIMIT=NONE] -->
+  <!-- A description for the DeskClock timer sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- Label on the main screen control used to set alarm [CHAR LIMIT=30]-->
+  <!-- Label on the main screen control used to set alarm when there is already an existing alarm [CHAR LIMIT=30]-->
+  <!--  ActionBar strings -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Alarm page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Timer page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Clock page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Stopwatch page -->
+  <!-- Clock view buttons strings-->
+  <!-- Describes the purpose of the button to start the activity to add/edit/delete alarms -->
+  <!-- Describes the purpose of the button which provides a list of cities for the world clock settings -->
+  <!-- Describes the purpose of the button which pops up a menu of setting choices -->
+  <!-- Menu item on most screens to get to more settings -->
+  <string name="menu_item_settings">Налады</string>
+  <!-- Menu item on most screens to get to the help information -->
+  <!-- Menu item on clock screen to enter night mode. -->
+  <!-- Menu item on Cities screen to sort by GMT offset -->
+  <!-- Menu item on Cities screen to sort by alphabetical order -->
+  <!-- Label for selected cities in Cities list view -->
+  <!-- Stop Watch strings -->
+  <!-- Describes the purpose of the button to resume running a stopwatch -->
+  <!-- Describes the purpose of the button to begin running a stopwatch -->
+  <!-- Describes the purpose of the button to pause a stopwatch. -->
+  <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
+  <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
+  <!-- Describes the purpose of the button to share the stopwatch value.
+         Also used as title for chooser when sharing stopwatch results. -->
+  <!-- Abbreviation for temporal hours [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal minutes [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal seconds [CHAR LIMIT=1] -->
+  <!-- Accessibility strings -->
+  <!--  Stopwatch share strings -->
+  <!-- Sentence within the message created to share the total time recorded within the stopwatch -->
+  <!-- Header within the message created to share a list of lap times (a new line is appended to this) -->
+  <!-- Label to enumerate the number of laps in the notification the user has counted -->
+  <!-- Formatted stopwatch time -->
+  <!-- Formatted stopwatch time for laps shared using the share button -->
+  <!-- Label to enumerate the number of laps the user has counted -->
+  <!-- Stopwatch accessibility strings -->
+  <!-- timer strings -->
+  <!-- Describes the purpose of the button to add a new timer -->
+  <!-- Describes the purpose of the button to begin or continue running a timer -->
+  <!-- Describes the purpose of the button to delete a timer. -->
+  <!-- Describes the purpose of the button increase the remaining time on a timer by one minute. -->
+  <!-- Like "timer_plus_one", but with 'minute' abbreviated for the notification. -->
+  <!-- Describes the purpose of the button to stop the timer. -->
+  <!-- Describes the purpose of the button to stop and delete the timer. -->
+  <!-- Describes the purpose of the button to return the timer to it's original starting value. -->
+  <!-- Describes the purpose of the button to discard the current dialog values. Will also close the dialog if other time's exist -->
+  <!-- Notification content shown when a timer has completed and has no more time remaining -->
+  <!-- Label associated with a notification for a Timer -->
+  <!-- Toast content shown when user attempts to create a new timer when there are already 4 timers -->
+  <!-- Jocular content that user may append when sharing the lap times -->
+  <!-- Title with the clock on the main page displaying the user's regular timezone (shows when automatic_home_clock enabled) -->
+  <!-- Label for the Cities activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Settings strings -->
+  <!-- Header in the preferences settings for the section pertaining to clocks on the main fragment -->
+  <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->
+  <!-- Entries listed in the ListPreference when invoking the clock style
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the clock_style_entries above. -->
+  <!-- Title for an option that will automtically show a clock representing the user's regular timezone on the main fragment whenever the user leaves their regular timezone-->
+  <!-- Describes the functionality provided by the automatic_home_clock option -->
+  <!-- Title in the preferences change the time zone for the user's home -->
+  <!-- Title in a list dialog box to pick a time zone for the user's home -->
+  <!-- Textual content of the button to discard the current dialog values and close the dialog -->
+  <!-- Textual content of the button to update an alarm with the current dialog values -->
+  <!--  place holder for am/pm label when it is not set -->
+  <!-- add 00 as minutes to the time when pressing this button -->
+  <!-- add 30 as minutes to the time when pressing this button -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. CHAR LIMIT=25] -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. -->
+  <!-- Header in the preferences settings for the section pertaining to alarms -->
+  <!-- Describes the running service for the stopwatch -->
+  <!-- Desription for the stopped stop watch -->
+  <!-- Text instruction for dismiss alarm on alarm lock screen. The dismiss button will still
+         be on the right even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Text instruction for snooze alarm on alarm lock screen. The snooze button will still
+         be on the left even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Notification title when timer is stopped. -->
+  <!-- Notification title when multiple timers are stopped. -->
+  <!-- Notification text when multiple timers are stopped. -->
+  <!-- Notification title when at least one timer, of those in use, is counting down. -->
+  <!-- Notification text when at least one timer, of those in use, is counting down. -->
+  <!-- screensaver settings strings -->
+  <!-- Label for the screen saver activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Title for check box to pick intensity of display diminuation during dream mode -->
+  <!-- Describes intensity of display diminuation during dream mode -->
+  <!-- Description of the down caret in the alarm alert screen to expand the alarm content to edit perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up caret in the alarm alert screen to collapse the alarm content to summary perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to undo change to alarm -->
+  <!-- Toast content when an alarm was deleted  -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- Description of field showing the next alarm time in the clock page, for accessibility. -->
+  <!-- Displays the number of alarms selected from the list of alarms. -->
+  <!-- message used by the talkback accessebility app to say that something was deleted -->
+  <!-- Alarm deletion confirmation message-->
+  <!-- Timer deletion confirmation -->
+  <!-- world clock deletion confirmation -->
+  <!-- Label for digital clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- format strings for clocks -->
+  <!-- Font size for AM/PM should match widget_label_font_size -->
+  <!-- Font size for AM/PM should match bottom_text_size -->
+  <!-- Font size for AM/PM should match label_font_size -->
+  <!-- Font size for AM/PM should match alarm_label_size -->
+  <!-- String for no alarms -->
+  <!-- String for no alarms set [CHAR LIMIT=24] -->
+  <!-- String for no enabled alarms in timeline view [CHAR LIMIT=30] -->
+</resources>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
new file mode 100644
index 000000000..b07b4ee46
--- /dev/null
+++ b/res/values-bg/cm_strings.xml
@@ -0,0 +1,80 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <string name="show_status_bar_icon_title">Показване на икона</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <string name="show_status_bar_icon_summary">Показва икона в лентата на състоянието, когато има включена аларма</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <string name="alarm_increasing_volume">Увеличаващ звук</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <string name="profile_description">Профил <xliff:g id="profile">%s </xliff:g></string>
+  <!-- No profile selected label -->
+  <string name="profile_no_selected">Няма избран профил</string>
+  <!-- User-defined cities -->
+  <string name="menu_item_add">Добавяне</string>
+  <string name="cities_add_city_title">Добавяне на град</string>
+  <string name="cities_add_city_city">Град:</string>
+  <string name="cities_add_city_timezone">Часова зона:</string>
+  <string name="cities_add_city_gps_cd">Докоснете, за локализиране на текущия град</string>
+  <string name="cities_add_loading">Зареждане\u2026</string>
+  <string name="cities_add_searching">Търси се\u2026</string>
+  <string name="cities_add_gps_no_results">GPS заявката не връща резултати</string>
+  <string name="cities_add_gps_not_available">GPS не е наличен</string>
+  <string name="cities_add_already_exists">Градът вече съществува в базата данни</string>
+  <string name="cities_add_city_failed">Не може да създаде града</string>
+  <string name="cities_delete_city_title">Изтриване на града</string>
+  <string name="cities_delete_city_msg">Желаете ли \"<xliff:g id="city">%s</xliff:g>?\" да бъде изтрит?</string>
+  <string name="cities_delete_city_failed">Градът не може да бъде изтрит</string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">Натискане на бутоните за сила на звука <xliff:g id="action">%s </xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
+  <string name="flip_action_title">Действие при обръщане</string>
+  <!-- Setting summary for the flip action setting. -->
+  <string name="flip_action_summary" product="tablet">Обръщането на таблета надолу <xliff:g id="action">%s</xliff:g></string>
+  <string name="flip_action_summary" product="default">Обръщането на телефона надолу <xliff:g id="action">%s </xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
+  <string name="shake_action_title">Действие при разклащанне</string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">Разклащането на таблета <xliff:g id="action">%s</xliff:g></string>
+  <string name="shake_action_summary" product="default">Разклащане на телефона <xliff:g id="action">%s </xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">ще отложи алармата</string>
+  <string name="action_summary_dismiss">ще отхвърли алармата</string>
+  <string name="action_summary_do_nothing">не прави нищо</string>
+  <!-- Alarm picker dialog title -->
+  <string name="alarm_picker_title">Изберете тип аларма</string>
+  <!-- Alarm types -->
+  <string name="alarm_type_ringtone">Мелодия</string>
+  <string name="alarm_type_playlist">Списък за изпълнение</string>
+  <string name="alarm_type_random">Случайно</string>
+  <!-- Warn Silent Alarm title -->
+  <string name="warn_silent_alarm_title">Звукът на алармата е безшумен</string>
+  <!-- Select the source of the alarm -->
+  <string name="alarm_select">Изберете аларма</string>
+  <!-- Select the ringtone as alarm -->
+  <string name="alarm_select_ringtone">Мелодия</string>
+  <!-- Select the alarm from external device -->
+  <string name="alarm_select_external">Музика</string>
+  <!-- Ringtone selection default -->
+  <string name="ringtone_default">Мелодия по подразбиране</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">Не може да се вземе постоянно разрешение за мелодията</string>
+  <string name="menu_item_widget_settings">Настройки на приспособленията</string>
+  <string name="activity_not_found">Дейност не е намерена!</string>
+</resources>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index b4af5e0dd..913a587a7 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -16,7 +16,27 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">প্রতিক প্রদর্শন</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">ভলিউম বৃদ্ধি করা হচ্ছে</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
   <string name="profile_no_selected">কোন প্রোফাইল নির্বাচিত নয়</string>
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
 </resources>
diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-br-rFR/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-br-rFR/strings.xml b/res/values-br-rFR/strings.xml
new file mode 100644
index 000000000..2ca9c3e5b
--- /dev/null
+++ b/res/values-br-rFR/strings.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label shown on launcher icon -->
+  <!-- Label for the this application displayed on-screen when this application must be represented to the user. -->
+  <!-- Title for AlarmClock activity -->
+  <!-- Label for the Alarms activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Menu item on Alarm Clock screen: Add alarm -->
+  <!-- Menu item on Alarm Clock screen: Desk clock -->
+  <!-- Menu item on Alarm Clock screen: Edit alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Delete alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Enable alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Disable alarm -->
+  <!-- Delete alarm confirmation dialog message. -->
+  <!-- Menu item on Alarm Clock screen: Show clock -->
+  <!-- Menu item on Alarm Clock screen: Hide clock -->
+  <!-- Setting label on Set alarm screen: Label -->
+  <!-- Default label to display for an alarm -->
+  <!-- Preference category on Alarm Settings screen: Set alarm -->
+  <!-- Also label for the old Alarms dialog activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting labels on Set alarm screen: Vibration on or off -->
+  <!-- Setting labels on Set alarm screen: Repeat -->
+  <!-- Setting labels on Set alarm screen: Select alarm ringtone  -->
+  <!-- Label on expanded alarm edit view. -->
+  <!-- Setting labels on Set alarm screen: Set time  -->
+  <!-- Label shown when user is setting up non-repeating alarm for tomorrow [CHAR LIMIT=15] -->
+  <!-- Label shown when user is setting up non-repeating alarm for later today [CHAR LIMIT=15] -->
+  <!-- The text shown above the clock when alarm is alerting [CHAR LIMIT=10] -->
+  <!-- The text shown as an option to dismiss an alerting alarm [CHAR LIMIT=5] -->
+  <!-- Button labels on the alarm dialog: Dismiss -->
+  <!-- Button labels on the pre-dismiss alarm notifications: Dismiss now -->
+  <!-- Alarm Alert screen: this message is shown after an alarm rung
+         unattended for a number of minutes.  It tells the user that
+         the alarm has been silenced.-->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the number of minutes in two separate lines. For example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the word 'Snoozed' in two separate lines or example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user dismissed an alerting alarm [CHAR LIMIT=15] -->
+  <!-- Button labels on the alarm dialog: Snooze -->
+  <!-- Toast that appears after Alarm is snoozed from the Alarm
+         dialog. Says the alarm will snooze for xxx minutes.  -->
+  <!-- Text to appear inside a notification while an alarm is snoozing. -->
+  <!-- Text to appear in the notification title while an alarm is about to go off. -->
+  <!-- Text to appear in when trying to view a missed alarm that has been deleted -->
+  <!-- 0: nothing
+         1: days
+         2:      hours
+         3: days hours
+         4:            minutes
+         5: days       minutes
+         6:      hours minutes
+         7: days hours minutes
+    -->
+  <!-- Timer notification: how long from now until timer goes off. -->
+  <!-- Alarm confirmation toast: Describes how long from now until
+         alarm fires -->
+  <!-- Alarm confirmation toast: singular day -->
+  <!-- Alarm confirmation toast: plural days -->
+  <!-- Alarm confirmation toast: singular hour -->
+  <!-- Alarm confirmation toast: plural hours -->
+  <!-- Alarm confirmation toast: singular minute  -->
+  <!-- Alarm confirmation toast: plural minutes  -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to repeat every day -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to never repeat -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: concatenate days with
+         this character, i.e. "Mon, Tue, Wed" -->
+  <!-- Appears at the top of the Clock Picker screen: Tell user to
+         select a clock to display -->
+  <!-- Label for analog clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- Help activity name -->
+  <!-- Settings activity name -->
+  <!-- Label for the Settings activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting title for changing the snooze duration. -->
+  <!-- Auto silence preference title -->
+  <!-- Auto silence summary string set based on the preference value. -->
+  <!-- Auto silence summary when turned off -->
+  <!-- Entries listed in the ListPreference when invoking the auto silence
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the auto_silence_entries above. -->
+  <!-- Done button when editing an alarm. -->
+  <!-- Revert button when editing an alarm. -->
+  <!-- Delete button when editing an alarm. -->
+  <!-- Setting title for changing the alarm volume. -->
+  <!-- Summary for the alarm preference when silent is chosen. -->
+  <!-- Text to display in the small text of the notification -->
+  <!-- Text to display in the notification ticker and label -->
+  <!-- Text to display in the notification when the alarm has been snoozed -->
+  <!-- Title of the setting to change hardware button behavior. This string
+         should be changed for each piece of hardware. [CHAR LIMIT=20] -->
+  <!-- Dialog title of the volume and power setting. -->
+  <!-- Entries listed in the setting for the side-button action. -->
+  <!-- Values for the side-button setting. -->
+  <!-- Title of the ringtone setting. -->
+  <!-- Accessibility labels for Clock activity buttons -->
+  <!-- Accessibility labels for alarm buttons -->
+  <!-- What to show the user if the weather widget exists but fails to
+         respond. This is a sign of an error; if the weather widget is not
+         present on the device, we show nothing at all. -->
+  <!-- A description for the DeskClock alarm sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- String displayed as the alert summary while loading the alert name from
+         the media player. [CHAR LIMIT=NONE] -->
+  <!-- A description for the DeskClock timer sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- Label on the main screen control used to set alarm [CHAR LIMIT=30]-->
+  <!-- Label on the main screen control used to set alarm when there is already an existing alarm [CHAR LIMIT=30]-->
+  <!--  ActionBar strings -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Alarm page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Timer page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Clock page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Stopwatch page -->
+  <!-- Clock view buttons strings-->
+  <!-- Describes the purpose of the button to start the activity to add/edit/delete alarms -->
+  <!-- Describes the purpose of the button which provides a list of cities for the world clock settings -->
+  <!-- Describes the purpose of the button which pops up a menu of setting choices -->
+  <!-- Menu item on most screens to get to more settings -->
+  <!-- Menu item on most screens to get to the help information -->
+  <!-- Menu item on clock screen to enter night mode. -->
+  <!-- Menu item on Cities screen to sort by GMT offset -->
+  <!-- Menu item on Cities screen to sort by alphabetical order -->
+  <!-- Label for selected cities in Cities list view -->
+  <!-- Stop Watch strings -->
+  <!-- Describes the purpose of the button to resume running a stopwatch -->
+  <!-- Describes the purpose of the button to begin running a stopwatch -->
+  <!-- Describes the purpose of the button to pause a stopwatch. -->
+  <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
+  <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
+  <!-- Describes the purpose of the button to share the stopwatch value.
+         Also used as title for chooser when sharing stopwatch results. -->
+  <!-- Abbreviation for temporal hours [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal minutes [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal seconds [CHAR LIMIT=1] -->
+  <!-- Accessibility strings -->
+  <!--  Stopwatch share strings -->
+  <!-- Sentence within the message created to share the total time recorded within the stopwatch -->
+  <!-- Header within the message created to share a list of lap times (a new line is appended to this) -->
+  <!-- Label to enumerate the number of laps in the notification the user has counted -->
+  <!-- Formatted stopwatch time -->
+  <!-- Formatted stopwatch time for laps shared using the share button -->
+  <!-- Label to enumerate the number of laps the user has counted -->
+  <!-- Stopwatch accessibility strings -->
+  <!-- timer strings -->
+  <!-- Describes the purpose of the button to add a new timer -->
+  <!-- Describes the purpose of the button to begin or continue running a timer -->
+  <!-- Describes the purpose of the button to delete a timer. -->
+  <!-- Describes the purpose of the button increase the remaining time on a timer by one minute. -->
+  <!-- Like "timer_plus_one", but with 'minute' abbreviated for the notification. -->
+  <!-- Describes the purpose of the button to stop the timer. -->
+  <!-- Describes the purpose of the button to stop and delete the timer. -->
+  <!-- Describes the purpose of the button to return the timer to it's original starting value. -->
+  <!-- Describes the purpose of the button to discard the current dialog values. Will also close the dialog if other time's exist -->
+  <!-- Notification content shown when a timer has completed and has no more time remaining -->
+  <!-- Label associated with a notification for a Timer -->
+  <!-- Toast content shown when user attempts to create a new timer when there are already 4 timers -->
+  <!-- Jocular content that user may append when sharing the lap times -->
+  <!-- Title with the clock on the main page displaying the user's regular timezone (shows when automatic_home_clock enabled) -->
+  <!-- Label for the Cities activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Settings strings -->
+  <!-- Header in the preferences settings for the section pertaining to clocks on the main fragment -->
+  <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->
+  <!-- Entries listed in the ListPreference when invoking the clock style
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the clock_style_entries above. -->
+  <!-- Title for an option that will automtically show a clock representing the user's regular timezone on the main fragment whenever the user leaves their regular timezone-->
+  <!-- Describes the functionality provided by the automatic_home_clock option -->
+  <!-- Title in the preferences change the time zone for the user's home -->
+  <!-- Title in a list dialog box to pick a time zone for the user's home -->
+  <!-- Textual content of the button to discard the current dialog values and close the dialog -->
+  <!-- Textual content of the button to update an alarm with the current dialog values -->
+  <!--  place holder for am/pm label when it is not set -->
+  <!-- add 00 as minutes to the time when pressing this button -->
+  <!-- add 30 as minutes to the time when pressing this button -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. CHAR LIMIT=25] -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. -->
+  <!-- Header in the preferences settings for the section pertaining to alarms -->
+  <!-- Describes the running service for the stopwatch -->
+  <!-- Desription for the stopped stop watch -->
+  <!-- Text instruction for dismiss alarm on alarm lock screen. The dismiss button will still
+         be on the right even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Text instruction for snooze alarm on alarm lock screen. The snooze button will still
+         be on the left even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Notification title when timer is stopped. -->
+  <!-- Notification title when multiple timers are stopped. -->
+  <!-- Notification text when multiple timers are stopped. -->
+  <!-- Notification title when at least one timer, of those in use, is counting down. -->
+  <!-- Notification text when at least one timer, of those in use, is counting down. -->
+  <!-- screensaver settings strings -->
+  <!-- Label for the screen saver activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Title for check box to pick intensity of display diminuation during dream mode -->
+  <!-- Describes intensity of display diminuation during dream mode -->
+  <!-- Description of the down caret in the alarm alert screen to expand the alarm content to edit perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up caret in the alarm alert screen to collapse the alarm content to summary perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to undo change to alarm -->
+  <!-- Toast content when an alarm was deleted  -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- Description of field showing the next alarm time in the clock page, for accessibility. -->
+  <!-- Displays the number of alarms selected from the list of alarms. -->
+  <!-- message used by the talkback accessebility app to say that something was deleted -->
+  <!-- Alarm deletion confirmation message-->
+  <!-- Timer deletion confirmation -->
+  <!-- world clock deletion confirmation -->
+  <!-- Label for digital clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- format strings for clocks -->
+  <!-- Font size for AM/PM should match widget_label_font_size -->
+  <!-- Font size for AM/PM should match bottom_text_size -->
+  <!-- Font size for AM/PM should match label_font_size -->
+  <!-- Font size for AM/PM should match alarm_label_size -->
+  <!-- String for no alarms -->
+  <!-- String for no alarms set [CHAR LIMIT=24] -->
+  <!-- String for no enabled alarms in timeline view [CHAR LIMIT=30] -->
+</resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index ff1e5818d..bb408cc96 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -16,18 +16,24 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Mostra la icona</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Mostra una icona a la barra d\'estat quan s\'estableixi una alarma</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Volum ascendent</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Perfil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Cap perfil seleccionat</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Afegeix</string>
   <string name="cities_add_city_title">Afegeix ciutat</string>
   <string name="cities_add_city_city">Ciutat:</string>
   <string name="cities_add_city_timezone">Fus horari:</string>
   <string name="cities_add_city_gps_cd">Pica per localitzar la teva ciutat actual</string>
   <string name="cities_add_loading">S\'està carregant\u2026</string>
-  <string name="cities_add_searching">S\'està cercant\u2026</string>
+  <string name="cities_add_searching">S\'està buscant\u2026</string>
   <string name="cities_add_gps_no_results">La consulta GPS no ha retornat resultats d\'ubicació</string>
   <string name="cities_add_gps_not_available">GPS no disponible</string>
   <string name="cities_add_already_exists">La ciutat ja existeix a la base de dades</string>
@@ -35,25 +41,39 @@
   <string name="cities_delete_city_title">Esborra ciutat</string>
   <string name="cities_delete_city_msg">Vols esborrar <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">No s\'ha pogut esborrar la ciutat</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Prement els botons de volum es <xliff:g id="action">%s </xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Acció girar</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Girant la tauleta <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Girant el telèfon <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Acció agitar</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Agitant la tauleta <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Agitant el telèfon <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">postposa l\'alarma</string>
   <string name="action_summary_dismiss">descarta l\'alarma</string>
   <string name="action_summary_do_nothing">no es fa res</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Tria el tipus d\'alarma</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">To de trucada</string>
   <string name="alarm_type_playlist">Llista de reproducció</string>
   <string name="alarm_type_random">A l\'atzar</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">El volum de l\'alarma està en silenci</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Selecciona alarma</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">To de trucada</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Música</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">To de trucada per defecte</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">No s\'ha pogut obtenir el permís persistent pel to de trucada</string>
   <string name="menu_item_widget_settings">Configuració Widget</string>
   <string name="activity_not_found">No s\'ha trobat activitat!</string>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 4ea17efee..5b7aeb553 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Zobrazit ikonu</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Pokud je nastaven budík, je v liště zobrazena ikona</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Zvyšující hlasitost</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Žádný profil</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Přidat</string>
   <string name="cities_add_city_title">Přidat město</string>
   <string name="cities_add_city_city">Město:</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">Smazat město</string>
   <string name="cities_delete_city_msg">Chcete smazat město <xliff:g id="city">%s</xliff:g> z databáze?</string>
   <string name="cities_delete_city_failed">Mesto nelze smazat</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Stiskem tlačítek hlasitosti: <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Akce při otočení</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Otočením tabletu dojde k <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Otočením telefonu dojde k <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Akce při zatřesení</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Zatřesením tabletu dojde k <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Zatřesením telefonu dojde k <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">odložit budík</string>
   <string name="action_summary_dismiss">vypnout budík</string>
   <string name="action_summary_do_nothing">ničemu</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Zvolte styl budíku</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Vyzváněcí melodie</string>
   <string name="alarm_type_playlist">Seznam stop</string>
   <string name="alarm_type_random">Náhodně</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Hlasitost budíku je příliš nízká</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Vyberte budík</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Vyzvánění</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Hudba</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Výchozí vyzváněcí tón</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Selhalo trvalé získání práv pro vyzvánění</string>
   <string name="menu_item_widget_settings">Nastavení widgetu</string>
   <string name="activity_not_found">Aktivita nebyla nalezena!</string>
-  <string name="permlab_write_alarms">přímá změna budíků</string>
-  <string name="permdesc_write_alarms">Umožňuje přidat, změnit nebo odebrat budíky.</string>
-  <string name="permlab_manage_alarms">přepnutí naplánovaných budíků</string>
-  <string name="permdesc_manage_alarms">Umožňuje vypnout nebo zapnout naplánované budíky.</string>
-  <string name="permlab_read_alarms">přístup k naplánovaným budíkům</string>
-  <string name="permdesc_read_alarms">Umožní číst naplánované budíky.</string>
-  <string name="alarm_modification_service_desc">Služba, umožnující aplikacím třetích stran manipulovat s budíky.</string>
 </resources>
diff --git a/res/values-csb-rPL/cm_strings.xml b/res/values-csb-rPL/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-csb-rPL/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-csb-rPL/strings.xml b/res/values-csb-rPL/strings.xml
new file mode 100644
index 000000000..2ca9c3e5b
--- /dev/null
+++ b/res/values-csb-rPL/strings.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label shown on launcher icon -->
+  <!-- Label for the this application displayed on-screen when this application must be represented to the user. -->
+  <!-- Title for AlarmClock activity -->
+  <!-- Label for the Alarms activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Menu item on Alarm Clock screen: Add alarm -->
+  <!-- Menu item on Alarm Clock screen: Desk clock -->
+  <!-- Menu item on Alarm Clock screen: Edit alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Delete alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Enable alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Disable alarm -->
+  <!-- Delete alarm confirmation dialog message. -->
+  <!-- Menu item on Alarm Clock screen: Show clock -->
+  <!-- Menu item on Alarm Clock screen: Hide clock -->
+  <!-- Setting label on Set alarm screen: Label -->
+  <!-- Default label to display for an alarm -->
+  <!-- Preference category on Alarm Settings screen: Set alarm -->
+  <!-- Also label for the old Alarms dialog activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting labels on Set alarm screen: Vibration on or off -->
+  <!-- Setting labels on Set alarm screen: Repeat -->
+  <!-- Setting labels on Set alarm screen: Select alarm ringtone  -->
+  <!-- Label on expanded alarm edit view. -->
+  <!-- Setting labels on Set alarm screen: Set time  -->
+  <!-- Label shown when user is setting up non-repeating alarm for tomorrow [CHAR LIMIT=15] -->
+  <!-- Label shown when user is setting up non-repeating alarm for later today [CHAR LIMIT=15] -->
+  <!-- The text shown above the clock when alarm is alerting [CHAR LIMIT=10] -->
+  <!-- The text shown as an option to dismiss an alerting alarm [CHAR LIMIT=5] -->
+  <!-- Button labels on the alarm dialog: Dismiss -->
+  <!-- Button labels on the pre-dismiss alarm notifications: Dismiss now -->
+  <!-- Alarm Alert screen: this message is shown after an alarm rung
+         unattended for a number of minutes.  It tells the user that
+         the alarm has been silenced.-->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the number of minutes in two separate lines. For example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the word 'Snoozed' in two separate lines or example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user dismissed an alerting alarm [CHAR LIMIT=15] -->
+  <!-- Button labels on the alarm dialog: Snooze -->
+  <!-- Toast that appears after Alarm is snoozed from the Alarm
+         dialog. Says the alarm will snooze for xxx minutes.  -->
+  <!-- Text to appear inside a notification while an alarm is snoozing. -->
+  <!-- Text to appear in the notification title while an alarm is about to go off. -->
+  <!-- Text to appear in when trying to view a missed alarm that has been deleted -->
+  <!-- 0: nothing
+         1: days
+         2:      hours
+         3: days hours
+         4:            minutes
+         5: days       minutes
+         6:      hours minutes
+         7: days hours minutes
+    -->
+  <!-- Timer notification: how long from now until timer goes off. -->
+  <!-- Alarm confirmation toast: Describes how long from now until
+         alarm fires -->
+  <!-- Alarm confirmation toast: singular day -->
+  <!-- Alarm confirmation toast: plural days -->
+  <!-- Alarm confirmation toast: singular hour -->
+  <!-- Alarm confirmation toast: plural hours -->
+  <!-- Alarm confirmation toast: singular minute  -->
+  <!-- Alarm confirmation toast: plural minutes  -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to repeat every day -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to never repeat -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: concatenate days with
+         this character, i.e. "Mon, Tue, Wed" -->
+  <!-- Appears at the top of the Clock Picker screen: Tell user to
+         select a clock to display -->
+  <!-- Label for analog clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- Help activity name -->
+  <!-- Settings activity name -->
+  <!-- Label for the Settings activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting title for changing the snooze duration. -->
+  <!-- Auto silence preference title -->
+  <!-- Auto silence summary string set based on the preference value. -->
+  <!-- Auto silence summary when turned off -->
+  <!-- Entries listed in the ListPreference when invoking the auto silence
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the auto_silence_entries above. -->
+  <!-- Done button when editing an alarm. -->
+  <!-- Revert button when editing an alarm. -->
+  <!-- Delete button when editing an alarm. -->
+  <!-- Setting title for changing the alarm volume. -->
+  <!-- Summary for the alarm preference when silent is chosen. -->
+  <!-- Text to display in the small text of the notification -->
+  <!-- Text to display in the notification ticker and label -->
+  <!-- Text to display in the notification when the alarm has been snoozed -->
+  <!-- Title of the setting to change hardware button behavior. This string
+         should be changed for each piece of hardware. [CHAR LIMIT=20] -->
+  <!-- Dialog title of the volume and power setting. -->
+  <!-- Entries listed in the setting for the side-button action. -->
+  <!-- Values for the side-button setting. -->
+  <!-- Title of the ringtone setting. -->
+  <!-- Accessibility labels for Clock activity buttons -->
+  <!-- Accessibility labels for alarm buttons -->
+  <!-- What to show the user if the weather widget exists but fails to
+         respond. This is a sign of an error; if the weather widget is not
+         present on the device, we show nothing at all. -->
+  <!-- A description for the DeskClock alarm sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- String displayed as the alert summary while loading the alert name from
+         the media player. [CHAR LIMIT=NONE] -->
+  <!-- A description for the DeskClock timer sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- Label on the main screen control used to set alarm [CHAR LIMIT=30]-->
+  <!-- Label on the main screen control used to set alarm when there is already an existing alarm [CHAR LIMIT=30]-->
+  <!--  ActionBar strings -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Alarm page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Timer page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Clock page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Stopwatch page -->
+  <!-- Clock view buttons strings-->
+  <!-- Describes the purpose of the button to start the activity to add/edit/delete alarms -->
+  <!-- Describes the purpose of the button which provides a list of cities for the world clock settings -->
+  <!-- Describes the purpose of the button which pops up a menu of setting choices -->
+  <!-- Menu item on most screens to get to more settings -->
+  <!-- Menu item on most screens to get to the help information -->
+  <!-- Menu item on clock screen to enter night mode. -->
+  <!-- Menu item on Cities screen to sort by GMT offset -->
+  <!-- Menu item on Cities screen to sort by alphabetical order -->
+  <!-- Label for selected cities in Cities list view -->
+  <!-- Stop Watch strings -->
+  <!-- Describes the purpose of the button to resume running a stopwatch -->
+  <!-- Describes the purpose of the button to begin running a stopwatch -->
+  <!-- Describes the purpose of the button to pause a stopwatch. -->
+  <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
+  <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
+  <!-- Describes the purpose of the button to share the stopwatch value.
+         Also used as title for chooser when sharing stopwatch results. -->
+  <!-- Abbreviation for temporal hours [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal minutes [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal seconds [CHAR LIMIT=1] -->
+  <!-- Accessibility strings -->
+  <!--  Stopwatch share strings -->
+  <!-- Sentence within the message created to share the total time recorded within the stopwatch -->
+  <!-- Header within the message created to share a list of lap times (a new line is appended to this) -->
+  <!-- Label to enumerate the number of laps in the notification the user has counted -->
+  <!-- Formatted stopwatch time -->
+  <!-- Formatted stopwatch time for laps shared using the share button -->
+  <!-- Label to enumerate the number of laps the user has counted -->
+  <!-- Stopwatch accessibility strings -->
+  <!-- timer strings -->
+  <!-- Describes the purpose of the button to add a new timer -->
+  <!-- Describes the purpose of the button to begin or continue running a timer -->
+  <!-- Describes the purpose of the button to delete a timer. -->
+  <!-- Describes the purpose of the button increase the remaining time on a timer by one minute. -->
+  <!-- Like "timer_plus_one", but with 'minute' abbreviated for the notification. -->
+  <!-- Describes the purpose of the button to stop the timer. -->
+  <!-- Describes the purpose of the button to stop and delete the timer. -->
+  <!-- Describes the purpose of the button to return the timer to it's original starting value. -->
+  <!-- Describes the purpose of the button to discard the current dialog values. Will also close the dialog if other time's exist -->
+  <!-- Notification content shown when a timer has completed and has no more time remaining -->
+  <!-- Label associated with a notification for a Timer -->
+  <!-- Toast content shown when user attempts to create a new timer when there are already 4 timers -->
+  <!-- Jocular content that user may append when sharing the lap times -->
+  <!-- Title with the clock on the main page displaying the user's regular timezone (shows when automatic_home_clock enabled) -->
+  <!-- Label for the Cities activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Settings strings -->
+  <!-- Header in the preferences settings for the section pertaining to clocks on the main fragment -->
+  <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->
+  <!-- Entries listed in the ListPreference when invoking the clock style
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the clock_style_entries above. -->
+  <!-- Title for an option that will automtically show a clock representing the user's regular timezone on the main fragment whenever the user leaves their regular timezone-->
+  <!-- Describes the functionality provided by the automatic_home_clock option -->
+  <!-- Title in the preferences change the time zone for the user's home -->
+  <!-- Title in a list dialog box to pick a time zone for the user's home -->
+  <!-- Textual content of the button to discard the current dialog values and close the dialog -->
+  <!-- Textual content of the button to update an alarm with the current dialog values -->
+  <!--  place holder for am/pm label when it is not set -->
+  <!-- add 00 as minutes to the time when pressing this button -->
+  <!-- add 30 as minutes to the time when pressing this button -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. CHAR LIMIT=25] -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. -->
+  <!-- Header in the preferences settings for the section pertaining to alarms -->
+  <!-- Describes the running service for the stopwatch -->
+  <!-- Desription for the stopped stop watch -->
+  <!-- Text instruction for dismiss alarm on alarm lock screen. The dismiss button will still
+         be on the right even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Text instruction for snooze alarm on alarm lock screen. The snooze button will still
+         be on the left even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Notification title when timer is stopped. -->
+  <!-- Notification title when multiple timers are stopped. -->
+  <!-- Notification text when multiple timers are stopped. -->
+  <!-- Notification title when at least one timer, of those in use, is counting down. -->
+  <!-- Notification text when at least one timer, of those in use, is counting down. -->
+  <!-- screensaver settings strings -->
+  <!-- Label for the screen saver activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Title for check box to pick intensity of display diminuation during dream mode -->
+  <!-- Describes intensity of display diminuation during dream mode -->
+  <!-- Description of the down caret in the alarm alert screen to expand the alarm content to edit perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up caret in the alarm alert screen to collapse the alarm content to summary perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to undo change to alarm -->
+  <!-- Toast content when an alarm was deleted  -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- Description of field showing the next alarm time in the clock page, for accessibility. -->
+  <!-- Displays the number of alarms selected from the list of alarms. -->
+  <!-- message used by the talkback accessebility app to say that something was deleted -->
+  <!-- Alarm deletion confirmation message-->
+  <!-- Timer deletion confirmation -->
+  <!-- world clock deletion confirmation -->
+  <!-- Label for digital clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- format strings for clocks -->
+  <!-- Font size for AM/PM should match widget_label_font_size -->
+  <!-- Font size for AM/PM should match bottom_text_size -->
+  <!-- Font size for AM/PM should match label_font_size -->
+  <!-- Font size for AM/PM should match alarm_label_size -->
+  <!-- String for no alarms -->
+  <!-- String for no alarms set [CHAR LIMIT=24] -->
+  <!-- String for no enabled alarms in timeline view [CHAR LIMIT=30] -->
+</resources>
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-cy/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
new file mode 100644
index 000000000..2ca9c3e5b
--- /dev/null
+++ b/res/values-cy/strings.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label shown on launcher icon -->
+  <!-- Label for the this application displayed on-screen when this application must be represented to the user. -->
+  <!-- Title for AlarmClock activity -->
+  <!-- Label for the Alarms activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Menu item on Alarm Clock screen: Add alarm -->
+  <!-- Menu item on Alarm Clock screen: Desk clock -->
+  <!-- Menu item on Alarm Clock screen: Edit alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Delete alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Enable alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Disable alarm -->
+  <!-- Delete alarm confirmation dialog message. -->
+  <!-- Menu item on Alarm Clock screen: Show clock -->
+  <!-- Menu item on Alarm Clock screen: Hide clock -->
+  <!-- Setting label on Set alarm screen: Label -->
+  <!-- Default label to display for an alarm -->
+  <!-- Preference category on Alarm Settings screen: Set alarm -->
+  <!-- Also label for the old Alarms dialog activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting labels on Set alarm screen: Vibration on or off -->
+  <!-- Setting labels on Set alarm screen: Repeat -->
+  <!-- Setting labels on Set alarm screen: Select alarm ringtone  -->
+  <!-- Label on expanded alarm edit view. -->
+  <!-- Setting labels on Set alarm screen: Set time  -->
+  <!-- Label shown when user is setting up non-repeating alarm for tomorrow [CHAR LIMIT=15] -->
+  <!-- Label shown when user is setting up non-repeating alarm for later today [CHAR LIMIT=15] -->
+  <!-- The text shown above the clock when alarm is alerting [CHAR LIMIT=10] -->
+  <!-- The text shown as an option to dismiss an alerting alarm [CHAR LIMIT=5] -->
+  <!-- Button labels on the alarm dialog: Dismiss -->
+  <!-- Button labels on the pre-dismiss alarm notifications: Dismiss now -->
+  <!-- Alarm Alert screen: this message is shown after an alarm rung
+         unattended for a number of minutes.  It tells the user that
+         the alarm has been silenced.-->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the number of minutes in two separate lines. For example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the word 'Snoozed' in two separate lines or example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user dismissed an alerting alarm [CHAR LIMIT=15] -->
+  <!-- Button labels on the alarm dialog: Snooze -->
+  <!-- Toast that appears after Alarm is snoozed from the Alarm
+         dialog. Says the alarm will snooze for xxx minutes.  -->
+  <!-- Text to appear inside a notification while an alarm is snoozing. -->
+  <!-- Text to appear in the notification title while an alarm is about to go off. -->
+  <!-- Text to appear in when trying to view a missed alarm that has been deleted -->
+  <!-- 0: nothing
+         1: days
+         2:      hours
+         3: days hours
+         4:            minutes
+         5: days       minutes
+         6:      hours minutes
+         7: days hours minutes
+    -->
+  <!-- Timer notification: how long from now until timer goes off. -->
+  <!-- Alarm confirmation toast: Describes how long from now until
+         alarm fires -->
+  <!-- Alarm confirmation toast: singular day -->
+  <!-- Alarm confirmation toast: plural days -->
+  <!-- Alarm confirmation toast: singular hour -->
+  <!-- Alarm confirmation toast: plural hours -->
+  <!-- Alarm confirmation toast: singular minute  -->
+  <!-- Alarm confirmation toast: plural minutes  -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to repeat every day -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to never repeat -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: concatenate days with
+         this character, i.e. "Mon, Tue, Wed" -->
+  <!-- Appears at the top of the Clock Picker screen: Tell user to
+         select a clock to display -->
+  <!-- Label for analog clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- Help activity name -->
+  <!-- Settings activity name -->
+  <!-- Label for the Settings activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting title for changing the snooze duration. -->
+  <!-- Auto silence preference title -->
+  <!-- Auto silence summary string set based on the preference value. -->
+  <!-- Auto silence summary when turned off -->
+  <!-- Entries listed in the ListPreference when invoking the auto silence
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the auto_silence_entries above. -->
+  <!-- Done button when editing an alarm. -->
+  <!-- Revert button when editing an alarm. -->
+  <!-- Delete button when editing an alarm. -->
+  <!-- Setting title for changing the alarm volume. -->
+  <!-- Summary for the alarm preference when silent is chosen. -->
+  <!-- Text to display in the small text of the notification -->
+  <!-- Text to display in the notification ticker and label -->
+  <!-- Text to display in the notification when the alarm has been snoozed -->
+  <!-- Title of the setting to change hardware button behavior. This string
+         should be changed for each piece of hardware. [CHAR LIMIT=20] -->
+  <!-- Dialog title of the volume and power setting. -->
+  <!-- Entries listed in the setting for the side-button action. -->
+  <!-- Values for the side-button setting. -->
+  <!-- Title of the ringtone setting. -->
+  <!-- Accessibility labels for Clock activity buttons -->
+  <!-- Accessibility labels for alarm buttons -->
+  <!-- What to show the user if the weather widget exists but fails to
+         respond. This is a sign of an error; if the weather widget is not
+         present on the device, we show nothing at all. -->
+  <!-- A description for the DeskClock alarm sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- String displayed as the alert summary while loading the alert name from
+         the media player. [CHAR LIMIT=NONE] -->
+  <!-- A description for the DeskClock timer sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- Label on the main screen control used to set alarm [CHAR LIMIT=30]-->
+  <!-- Label on the main screen control used to set alarm when there is already an existing alarm [CHAR LIMIT=30]-->
+  <!--  ActionBar strings -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Alarm page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Timer page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Clock page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Stopwatch page -->
+  <!-- Clock view buttons strings-->
+  <!-- Describes the purpose of the button to start the activity to add/edit/delete alarms -->
+  <!-- Describes the purpose of the button which provides a list of cities for the world clock settings -->
+  <!-- Describes the purpose of the button which pops up a menu of setting choices -->
+  <!-- Menu item on most screens to get to more settings -->
+  <!-- Menu item on most screens to get to the help information -->
+  <!-- Menu item on clock screen to enter night mode. -->
+  <!-- Menu item on Cities screen to sort by GMT offset -->
+  <!-- Menu item on Cities screen to sort by alphabetical order -->
+  <!-- Label for selected cities in Cities list view -->
+  <!-- Stop Watch strings -->
+  <!-- Describes the purpose of the button to resume running a stopwatch -->
+  <!-- Describes the purpose of the button to begin running a stopwatch -->
+  <!-- Describes the purpose of the button to pause a stopwatch. -->
+  <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
+  <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
+  <!-- Describes the purpose of the button to share the stopwatch value.
+         Also used as title for chooser when sharing stopwatch results. -->
+  <!-- Abbreviation for temporal hours [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal minutes [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal seconds [CHAR LIMIT=1] -->
+  <!-- Accessibility strings -->
+  <!--  Stopwatch share strings -->
+  <!-- Sentence within the message created to share the total time recorded within the stopwatch -->
+  <!-- Header within the message created to share a list of lap times (a new line is appended to this) -->
+  <!-- Label to enumerate the number of laps in the notification the user has counted -->
+  <!-- Formatted stopwatch time -->
+  <!-- Formatted stopwatch time for laps shared using the share button -->
+  <!-- Label to enumerate the number of laps the user has counted -->
+  <!-- Stopwatch accessibility strings -->
+  <!-- timer strings -->
+  <!-- Describes the purpose of the button to add a new timer -->
+  <!-- Describes the purpose of the button to begin or continue running a timer -->
+  <!-- Describes the purpose of the button to delete a timer. -->
+  <!-- Describes the purpose of the button increase the remaining time on a timer by one minute. -->
+  <!-- Like "timer_plus_one", but with 'minute' abbreviated for the notification. -->
+  <!-- Describes the purpose of the button to stop the timer. -->
+  <!-- Describes the purpose of the button to stop and delete the timer. -->
+  <!-- Describes the purpose of the button to return the timer to it's original starting value. -->
+  <!-- Describes the purpose of the button to discard the current dialog values. Will also close the dialog if other time's exist -->
+  <!-- Notification content shown when a timer has completed and has no more time remaining -->
+  <!-- Label associated with a notification for a Timer -->
+  <!-- Toast content shown when user attempts to create a new timer when there are already 4 timers -->
+  <!-- Jocular content that user may append when sharing the lap times -->
+  <!-- Title with the clock on the main page displaying the user's regular timezone (shows when automatic_home_clock enabled) -->
+  <!-- Label for the Cities activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Settings strings -->
+  <!-- Header in the preferences settings for the section pertaining to clocks on the main fragment -->
+  <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->
+  <!-- Entries listed in the ListPreference when invoking the clock style
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the clock_style_entries above. -->
+  <!-- Title for an option that will automtically show a clock representing the user's regular timezone on the main fragment whenever the user leaves their regular timezone-->
+  <!-- Describes the functionality provided by the automatic_home_clock option -->
+  <!-- Title in the preferences change the time zone for the user's home -->
+  <!-- Title in a list dialog box to pick a time zone for the user's home -->
+  <!-- Textual content of the button to discard the current dialog values and close the dialog -->
+  <!-- Textual content of the button to update an alarm with the current dialog values -->
+  <!--  place holder for am/pm label when it is not set -->
+  <!-- add 00 as minutes to the time when pressing this button -->
+  <!-- add 30 as minutes to the time when pressing this button -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. CHAR LIMIT=25] -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. -->
+  <!-- Header in the preferences settings for the section pertaining to alarms -->
+  <!-- Describes the running service for the stopwatch -->
+  <!-- Desription for the stopped stop watch -->
+  <!-- Text instruction for dismiss alarm on alarm lock screen. The dismiss button will still
+         be on the right even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Text instruction for snooze alarm on alarm lock screen. The snooze button will still
+         be on the left even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Notification title when timer is stopped. -->
+  <!-- Notification title when multiple timers are stopped. -->
+  <!-- Notification text when multiple timers are stopped. -->
+  <!-- Notification title when at least one timer, of those in use, is counting down. -->
+  <!-- Notification text when at least one timer, of those in use, is counting down. -->
+  <!-- screensaver settings strings -->
+  <!-- Label for the screen saver activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Title for check box to pick intensity of display diminuation during dream mode -->
+  <!-- Describes intensity of display diminuation during dream mode -->
+  <!-- Description of the down caret in the alarm alert screen to expand the alarm content to edit perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up caret in the alarm alert screen to collapse the alarm content to summary perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to undo change to alarm -->
+  <!-- Toast content when an alarm was deleted  -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- Description of field showing the next alarm time in the clock page, for accessibility. -->
+  <!-- Displays the number of alarms selected from the list of alarms. -->
+  <!-- message used by the talkback accessebility app to say that something was deleted -->
+  <!-- Alarm deletion confirmation message-->
+  <!-- Timer deletion confirmation -->
+  <!-- world clock deletion confirmation -->
+  <!-- Label for digital clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- format strings for clocks -->
+  <!-- Font size for AM/PM should match widget_label_font_size -->
+  <!-- Font size for AM/PM should match bottom_text_size -->
+  <!-- Font size for AM/PM should match label_font_size -->
+  <!-- Font size for AM/PM should match alarm_label_size -->
+  <!-- String for no alarms -->
+  <!-- String for no alarms set [CHAR LIMIT=24] -->
+  <!-- String for no enabled alarms in timeline view [CHAR LIMIT=30] -->
+</resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 818dfc000..062ee102a 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Vis ikon</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Vis et ikon i statuslinjen, når en alarm er indstillet</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Stigende lydstyrke</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Ingen profil valgt</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Tilføj</string>
   <string name="cities_add_city_title">Tilføj by</string>
   <string name="cities_add_city_city">By:</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">Slet by</string>
   <string name="cities_delete_city_msg">Vil du slette <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Kan ikke slette byen</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Tryk på volumeknapperne vil <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Vendehandling</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">At vende tabletten nedad vil <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">At vende telefonen nedad vil <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Rystehandling</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">At ryste tabletten vil <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">At ryste telefonen vil <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">udsætte alarmen</string>
   <string name="action_summary_dismiss">afvise alarmen</string>
   <string name="action_summary_do_nothing">gøre ingenting</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Vælg alarmtype</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Ringetone</string>
   <string name="alarm_type_playlist">Afspilningsliste</string>
   <string name="alarm_type_random">Tilfældig</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Alarmen er sat på lydløs</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Vælg alarm</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Ringetone</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Musik</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Standardringetone</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Kunne ikke give permanent tilladelse til ringetone</string>
   <string name="menu_item_widget_settings">Widget-indstillinger</string>
   <string name="activity_not_found">Aktivitet ikke fundet!</string>
-  <string name="permlab_write_alarms">ændrer alarmer direkte</string>
-  <string name="permdesc_write_alarms">Tillader en app at tilføje, ændre eller slette alle dine alarmer.</string>
-  <string name="permlab_manage_alarms">skifte planlagte alarmer</string>
-  <string name="permdesc_manage_alarms">Tillader en app at aktivere eller deaktivere dine planlagte alarmer.</string>
-  <string name="permlab_read_alarms">få adgang til planlagte alarmer</string>
-  <string name="permdesc_read_alarms">Tillader en app at læse dine planlagte alarmer.</string>
-  <string name="alarm_modification_service_desc">En tjeneste der tillader at manipulere alarmer af tredjepart.</string>
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index beb04b6ed..9ee89da4a 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -16,44 +16,64 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Weckersymbol anzeigen</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Bei aktivem Wecker das Symbol in der Statusleiste anzeigen</string>
-  <string name="alarm_increasing_volume">Ansteigend</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <string name="alarm_increasing_volume">Ansteigende Lautstärke</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Kein Profil ausgewählt</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Hinzufügen</string>
   <string name="cities_add_city_title">Stadt hinzufügen</string>
-  <string name="cities_add_city_city">Stadt</string>
-  <string name="cities_add_city_timezone">Zeitzone</string>
-  <string name="cities_add_city_gps_cd">Berühren, um die Stadt mittels GPS zu ermitteln</string>
-  <string name="cities_add_loading">Lädt\u2026</string>
-  <string name="cities_add_searching">Suche\u2026</string>
-  <string name="cities_add_gps_no_results">Die GPS-Abfrage war nicht erfolgreich</string>
-  <string name="cities_add_gps_not_available">GPS ist nicht verfügbar</string>
-  <string name="cities_add_already_exists">Die Stadt ist bereits vorhanden</string>
-  <string name="cities_add_city_failed">Stadt konnte nicht angelegt werden</string>
+  <string name="cities_add_city_city">Stadt:</string>
+  <string name="cities_add_city_timezone">Zeitzone:</string>
+  <string name="cities_add_city_gps_cd">Tippen, um die Stadt mittels GPS zu ermitteln</string>
+  <string name="cities_add_loading">Laden\u2026</string>
+  <string name="cities_add_searching">Suchen\u2026</string>
+  <string name="cities_add_gps_no_results">Die GPS-Abfrage war nicht erfolgreich.</string>
+  <string name="cities_add_gps_not_available">GPS ist nicht verfügbar.</string>
+  <string name="cities_add_already_exists">Die Stadt ist bereits vorhanden.</string>
+  <string name="cities_add_city_failed">Stadt konnte nicht angelegt werden.</string>
   <string name="cities_delete_city_title">Stadt löschen</string>
   <string name="cities_delete_city_msg">Soll <xliff:g id="city">%s</xliff:g> gelöscht werden?</string>
-  <string name="cities_delete_city_failed">Stadt konnte nicht gelöscht werden</string>
+  <string name="cities_delete_city_failed">Stadt konnte nicht gelöscht werden.</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Beim Drücken der Lautstärketasten <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Aktion beim Umdrehen</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Beim Umdrehen des Tablets <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Beim Umdrehen des Telefons <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Aktion beim Schütteln</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Beim Schütteln des Tablets <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Beim Schütteln des Telefons <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">die Schlummerfunktion aktivieren</string>
   <string name="action_summary_dismiss">den Alarm beenden</string>
   <string name="action_summary_do_nothing">keine Aktion ausführen</string>
-  <string name="alarm_picker_title">Alarmtyp</string>
+  <!-- Alarm picker dialog title -->
+  <string name="alarm_picker_title">Alarmtyp auswählen</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Klingelton</string>
   <string name="alarm_type_playlist">Wiedergabeliste</string>
   <string name="alarm_type_random">Zufällig</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Weckerlautstärke ist lautlos</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Weckton wählen</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Klingelton</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Musik</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Standard-Klingelton</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Dauerhafte Berechtigung zum Ändern des Klingeltons konnte nicht eingeholt werden</string>
   <string name="menu_item_widget_settings">Widget-Einstellungen</string>
   <string name="activity_not_found">Aktivität nicht gefunden!</string>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index d7c114e38..9864fced8 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Εμφάνιση εικονιδίου</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Εμφάνιση εικονιδίου στη γραμμή κατάστασης όταν έχει οριστεί ώρα αφύπνισης</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Αυξανόμενη ένταση</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Προφίλ <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Δεν επιλέχθηκε προφίλ</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Προσθήκη</string>
   <string name="cities_add_city_title">Προσθήκη πόλης</string>
   <string name="cities_add_city_city">Πόλη:</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">Διαγραφή πόλης</string>
   <string name="cities_delete_city_msg">Θέλετε να διαγράψετε την πόλη <xliff:g id="city">%s</xliff:g>;</string>
   <string name="cities_delete_city_failed">Δεν είναι δυνατή η διαγραφή της πόλης</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Πιέζοντας τα πλήκτρα ήχου <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Ενέργεια αναποδογυρίσματος</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Αναποδογυρίζοντας το tablet <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Αναποδογυρίζοντας το τηλέφωνο <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Ενέργεια κουνήματος</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Κουνώντας το tablet <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Κουνώντας το τηλέφωνο <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">θα αναβάλλετε το ξυπνητήρι</string>
   <string name="action_summary_dismiss">θα παραβλέπετε το ξυπνητήρι</string>
   <string name="action_summary_do_nothing">δεν θα εκτελείτε καμία ενέργεια</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Επιλογή τύπου ξυπνητηριού</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Ήχος</string>
   <string name="alarm_type_playlist">Λίστα αναπαραγωγής</string>
   <string name="alarm_type_random">Τυχαίο</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Το ξυπνητήρι είναι αθόρυβο</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Επιλογή ξυπνητηριού</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Ήχοι κλήσης</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Μουσική</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Προεπιλεγμένος ήχος</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Αποτυχία λήψης μόνιμης παροχής άδειας για τον ήχο κλήσης</string>
   <string name="menu_item_widget_settings">Ρυθμίσεις widget</string>
   <string name="activity_not_found">Η δραστηριότητα δεν βρέθηκε!</string>
-  <string name="permlab_write_alarms">άμεση επεξεργασία αφυπνίσεων</string>
-  <string name="permdesc_write_alarms">Επιτρέπει σε μια εφαρμογή να προσθέσει, να τροποποιήσει ή να διαγράψει όλες τις αφυπνίσεις.</string>
-  <string name="permlab_manage_alarms">εναλλαγή προγραμματισμένων αφυπνίσεων</string>
-  <string name="permdesc_manage_alarms">Επιτρέπει σε μια εφαρμογή να ενεργοποιήσει ή να απενεργοποιήσει τις προγραμματισμένες αφυπνίσεις.</string>
-  <string name="permlab_read_alarms">ανάγνωση προγραμματισμένων αφυπνίσεων</string>
-  <string name="permdesc_read_alarms">Επιτρέπει σε μια εφαρμογή να διαβάσει τις προγραμματισμένες αφυπνίσεις.</string>
-  <string name="alarm_modification_service_desc">Μια υπηρεσία που επιτρέπει την χειραγώγηση των αφυπνίσεων από τρίτους.</string>
 </resources>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index 99033d747..eca8934e5 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Show icon</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Show an icon in the status bar when an alarm is set</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Increasing volume</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profile <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">No profile selected</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Add</string>
   <string name="cities_add_city_title">Add city</string>
   <string name="cities_add_city_city">City:</string>
@@ -35,24 +41,38 @@
   <string name="cities_delete_city_title">Delete city</string>
   <string name="cities_delete_city_msg">Do you want to delete <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Can\'t delete the city</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Pressing the volume buttons will <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Flip action</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Flipping the tablet down will <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Flipping the phone down will <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Shake action</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Shaking the tablet will <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Shaking the phone will <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">snooze the alarm</string>
   <string name="action_summary_dismiss">dismiss the alarm</string>
   <string name="action_summary_do_nothing">do nothing</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Choose alarm type</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Ringtone</string>
   <string name="alarm_type_playlist">Playlist</string>
   <string name="alarm_type_random">Randomly</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Alarm volume is silent</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Select alarm</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Ringtone</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Music</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Default ringtone</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Failed to take persistent grant permission for ringtone</string>
 </resources>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-en-rGB/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index 728d417cf..8d860db26 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Show icon</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Show an icon in the status bar when an alarm is set</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Increasing volume</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profile <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">No profile selected</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Add</string>
   <string name="cities_add_city_title">Add city</string>
   <string name="cities_add_city_city">City:</string>
@@ -35,24 +41,40 @@
   <string name="cities_delete_city_title">Delete city</string>
   <string name="cities_delete_city_msg">Do you want to delete <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Can\'t delete the city</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Pressing the volume buttons will <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Flip action</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Flipping the tablet down will <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Flipping the phone down will <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Shake action</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Shaking the tablet will <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Shaking the phone will <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">snooze the alarm</string>
   <string name="action_summary_dismiss">dismiss the alarm</string>
   <string name="action_summary_do_nothing">do nothing</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Choose alarm type</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Ringtone</string>
   <string name="alarm_type_playlist">Playlist</string>
   <string name="alarm_type_random">Randomly</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Alarm volume is silent</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Select alarm</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Ringtone</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Music</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Default ringtone</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Failed to take persistent grant permission for ringtone</string>
+  <string name="menu_item_widget_settings">Widget settings</string>
+  <string name="activity_not_found">Activity not found!</string>
 </resources>
diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-en-rPT/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-en-rPT/strings.xml b/res/values-en-rPT/strings.xml
new file mode 100644
index 000000000..2ca9c3e5b
--- /dev/null
+++ b/res/values-en-rPT/strings.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label shown on launcher icon -->
+  <!-- Label for the this application displayed on-screen when this application must be represented to the user. -->
+  <!-- Title for AlarmClock activity -->
+  <!-- Label for the Alarms activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Menu item on Alarm Clock screen: Add alarm -->
+  <!-- Menu item on Alarm Clock screen: Desk clock -->
+  <!-- Menu item on Alarm Clock screen: Edit alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Delete alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Enable alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Disable alarm -->
+  <!-- Delete alarm confirmation dialog message. -->
+  <!-- Menu item on Alarm Clock screen: Show clock -->
+  <!-- Menu item on Alarm Clock screen: Hide clock -->
+  <!-- Setting label on Set alarm screen: Label -->
+  <!-- Default label to display for an alarm -->
+  <!-- Preference category on Alarm Settings screen: Set alarm -->
+  <!-- Also label for the old Alarms dialog activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting labels on Set alarm screen: Vibration on or off -->
+  <!-- Setting labels on Set alarm screen: Repeat -->
+  <!-- Setting labels on Set alarm screen: Select alarm ringtone  -->
+  <!-- Label on expanded alarm edit view. -->
+  <!-- Setting labels on Set alarm screen: Set time  -->
+  <!-- Label shown when user is setting up non-repeating alarm for tomorrow [CHAR LIMIT=15] -->
+  <!-- Label shown when user is setting up non-repeating alarm for later today [CHAR LIMIT=15] -->
+  <!-- The text shown above the clock when alarm is alerting [CHAR LIMIT=10] -->
+  <!-- The text shown as an option to dismiss an alerting alarm [CHAR LIMIT=5] -->
+  <!-- Button labels on the alarm dialog: Dismiss -->
+  <!-- Button labels on the pre-dismiss alarm notifications: Dismiss now -->
+  <!-- Alarm Alert screen: this message is shown after an alarm rung
+         unattended for a number of minutes.  It tells the user that
+         the alarm has been silenced.-->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the number of minutes in two separate lines. For example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the word 'Snoozed' in two separate lines or example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user dismissed an alerting alarm [CHAR LIMIT=15] -->
+  <!-- Button labels on the alarm dialog: Snooze -->
+  <!-- Toast that appears after Alarm is snoozed from the Alarm
+         dialog. Says the alarm will snooze for xxx minutes.  -->
+  <!-- Text to appear inside a notification while an alarm is snoozing. -->
+  <!-- Text to appear in the notification title while an alarm is about to go off. -->
+  <!-- Text to appear in when trying to view a missed alarm that has been deleted -->
+  <!-- 0: nothing
+         1: days
+         2:      hours
+         3: days hours
+         4:            minutes
+         5: days       minutes
+         6:      hours minutes
+         7: days hours minutes
+    -->
+  <!-- Timer notification: how long from now until timer goes off. -->
+  <!-- Alarm confirmation toast: Describes how long from now until
+         alarm fires -->
+  <!-- Alarm confirmation toast: singular day -->
+  <!-- Alarm confirmation toast: plural days -->
+  <!-- Alarm confirmation toast: singular hour -->
+  <!-- Alarm confirmation toast: plural hours -->
+  <!-- Alarm confirmation toast: singular minute  -->
+  <!-- Alarm confirmation toast: plural minutes  -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to repeat every day -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to never repeat -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: concatenate days with
+         this character, i.e. "Mon, Tue, Wed" -->
+  <!-- Appears at the top of the Clock Picker screen: Tell user to
+         select a clock to display -->
+  <!-- Label for analog clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- Help activity name -->
+  <!-- Settings activity name -->
+  <!-- Label for the Settings activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting title for changing the snooze duration. -->
+  <!-- Auto silence preference title -->
+  <!-- Auto silence summary string set based on the preference value. -->
+  <!-- Auto silence summary when turned off -->
+  <!-- Entries listed in the ListPreference when invoking the auto silence
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the auto_silence_entries above. -->
+  <!-- Done button when editing an alarm. -->
+  <!-- Revert button when editing an alarm. -->
+  <!-- Delete button when editing an alarm. -->
+  <!-- Setting title for changing the alarm volume. -->
+  <!-- Summary for the alarm preference when silent is chosen. -->
+  <!-- Text to display in the small text of the notification -->
+  <!-- Text to display in the notification ticker and label -->
+  <!-- Text to display in the notification when the alarm has been snoozed -->
+  <!-- Title of the setting to change hardware button behavior. This string
+         should be changed for each piece of hardware. [CHAR LIMIT=20] -->
+  <!-- Dialog title of the volume and power setting. -->
+  <!-- Entries listed in the setting for the side-button action. -->
+  <!-- Values for the side-button setting. -->
+  <!-- Title of the ringtone setting. -->
+  <!-- Accessibility labels for Clock activity buttons -->
+  <!-- Accessibility labels for alarm buttons -->
+  <!-- What to show the user if the weather widget exists but fails to
+         respond. This is a sign of an error; if the weather widget is not
+         present on the device, we show nothing at all. -->
+  <!-- A description for the DeskClock alarm sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- String displayed as the alert summary while loading the alert name from
+         the media player. [CHAR LIMIT=NONE] -->
+  <!-- A description for the DeskClock timer sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- Label on the main screen control used to set alarm [CHAR LIMIT=30]-->
+  <!-- Label on the main screen control used to set alarm when there is already an existing alarm [CHAR LIMIT=30]-->
+  <!--  ActionBar strings -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Alarm page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Timer page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Clock page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Stopwatch page -->
+  <!-- Clock view buttons strings-->
+  <!-- Describes the purpose of the button to start the activity to add/edit/delete alarms -->
+  <!-- Describes the purpose of the button which provides a list of cities for the world clock settings -->
+  <!-- Describes the purpose of the button which pops up a menu of setting choices -->
+  <!-- Menu item on most screens to get to more settings -->
+  <!-- Menu item on most screens to get to the help information -->
+  <!-- Menu item on clock screen to enter night mode. -->
+  <!-- Menu item on Cities screen to sort by GMT offset -->
+  <!-- Menu item on Cities screen to sort by alphabetical order -->
+  <!-- Label for selected cities in Cities list view -->
+  <!-- Stop Watch strings -->
+  <!-- Describes the purpose of the button to resume running a stopwatch -->
+  <!-- Describes the purpose of the button to begin running a stopwatch -->
+  <!-- Describes the purpose of the button to pause a stopwatch. -->
+  <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
+  <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
+  <!-- Describes the purpose of the button to share the stopwatch value.
+         Also used as title for chooser when sharing stopwatch results. -->
+  <!-- Abbreviation for temporal hours [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal minutes [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal seconds [CHAR LIMIT=1] -->
+  <!-- Accessibility strings -->
+  <!--  Stopwatch share strings -->
+  <!-- Sentence within the message created to share the total time recorded within the stopwatch -->
+  <!-- Header within the message created to share a list of lap times (a new line is appended to this) -->
+  <!-- Label to enumerate the number of laps in the notification the user has counted -->
+  <!-- Formatted stopwatch time -->
+  <!-- Formatted stopwatch time for laps shared using the share button -->
+  <!-- Label to enumerate the number of laps the user has counted -->
+  <!-- Stopwatch accessibility strings -->
+  <!-- timer strings -->
+  <!-- Describes the purpose of the button to add a new timer -->
+  <!-- Describes the purpose of the button to begin or continue running a timer -->
+  <!-- Describes the purpose of the button to delete a timer. -->
+  <!-- Describes the purpose of the button increase the remaining time on a timer by one minute. -->
+  <!-- Like "timer_plus_one", but with 'minute' abbreviated for the notification. -->
+  <!-- Describes the purpose of the button to stop the timer. -->
+  <!-- Describes the purpose of the button to stop and delete the timer. -->
+  <!-- Describes the purpose of the button to return the timer to it's original starting value. -->
+  <!-- Describes the purpose of the button to discard the current dialog values. Will also close the dialog if other time's exist -->
+  <!-- Notification content shown when a timer has completed and has no more time remaining -->
+  <!-- Label associated with a notification for a Timer -->
+  <!-- Toast content shown when user attempts to create a new timer when there are already 4 timers -->
+  <!-- Jocular content that user may append when sharing the lap times -->
+  <!-- Title with the clock on the main page displaying the user's regular timezone (shows when automatic_home_clock enabled) -->
+  <!-- Label for the Cities activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Settings strings -->
+  <!-- Header in the preferences settings for the section pertaining to clocks on the main fragment -->
+  <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->
+  <!-- Entries listed in the ListPreference when invoking the clock style
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the clock_style_entries above. -->
+  <!-- Title for an option that will automtically show a clock representing the user's regular timezone on the main fragment whenever the user leaves their regular timezone-->
+  <!-- Describes the functionality provided by the automatic_home_clock option -->
+  <!-- Title in the preferences change the time zone for the user's home -->
+  <!-- Title in a list dialog box to pick a time zone for the user's home -->
+  <!-- Textual content of the button to discard the current dialog values and close the dialog -->
+  <!-- Textual content of the button to update an alarm with the current dialog values -->
+  <!--  place holder for am/pm label when it is not set -->
+  <!-- add 00 as minutes to the time when pressing this button -->
+  <!-- add 30 as minutes to the time when pressing this button -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. CHAR LIMIT=25] -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. -->
+  <!-- Header in the preferences settings for the section pertaining to alarms -->
+  <!-- Describes the running service for the stopwatch -->
+  <!-- Desription for the stopped stop watch -->
+  <!-- Text instruction for dismiss alarm on alarm lock screen. The dismiss button will still
+         be on the right even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Text instruction for snooze alarm on alarm lock screen. The snooze button will still
+         be on the left even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Notification title when timer is stopped. -->
+  <!-- Notification title when multiple timers are stopped. -->
+  <!-- Notification text when multiple timers are stopped. -->
+  <!-- Notification title when at least one timer, of those in use, is counting down. -->
+  <!-- Notification text when at least one timer, of those in use, is counting down. -->
+  <!-- screensaver settings strings -->
+  <!-- Label for the screen saver activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Title for check box to pick intensity of display diminuation during dream mode -->
+  <!-- Describes intensity of display diminuation during dream mode -->
+  <!-- Description of the down caret in the alarm alert screen to expand the alarm content to edit perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up caret in the alarm alert screen to collapse the alarm content to summary perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to undo change to alarm -->
+  <!-- Toast content when an alarm was deleted  -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- Description of field showing the next alarm time in the clock page, for accessibility. -->
+  <!-- Displays the number of alarms selected from the list of alarms. -->
+  <!-- message used by the talkback accessebility app to say that something was deleted -->
+  <!-- Alarm deletion confirmation message-->
+  <!-- Timer deletion confirmation -->
+  <!-- world clock deletion confirmation -->
+  <!-- Label for digital clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- format strings for clocks -->
+  <!-- Font size for AM/PM should match widget_label_font_size -->
+  <!-- Font size for AM/PM should match bottom_text_size -->
+  <!-- Font size for AM/PM should match label_font_size -->
+  <!-- Font size for AM/PM should match alarm_label_size -->
+  <!-- String for no alarms -->
+  <!-- String for no alarms set [CHAR LIMIT=24] -->
+  <!-- String for no enabled alarms in timeline view [CHAR LIMIT=30] -->
+</resources>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index d1fb73a07..fd0828634 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Montri piktogramon</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Montri piktogramon en la stata breto kiam alarmo aktiviĝas</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Pliigi la laŭtecon</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profilo <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Neniu profilo elektita</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Aldoni</string>
   <string name="cities_add_city_title">Aldoni urbon</string>
   <string name="cities_add_city_city">Urbo:</string>
@@ -35,25 +41,39 @@
   <string name="cities_delete_city_title">Forigi urbon</string>
   <string name="cities_delete_city_msg">Ĉu vi certas forigi <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Ne eblas forigi la urbon</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Premi laŭtecajn butonojn faros <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Ago de renverso</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Renversi la tabulon faros <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Renversi la telefonon faros <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Ago de skuado</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Skui la tabulon faros <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Skui la telefonon faros <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">prokrasti alarmon</string>
   <string name="action_summary_dismiss">rezigni alarmon</string>
   <string name="action_summary_do_nothing">fari nenion</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Elekti alarmtipon</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Sonoro</string>
   <string name="alarm_type_playlist">Ludlisto</string>
   <string name="alarm_type_random">Hazarde</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Alarma laŭteco estas silenta</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Elekti alarmon</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Sonoro</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Muziko</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Defaŭlta sonoro</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Ne eblas akiri daŭran rajton por sonoro</string>
   <string name="menu_item_widget_settings">Fenestraĵaj agordoj</string>
   <string name="activity_not_found">Aktiveco ne troveblas!</string>
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
new file mode 100644
index 000000000..2ca9c3e5b
--- /dev/null
+++ b/res/values-eo/strings.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label shown on launcher icon -->
+  <!-- Label for the this application displayed on-screen when this application must be represented to the user. -->
+  <!-- Title for AlarmClock activity -->
+  <!-- Label for the Alarms activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Menu item on Alarm Clock screen: Add alarm -->
+  <!-- Menu item on Alarm Clock screen: Desk clock -->
+  <!-- Menu item on Alarm Clock screen: Edit alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Delete alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Enable alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Disable alarm -->
+  <!-- Delete alarm confirmation dialog message. -->
+  <!-- Menu item on Alarm Clock screen: Show clock -->
+  <!-- Menu item on Alarm Clock screen: Hide clock -->
+  <!-- Setting label on Set alarm screen: Label -->
+  <!-- Default label to display for an alarm -->
+  <!-- Preference category on Alarm Settings screen: Set alarm -->
+  <!-- Also label for the old Alarms dialog activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting labels on Set alarm screen: Vibration on or off -->
+  <!-- Setting labels on Set alarm screen: Repeat -->
+  <!-- Setting labels on Set alarm screen: Select alarm ringtone  -->
+  <!-- Label on expanded alarm edit view. -->
+  <!-- Setting labels on Set alarm screen: Set time  -->
+  <!-- Label shown when user is setting up non-repeating alarm for tomorrow [CHAR LIMIT=15] -->
+  <!-- Label shown when user is setting up non-repeating alarm for later today [CHAR LIMIT=15] -->
+  <!-- The text shown above the clock when alarm is alerting [CHAR LIMIT=10] -->
+  <!-- The text shown as an option to dismiss an alerting alarm [CHAR LIMIT=5] -->
+  <!-- Button labels on the alarm dialog: Dismiss -->
+  <!-- Button labels on the pre-dismiss alarm notifications: Dismiss now -->
+  <!-- Alarm Alert screen: this message is shown after an alarm rung
+         unattended for a number of minutes.  It tells the user that
+         the alarm has been silenced.-->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the number of minutes in two separate lines. For example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the word 'Snoozed' in two separate lines or example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user dismissed an alerting alarm [CHAR LIMIT=15] -->
+  <!-- Button labels on the alarm dialog: Snooze -->
+  <!-- Toast that appears after Alarm is snoozed from the Alarm
+         dialog. Says the alarm will snooze for xxx minutes.  -->
+  <!-- Text to appear inside a notification while an alarm is snoozing. -->
+  <!-- Text to appear in the notification title while an alarm is about to go off. -->
+  <!-- Text to appear in when trying to view a missed alarm that has been deleted -->
+  <!-- 0: nothing
+         1: days
+         2:      hours
+         3: days hours
+         4:            minutes
+         5: days       minutes
+         6:      hours minutes
+         7: days hours minutes
+    -->
+  <!-- Timer notification: how long from now until timer goes off. -->
+  <!-- Alarm confirmation toast: Describes how long from now until
+         alarm fires -->
+  <!-- Alarm confirmation toast: singular day -->
+  <!-- Alarm confirmation toast: plural days -->
+  <!-- Alarm confirmation toast: singular hour -->
+  <!-- Alarm confirmation toast: plural hours -->
+  <!-- Alarm confirmation toast: singular minute  -->
+  <!-- Alarm confirmation toast: plural minutes  -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to repeat every day -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to never repeat -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: concatenate days with
+         this character, i.e. "Mon, Tue, Wed" -->
+  <!-- Appears at the top of the Clock Picker screen: Tell user to
+         select a clock to display -->
+  <!-- Label for analog clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- Help activity name -->
+  <!-- Settings activity name -->
+  <!-- Label for the Settings activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting title for changing the snooze duration. -->
+  <!-- Auto silence preference title -->
+  <!-- Auto silence summary string set based on the preference value. -->
+  <!-- Auto silence summary when turned off -->
+  <!-- Entries listed in the ListPreference when invoking the auto silence
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the auto_silence_entries above. -->
+  <!-- Done button when editing an alarm. -->
+  <!-- Revert button when editing an alarm. -->
+  <!-- Delete button when editing an alarm. -->
+  <!-- Setting title for changing the alarm volume. -->
+  <!-- Summary for the alarm preference when silent is chosen. -->
+  <!-- Text to display in the small text of the notification -->
+  <!-- Text to display in the notification ticker and label -->
+  <!-- Text to display in the notification when the alarm has been snoozed -->
+  <!-- Title of the setting to change hardware button behavior. This string
+         should be changed for each piece of hardware. [CHAR LIMIT=20] -->
+  <!-- Dialog title of the volume and power setting. -->
+  <!-- Entries listed in the setting for the side-button action. -->
+  <!-- Values for the side-button setting. -->
+  <!-- Title of the ringtone setting. -->
+  <!-- Accessibility labels for Clock activity buttons -->
+  <!-- Accessibility labels for alarm buttons -->
+  <!-- What to show the user if the weather widget exists but fails to
+         respond. This is a sign of an error; if the weather widget is not
+         present on the device, we show nothing at all. -->
+  <!-- A description for the DeskClock alarm sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- String displayed as the alert summary while loading the alert name from
+         the media player. [CHAR LIMIT=NONE] -->
+  <!-- A description for the DeskClock timer sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- Label on the main screen control used to set alarm [CHAR LIMIT=30]-->
+  <!-- Label on the main screen control used to set alarm when there is already an existing alarm [CHAR LIMIT=30]-->
+  <!--  ActionBar strings -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Alarm page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Timer page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Clock page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Stopwatch page -->
+  <!-- Clock view buttons strings-->
+  <!-- Describes the purpose of the button to start the activity to add/edit/delete alarms -->
+  <!-- Describes the purpose of the button which provides a list of cities for the world clock settings -->
+  <!-- Describes the purpose of the button which pops up a menu of setting choices -->
+  <!-- Menu item on most screens to get to more settings -->
+  <!-- Menu item on most screens to get to the help information -->
+  <!-- Menu item on clock screen to enter night mode. -->
+  <!-- Menu item on Cities screen to sort by GMT offset -->
+  <!-- Menu item on Cities screen to sort by alphabetical order -->
+  <!-- Label for selected cities in Cities list view -->
+  <!-- Stop Watch strings -->
+  <!-- Describes the purpose of the button to resume running a stopwatch -->
+  <!-- Describes the purpose of the button to begin running a stopwatch -->
+  <!-- Describes the purpose of the button to pause a stopwatch. -->
+  <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
+  <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
+  <!-- Describes the purpose of the button to share the stopwatch value.
+         Also used as title for chooser when sharing stopwatch results. -->
+  <!-- Abbreviation for temporal hours [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal minutes [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal seconds [CHAR LIMIT=1] -->
+  <!-- Accessibility strings -->
+  <!--  Stopwatch share strings -->
+  <!-- Sentence within the message created to share the total time recorded within the stopwatch -->
+  <!-- Header within the message created to share a list of lap times (a new line is appended to this) -->
+  <!-- Label to enumerate the number of laps in the notification the user has counted -->
+  <!-- Formatted stopwatch time -->
+  <!-- Formatted stopwatch time for laps shared using the share button -->
+  <!-- Label to enumerate the number of laps the user has counted -->
+  <!-- Stopwatch accessibility strings -->
+  <!-- timer strings -->
+  <!-- Describes the purpose of the button to add a new timer -->
+  <!-- Describes the purpose of the button to begin or continue running a timer -->
+  <!-- Describes the purpose of the button to delete a timer. -->
+  <!-- Describes the purpose of the button increase the remaining time on a timer by one minute. -->
+  <!-- Like "timer_plus_one", but with 'minute' abbreviated for the notification. -->
+  <!-- Describes the purpose of the button to stop the timer. -->
+  <!-- Describes the purpose of the button to stop and delete the timer. -->
+  <!-- Describes the purpose of the button to return the timer to it's original starting value. -->
+  <!-- Describes the purpose of the button to discard the current dialog values. Will also close the dialog if other time's exist -->
+  <!-- Notification content shown when a timer has completed and has no more time remaining -->
+  <!-- Label associated with a notification for a Timer -->
+  <!-- Toast content shown when user attempts to create a new timer when there are already 4 timers -->
+  <!-- Jocular content that user may append when sharing the lap times -->
+  <!-- Title with the clock on the main page displaying the user's regular timezone (shows when automatic_home_clock enabled) -->
+  <!-- Label for the Cities activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Settings strings -->
+  <!-- Header in the preferences settings for the section pertaining to clocks on the main fragment -->
+  <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->
+  <!-- Entries listed in the ListPreference when invoking the clock style
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the clock_style_entries above. -->
+  <!-- Title for an option that will automtically show a clock representing the user's regular timezone on the main fragment whenever the user leaves their regular timezone-->
+  <!-- Describes the functionality provided by the automatic_home_clock option -->
+  <!-- Title in the preferences change the time zone for the user's home -->
+  <!-- Title in a list dialog box to pick a time zone for the user's home -->
+  <!-- Textual content of the button to discard the current dialog values and close the dialog -->
+  <!-- Textual content of the button to update an alarm with the current dialog values -->
+  <!--  place holder for am/pm label when it is not set -->
+  <!-- add 00 as minutes to the time when pressing this button -->
+  <!-- add 30 as minutes to the time when pressing this button -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. CHAR LIMIT=25] -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. -->
+  <!-- Header in the preferences settings for the section pertaining to alarms -->
+  <!-- Describes the running service for the stopwatch -->
+  <!-- Desription for the stopped stop watch -->
+  <!-- Text instruction for dismiss alarm on alarm lock screen. The dismiss button will still
+         be on the right even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Text instruction for snooze alarm on alarm lock screen. The snooze button will still
+         be on the left even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Notification title when timer is stopped. -->
+  <!-- Notification title when multiple timers are stopped. -->
+  <!-- Notification text when multiple timers are stopped. -->
+  <!-- Notification title when at least one timer, of those in use, is counting down. -->
+  <!-- Notification text when at least one timer, of those in use, is counting down. -->
+  <!-- screensaver settings strings -->
+  <!-- Label for the screen saver activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Title for check box to pick intensity of display diminuation during dream mode -->
+  <!-- Describes intensity of display diminuation during dream mode -->
+  <!-- Description of the down caret in the alarm alert screen to expand the alarm content to edit perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up caret in the alarm alert screen to collapse the alarm content to summary perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to undo change to alarm -->
+  <!-- Toast content when an alarm was deleted  -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- Description of field showing the next alarm time in the clock page, for accessibility. -->
+  <!-- Displays the number of alarms selected from the list of alarms. -->
+  <!-- message used by the talkback accessebility app to say that something was deleted -->
+  <!-- Alarm deletion confirmation message-->
+  <!-- Timer deletion confirmation -->
+  <!-- world clock deletion confirmation -->
+  <!-- Label for digital clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- format strings for clocks -->
+  <!-- Font size for AM/PM should match widget_label_font_size -->
+  <!-- Font size for AM/PM should match bottom_text_size -->
+  <!-- Font size for AM/PM should match label_font_size -->
+  <!-- Font size for AM/PM should match alarm_label_size -->
+  <!-- String for no alarms -->
+  <!-- String for no alarms set [CHAR LIMIT=24] -->
+  <!-- String for no enabled alarms in timeline view [CHAR LIMIT=30] -->
+</resources>
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-es-rMX/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-es-rMX/strings.xml b/res/values-es-rMX/strings.xml
new file mode 100644
index 000000000..2ca9c3e5b
--- /dev/null
+++ b/res/values-es-rMX/strings.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label shown on launcher icon -->
+  <!-- Label for the this application displayed on-screen when this application must be represented to the user. -->
+  <!-- Title for AlarmClock activity -->
+  <!-- Label for the Alarms activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Menu item on Alarm Clock screen: Add alarm -->
+  <!-- Menu item on Alarm Clock screen: Desk clock -->
+  <!-- Menu item on Alarm Clock screen: Edit alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Delete alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Enable alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Disable alarm -->
+  <!-- Delete alarm confirmation dialog message. -->
+  <!-- Menu item on Alarm Clock screen: Show clock -->
+  <!-- Menu item on Alarm Clock screen: Hide clock -->
+  <!-- Setting label on Set alarm screen: Label -->
+  <!-- Default label to display for an alarm -->
+  <!-- Preference category on Alarm Settings screen: Set alarm -->
+  <!-- Also label for the old Alarms dialog activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting labels on Set alarm screen: Vibration on or off -->
+  <!-- Setting labels on Set alarm screen: Repeat -->
+  <!-- Setting labels on Set alarm screen: Select alarm ringtone  -->
+  <!-- Label on expanded alarm edit view. -->
+  <!-- Setting labels on Set alarm screen: Set time  -->
+  <!-- Label shown when user is setting up non-repeating alarm for tomorrow [CHAR LIMIT=15] -->
+  <!-- Label shown when user is setting up non-repeating alarm for later today [CHAR LIMIT=15] -->
+  <!-- The text shown above the clock when alarm is alerting [CHAR LIMIT=10] -->
+  <!-- The text shown as an option to dismiss an alerting alarm [CHAR LIMIT=5] -->
+  <!-- Button labels on the alarm dialog: Dismiss -->
+  <!-- Button labels on the pre-dismiss alarm notifications: Dismiss now -->
+  <!-- Alarm Alert screen: this message is shown after an alarm rung
+         unattended for a number of minutes.  It tells the user that
+         the alarm has been silenced.-->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the number of minutes in two separate lines. For example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the word 'Snoozed' in two separate lines or example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user dismissed an alerting alarm [CHAR LIMIT=15] -->
+  <!-- Button labels on the alarm dialog: Snooze -->
+  <!-- Toast that appears after Alarm is snoozed from the Alarm
+         dialog. Says the alarm will snooze for xxx minutes.  -->
+  <!-- Text to appear inside a notification while an alarm is snoozing. -->
+  <!-- Text to appear in the notification title while an alarm is about to go off. -->
+  <!-- Text to appear in when trying to view a missed alarm that has been deleted -->
+  <!-- 0: nothing
+         1: days
+         2:      hours
+         3: days hours
+         4:            minutes
+         5: days       minutes
+         6:      hours minutes
+         7: days hours minutes
+    -->
+  <!-- Timer notification: how long from now until timer goes off. -->
+  <!-- Alarm confirmation toast: Describes how long from now until
+         alarm fires -->
+  <!-- Alarm confirmation toast: singular day -->
+  <!-- Alarm confirmation toast: plural days -->
+  <!-- Alarm confirmation toast: singular hour -->
+  <!-- Alarm confirmation toast: plural hours -->
+  <!-- Alarm confirmation toast: singular minute  -->
+  <!-- Alarm confirmation toast: plural minutes  -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to repeat every day -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to never repeat -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: concatenate days with
+         this character, i.e. "Mon, Tue, Wed" -->
+  <!-- Appears at the top of the Clock Picker screen: Tell user to
+         select a clock to display -->
+  <!-- Label for analog clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- Help activity name -->
+  <!-- Settings activity name -->
+  <!-- Label for the Settings activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting title for changing the snooze duration. -->
+  <!-- Auto silence preference title -->
+  <!-- Auto silence summary string set based on the preference value. -->
+  <!-- Auto silence summary when turned off -->
+  <!-- Entries listed in the ListPreference when invoking the auto silence
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the auto_silence_entries above. -->
+  <!-- Done button when editing an alarm. -->
+  <!-- Revert button when editing an alarm. -->
+  <!-- Delete button when editing an alarm. -->
+  <!-- Setting title for changing the alarm volume. -->
+  <!-- Summary for the alarm preference when silent is chosen. -->
+  <!-- Text to display in the small text of the notification -->
+  <!-- Text to display in the notification ticker and label -->
+  <!-- Text to display in the notification when the alarm has been snoozed -->
+  <!-- Title of the setting to change hardware button behavior. This string
+         should be changed for each piece of hardware. [CHAR LIMIT=20] -->
+  <!-- Dialog title of the volume and power setting. -->
+  <!-- Entries listed in the setting for the side-button action. -->
+  <!-- Values for the side-button setting. -->
+  <!-- Title of the ringtone setting. -->
+  <!-- Accessibility labels for Clock activity buttons -->
+  <!-- Accessibility labels for alarm buttons -->
+  <!-- What to show the user if the weather widget exists but fails to
+         respond. This is a sign of an error; if the weather widget is not
+         present on the device, we show nothing at all. -->
+  <!-- A description for the DeskClock alarm sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- String displayed as the alert summary while loading the alert name from
+         the media player. [CHAR LIMIT=NONE] -->
+  <!-- A description for the DeskClock timer sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- Label on the main screen control used to set alarm [CHAR LIMIT=30]-->
+  <!-- Label on the main screen control used to set alarm when there is already an existing alarm [CHAR LIMIT=30]-->
+  <!--  ActionBar strings -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Alarm page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Timer page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Clock page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Stopwatch page -->
+  <!-- Clock view buttons strings-->
+  <!-- Describes the purpose of the button to start the activity to add/edit/delete alarms -->
+  <!-- Describes the purpose of the button which provides a list of cities for the world clock settings -->
+  <!-- Describes the purpose of the button which pops up a menu of setting choices -->
+  <!-- Menu item on most screens to get to more settings -->
+  <!-- Menu item on most screens to get to the help information -->
+  <!-- Menu item on clock screen to enter night mode. -->
+  <!-- Menu item on Cities screen to sort by GMT offset -->
+  <!-- Menu item on Cities screen to sort by alphabetical order -->
+  <!-- Label for selected cities in Cities list view -->
+  <!-- Stop Watch strings -->
+  <!-- Describes the purpose of the button to resume running a stopwatch -->
+  <!-- Describes the purpose of the button to begin running a stopwatch -->
+  <!-- Describes the purpose of the button to pause a stopwatch. -->
+  <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
+  <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
+  <!-- Describes the purpose of the button to share the stopwatch value.
+         Also used as title for chooser when sharing stopwatch results. -->
+  <!-- Abbreviation for temporal hours [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal minutes [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal seconds [CHAR LIMIT=1] -->
+  <!-- Accessibility strings -->
+  <!--  Stopwatch share strings -->
+  <!-- Sentence within the message created to share the total time recorded within the stopwatch -->
+  <!-- Header within the message created to share a list of lap times (a new line is appended to this) -->
+  <!-- Label to enumerate the number of laps in the notification the user has counted -->
+  <!-- Formatted stopwatch time -->
+  <!-- Formatted stopwatch time for laps shared using the share button -->
+  <!-- Label to enumerate the number of laps the user has counted -->
+  <!-- Stopwatch accessibility strings -->
+  <!-- timer strings -->
+  <!-- Describes the purpose of the button to add a new timer -->
+  <!-- Describes the purpose of the button to begin or continue running a timer -->
+  <!-- Describes the purpose of the button to delete a timer. -->
+  <!-- Describes the purpose of the button increase the remaining time on a timer by one minute. -->
+  <!-- Like "timer_plus_one", but with 'minute' abbreviated for the notification. -->
+  <!-- Describes the purpose of the button to stop the timer. -->
+  <!-- Describes the purpose of the button to stop and delete the timer. -->
+  <!-- Describes the purpose of the button to return the timer to it's original starting value. -->
+  <!-- Describes the purpose of the button to discard the current dialog values. Will also close the dialog if other time's exist -->
+  <!-- Notification content shown when a timer has completed and has no more time remaining -->
+  <!-- Label associated with a notification for a Timer -->
+  <!-- Toast content shown when user attempts to create a new timer when there are already 4 timers -->
+  <!-- Jocular content that user may append when sharing the lap times -->
+  <!-- Title with the clock on the main page displaying the user's regular timezone (shows when automatic_home_clock enabled) -->
+  <!-- Label for the Cities activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Settings strings -->
+  <!-- Header in the preferences settings for the section pertaining to clocks on the main fragment -->
+  <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->
+  <!-- Entries listed in the ListPreference when invoking the clock style
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the clock_style_entries above. -->
+  <!-- Title for an option that will automtically show a clock representing the user's regular timezone on the main fragment whenever the user leaves their regular timezone-->
+  <!-- Describes the functionality provided by the automatic_home_clock option -->
+  <!-- Title in the preferences change the time zone for the user's home -->
+  <!-- Title in a list dialog box to pick a time zone for the user's home -->
+  <!-- Textual content of the button to discard the current dialog values and close the dialog -->
+  <!-- Textual content of the button to update an alarm with the current dialog values -->
+  <!--  place holder for am/pm label when it is not set -->
+  <!-- add 00 as minutes to the time when pressing this button -->
+  <!-- add 30 as minutes to the time when pressing this button -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. CHAR LIMIT=25] -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. -->
+  <!-- Header in the preferences settings for the section pertaining to alarms -->
+  <!-- Describes the running service for the stopwatch -->
+  <!-- Desription for the stopped stop watch -->
+  <!-- Text instruction for dismiss alarm on alarm lock screen. The dismiss button will still
+         be on the right even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Text instruction for snooze alarm on alarm lock screen. The snooze button will still
+         be on the left even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Notification title when timer is stopped. -->
+  <!-- Notification title when multiple timers are stopped. -->
+  <!-- Notification text when multiple timers are stopped. -->
+  <!-- Notification title when at least one timer, of those in use, is counting down. -->
+  <!-- Notification text when at least one timer, of those in use, is counting down. -->
+  <!-- screensaver settings strings -->
+  <!-- Label for the screen saver activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Title for check box to pick intensity of display diminuation during dream mode -->
+  <!-- Describes intensity of display diminuation during dream mode -->
+  <!-- Description of the down caret in the alarm alert screen to expand the alarm content to edit perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up caret in the alarm alert screen to collapse the alarm content to summary perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to undo change to alarm -->
+  <!-- Toast content when an alarm was deleted  -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- Description of field showing the next alarm time in the clock page, for accessibility. -->
+  <!-- Displays the number of alarms selected from the list of alarms. -->
+  <!-- message used by the talkback accessebility app to say that something was deleted -->
+  <!-- Alarm deletion confirmation message-->
+  <!-- Timer deletion confirmation -->
+  <!-- world clock deletion confirmation -->
+  <!-- Label for digital clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- format strings for clocks -->
+  <!-- Font size for AM/PM should match widget_label_font_size -->
+  <!-- Font size for AM/PM should match bottom_text_size -->
+  <!-- Font size for AM/PM should match label_font_size -->
+  <!-- Font size for AM/PM should match alarm_label_size -->
+  <!-- String for no alarms -->
+  <!-- String for no alarms set [CHAR LIMIT=24] -->
+  <!-- String for no enabled alarms in timeline view [CHAR LIMIT=30] -->
+</resources>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
new file mode 100644
index 000000000..ca0bf4d46
--- /dev/null
+++ b/res/values-es-rUS/cm_strings.xml
@@ -0,0 +1,80 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <string name="show_status_bar_icon_title">Mostrar icono</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <string name="show_status_bar_icon_summary">Mostrar un icono en la barra de estado cuando haya una alarma programada</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <string name="alarm_increasing_volume">Volumen ascendente</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <string name="profile_description">Perfil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
+  <string name="profile_no_selected">Ningún perfil seleccionado</string>
+  <!-- User-defined cities -->
+  <string name="menu_item_add">Añadir</string>
+  <string name="cities_add_city_title">Añadir ciudad</string>
+  <string name="cities_add_city_city">Ciudad:</string>
+  <string name="cities_add_city_timezone">Zona horaria:</string>
+  <string name="cities_add_city_gps_cd">Pulsa para buscar tu ciudad actual</string>
+  <string name="cities_add_loading">Cargando\u2026</string>
+  <string name="cities_add_searching">Buscando\u2026</string>
+  <string name="cities_add_gps_no_results">La consulta al GPS no devolvió ningún resultado</string>
+  <string name="cities_add_gps_not_available">GPS no disponible</string>
+  <string name="cities_add_already_exists">La ciudad ya existe en la base de datos</string>
+  <string name="cities_add_city_failed">No se puede crear la ciudad</string>
+  <string name="cities_delete_city_title">Eliminar ciudad</string>
+  <string name="cities_delete_city_msg">¿Quieres eliminar <xliff:g id="city">%s</xliff:g>?</string>
+  <string name="cities_delete_city_failed">No se pudo eliminar la ciudad</string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">Presionar los botones de volumen: <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
+  <string name="flip_action_title">Acción de girar</string>
+  <!-- Setting summary for the flip action setting. -->
+  <string name="flip_action_summary" product="tablet">Voltear la tableta hacia abajo: <xliff:g id="action">%s</xliff:g></string>
+  <string name="flip_action_summary" product="default">Voltear el teléfono hacia abajo: <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
+  <string name="shake_action_title">Acción de agitar</string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">Agitar la tableta: <xliff:g id="action">%s</xliff:g></string>
+  <string name="shake_action_summary" product="default">Agitar el teléfono: <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">posponer la alarma</string>
+  <string name="action_summary_dismiss">descartar la alarma</string>
+  <string name="action_summary_do_nothing">no hacer nada</string>
+  <!-- Alarm picker dialog title -->
+  <string name="alarm_picker_title">Elegir tipo de alarma</string>
+  <!-- Alarm types -->
+  <string name="alarm_type_ringtone">Tono de llamada</string>
+  <string name="alarm_type_playlist">Lista de reproducción</string>
+  <string name="alarm_type_random">Aleatorio</string>
+  <!-- Warn Silent Alarm title -->
+  <string name="warn_silent_alarm_title">El volumen de la alarma está en silencio</string>
+  <!-- Select the source of the alarm -->
+  <string name="alarm_select">Seleccionar alarma</string>
+  <!-- Select the ringtone as alarm -->
+  <string name="alarm_select_ringtone">Tono de llamada</string>
+  <!-- Select the alarm from external device -->
+  <string name="alarm_select_external">Música</string>
+  <!-- Ringtone selection default -->
+  <string name="ringtone_default">Tono de llamada predeterminado</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">No se pudo conceder un permiso para el tono de llamada</string>
+  <string name="menu_item_widget_settings">Configuración del widget</string>
+  <string name="activity_not_found">¡Actividad no encontrada!</string>
+</resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index fe3f9a631..c22f559c8 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Mostrar icono</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Mostrar un icono en la barra de estado cuando haya alguna alarma establecida</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Volumen ascendente</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Perfil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Ningún perfil seleccionado</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Añadir</string>
   <string name="cities_add_city_title">Añadir ciudad</string>
   <string name="cities_add_city_city">Ciudad:</string>
@@ -31,37 +37,44 @@
   <string name="cities_add_gps_no_results">La consulta GPS no devolvió ninguna localización</string>
   <string name="cities_add_gps_not_available">GPS no disponible</string>
   <string name="cities_add_already_exists">La ciudad ya existe en la base de datos</string>
-  <string name="cities_add_city_failed">Imposible crear la ciudad</string>
+  <string name="cities_add_city_failed">No se puede crear la ciudad</string>
   <string name="cities_delete_city_title">Eliminar ciudad</string>
-  <string name="cities_delete_city_msg">¿Deseas eliminar <xliff:g id="city">%s</xliff:g>?</string>
-  <string name="cities_delete_city_failed">Imposible eliminar la ciudad</string>
+  <string name="cities_delete_city_msg">¿Deseas eliminar a <xliff:g id="city">%s</xliff:g>?</string>
+  <string name="cities_delete_city_failed">No se puede eliminar la ciudad</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Al presionar los botones de volumen <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Acción al voltear</string>
-  <string name="flip_action_summary" product="tablet"><xliff:g id="action">%s</xliff:g></string>
-  <string name="flip_action_summary" product="default"><xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting summary for the flip action setting. -->
+  <string name="flip_action_summary" product="tablet">Al voltear el tablet, <xliff:g id="action">%s</xliff:g></string>
+  <string name="flip_action_summary" product="default">Al voltear el teléfono, <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Acción al agitar</string>
-  <string name="shake_action_summary" product="tablet"><xliff:g id="action">%s</xliff:g></string>
-  <string name="shake_action_summary" product="default"><xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">Al agitar el tablet, <xliff:g id="action">%s</xliff:g></string>
+  <string name="shake_action_summary" product="default">Al agitar el teléfono, <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">repetir la alarma</string>
   <string name="action_summary_dismiss">descartar la alarma</string>
   <string name="action_summary_do_nothing">no hacer nada</string>
-  <string name="alarm_picker_title">Tono de alarma</string>
-  <string name="alarm_type_ringtone">Personalizado</string>
+  <!-- Alarm picker dialog title -->
+  <string name="alarm_picker_title">Elige el tipo de alarma</string>
+  <!-- Alarm types -->
+  <string name="alarm_type_ringtone">Timbre de llamada</string>
   <string name="alarm_type_playlist">Lista de reproducción</string>
   <string name="alarm_type_random">Aleatorio</string>
-  <string name="warn_silent_alarm_title">Volumen de la alarma en silencio</string>
-  <string name="alarm_select">Tipo de aviso</string>
-  <string name="alarm_select_ringtone">Tono de llamada</string>
+  <!-- Warn Silent Alarm title -->
+  <string name="warn_silent_alarm_title">El volumen de la alarma está en silencio</string>
+  <!-- Select the source of the alarm -->
+  <string name="alarm_select">Seleccionar aviso</string>
+  <!-- Select the ringtone as alarm -->
+  <string name="alarm_select_ringtone">Timbre de llamada</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Música</string>
-  <string name="ringtone_default">Tono por defecto</string>
-  <string name="take_persistent_grant_uri_permission_failed_msg">Error al obtener permiso persistente para el tono de llamada</string>
-  <string name="menu_item_widget_settings">Configuración del widget</string>
+  <!-- Ringtone selection default -->
+  <string name="ringtone_default">Timbre de llamada por defecto</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">Error al obtener permiso persistente para el timbre de llamada</string>
+  <string name="menu_item_widget_settings">Ajustes de widgets</string>
   <string name="activity_not_found">¡Actividad no encontrada!</string>
-  <string name="permlab_write_alarms">cambiar directamente alarmas</string>
-  <string name="permdesc_write_alarms">Permite a una aplicación añadir, modificar o eliminar todas tus alarmas.</string>
-  <string name="permlab_manage_alarms">activar o desactivar alarmas programadas</string>
-  <string name="permdesc_manage_alarms">Permite a una aplicación activar o desactivar tus alarmas programadas.</string>
-  <string name="permlab_read_alarms">acceder a alarmas programadas</string>
-  <string name="permdesc_read_alarms">Permite a una aplicación leer tus alarmas programadas.</string>
-  <string name="alarm_modification_service_desc">Un servicio para permitir la manipulación de alarmas por parte de terceros.</string>
 </resources>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index 9d3321379..eb0462042 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Kuva ikoon</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Näita olekuribal ikooni kui alarm on sees</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Valjenev helin</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profiil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Ühtegi profiili pole valitud</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Lisa</string>
   <string name="cities_add_city_title">Lisa linn</string>
   <string name="cities_add_city_city">Linn:</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">Kustuta linn</string>
   <string name="cities_delete_city_msg">Kas soovite kustutada linna <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Ei saa kustutada linna</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Helitugevuse nupu vajutamine aktiveerib <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Ümberpööramise tegevus</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Tahvelarvuti ümberpööramine aktiveerib <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Telefoni ümberpööramine aktiveerib <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Raputamise tegevus</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Tahvelarvuti raputamine aktiveerib <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Telefoni raputamine aktiveerib <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">Lükka äratust edasi</string>
   <string name="action_summary_dismiss">lõpeta äratus</string>
   <string name="action_summary_do_nothing">ei tee midagi</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Valige äratuse tüüp</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Helin</string>
   <string name="alarm_type_playlist">Esitusloend</string>
   <string name="alarm_type_random">Juhuslikult</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Äratus on vaigistatud</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Valige äratus</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Helin</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Muusika</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Vaikimisi helin</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Ei saanud püsivat luba helinale</string>
   <string name="menu_item_widget_settings">Vidina sätted</string>
   <string name="activity_not_found">Tegevusala ei leitud!</string>
-  <string name="permlab_write_alarms">vahetult alarmide muutmine</string>
-  <string name="permdesc_write_alarms">Võimaldab rakendusel lisada, muuta või kustutada kõik sinu alarmid.</string>
-  <string name="permlab_manage_alarms">lülitada planeeritud alarme</string>
-  <string name="permdesc_manage_alarms">Võimaldab rakendusel lülitada planeeritud alarme sisse või välja.</string>
-  <string name="permlab_read_alarms">juurdepääs planeeritud alarmidele</string>
-  <string name="permdesc_read_alarms">Võimaldab rakendusel lugeda sinu planeeritud alarme.</string>
-  <string name="alarm_modification_service_desc">Teenus, mis võimaldab alarmide manipuleerimist kolmandate isikute poolt.</string>
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index d563b5af2..e5ccd5f4c 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Erakutsi ikonoa</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Bistaratu ikono bat egoera barran alarma bat ezarrita badago</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Bolumen gorakorra</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description"><xliff:g id="profile">%s</xliff:g> profila</string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Ez da profilik ezarri</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Gehitu</string>
   <string name="cities_add_city_title">Gehitu hiria</string>
   <string name="cities_add_city_city">Hiria:</string>
@@ -35,28 +41,40 @@
   <string name="cities_delete_city_title">Hiria ezabatu</string>
   <string name="cities_delete_city_msg"><xliff:g id="city">%s</xliff:g> ezabatu nahi duzu?</string>
   <string name="cities_delete_city_failed">Ezin da hiria ezabatu</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Bolumen botoiak sakatzean <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Iraultzerako ekintza</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet"><xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default"><xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Astintzerako ekintza</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet"><xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default"><xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">atzeratu alarma</string>
   <string name="action_summary_dismiss">baztertu alarma</string>
   <string name="action_summary_do_nothing">Ez egin ezer</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Alarma doinua</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Dei doinua</string>
   <string name="alarm_type_playlist">Erreprodukzio-zerrenda</string>
   <string name="alarm_type_random">Ausazkoa</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Alarmaren bolumena isilpean</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Hautatu alarma</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Dei doinua</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Musika</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Dei doinu lehenetsia</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Huts egin du dei doinuarentzat behin betiko baimen eskaerak</string>
   <string name="menu_item_widget_settings">Trepetaren ezarpenak</string>
   <string name="activity_not_found">Aktibitatea ez da aurkitu!</string>
-  <string name="permlab_write_alarms">zuzenean aldatu alarmak</string>
-  <string name="permlab_manage_alarms">txandakatu programatutako alarmak</string>
 </resources>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index 4035a2ef2..69e42424e 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">نمایش آیکون</string>
-  <string name="show_status_bar_icon_summary">هنگامی که هشداری تنظیم می‌شود، آیکونی در نوار وضعیت نشان داده شود</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <string name="show_status_bar_icon_summary">هنگامی که هشداری تنظیم می‌شود، آیکون در نوار وضعیت نشان داده شود</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">صدای صعودی</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">پروفایل <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">پروفایلی انتخاب نشده است</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">افزودن</string>
   <string name="cities_add_city_title">افزودن شهر</string>
   <string name="cities_add_city_city">شهر:</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">حذف شهر</string>
   <string name="cities_delete_city_msg">آیا می‌خواهید <xliff:g id="city">%s</xliff:g> را حذف کنید؟</string>
   <string name="cities_delete_city_failed">نمی‌توان شهر را حذف کرد</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">با زدن کلیدهای صدا هشدار <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">واکنش نسبت به وارونگی</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">با وارونه کردن تبلت هشدار <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">با وارونه کردن گوشی هشدار <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">واکنش نسبت به تکان دادن</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">با تکان دادن تبلت هشدار <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">با تکان دادن گوشی هشدار <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">به تعویق می‌افتد</string>
   <string name="action_summary_dismiss">رد می‌شود</string>
   <string name="action_summary_do_nothing">تغییری نمی‌کند</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">انتخاب نوع هشدار</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">صدای زنگ</string>
   <string name="alarm_type_playlist">لیست پخش</string>
   <string name="alarm_type_random">به طور تصادفی</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">هشدار در حالت بی‌صدا است</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">انتخاب هشدار</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">صدای زنگ</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">موسیقی</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">صدای زنگ پیش‌فرض</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">گرفتن اجازه دائم برای صدای زنگ ناموفق بود</string>
   <string name="menu_item_widget_settings">تنظیمات ابزارک</string>
   <string name="activity_not_found">فعالیت پیدا نشد!</string>
-  <string name="permlab_write_alarms">به طور مستقیم هشدارها را تغییر می‌دهد</string>
-  <string name="permdesc_write_alarms">به برنامه اجازه افزودن، تغییر یا حذف تمام هشدارهای دستگاه را می‌دهد.</string>
-  <string name="permlab_manage_alarms">تغییر در وضعیت هشدارهای زمان‌بندی شده</string>
-  <string name="permdesc_manage_alarms">به برنامه اجازه می‌دهد هشدارهای زمان‌بندی شده را خاموش یا روشن کند.</string>
-  <string name="permlab_read_alarms">دسترسی به هشدارهای زمان‌بندی شده</string>
-  <string name="permdesc_read_alarms">به برنامه اجازه می‌دهد هشدارهای زمان‌بندی شده را بررسی کند.</string>
-  <string name="alarm_modification_service_desc">سرویسی برای تغییر در هشدارها توسط برنامه‌های نصب شده.</string>
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index ea9ce5b00..d49fd0670 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Näytä kuvake</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Näytä kuvake tilapalkissa, kun hälytys on asetettu</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Nouseva äänenvoimakkuus</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profiili <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Profiilia ei valittu</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Lisää</string>
   <string name="cities_add_city_title">Lisää kaupunki</string>
   <string name="cities_add_city_city">Kaupunki:</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">Poista kaupunki</string>
   <string name="cities_delete_city_msg">Haluatko varmasti poistaa kaupungin <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Ei voida poistaa kaupunkia</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Äänenvoimakkuuspainikkeiden painaminen <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Laitteen kääntö</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Tabletin kääntö <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Puhelimen kääntö <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Ravistaminen</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Tabletin ravistaminen <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Puhelimen ravistaminen <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">asettaa torkun</string>
   <string name="action_summary_dismiss">lopettaa hälytyksen</string>
   <string name="action_summary_do_nothing">ei tee mitään</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Valitse hälytyksen tyyppi</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Soittoääni</string>
   <string name="alarm_type_playlist">Soittolista</string>
   <string name="alarm_type_random">Satunnainen</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Hälytyksen äänenvoimakkuus on äänettömällä</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Valitse hälytys</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Soittoääni</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Musiikki</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Oletussoittoääni</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Pysyvän käyttöoikeuden ottaminen soittoäänelle epäonnistui</string>
   <string name="menu_item_widget_settings">Widget-asetukset</string>
   <string name="activity_not_found">Aktiviteetteja ei löydy!</string>
-  <string name="permlab_write_alarms">muuta hälytyksiä suoraan</string>
-  <string name="permdesc_write_alarms">Sallii sovelluksen lisätä, muokata tai poistaa kaikki hälytyksesi.</string>
-  <string name="permlab_manage_alarms">ota hälytys käyttöön</string>
-  <string name="permdesc_manage_alarms">Sallii sovelluksen ottaa hälytyksen käyttöön tai poistaa sen käytöstä.</string>
-  <string name="permlab_read_alarms">käyttää ajoitettua hälytystä</string>
-  <string name="permdesc_read_alarms">Sallii sovelluksen lukea ajoitettuja hälytyksiä.</string>
-  <string name="alarm_modification_service_desc">Palvelu sallii kolmannen osapuolen manipuloida hälytyksiä.</string>
 </resources>
diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-fil-rPH/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-fr-rCA/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 534a94c7a..168c527f2 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -16,16 +16,22 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Afficher l\'icône</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Afficher l\'icône dans la barre d\'état quand une alarme est activée</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Volume progressif</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Aucun profil sélectionné</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Ajouter</string>
   <string name="cities_add_city_title">Ajouter une ville</string>
   <string name="cities_add_city_city">Ville\u00A0:</string>
-  <string name="cities_add_city_timezone">Fuseau horaire\u00A0:</string>
-  <string name="cities_add_city_gps_cd">Appuyer pour localiser votre ville actuelle</string>
+  <string name="cities_add_city_timezone">Fuseau horaire :</string>
+  <string name="cities_add_city_gps_cd">Appuyer pour rechercher votre ville actuelle</string>
   <string name="cities_add_loading">Chargement\u2026</string>
   <string name="cities_add_searching">Recherche\u2026</string>
   <string name="cities_add_gps_no_results">La requête GPS ne retourne aucun résultat de localisation</string>
@@ -35,26 +41,40 @@
   <string name="cities_delete_city_title">Supprimer la ville</string>
   <string name="cities_delete_city_msg">Voulez-vous supprimer <xliff:g id="city">%s</xliff:g>\u00A0?</string>
   <string name="cities_delete_city_failed">Impossible de supprimer la ville</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Appuyer sur les boutons de volume <xliff:g id="action">%s</xliff:g></string>
-  <string name="flip_action_title">Action quand retourné</string>
-  <string name="flip_action_summary" product="tablet">Retourner la tablette <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
+  <string name="flip_action_title">Action retourner</string>
+  <!-- Setting summary for the flip action setting. -->
+  <string name="flip_action_summary" product="tablet">Retourner la tablette vers le bas <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Retourner le téléphone <xliff:g id="action">%s</xliff:g></string>
-  <string name="shake_action_title">Action quand secoué</string>
+  <!-- Setting title for the shake action setting. -->
+  <string name="shake_action_title">Action secousse</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Secouer la tablette <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Secouer le téléphone <xliff:g id="action">%s</xliff:g></string>
-  <string name="action_summary_snooze">pour répéter l\'alarme</string>
-  <string name="action_summary_dismiss">pour arrêter l\'alarme</string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">répétera l\'alarme</string>
+  <string name="action_summary_dismiss">arrêtera l\'alarme</string>
   <string name="action_summary_do_nothing">ne fera rien</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Définir le type d\'alarme</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Sonnerie</string>
   <string name="alarm_type_playlist">Liste de lecture</string>
   <string name="alarm_type_random">Aléatoire</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Le volume de l\'alarme est silencieux</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Sélectionner une alarme</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Sonnerie</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Musique</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Sonnerie par défaut</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Impossible d\'obtenir une autorisation permanente pour la sonnerie</string>
   <string name="menu_item_widget_settings">Paramètres du widget</string>
-  <string name="activity_not_found">Activité non trouvée !</string>
+  <string name="activity_not_found">Activité introuvable !</string>
 </resources>
diff --git a/res/values-frp-rIT/cm_strings.xml b/res/values-frp-rIT/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-frp-rIT/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-frp-rIT/strings.xml b/res/values-frp-rIT/strings.xml
new file mode 100644
index 000000000..2ca9c3e5b
--- /dev/null
+++ b/res/values-frp-rIT/strings.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label shown on launcher icon -->
+  <!-- Label for the this application displayed on-screen when this application must be represented to the user. -->
+  <!-- Title for AlarmClock activity -->
+  <!-- Label for the Alarms activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Menu item on Alarm Clock screen: Add alarm -->
+  <!-- Menu item on Alarm Clock screen: Desk clock -->
+  <!-- Menu item on Alarm Clock screen: Edit alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Delete alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Enable alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Disable alarm -->
+  <!-- Delete alarm confirmation dialog message. -->
+  <!-- Menu item on Alarm Clock screen: Show clock -->
+  <!-- Menu item on Alarm Clock screen: Hide clock -->
+  <!-- Setting label on Set alarm screen: Label -->
+  <!-- Default label to display for an alarm -->
+  <!-- Preference category on Alarm Settings screen: Set alarm -->
+  <!-- Also label for the old Alarms dialog activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting labels on Set alarm screen: Vibration on or off -->
+  <!-- Setting labels on Set alarm screen: Repeat -->
+  <!-- Setting labels on Set alarm screen: Select alarm ringtone  -->
+  <!-- Label on expanded alarm edit view. -->
+  <!-- Setting labels on Set alarm screen: Set time  -->
+  <!-- Label shown when user is setting up non-repeating alarm for tomorrow [CHAR LIMIT=15] -->
+  <!-- Label shown when user is setting up non-repeating alarm for later today [CHAR LIMIT=15] -->
+  <!-- The text shown above the clock when alarm is alerting [CHAR LIMIT=10] -->
+  <!-- The text shown as an option to dismiss an alerting alarm [CHAR LIMIT=5] -->
+  <!-- Button labels on the alarm dialog: Dismiss -->
+  <!-- Button labels on the pre-dismiss alarm notifications: Dismiss now -->
+  <!-- Alarm Alert screen: this message is shown after an alarm rung
+         unattended for a number of minutes.  It tells the user that
+         the alarm has been silenced.-->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the number of minutes in two separate lines. For example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the word 'Snoozed' in two separate lines or example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user dismissed an alerting alarm [CHAR LIMIT=15] -->
+  <!-- Button labels on the alarm dialog: Snooze -->
+  <!-- Toast that appears after Alarm is snoozed from the Alarm
+         dialog. Says the alarm will snooze for xxx minutes.  -->
+  <!-- Text to appear inside a notification while an alarm is snoozing. -->
+  <!-- Text to appear in the notification title while an alarm is about to go off. -->
+  <!-- Text to appear in when trying to view a missed alarm that has been deleted -->
+  <!-- 0: nothing
+         1: days
+         2:      hours
+         3: days hours
+         4:            minutes
+         5: days       minutes
+         6:      hours minutes
+         7: days hours minutes
+    -->
+  <!-- Timer notification: how long from now until timer goes off. -->
+  <!-- Alarm confirmation toast: Describes how long from now until
+         alarm fires -->
+  <!-- Alarm confirmation toast: singular day -->
+  <!-- Alarm confirmation toast: plural days -->
+  <!-- Alarm confirmation toast: singular hour -->
+  <!-- Alarm confirmation toast: plural hours -->
+  <!-- Alarm confirmation toast: singular minute  -->
+  <!-- Alarm confirmation toast: plural minutes  -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to repeat every day -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to never repeat -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: concatenate days with
+         this character, i.e. "Mon, Tue, Wed" -->
+  <!-- Appears at the top of the Clock Picker screen: Tell user to
+         select a clock to display -->
+  <!-- Label for analog clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- Help activity name -->
+  <!-- Settings activity name -->
+  <!-- Label for the Settings activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting title for changing the snooze duration. -->
+  <!-- Auto silence preference title -->
+  <!-- Auto silence summary string set based on the preference value. -->
+  <!-- Auto silence summary when turned off -->
+  <!-- Entries listed in the ListPreference when invoking the auto silence
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the auto_silence_entries above. -->
+  <!-- Done button when editing an alarm. -->
+  <!-- Revert button when editing an alarm. -->
+  <!-- Delete button when editing an alarm. -->
+  <!-- Setting title for changing the alarm volume. -->
+  <!-- Summary for the alarm preference when silent is chosen. -->
+  <!-- Text to display in the small text of the notification -->
+  <!-- Text to display in the notification ticker and label -->
+  <!-- Text to display in the notification when the alarm has been snoozed -->
+  <!-- Title of the setting to change hardware button behavior. This string
+         should be changed for each piece of hardware. [CHAR LIMIT=20] -->
+  <!-- Dialog title of the volume and power setting. -->
+  <!-- Entries listed in the setting for the side-button action. -->
+  <!-- Values for the side-button setting. -->
+  <!-- Title of the ringtone setting. -->
+  <!-- Accessibility labels for Clock activity buttons -->
+  <!-- Accessibility labels for alarm buttons -->
+  <!-- What to show the user if the weather widget exists but fails to
+         respond. This is a sign of an error; if the weather widget is not
+         present on the device, we show nothing at all. -->
+  <!-- A description for the DeskClock alarm sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- String displayed as the alert summary while loading the alert name from
+         the media player. [CHAR LIMIT=NONE] -->
+  <!-- A description for the DeskClock timer sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- Label on the main screen control used to set alarm [CHAR LIMIT=30]-->
+  <!-- Label on the main screen control used to set alarm when there is already an existing alarm [CHAR LIMIT=30]-->
+  <!--  ActionBar strings -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Alarm page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Timer page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Clock page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Stopwatch page -->
+  <!-- Clock view buttons strings-->
+  <!-- Describes the purpose of the button to start the activity to add/edit/delete alarms -->
+  <!-- Describes the purpose of the button which provides a list of cities for the world clock settings -->
+  <!-- Describes the purpose of the button which pops up a menu of setting choices -->
+  <!-- Menu item on most screens to get to more settings -->
+  <!-- Menu item on most screens to get to the help information -->
+  <!-- Menu item on clock screen to enter night mode. -->
+  <!-- Menu item on Cities screen to sort by GMT offset -->
+  <!-- Menu item on Cities screen to sort by alphabetical order -->
+  <!-- Label for selected cities in Cities list view -->
+  <!-- Stop Watch strings -->
+  <!-- Describes the purpose of the button to resume running a stopwatch -->
+  <!-- Describes the purpose of the button to begin running a stopwatch -->
+  <!-- Describes the purpose of the button to pause a stopwatch. -->
+  <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
+  <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
+  <!-- Describes the purpose of the button to share the stopwatch value.
+         Also used as title for chooser when sharing stopwatch results. -->
+  <!-- Abbreviation for temporal hours [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal minutes [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal seconds [CHAR LIMIT=1] -->
+  <!-- Accessibility strings -->
+  <!--  Stopwatch share strings -->
+  <!-- Sentence within the message created to share the total time recorded within the stopwatch -->
+  <!-- Header within the message created to share a list of lap times (a new line is appended to this) -->
+  <!-- Label to enumerate the number of laps in the notification the user has counted -->
+  <!-- Formatted stopwatch time -->
+  <!-- Formatted stopwatch time for laps shared using the share button -->
+  <!-- Label to enumerate the number of laps the user has counted -->
+  <!-- Stopwatch accessibility strings -->
+  <!-- timer strings -->
+  <!-- Describes the purpose of the button to add a new timer -->
+  <!-- Describes the purpose of the button to begin or continue running a timer -->
+  <!-- Describes the purpose of the button to delete a timer. -->
+  <!-- Describes the purpose of the button increase the remaining time on a timer by one minute. -->
+  <!-- Like "timer_plus_one", but with 'minute' abbreviated for the notification. -->
+  <!-- Describes the purpose of the button to stop the timer. -->
+  <!-- Describes the purpose of the button to stop and delete the timer. -->
+  <!-- Describes the purpose of the button to return the timer to it's original starting value. -->
+  <!-- Describes the purpose of the button to discard the current dialog values. Will also close the dialog if other time's exist -->
+  <!-- Notification content shown when a timer has completed and has no more time remaining -->
+  <!-- Label associated with a notification for a Timer -->
+  <!-- Toast content shown when user attempts to create a new timer when there are already 4 timers -->
+  <!-- Jocular content that user may append when sharing the lap times -->
+  <!-- Title with the clock on the main page displaying the user's regular timezone (shows when automatic_home_clock enabled) -->
+  <!-- Label for the Cities activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Settings strings -->
+  <!-- Header in the preferences settings for the section pertaining to clocks on the main fragment -->
+  <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->
+  <!-- Entries listed in the ListPreference when invoking the clock style
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the clock_style_entries above. -->
+  <!-- Title for an option that will automtically show a clock representing the user's regular timezone on the main fragment whenever the user leaves their regular timezone-->
+  <!-- Describes the functionality provided by the automatic_home_clock option -->
+  <!-- Title in the preferences change the time zone for the user's home -->
+  <!-- Title in a list dialog box to pick a time zone for the user's home -->
+  <!-- Textual content of the button to discard the current dialog values and close the dialog -->
+  <!-- Textual content of the button to update an alarm with the current dialog values -->
+  <!--  place holder for am/pm label when it is not set -->
+  <!-- add 00 as minutes to the time when pressing this button -->
+  <!-- add 30 as minutes to the time when pressing this button -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. CHAR LIMIT=25] -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. -->
+  <!-- Header in the preferences settings for the section pertaining to alarms -->
+  <!-- Describes the running service for the stopwatch -->
+  <!-- Desription for the stopped stop watch -->
+  <!-- Text instruction for dismiss alarm on alarm lock screen. The dismiss button will still
+         be on the right even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Text instruction for snooze alarm on alarm lock screen. The snooze button will still
+         be on the left even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Notification title when timer is stopped. -->
+  <!-- Notification title when multiple timers are stopped. -->
+  <!-- Notification text when multiple timers are stopped. -->
+  <!-- Notification title when at least one timer, of those in use, is counting down. -->
+  <!-- Notification text when at least one timer, of those in use, is counting down. -->
+  <!-- screensaver settings strings -->
+  <!-- Label for the screen saver activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Title for check box to pick intensity of display diminuation during dream mode -->
+  <!-- Describes intensity of display diminuation during dream mode -->
+  <!-- Description of the down caret in the alarm alert screen to expand the alarm content to edit perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up caret in the alarm alert screen to collapse the alarm content to summary perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to undo change to alarm -->
+  <!-- Toast content when an alarm was deleted  -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- Description of field showing the next alarm time in the clock page, for accessibility. -->
+  <!-- Displays the number of alarms selected from the list of alarms. -->
+  <!-- message used by the talkback accessebility app to say that something was deleted -->
+  <!-- Alarm deletion confirmation message-->
+  <!-- Timer deletion confirmation -->
+  <!-- world clock deletion confirmation -->
+  <!-- Label for digital clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- format strings for clocks -->
+  <!-- Font size for AM/PM should match widget_label_font_size -->
+  <!-- Font size for AM/PM should match bottom_text_size -->
+  <!-- Font size for AM/PM should match label_font_size -->
+  <!-- Font size for AM/PM should match alarm_label_size -->
+  <!-- String for no alarms -->
+  <!-- String for no alarms set [CHAR LIMIT=24] -->
+  <!-- String for no enabled alarms in timeline view [CHAR LIMIT=30] -->
+</resources>
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-fy-rNL/strings.xml b/res/values-fy-rNL/strings.xml
new file mode 100644
index 000000000..2ca9c3e5b
--- /dev/null
+++ b/res/values-fy-rNL/strings.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label shown on launcher icon -->
+  <!-- Label for the this application displayed on-screen when this application must be represented to the user. -->
+  <!-- Title for AlarmClock activity -->
+  <!-- Label for the Alarms activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Menu item on Alarm Clock screen: Add alarm -->
+  <!-- Menu item on Alarm Clock screen: Desk clock -->
+  <!-- Menu item on Alarm Clock screen: Edit alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Delete alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Enable alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Disable alarm -->
+  <!-- Delete alarm confirmation dialog message. -->
+  <!-- Menu item on Alarm Clock screen: Show clock -->
+  <!-- Menu item on Alarm Clock screen: Hide clock -->
+  <!-- Setting label on Set alarm screen: Label -->
+  <!-- Default label to display for an alarm -->
+  <!-- Preference category on Alarm Settings screen: Set alarm -->
+  <!-- Also label for the old Alarms dialog activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting labels on Set alarm screen: Vibration on or off -->
+  <!-- Setting labels on Set alarm screen: Repeat -->
+  <!-- Setting labels on Set alarm screen: Select alarm ringtone  -->
+  <!-- Label on expanded alarm edit view. -->
+  <!-- Setting labels on Set alarm screen: Set time  -->
+  <!-- Label shown when user is setting up non-repeating alarm for tomorrow [CHAR LIMIT=15] -->
+  <!-- Label shown when user is setting up non-repeating alarm for later today [CHAR LIMIT=15] -->
+  <!-- The text shown above the clock when alarm is alerting [CHAR LIMIT=10] -->
+  <!-- The text shown as an option to dismiss an alerting alarm [CHAR LIMIT=5] -->
+  <!-- Button labels on the alarm dialog: Dismiss -->
+  <!-- Button labels on the pre-dismiss alarm notifications: Dismiss now -->
+  <!-- Alarm Alert screen: this message is shown after an alarm rung
+         unattended for a number of minutes.  It tells the user that
+         the alarm has been silenced.-->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the number of minutes in two separate lines. For example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the word 'Snoozed' in two separate lines or example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user dismissed an alerting alarm [CHAR LIMIT=15] -->
+  <!-- Button labels on the alarm dialog: Snooze -->
+  <!-- Toast that appears after Alarm is snoozed from the Alarm
+         dialog. Says the alarm will snooze for xxx minutes.  -->
+  <!-- Text to appear inside a notification while an alarm is snoozing. -->
+  <!-- Text to appear in the notification title while an alarm is about to go off. -->
+  <!-- Text to appear in when trying to view a missed alarm that has been deleted -->
+  <!-- 0: nothing
+         1: days
+         2:      hours
+         3: days hours
+         4:            minutes
+         5: days       minutes
+         6:      hours minutes
+         7: days hours minutes
+    -->
+  <!-- Timer notification: how long from now until timer goes off. -->
+  <!-- Alarm confirmation toast: Describes how long from now until
+         alarm fires -->
+  <!-- Alarm confirmation toast: singular day -->
+  <!-- Alarm confirmation toast: plural days -->
+  <!-- Alarm confirmation toast: singular hour -->
+  <!-- Alarm confirmation toast: plural hours -->
+  <!-- Alarm confirmation toast: singular minute  -->
+  <!-- Alarm confirmation toast: plural minutes  -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to repeat every day -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to never repeat -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: concatenate days with
+         this character, i.e. "Mon, Tue, Wed" -->
+  <!-- Appears at the top of the Clock Picker screen: Tell user to
+         select a clock to display -->
+  <!-- Label for analog clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- Help activity name -->
+  <!-- Settings activity name -->
+  <!-- Label for the Settings activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting title for changing the snooze duration. -->
+  <!-- Auto silence preference title -->
+  <!-- Auto silence summary string set based on the preference value. -->
+  <!-- Auto silence summary when turned off -->
+  <!-- Entries listed in the ListPreference when invoking the auto silence
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the auto_silence_entries above. -->
+  <!-- Done button when editing an alarm. -->
+  <!-- Revert button when editing an alarm. -->
+  <!-- Delete button when editing an alarm. -->
+  <!-- Setting title for changing the alarm volume. -->
+  <!-- Summary for the alarm preference when silent is chosen. -->
+  <!-- Text to display in the small text of the notification -->
+  <!-- Text to display in the notification ticker and label -->
+  <!-- Text to display in the notification when the alarm has been snoozed -->
+  <!-- Title of the setting to change hardware button behavior. This string
+         should be changed for each piece of hardware. [CHAR LIMIT=20] -->
+  <!-- Dialog title of the volume and power setting. -->
+  <!-- Entries listed in the setting for the side-button action. -->
+  <!-- Values for the side-button setting. -->
+  <!-- Title of the ringtone setting. -->
+  <!-- Accessibility labels for Clock activity buttons -->
+  <!-- Accessibility labels for alarm buttons -->
+  <!-- What to show the user if the weather widget exists but fails to
+         respond. This is a sign of an error; if the weather widget is not
+         present on the device, we show nothing at all. -->
+  <!-- A description for the DeskClock alarm sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- String displayed as the alert summary while loading the alert name from
+         the media player. [CHAR LIMIT=NONE] -->
+  <!-- A description for the DeskClock timer sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- Label on the main screen control used to set alarm [CHAR LIMIT=30]-->
+  <!-- Label on the main screen control used to set alarm when there is already an existing alarm [CHAR LIMIT=30]-->
+  <!--  ActionBar strings -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Alarm page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Timer page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Clock page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Stopwatch page -->
+  <!-- Clock view buttons strings-->
+  <!-- Describes the purpose of the button to start the activity to add/edit/delete alarms -->
+  <!-- Describes the purpose of the button which provides a list of cities for the world clock settings -->
+  <!-- Describes the purpose of the button which pops up a menu of setting choices -->
+  <!-- Menu item on most screens to get to more settings -->
+  <!-- Menu item on most screens to get to the help information -->
+  <!-- Menu item on clock screen to enter night mode. -->
+  <!-- Menu item on Cities screen to sort by GMT offset -->
+  <!-- Menu item on Cities screen to sort by alphabetical order -->
+  <!-- Label for selected cities in Cities list view -->
+  <!-- Stop Watch strings -->
+  <!-- Describes the purpose of the button to resume running a stopwatch -->
+  <!-- Describes the purpose of the button to begin running a stopwatch -->
+  <!-- Describes the purpose of the button to pause a stopwatch. -->
+  <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
+  <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
+  <!-- Describes the purpose of the button to share the stopwatch value.
+         Also used as title for chooser when sharing stopwatch results. -->
+  <!-- Abbreviation for temporal hours [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal minutes [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal seconds [CHAR LIMIT=1] -->
+  <!-- Accessibility strings -->
+  <!--  Stopwatch share strings -->
+  <!-- Sentence within the message created to share the total time recorded within the stopwatch -->
+  <!-- Header within the message created to share a list of lap times (a new line is appended to this) -->
+  <!-- Label to enumerate the number of laps in the notification the user has counted -->
+  <!-- Formatted stopwatch time -->
+  <!-- Formatted stopwatch time for laps shared using the share button -->
+  <!-- Label to enumerate the number of laps the user has counted -->
+  <!-- Stopwatch accessibility strings -->
+  <!-- timer strings -->
+  <!-- Describes the purpose of the button to add a new timer -->
+  <!-- Describes the purpose of the button to begin or continue running a timer -->
+  <!-- Describes the purpose of the button to delete a timer. -->
+  <!-- Describes the purpose of the button increase the remaining time on a timer by one minute. -->
+  <!-- Like "timer_plus_one", but with 'minute' abbreviated for the notification. -->
+  <!-- Describes the purpose of the button to stop the timer. -->
+  <!-- Describes the purpose of the button to stop and delete the timer. -->
+  <!-- Describes the purpose of the button to return the timer to it's original starting value. -->
+  <!-- Describes the purpose of the button to discard the current dialog values. Will also close the dialog if other time's exist -->
+  <!-- Notification content shown when a timer has completed and has no more time remaining -->
+  <!-- Label associated with a notification for a Timer -->
+  <!-- Toast content shown when user attempts to create a new timer when there are already 4 timers -->
+  <!-- Jocular content that user may append when sharing the lap times -->
+  <!-- Title with the clock on the main page displaying the user's regular timezone (shows when automatic_home_clock enabled) -->
+  <!-- Label for the Cities activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Settings strings -->
+  <!-- Header in the preferences settings for the section pertaining to clocks on the main fragment -->
+  <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->
+  <!-- Entries listed in the ListPreference when invoking the clock style
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the clock_style_entries above. -->
+  <!-- Title for an option that will automtically show a clock representing the user's regular timezone on the main fragment whenever the user leaves their regular timezone-->
+  <!-- Describes the functionality provided by the automatic_home_clock option -->
+  <!-- Title in the preferences change the time zone for the user's home -->
+  <!-- Title in a list dialog box to pick a time zone for the user's home -->
+  <!-- Textual content of the button to discard the current dialog values and close the dialog -->
+  <!-- Textual content of the button to update an alarm with the current dialog values -->
+  <!--  place holder for am/pm label when it is not set -->
+  <!-- add 00 as minutes to the time when pressing this button -->
+  <!-- add 30 as minutes to the time when pressing this button -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. CHAR LIMIT=25] -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. -->
+  <!-- Header in the preferences settings for the section pertaining to alarms -->
+  <!-- Describes the running service for the stopwatch -->
+  <!-- Desription for the stopped stop watch -->
+  <!-- Text instruction for dismiss alarm on alarm lock screen. The dismiss button will still
+         be on the right even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Text instruction for snooze alarm on alarm lock screen. The snooze button will still
+         be on the left even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Notification title when timer is stopped. -->
+  <!-- Notification title when multiple timers are stopped. -->
+  <!-- Notification text when multiple timers are stopped. -->
+  <!-- Notification title when at least one timer, of those in use, is counting down. -->
+  <!-- Notification text when at least one timer, of those in use, is counting down. -->
+  <!-- screensaver settings strings -->
+  <!-- Label for the screen saver activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Title for check box to pick intensity of display diminuation during dream mode -->
+  <!-- Describes intensity of display diminuation during dream mode -->
+  <!-- Description of the down caret in the alarm alert screen to expand the alarm content to edit perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up caret in the alarm alert screen to collapse the alarm content to summary perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to undo change to alarm -->
+  <!-- Toast content when an alarm was deleted  -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- Description of field showing the next alarm time in the clock page, for accessibility. -->
+  <!-- Displays the number of alarms selected from the list of alarms. -->
+  <!-- message used by the talkback accessebility app to say that something was deleted -->
+  <!-- Alarm deletion confirmation message-->
+  <!-- Timer deletion confirmation -->
+  <!-- world clock deletion confirmation -->
+  <!-- Label for digital clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- format strings for clocks -->
+  <!-- Font size for AM/PM should match widget_label_font_size -->
+  <!-- Font size for AM/PM should match bottom_text_size -->
+  <!-- Font size for AM/PM should match label_font_size -->
+  <!-- Font size for AM/PM should match alarm_label_size -->
+  <!-- String for no alarms -->
+  <!-- String for no alarms set [CHAR LIMIT=24] -->
+  <!-- String for no enabled alarms in timeline view [CHAR LIMIT=30] -->
+</resources>
diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-gd-rGB/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-gd-rGB/strings.xml b/res/values-gd-rGB/strings.xml
new file mode 100644
index 000000000..2ca9c3e5b
--- /dev/null
+++ b/res/values-gd-rGB/strings.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label shown on launcher icon -->
+  <!-- Label for the this application displayed on-screen when this application must be represented to the user. -->
+  <!-- Title for AlarmClock activity -->
+  <!-- Label for the Alarms activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Menu item on Alarm Clock screen: Add alarm -->
+  <!-- Menu item on Alarm Clock screen: Desk clock -->
+  <!-- Menu item on Alarm Clock screen: Edit alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Delete alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Enable alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Disable alarm -->
+  <!-- Delete alarm confirmation dialog message. -->
+  <!-- Menu item on Alarm Clock screen: Show clock -->
+  <!-- Menu item on Alarm Clock screen: Hide clock -->
+  <!-- Setting label on Set alarm screen: Label -->
+  <!-- Default label to display for an alarm -->
+  <!-- Preference category on Alarm Settings screen: Set alarm -->
+  <!-- Also label for the old Alarms dialog activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting labels on Set alarm screen: Vibration on or off -->
+  <!-- Setting labels on Set alarm screen: Repeat -->
+  <!-- Setting labels on Set alarm screen: Select alarm ringtone  -->
+  <!-- Label on expanded alarm edit view. -->
+  <!-- Setting labels on Set alarm screen: Set time  -->
+  <!-- Label shown when user is setting up non-repeating alarm for tomorrow [CHAR LIMIT=15] -->
+  <!-- Label shown when user is setting up non-repeating alarm for later today [CHAR LIMIT=15] -->
+  <!-- The text shown above the clock when alarm is alerting [CHAR LIMIT=10] -->
+  <!-- The text shown as an option to dismiss an alerting alarm [CHAR LIMIT=5] -->
+  <!-- Button labels on the alarm dialog: Dismiss -->
+  <!-- Button labels on the pre-dismiss alarm notifications: Dismiss now -->
+  <!-- Alarm Alert screen: this message is shown after an alarm rung
+         unattended for a number of minutes.  It tells the user that
+         the alarm has been silenced.-->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the number of minutes in two separate lines. For example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the word 'Snoozed' in two separate lines or example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user dismissed an alerting alarm [CHAR LIMIT=15] -->
+  <!-- Button labels on the alarm dialog: Snooze -->
+  <!-- Toast that appears after Alarm is snoozed from the Alarm
+         dialog. Says the alarm will snooze for xxx minutes.  -->
+  <!-- Text to appear inside a notification while an alarm is snoozing. -->
+  <!-- Text to appear in the notification title while an alarm is about to go off. -->
+  <!-- Text to appear in when trying to view a missed alarm that has been deleted -->
+  <!-- 0: nothing
+         1: days
+         2:      hours
+         3: days hours
+         4:            minutes
+         5: days       minutes
+         6:      hours minutes
+         7: days hours minutes
+    -->
+  <!-- Timer notification: how long from now until timer goes off. -->
+  <!-- Alarm confirmation toast: Describes how long from now until
+         alarm fires -->
+  <!-- Alarm confirmation toast: singular day -->
+  <!-- Alarm confirmation toast: plural days -->
+  <!-- Alarm confirmation toast: singular hour -->
+  <!-- Alarm confirmation toast: plural hours -->
+  <!-- Alarm confirmation toast: singular minute  -->
+  <!-- Alarm confirmation toast: plural minutes  -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to repeat every day -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to never repeat -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: concatenate days with
+         this character, i.e. "Mon, Tue, Wed" -->
+  <!-- Appears at the top of the Clock Picker screen: Tell user to
+         select a clock to display -->
+  <!-- Label for analog clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- Help activity name -->
+  <!-- Settings activity name -->
+  <!-- Label for the Settings activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting title for changing the snooze duration. -->
+  <!-- Auto silence preference title -->
+  <!-- Auto silence summary string set based on the preference value. -->
+  <!-- Auto silence summary when turned off -->
+  <!-- Entries listed in the ListPreference when invoking the auto silence
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the auto_silence_entries above. -->
+  <!-- Done button when editing an alarm. -->
+  <!-- Revert button when editing an alarm. -->
+  <!-- Delete button when editing an alarm. -->
+  <!-- Setting title for changing the alarm volume. -->
+  <!-- Summary for the alarm preference when silent is chosen. -->
+  <!-- Text to display in the small text of the notification -->
+  <!-- Text to display in the notification ticker and label -->
+  <!-- Text to display in the notification when the alarm has been snoozed -->
+  <!-- Title of the setting to change hardware button behavior. This string
+         should be changed for each piece of hardware. [CHAR LIMIT=20] -->
+  <!-- Dialog title of the volume and power setting. -->
+  <!-- Entries listed in the setting for the side-button action. -->
+  <!-- Values for the side-button setting. -->
+  <!-- Title of the ringtone setting. -->
+  <!-- Accessibility labels for Clock activity buttons -->
+  <!-- Accessibility labels for alarm buttons -->
+  <!-- What to show the user if the weather widget exists but fails to
+         respond. This is a sign of an error; if the weather widget is not
+         present on the device, we show nothing at all. -->
+  <!-- A description for the DeskClock alarm sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- String displayed as the alert summary while loading the alert name from
+         the media player. [CHAR LIMIT=NONE] -->
+  <!-- A description for the DeskClock timer sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- Label on the main screen control used to set alarm [CHAR LIMIT=30]-->
+  <!-- Label on the main screen control used to set alarm when there is already an existing alarm [CHAR LIMIT=30]-->
+  <!--  ActionBar strings -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Alarm page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Timer page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Clock page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Stopwatch page -->
+  <!-- Clock view buttons strings-->
+  <!-- Describes the purpose of the button to start the activity to add/edit/delete alarms -->
+  <!-- Describes the purpose of the button which provides a list of cities for the world clock settings -->
+  <!-- Describes the purpose of the button which pops up a menu of setting choices -->
+  <!-- Menu item on most screens to get to more settings -->
+  <!-- Menu item on most screens to get to the help information -->
+  <!-- Menu item on clock screen to enter night mode. -->
+  <!-- Menu item on Cities screen to sort by GMT offset -->
+  <!-- Menu item on Cities screen to sort by alphabetical order -->
+  <!-- Label for selected cities in Cities list view -->
+  <!-- Stop Watch strings -->
+  <!-- Describes the purpose of the button to resume running a stopwatch -->
+  <!-- Describes the purpose of the button to begin running a stopwatch -->
+  <!-- Describes the purpose of the button to pause a stopwatch. -->
+  <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
+  <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
+  <!-- Describes the purpose of the button to share the stopwatch value.
+         Also used as title for chooser when sharing stopwatch results. -->
+  <!-- Abbreviation for temporal hours [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal minutes [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal seconds [CHAR LIMIT=1] -->
+  <!-- Accessibility strings -->
+  <!--  Stopwatch share strings -->
+  <!-- Sentence within the message created to share the total time recorded within the stopwatch -->
+  <!-- Header within the message created to share a list of lap times (a new line is appended to this) -->
+  <!-- Label to enumerate the number of laps in the notification the user has counted -->
+  <!-- Formatted stopwatch time -->
+  <!-- Formatted stopwatch time for laps shared using the share button -->
+  <!-- Label to enumerate the number of laps the user has counted -->
+  <!-- Stopwatch accessibility strings -->
+  <!-- timer strings -->
+  <!-- Describes the purpose of the button to add a new timer -->
+  <!-- Describes the purpose of the button to begin or continue running a timer -->
+  <!-- Describes the purpose of the button to delete a timer. -->
+  <!-- Describes the purpose of the button increase the remaining time on a timer by one minute. -->
+  <!-- Like "timer_plus_one", but with 'minute' abbreviated for the notification. -->
+  <!-- Describes the purpose of the button to stop the timer. -->
+  <!-- Describes the purpose of the button to stop and delete the timer. -->
+  <!-- Describes the purpose of the button to return the timer to it's original starting value. -->
+  <!-- Describes the purpose of the button to discard the current dialog values. Will also close the dialog if other time's exist -->
+  <!-- Notification content shown when a timer has completed and has no more time remaining -->
+  <!-- Label associated with a notification for a Timer -->
+  <!-- Toast content shown when user attempts to create a new timer when there are already 4 timers -->
+  <!-- Jocular content that user may append when sharing the lap times -->
+  <!-- Title with the clock on the main page displaying the user's regular timezone (shows when automatic_home_clock enabled) -->
+  <!-- Label for the Cities activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Settings strings -->
+  <!-- Header in the preferences settings for the section pertaining to clocks on the main fragment -->
+  <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->
+  <!-- Entries listed in the ListPreference when invoking the clock style
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the clock_style_entries above. -->
+  <!-- Title for an option that will automtically show a clock representing the user's regular timezone on the main fragment whenever the user leaves their regular timezone-->
+  <!-- Describes the functionality provided by the automatic_home_clock option -->
+  <!-- Title in the preferences change the time zone for the user's home -->
+  <!-- Title in a list dialog box to pick a time zone for the user's home -->
+  <!-- Textual content of the button to discard the current dialog values and close the dialog -->
+  <!-- Textual content of the button to update an alarm with the current dialog values -->
+  <!--  place holder for am/pm label when it is not set -->
+  <!-- add 00 as minutes to the time when pressing this button -->
+  <!-- add 30 as minutes to the time when pressing this button -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. CHAR LIMIT=25] -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. -->
+  <!-- Header in the preferences settings for the section pertaining to alarms -->
+  <!-- Describes the running service for the stopwatch -->
+  <!-- Desription for the stopped stop watch -->
+  <!-- Text instruction for dismiss alarm on alarm lock screen. The dismiss button will still
+         be on the right even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Text instruction for snooze alarm on alarm lock screen. The snooze button will still
+         be on the left even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Notification title when timer is stopped. -->
+  <!-- Notification title when multiple timers are stopped. -->
+  <!-- Notification text when multiple timers are stopped. -->
+  <!-- Notification title when at least one timer, of those in use, is counting down. -->
+  <!-- Notification text when at least one timer, of those in use, is counting down. -->
+  <!-- screensaver settings strings -->
+  <!-- Label for the screen saver activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Title for check box to pick intensity of display diminuation during dream mode -->
+  <!-- Describes intensity of display diminuation during dream mode -->
+  <!-- Description of the down caret in the alarm alert screen to expand the alarm content to edit perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up caret in the alarm alert screen to collapse the alarm content to summary perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to undo change to alarm -->
+  <!-- Toast content when an alarm was deleted  -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- Description of field showing the next alarm time in the clock page, for accessibility. -->
+  <!-- Displays the number of alarms selected from the list of alarms. -->
+  <!-- message used by the talkback accessebility app to say that something was deleted -->
+  <!-- Alarm deletion confirmation message-->
+  <!-- Timer deletion confirmation -->
+  <!-- world clock deletion confirmation -->
+  <!-- Label for digital clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- format strings for clocks -->
+  <!-- Font size for AM/PM should match widget_label_font_size -->
+  <!-- Font size for AM/PM should match bottom_text_size -->
+  <!-- Font size for AM/PM should match label_font_size -->
+  <!-- Font size for AM/PM should match alarm_label_size -->
+  <!-- String for no alarms -->
+  <!-- String for no alarms set [CHAR LIMIT=24] -->
+  <!-- String for no enabled alarms in timeline view [CHAR LIMIT=30] -->
+</resources>
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
new file mode 100644
index 000000000..e9e484a8e
--- /dev/null
+++ b/res/values-gl-rES/cm_strings.xml
@@ -0,0 +1,80 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <string name="show_status_bar_icon_title">Amosar a icona</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <string name="show_status_bar_icon_summary">Amosar unha icona na barra de estado cando haxa unha alarma definida</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <string name="alarm_increasing_volume">Aumentar o volume</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <string name="profile_description">Perfil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
+  <string name="profile_no_selected">Non hai ningún perfil seleccionado</string>
+  <!-- User-defined cities -->
+  <string name="menu_item_add">Engadir</string>
+  <string name="cities_add_city_title">Engadir unha cidade</string>
+  <string name="cities_add_city_city">Cidade:</string>
+  <string name="cities_add_city_timezone">Zona horaria:</string>
+  <string name="cities_add_city_gps_cd">Toque para localizar a súa cidade actual</string>
+  <string name="cities_add_loading">Cargando\u2026</string>
+  <string name="cities_add_searching">Buscando\u2026</string>
+  <string name="cities_add_gps_no_results">A consulta GPS non obtivo ningún resultado de localización</string>
+  <string name="cities_add_gps_not_available">O GPS non está dispoñíbel</string>
+  <string name="cities_add_already_exists">A cidade xa existe na base de datos</string>
+  <string name="cities_add_city_failed">Non é posíbel crear a cidade</string>
+  <string name="cities_delete_city_title">Eliminar a cidade</string>
+  <string name="cities_delete_city_msg">Confirma que quere eliminar <xliff:g id="city">%s</xliff:g>?</string>
+  <string name="cities_delete_city_failed">Non é posíbel eliminar a cidade</string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">Ao premer os botóns de volume vai <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
+  <string name="flip_action_title">Acción de xiro</string>
+  <!-- Setting summary for the flip action setting. -->
+  <string name="flip_action_summary" product="tablet">Xirando a tableta cara abaixo vai <xliff:g id="action">%s</xliff:g></string>
+  <string name="flip_action_summary" product="default">Xirando o teléfono cara abaixo vai <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
+  <string name="shake_action_title">Acción de mexer</string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">Mexendo a tableta vai <xliff:g id="action">%s</xliff:g></string>
+  <string name="shake_action_summary" product="default">Mexendo o teléfono vai <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">repetir a alarma</string>
+  <string name="action_summary_dismiss">desestimar a alarma</string>
+  <string name="action_summary_do_nothing">non facer nada</string>
+  <!-- Alarm picker dialog title -->
+  <string name="alarm_picker_title">Escoller o tipo de alarma</string>
+  <!-- Alarm types -->
+  <string name="alarm_type_ringtone">Ton de chamada</string>
+  <string name="alarm_type_playlist">Lista de reprodución</string>
+  <string name="alarm_type_random">Ao chou</string>
+  <!-- Warn Silent Alarm title -->
+  <string name="warn_silent_alarm_title">O volume da alarma está silenciado</string>
+  <!-- Select the source of the alarm -->
+  <string name="alarm_select">Seleccionar a alarma</string>
+  <!-- Select the ringtone as alarm -->
+  <string name="alarm_select_ringtone">Ton de chamada</string>
+  <!-- Select the alarm from external device -->
+  <string name="alarm_select_external">Música</string>
+  <!-- Ringtone selection default -->
+  <string name="ringtone_default">Ton predeterminado</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">Produciuse un fallo ao estabelecer os permisos persistentes para un ton de chamada</string>
+  <string name="menu_item_widget_settings">Configuración do trebello</string>
+  <string name="activity_not_found">Actividade non atopada!</string>
+</resources>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
new file mode 100644
index 000000000..7f93a6462
--- /dev/null
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -0,0 +1,80 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <string name="show_status_bar_icon_title">આઇકૉન દર્શાવો</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <string name="show_status_bar_icon_summary">જ્યારે ઍલાર્મ સેટ કરો ત્યારે સ્ટેટસ બારમાં આઇકૉન દર્શાવો</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <string name="alarm_increasing_volume">વોલ્યુમ વધારવામાં આવે છે</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <string name="profile_description">પ્રોફાઇલ <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
+  <string name="profile_no_selected">કોઇ પ્રોફાઇલ પસંદ કરેલ નથી</string>
+  <!-- User-defined cities -->
+  <string name="menu_item_add">ઉમેરો</string>
+  <string name="cities_add_city_title">શહેર ઍડ કરો</string>
+  <string name="cities_add_city_city">શહેર:</string>
+  <string name="cities_add_city_timezone">ટાઇમઝોન:</string>
+  <string name="cities_add_city_gps_cd">તમારા હાલના શહેરનું સ્થાનિકરણ કરવા ટૅપ કરો</string>
+  <string name="cities_add_loading">લોડ કરી રહ્યું છે...</string>
+  <string name="cities_add_searching">શોધી રહ્યું છે...</string>
+  <string name="cities_add_gps_no_results">GPS પ્રશ્ન કોઇ સ્થાન પરિણામો બહાર પાડતું નથી</string>
+  <string name="cities_add_gps_not_available">GPS ઉપલબ્ધ નથી</string>
+  <string name="cities_add_already_exists">ડેટાબેઝમાં અગાઉથી શહેર હાજર છે</string>
+  <string name="cities_add_city_failed">શહેર સર્જી શકાયું નહીં</string>
+  <string name="cities_delete_city_title">શહેર રદ કરો</string>
+  <string name="cities_delete_city_msg">શું તમારે <xliff:g id="city">%s</xliff:g> ભૂંસવો છે?</string>
+  <string name="cities_delete_city_failed">શહેર ભૂંસી શકાયું નહીં</string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">વૉલ્યુમ બટનો દબાવવાથી <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
+  <string name="flip_action_title">ઉછાળ ક્રિયા</string>
+  <!-- Setting summary for the flip action setting. -->
+  <string name="flip_action_summary" product="tablet">ટૅબ્લેટ નીચેની તરફ ઉછાળવાથી <xliff:g id="action">%s</xliff:g></string>
+  <string name="flip_action_summary" product="default">ફોન નીચેની તરફ ઉછાળવાથી <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
+  <string name="shake_action_title">હલાવવાની ક્રિયા</string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">ટૅબ્લેટ હલાવવાથી <xliff:g id="action">%s</xliff:g></string>
+  <string name="shake_action_summary" product="default">ફોન હલાવવાથી <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">ઍલાર્મ સ્નૂઝ કરો</string>
+  <string name="action_summary_dismiss">ઍલાર્મ બરતરફ કરો</string>
+  <string name="action_summary_do_nothing">કંઇ ન કરો</string>
+  <!-- Alarm picker dialog title -->
+  <string name="alarm_picker_title">ઍલાર્મ પ્રકાર પસંદ કરો</string>
+  <!-- Alarm types -->
+  <string name="alarm_type_ringtone">રિંગટોન</string>
+  <string name="alarm_type_playlist">પ્લેલિસ્ટ</string>
+  <string name="alarm_type_random">યાદચ્છિક</string>
+  <!-- Warn Silent Alarm title -->
+  <string name="warn_silent_alarm_title">ઍલાર્મ વોલ્યુમ સાઇલન્ટ છે</string>
+  <!-- Select the source of the alarm -->
+  <string name="alarm_select">ઍલાર્મ પસંદ કરો</string>
+  <!-- Select the ringtone as alarm -->
+  <string name="alarm_select_ringtone">રિંગટોન</string>
+  <!-- Select the alarm from external device -->
+  <string name="alarm_select_external">સંગીત</string>
+  <!-- Ringtone selection default -->
+  <string name="ringtone_default">ડિફોલ્ટ રિંગટોન</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">રિંગટોન માટે નિરંતર અનુદાનની પરવાનગી લેવામાં નિષ્ફળતા</string>
+  <string name="menu_item_widget_settings">વિજેટ સેટિંગ્સ</string>
+  <string name="activity_not_found">પ્રવૃત્તિ મળી નહીં!</string>
+</resources>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index 2c40c7587..60d78b582 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">आइकन दिखाएँ</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">जब अलार्म सेट किया जाता है, स्थिति पट्टी में एक आइकन दिखाएँ</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">बढ़ता वोल्यूम</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">प्रोफ़ाइल <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">कोई प्रोफ़ाइल नहीं चुनी गई है</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">जोड़ें</string>
   <string name="cities_add_city_title">शहर जोड़ें</string>
   <string name="cities_add_city_city">शहर:</string>
@@ -35,25 +41,39 @@
   <string name="cities_delete_city_title">शहर को हटाएँ</string>
   <string name="cities_delete_city_msg">क्या आप <xliff:g id="city">%s</xliff:g> को हटाना चाहते हैं?</string>
   <string name="cities_delete_city_failed">शहर को हटा नहीं सके</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">वोल्यूम बटन को दबाने पर <xliff:g id="action">%s</xliff:g> होगा</string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">फ्लिप करने की क्रिया</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">टैब्लेट को नीचे की ओर फ़्लिप करने पर <xliff:g id="action">%s</xliff:g> होगा</string>
   <string name="flip_action_summary" product="default">फ़ोन को नीचे की ओर फ़्लिप करने पर <xliff:g id="action">%s</xliff:g> होगा</string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">हिलाने की क्रिया</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">टैब्लेट को हिलाने पर <xliff:g id="action">%s</xliff:g> होगा</string>
   <string name="shake_action_summary" product="default">फ़ोन को हिलाने पर <xliff:g id="action">%s</xliff:g> होगा</string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">अलार्म को स्नूज़ कराएँ</string>
   <string name="action_summary_dismiss">अलार्म का खारिज करें</string>
   <string name="action_summary_do_nothing">कुछ नहीं करें</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">अलार्म प्रकार चुनें</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">रिंगटोन</string>
   <string name="alarm_type_playlist">प्लेसूची</string>
   <string name="alarm_type_random">बेतरतीब ढंग से</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">अलार्म वोल्यूम मूक पर है</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">अलार्म चुनें</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">रिंगटोन</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">संगीत</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">डिफ़ॉल्ट रिंगटोन</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">रिंगटोन के लिए बनी रहनेवाली अनुमति ले नहीं सके</string>
   <string name="menu_item_widget_settings">विजेट सेटिंग</string>
   <string name="activity_not_found">गतिविधि नहीं मिली!</string>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 238b9a1c2..c1f2e2100 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Prikaži ikonu</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Prikaži ikonu u obavijestnoj traci kada je podešen alarm</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Pojačavanje glasnoće</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Nije odabran profil</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Dodaj</string>
   <string name="cities_add_city_title">Dodaj grad</string>
   <string name="cities_add_city_city">Grad:</string>
@@ -35,15 +41,40 @@
   <string name="cities_delete_city_title">Izbriši grad</string>
   <string name="cities_delete_city_msg">Želite li izbrisati<xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Nije moguće izbrisati grad</string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">Tipke za glasnoću zvuka će <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Akcija okreta</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Preokretanje tableta prema dolje će <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Preokretanje telefona prema dolje će <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Protresi</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Protresivanje tableta će <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Protresivanje telefona će <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">utišati alarm</string>
+  <string name="action_summary_dismiss">propustiti alarm</string>
   <string name="action_summary_do_nothing">učiniti ništa</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Odaberi tip alarma</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Zvuk zvona</string>
+  <string name="alarm_type_playlist">Popis za reprodukciju</string>
   <string name="alarm_type_random">Nasumično</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Glasnoća alarma je utišana</string>
+  <!-- Select the source of the alarm -->
+  <string name="alarm_select">Odaberite alarm</string>
+  <!-- Select the ringtone as alarm -->
+  <string name="alarm_select_ringtone">Zvuk zvona</string>
+  <!-- Select the alarm from external device -->
+  <string name="alarm_select_external">Glazba</string>
+  <!-- Ringtone selection default -->
+  <string name="ringtone_default">Zadani zvuk zvona</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">Neuspješno preuzimanje trajne dozvole za zvuk zvona</string>
+  <string name="menu_item_widget_settings">Postavke widgeta</string>
+  <string name="activity_not_found">Aktivnost nije pronađena!</string>
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 950e9706c..626f4d4ce 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Ikon megjelenítése</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Ikon megjelenítése aktív ébresztés esetén az értesítési sávon</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Emelkedő csengőhang</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description"><xliff:g id="profile">%s</xliff:g> profil</string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Nincs kiválasztva profil</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Hozzáadás</string>
   <string name="cities_add_city_title">Város hozzáadása</string>
   <string name="cities_add_city_city">Város:</string>
@@ -35,25 +41,39 @@
   <string name="cities_delete_city_title">Város törlése</string>
   <string name="cities_delete_city_msg">Biztosan törli a következőt: <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Nem lehet törölni a várost</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Hangerő gombok érintése <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Megfordítás művelete</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">A táblagép megfordítására <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">A telefon megfordítására <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Rázás művelete</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">A táblagép rázására <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">A telefon rázására <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">elhalasztja az ébresztést</string>
   <string name="action_summary_dismiss">elveti az ébresztést</string>
   <string name="action_summary_do_nothing">nem történik semmi</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Válassza ki az ébresztés típusát</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Csengőhang</string>
   <string name="alarm_type_playlist">Lejátszási lista</string>
   <string name="alarm_type_random">Véletlenszerűen</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">A riasztás némítva lett</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Ébresztés kiválasztása</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Csengőhang</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Zene</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Alapértelmezett csengőhang</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Nem sikerült állandó engedélyt szerezni a csengőhanghoz</string>
   <string name="menu_item_widget_settings">Modul beállítások</string>
   <string name="activity_not_found">Tevékenység nem található!</string>
diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-hy-rAM/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 0a3374b1b..be69ecd82 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -16,52 +16,65 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Tampilkan ikon</string>
-  <string name="show_status_bar_icon_summary">Tampilkan ikon di status bar ketika alarm telah diatur</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <string name="show_status_bar_icon_summary">Perlihatkan ikon di bilah status ketika alarm telah diatur</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Meningkatkan volume</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Tidak ada profil yang terpilih</string>
-  <string name="menu_item_add">Tambah</string>
-  <string name="cities_add_city_title">Tambah kota</string>
+  <!-- User-defined cities -->
+  <string name="menu_item_add">Tambahkan</string>
+  <string name="cities_add_city_title">Tambahkan kota</string>
   <string name="cities_add_city_city">Kota:</string>
   <string name="cities_add_city_timezone">Zona waktu:</string>
-  <string name="cities_add_city_gps_cd">Ketuk untuk melokalisasi kota anda saat ini</string>
+  <string name="cities_add_city_gps_cd">Ketuk untuk melokalisasi kota Anda saat ini</string>
   <string name="cities_add_loading">Memuat\u2026</string>
   <string name="cities_add_searching">Mencari\u2026</string>
   <string name="cities_add_gps_no_results">Permintaan GPS tidak menghasilkan lokasi</string>
   <string name="cities_add_gps_not_available">GPS tidak tersedia</string>
-  <string name="cities_add_already_exists">Kota sudah ada dalam database</string>
+  <string name="cities_add_already_exists">Kota sudah ada dalam basis data</string>
   <string name="cities_add_city_failed">Tidak dapat membuat kota</string>
   <string name="cities_delete_city_title">Hapus kota</string>
-  <string name="cities_delete_city_msg">Apakah anda ingin menghapus <xliff:g id="city">%s</xliff:g>?</string>
+  <string name="cities_delete_city_msg">Apakah Anda ingin menghapus <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Tidak dapat menghapus kota</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Menekan tombol volume akan <xliff:g id="action">%s</xliff:g></string>
-  <string name="flip_action_title">Aksi membalik</string>
+  <!-- Setting title for the flip action setting. -->
+  <string name="flip_action_title">Tindakan membalik</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Membalikkan tablet ke bawah akan <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Membalikkan telepon ke bawah akan <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Tindakan goyang</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Menggoyangkan tablet akan <xliff:g id="action">%s</xliff:g></string>
-  <string name="shake_action_summary" product="default">Menggoyangkan telepon akan <xliff:g id="action">%s</xliff:g></string>
-  <string name="action_summary_snooze">menunda alarm</string>
+  <string name="shake_action_summary" product="default">Menggoyangkan ponsel akan <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">tunda alarm</string>
   <string name="action_summary_dismiss">mengabaikan alarm</string>
   <string name="action_summary_do_nothing">tidak melakukan apa-apa</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Pilih jenis alarm</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Nada dering</string>
   <string name="alarm_type_playlist">Daftar putar</string>
   <string name="alarm_type_random">Secara acak</string>
-  <string name="warn_silent_alarm_title">Volume alarm diam</string>
+  <!-- Warn Silent Alarm title -->
+  <string name="warn_silent_alarm_title">Volume alarm disenyapkan</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Pilih alarm</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Nada dering</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Musik</string>
-  <string name="ringtone_default">Nada dering standar</string>
-  <string name="take_persistent_grant_uri_permission_failed_msg">Gagal mengambil izin bantuan persisten untuk nada dering</string>
-  <string name="menu_item_widget_settings">Pengaturan widget</string>
+  <!-- Ringtone selection default -->
+  <string name="ringtone_default">Nada dering baku</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">Gagal mengambil izin bantuan berterusan untuk nada dering</string>
+  <string name="menu_item_widget_settings">Pengaturan gawit</string>
   <string name="activity_not_found">Aktivitas tidak ditemukan!</string>
-  <string name="permlab_write_alarms">langsung ubah alarm</string>
-  <string name="permdesc_write_alarms">Mengizinkan aplikasi untuk menambah, mengubah atau menghapus semua alarm.</string>
-  <string name="permlab_manage_alarms">hidup/matikan alarm terjadwal</string>
-  <string name="permdesc_manage_alarms">Mengizinkan aplikasi untuk menghidup/matikan alarm terjadwal.</string>
-  <string name="permlab_read_alarms">akses alarm terjadwal</string>
-  <string name="permdesc_read_alarms">Mengizinkan aplikasi untuk melihat alarm terjadwal.</string>
-  <string name="alarm_modification_service_desc">Layanan yang mengizinkan manipulasi alarm oleh pihak ketiga.</string>
 </resources>
diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-is-rIS/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index ae8521dad..7d38e1a6c 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Mostra icona</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Mostra un\'icona nella barra di stato quando è impostata la sveglia</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Volume incrementale</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profilo <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Nessun profilo selezionato</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Aggiungi</string>
   <string name="cities_add_city_title">Aggiungi località</string>
   <string name="cities_add_city_city">Località:</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">Elimina località</string>
   <string name="cities_delete_city_msg">Vuoi eliminare <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Impossibile eliminare la località</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Premere i pulsanti volume farà <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Azione capovolgimento</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Capovolgere il tablet verso il basso: <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Capovolgere il telefono verso il basso: <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Azione scuotimento</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Agitare il tablet: <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Agitare il telefono: <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">posporre l\'allarme</string>
   <string name="action_summary_dismiss">interrompere l\'allarme</string>
   <string name="action_summary_do_nothing">nessuna azione</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Tipo sveglia</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Suoneria</string>
   <string name="alarm_type_playlist">Playlist</string>
   <string name="alarm_type_random">Casuale</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Volume sveglia silenzioso</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Seleziona allarme</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Suoneria</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Musica</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Suoneria predefinita</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Impossibile ricevere un\'autorizzazione permanente per la suoneria</string>
   <string name="menu_item_widget_settings">Impostazioni widget</string>
   <string name="activity_not_found">Activity non trovata!</string>
-  <string name="permlab_write_alarms">modifica gli allarmi</string>
-  <string name="permdesc_write_alarms">Consenti all\'app di aggiungere, modificare o eliminare tutti i tuoi allarmi.</string>
-  <string name="permlab_manage_alarms">cambia avvisi programmati</string>
-  <string name="permdesc_manage_alarms">Consenti all\'app di attivare o disattivare i tuoi avvisi programmati.</string>
-  <string name="permlab_read_alarms">accesso avvisi programmati</string>
-  <string name="permdesc_read_alarms">Consenti all\'app di leggere i tuoi avvisi programmati.</string>
-  <string name="alarm_modification_service_desc">Un servizio per consentire la manipolazione di allarmi da parte di terzi.</string>
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index fce81edd9..1b8160849 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">הצג סמל</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">הצג סמל בשורת המצב כאשר שעון מעורר מוגדר</string>
-  <string name="alarm_increasing_volume">עוצמה מתגברת</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <string name="alarm_increasing_volume">עוצמת קול מתגברת</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">פרופיל <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">לא נבחר פרופיל</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">הוסף</string>
   <string name="cities_add_city_title">הוסף עיר</string>
   <string name="cities_add_city_city">עיר:</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">מחק עיר</string>
   <string name="cities_delete_city_msg">האם ברצונך למחוק את <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">לא ניתן למחוק את העיר</string>
-  <string name="volume_buttons_summary">הקשה על כפתורי עוצמת הקול תגרום ל<xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">הקשה על לחצני עוצמת הקול תגרום לפעולה: <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">פעולת היפוך</string>
-  <string name="flip_action_summary" product="tablet">היפוך הטאבלט יגרום ל<xliff:g id="action">%s</xliff:g></string>
-  <string name="flip_action_summary" product="default">היפוך המכשיר יגרום ל<xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting summary for the flip action setting. -->
+  <string name="flip_action_summary" product="tablet">היפוך הטאבלט יגרום לפעולה <xliff:g id="action">%s</xliff:g></string>
+  <string name="flip_action_summary" product="default">היפוך המכשיר יגרום לפעולה <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">פעולת ניעור</string>
-  <string name="shake_action_summary" product="tablet">ניעור הטאבלט יגרום ל<xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">ניעור הטאבלט יגרום לפעולה <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">ניעור המכשיר יגרום ל<xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">נמנום השעון המעורר</string>
   <string name="action_summary_dismiss">ביטול השעון המעורר</string>
-  <string name="action_summary_do_nothing">שום פעולה</string>
+  <string name="action_summary_do_nothing">אל תעשה דבר</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">בחר סוג שעון מעורר</string>
-  <string name="alarm_type_ringtone">צלצול</string>
+  <!-- Alarm types -->
+  <string name="alarm_type_ringtone">רינגטון</string>
   <string name="alarm_type_playlist">רשימת השמעה</string>
   <string name="alarm_type_random">אקראי</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">עוצמת שעון מעורר מושתקת</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">בחר צליל התראה</string>
-  <string name="alarm_select_ringtone">צלצול</string>
+  <!-- Select the ringtone as alarm -->
+  <string name="alarm_select_ringtone">רינגטון</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">מוזיקה</string>
-  <string name="ringtone_default">צלצול ברירת מחדל</string>
-  <string name="take_persistent_grant_uri_permission_failed_msg">אין אפשרות לקבל הרשאות תמידיות לצלצול</string>
+  <!-- Ringtone selection default -->
+  <string name="ringtone_default">רינגטון ברירת מחדל</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">קבלת הרשאות תמידיות לרינגטון נכשלה</string>
   <string name="menu_item_widget_settings">הגדרות ווידג\'ט</string>
-  <string name="activity_not_found">פעולה לא נמצאה!</string>
-  <string name="permlab_write_alarms">שינוי שעונים מעוררים ישירות</string>
-  <string name="permdesc_write_alarms">מאפשר ליישום להוסיף, לשנות או למחוק את כל ההתראות שלך.</string>
-  <string name="permlab_manage_alarms">הפעלת/כיבוי שעון מעורר</string>
-  <string name="permdesc_manage_alarms">מאפשר ליישום להפעיל או לכבות התראות שנקבעו.</string>
-  <string name="permlab_read_alarms">גישה לשעונים מעוררים שנקבעו</string>
-  <string name="permdesc_read_alarms">מאפשר ליישום לקרוא את ההתראות שנקבעו.</string>
-  <string name="alarm_modification_service_desc">שירות המאפשר שינויי שעונים מעוררים בידי יישומי צד שלישי.</string>
+  <string name="activity_not_found">הפעולה לא נמצאה!</string>
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 4b092354b..cf92976e6 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">アイコンを表示</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">アラームがセットされているときはステータスバーにアイコンを表示する</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">音量の増幅</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">プロファイル<xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">プロファイルが選択されていません</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">追加</string>
   <string name="cities_add_city_title">都市を追加</string>
   <string name="cities_add_city_city">都市:</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">都市を削除</string>
   <string name="cities_delete_city_msg"><xliff:g id="city">%s</xliff:g>を削除しますか？</string>
   <string name="cities_delete_city_failed">都市を削除できません</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">音量ボタンを押して<xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">伏せる動作</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">タブレットを伏せて<xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">携帯電話を伏せて<xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">シェイクの動作</string>
-  <string name="shake_action_summary" product="tablet">タブレットを振ると<xliff:g id="action">%s</xliff:g></string>
-  <string name="shake_action_summary" product="default">携帯電話を振ると<xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">タブレットを振って<xliff:g id="action">%s</xliff:g></string>
+  <string name="shake_action_summary" product="default">携帯電話を振って<xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">アラームをスヌーズする</string>
   <string name="action_summary_dismiss">アラームを解除する</string>
   <string name="action_summary_do_nothing">何もしない</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">アラームの種類を選択</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">着信音</string>
   <string name="alarm_type_playlist">プレイリスト</string>
   <string name="alarm_type_random">ランダム</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">アラームの音量はサイレントです</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">アラームを選択</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">着信音</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">音楽</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">デフォルトの着信音</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">着信音の権限の持続的な許可を取得できませんでした</string>
   <string name="menu_item_widget_settings">ウィジェットの設定</string>
   <string name="activity_not_found">アクティビティが見つかりません。</string>
-  <string name="permlab_write_alarms">アラームの直接の変更</string>
-  <string name="permdesc_write_alarms">アラームの追加やすべてのアラームの変更および削除をアプリに許可します。</string>
-  <string name="permlab_manage_alarms">予定されているアラームの切り替え</string>
-  <string name="permdesc_manage_alarms">予定されているアラームをONまたはOFFにすることをアプリに許可します。</string>
-  <string name="permlab_read_alarms">予定されているアラームへのアクセス</string>
-  <string name="permdesc_read_alarms">予定されているアラームの読み取りをアプリに許可します。</string>
-  <string name="alarm_modification_service_desc">第三者によるアラームの操作を許可するためのサービスです。</string>
 </resources>
diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-ka-rGE/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-kk-rKZ/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-km-rKH/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 709d2fd30..35b229b3f 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">ಐಕಾನ್ ಪ್ರದರ್ಶಿಸು</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">ಅಲಾರಂ ಹೊಂದಿಸಿದಾಗ ಸ್ಟೇಟಸ್‍ಬಾರ್‍ನಲ್ಲಿ ಒಂದು ಐಕಾನ್ ಪ್ರದರ್ಶಿಸು</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">ವೃದ್ಧಿಗೊಳ್ಳುವ ವಾಲ್ಯೂಂ</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">ಪ್ರೊಫೈಲ್<xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">ಯಾವುದೇ ಪ್ರೊಫೈಲ್ ಆಯ್ಕೆಮಾಡಿಲ್ಲ</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">ಸೇರಿಸಿ</string>
   <string name="cities_add_city_title">ನಗರವನ್ನು ಸೇರಿಸಿ</string>
   <string name="cities_add_city_city">ನಗರ:</string>
@@ -35,25 +41,39 @@
   <string name="cities_delete_city_title">ನಗರವನ್ನು ಅಳಿಸು</string>
   <string name="cities_delete_city_msg">ನೀವು <xliff:g id="city">%s</xliff:g> ಅಳಿಸಲು ಬಯಸುತ್ತೀರಾ?</string>
   <string name="cities_delete_city_failed">ನಗರವನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">ವಾಲ್ಯೂಮ್ ಬಟನ್ಸ್ ಒತ್ತುವುದರಿಂದ <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">ಕಾರ್ಯವನ್ನು ಫ್ಲಿಪ್‍ಮಾಡು</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">ಟ್ಯಾಬ್ಲೆಟ್ ಕೆಳಗೆ ಫ್ಲಿಪ್ ಮಾಡುವುದರಿಂದ <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">ಫೋನ್ ಕೆಳಗೆ ಫ್ಲಿಪ್ ಮಾಡುವುದರಿಂದ <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">ಕುಲುಕು ಕ್ರಿಯೆ</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">ಟ್ಯಾಬ್ಲೆಟ್ ಕುಲುಕುವುದರಿಂದ <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">ಫೋನ್ ಕುಲುಕುವುದರಿಂದ <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">ಅಲಾರಂ ಸ್ನೂಜ್‍ಮಾಡು</string>
   <string name="action_summary_dismiss">ಅಲಾರಂ ವಜಾಗೊಳಿಸು</string>
   <string name="action_summary_do_nothing">ಏನೂ ಮಾಡಬೇಡ</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">ಅಲಾರಂ ಪ್ರಕಾರವನ್ನು ಆರಿಸಿ</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">ರಿಂಗ್‍ಟೋನ್</string>
   <string name="alarm_type_playlist">ಪ್ಲೇಪಟ್ಟಿ</string>
   <string name="alarm_type_random">ಸ್ವೇಚ್ಛೆಯಾಗಿ</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">ಅಲಾರಂ ವಾಲ್ಯೂಮ್ ನಿಶ್ಯಬ್ಧವಾಗಿದೆ</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">ಅಲಾರಂ ಆಯ್ಕೆಮಾಡಿ</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">ರಿಂಗ್‍ಟೋನ್</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">ಮ್ಯೂಸಿಕ್</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">ಡೀಫಾಲ್ಟ್ ರಿಂಗ್‍ಟೋನ್</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">ರಿಂಗ್‍ಟೋನ್‍ಗಾಗಿ ನಿರಂತರ ಒಪ್ಪಿಗೆ ಅನುಮತಿಯನ್ನು ಪಡೆಯಲು ವಿಫಲವಾಗಿದೆ</string>
   <string name="menu_item_widget_settings">ವಿಜೆಟ್ ಸೆಟ್ಟಿಂಗ್ಸ್</string>
   <string name="activity_not_found">ಚಟುವಟಿಕೆ ಪತ್ತೆಯಾಗಲಿಲ್ಲ!</string>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 2aad069ed..84a2fc816 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">아이콘 표시</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">알람이 설정되어 있으면 상태 표시줄에 아이콘 표시</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">볼륨 점점 키우기</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">프로필 <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">선택된 프로필 없음</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">추가</string>
   <string name="cities_add_city_title">도시 추가</string>
   <string name="cities_add_city_city">도시:</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">도시 삭제</string>
   <string name="cities_delete_city_msg"><xliff:g id="city">%s</xliff:g>을(를) 삭제할까요?</string>
   <string name="cities_delete_city_failed">도시를 삭제할 수 없습니다</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">볼륨 버튼을 누르면 <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">뒤집기 동작</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">태블릿을 뒤집으면 <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">휴대전화를 뒤집으면 <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">흔들기 동작</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">태블릿을 흔들면 <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">휴대전화를 흔들면 <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">알람 일시 중지</string>
   <string name="action_summary_dismiss">알람 해제</string>
   <string name="action_summary_do_nothing">아무것도 안 함</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">알람 종류 선택</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">벨소리</string>
   <string name="alarm_type_playlist">재생목록</string>
   <string name="alarm_type_random">무작위</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">알람 볼륨이 무음입니다</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">알람 선택</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">벨소리</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">음악</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">기본 벨소리</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">벨소리에 대한 영구적 권한을 얻을 수 없었습니다</string>
   <string name="menu_item_widget_settings">위젯 설정</string>
   <string name="activity_not_found">액티비티를 찾을 수 없습니다!</string>
-  <string name="permlab_write_alarms">알람을 직접 변경</string>
-  <string name="permdesc_write_alarms">앱이 알람을 추가, 변경 또는 삭제할 수 있도록 허용합니다.</string>
-  <string name="permlab_manage_alarms">예정된 알람 설정/해제</string>
-  <string name="permdesc_manage_alarms">앱이 예정된 알람을 켜고 끌 수 있도록 허용합니다.</string>
-  <string name="permlab_read_alarms">예정된 알람 접근</string>
-  <string name="permdesc_read_alarms">앱이 예정된 알람을 볼 수 있도록 허용합니다.</string>
-  <string name="alarm_modification_service_desc">서드 파티가 알람을 조작할 수 있도록 하는 서비스</string>
 </resources>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index 7b6371a6b..85ca292f1 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -16,12 +16,18 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">نیشاندانی وێنۆچکه‌</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">نیشانەی کاژێر دابنێ لە سەنتەری ئاگاداریەکان</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">زیادکردنی دەنگ</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">ڕێژەی <xliff:g id="profile">%s</xliff:g>
 </string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">هیچ ڕێژەیەك دیاری نەکراوە</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">زیادکردن</string>
   <string name="cities_add_city_title">زیادکردنی شار</string>
   <string name="cities_add_city_city">شار:</string>
@@ -36,26 +42,40 @@
   <string name="cities_delete_city_title">سڕینەوەی شار</string>
   <string name="cities_delete_city_msg">ئایا دڵنیایت لە سڕینەوەی <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">نەتوانرا ئەو شارە بسڕێتەوە</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">دەستنان بەسەر دوگمەی دەنگەکان  <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">بە دەمەوە دانان</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">ته‌قله‌ لێدان به‌ تابلێت بۆ خواره‌وه‌ بۆ <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">ته‌قله‌ لێدان به‌ ئامێر بۆ خواره‌وه‌ بۆ <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">کرداری جوڵاندن</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">له‌رینه‌وه‌ی تابلێت <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">له‌رینه‌وه‌ی ئامێر <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">زەنگی سەرخەوشکاندن</string>
   <string name="action_summary_dismiss">لەبیرکردنی دەنگی بیرخەرەوە</string>
   <string name="action_summary_do_nothing">هیچ کارێك مەکە</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">هەڵبژاردنی جۆری زەنگ</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">زەنگەکان</string>
   <string name="alarm_type_playlist">لیستی لێدان</string>
   <string name="alarm_type_random">خوازراوانە</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">ده‌نگی ئاگادارکه‌ره‌وه‌ بێده‌نگه‌
 30</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">دیاریکردنی ئاگادارکه‌ره‌وه‌</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">زه‌نگ</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">مۆسیقا</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">زه‌نگی بنه‌ڕه‌تی</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">سەرکەوتوو نەبوو لە گرتنی ڕێگەپێدانی بەردەوام  بۆ مۆسیقای زەنگ</string>
   <string name="menu_item_widget_settings">ڕێکخستنی ویجد</string>
   <string name="activity_not_found">چالاکی نەدۆزرایەوە!</string>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index 2f2280498..32dd8f967 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -15,43 +15,107 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label shown on launcher icon -->
+  <!-- Label for the this application displayed on-screen when this application must be represented to the user. -->
   <string name="app_label">کاتژمێر</string>
+  <!-- Title for AlarmClock activity -->
+  <!-- Label for the Alarms activity displayed on-screen when that activity must be represented to the user. -->
   <string name="alarm_list_title">وریاکەرەوەکان</string>
+  <!-- Menu item on Alarm Clock screen: Add alarm -->
   <string name="add_alarm">زیادکردنی ئاگادارکردنه‌وه‌</string>
+  <!-- Menu item on Alarm Clock screen: Desk clock -->
   <string name="menu_desk_clock">کاتژمێری ڕوونما</string>
+  <!-- Menu item on Alarm Clock screen: Edit alarm -->
   <string name="menu_edit_alarm">ده‌ستکاریکردنی ئاگادارکه‌ره‌وه‌</string>
+  <!-- Context Menu Item on Alarm Settings screen: Delete alarm -->
   <string name="delete_alarm">سڕینه‌وه‌ی ئاگادارکه‌ره‌وه‌</string>
+  <!-- Context Menu Item on Alarm Settings screen: Enable alarm -->
   <string name="enable_alarm">کارپێکردنی ئاگادارکه‌ره‌وه‌</string>
+  <!-- Context Menu Item on Alarm Settings screen: Disable alarm -->
   <string name="disable_alarm">له‌کارخستنی ئاگادارکه‌ره‌وه‌</string>
+  <!-- Delete alarm confirmation dialog message. -->
   <string name="delete_alarm_confirm">ئه‌م ئاگادارکه‌ره‌وه‌ ده‌سڕیته‌وه‌؟</string>
+  <!-- Menu item on Alarm Clock screen: Show clock -->
   <string name="show_clock">نیشاندانی کاتژمێر</string>
+  <!-- Menu item on Alarm Clock screen: Hide clock -->
   <string name="hide_clock">شاردنه‌وه‌ی کاتژمێر</string>
+  <!-- Setting label on Set alarm screen: Label -->
   <string name="label">پێناس</string>
+  <!-- Default label to display for an alarm -->
   <string name="default_label">وریاکەرەوە</string>
+  <!-- Preference category on Alarm Settings screen: Set alarm -->
+  <!-- Also label for the old Alarms dialog activity displayed on-screen when that activity must be represented to the user. -->
   <string name="set_alarm">دیاریکردنی ئاگادارکه‌ره‌وه‌</string>
+  <!-- Setting labels on Set alarm screen: Vibration on or off -->
   <string name="alarm_vibrate">لەرزین</string>
+  <!-- Setting labels on Set alarm screen: Repeat -->
   <string name="alarm_repeat">دوبارەکردنەوە</string>
+  <!-- Setting labels on Set alarm screen: Select alarm ringtone  -->
   <string name="alert">زه‌نگی ئاگادارکه‌ره‌وه‌</string>
+  <!-- Label on expanded alarm edit view. -->
   <string name="ringtone">زه‌نگ</string>
+  <!-- Setting labels on Set alarm screen: Set time  -->
   <string name="time">کات</string>
+  <!-- Label shown when user is setting up non-repeating alarm for tomorrow [CHAR LIMIT=15] -->
+  <!-- Label shown when user is setting up non-repeating alarm for later today [CHAR LIMIT=15] -->
+  <!-- The text shown above the clock when alarm is alerting [CHAR LIMIT=10] -->
+  <!-- The text shown as an option to dismiss an alerting alarm [CHAR LIMIT=5] -->
+  <!-- Button labels on the alarm dialog: Dismiss -->
   <string name="alarm_alert_dismiss_text">لابردن</string>
+  <!-- Button labels on the pre-dismiss alarm notifications: Dismiss now -->
   <string name="alarm_alert_dismiss_now_text">لابردن هه‌ر ئێستا</string>
+  <!-- Alarm Alert screen: this message is shown after an alarm rung
+         unattended for a number of minutes.  It tells the user that
+         the alarm has been silenced.-->
   <string name="alarm_missed_title">ئاگادارکه‌ره‌وه‌ی ونبوو</string>
   <string name="alarm_missed_text"><xliff:g id="alarm_time">%s</xliff:g> - <xliff:g id="alarm_label">%s</xliff:g></string>
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the number of minutes in two separate lines. For example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the word 'Snoozed' in two separate lines or example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user dismissed an alerting alarm [CHAR LIMIT=15] -->
+  <!-- Button labels on the alarm dialog: Snooze -->
   <string name="alarm_alert_snooze_text">سووکه‌ نوستن</string>
+  <!-- Toast that appears after Alarm is snoozed from the Alarm
+         dialog. Says the alarm will snooze for xxx minutes.  -->
   <plurals name="alarm_alert_snooze_set">
+    <!-- Duration for one minute -->
     <item quantity="one">سوکه‌نوستن بۆ یه‌ک خوله‌ک.</item>
+    <!-- Duration for more than one minute -->
     <item quantity="other">سوکه‌ نوستن بۆ <xliff:g id="minutes">%d</xliff:g> خوله‌ک.</item>
   </plurals>
+  <!-- Text to appear inside a notification while an alarm is snoozing. -->
   <string name="alarm_alert_snooze_until">سووکه‌ نوستن تا <xliff:g id="time">%s</xliff:g></string>
+  <!-- Text to appear in the notification title while an alarm is about to go off. -->
   <string name="alarm_alert_predismiss_title">ئاگادارکه‌ره‌وه‌ی به‌ڕێگا</string>
+  <!-- Text to appear in when trying to view a missed alarm that has been deleted -->
   <string name="missed_alarm_has_been_deleted">ئاگادارکه‌ره‌وه‌ی ونبوو سڕدرایه‌وه‌</string>
+  <!-- 0: nothing
+         1: days
+         2:      hours
+         3: days hours
+         4:            minutes
+         5: days       minutes
+         6:      hours minutes
+         7: days hours minutes
+    -->
+  <!-- Timer notification: how long from now until timer goes off. -->
   <string-array name="timer_notifications">
     <item>که‌متر له‌ یه‌ک خوله‌کی ماوه‌</item>
     <item><xliff:g id="HOURS" example="2 hours">%1$s</xliff:g> remaining ماوه‌</item>
     <item><xliff:g id="MINUTES" example="2 minutes">%2$s</xliff:g> remaining ماوه‌</item>
     <item><xliff:g id="HOURS" example="2 hours">%1$s</xliff:g> <xliff:g id="MINUTES" example="2 minutes">%2$s</xliff:g> remaining ماوه‌</item>
   </string-array>
+  <!-- Alarm confirmation toast: Describes how long from now until
+         alarm fires -->
   <string-array name="alarm_set">
     <item>ئاگادارکه‌ره‌وه‌ دانرا بۆ که‌متر له‌ یه‌ک خوله‌ک له‌ ئێستاوه‌.</item>
     <item>ئاگادارکه‌ره‌وه‌ دانرا بۆ <xliff:g id="DAYS" example="2 days">%1$s</xliff:g> له‌ ئێستاوه‌.</item>
@@ -62,31 +126,62 @@
     <item>ئاگادارکه‌ره‌وه‌ دانرا بۆ  <xliff:g id="DAYS" example="2 days">%2$s</xliff:g>  وه‌ <xliff:g id="HOURS" example="2 hours">%3$s</xliff:g> له‌ ئێستاوه‌.</item>
     <item>ئاگادارکه‌ره‌وه‌ دانرا بۆ  <xliff:g id="DAYS" example="2 days">%1$s</xliff:g>, <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g>,  وه‌  <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g> له‌ ئێستاوه‌.</item>
   </string-array>
+  <!-- Alarm confirmation toast: singular day -->
   <string name="day">"1 ڕۆژ"</string>
+  <!-- Alarm confirmation toast: plural days -->
   <string name="days">"<xliff:g id="days">%s</xliff:g>  ڕۆژ"</string>
+  <!-- Alarm confirmation toast: singular hour -->
   <string name="hour">1 کاژێر</string>
+  <!-- Alarm confirmation toast: plural hours -->
   <string name="hours"><xliff:g id="hours">%s</xliff:g> کاژێر</string>
+  <!-- Alarm confirmation toast: singular minute  -->
   <string name="minute">"1 خوله‌ک"</string>
+  <!-- Alarm confirmation toast: plural minutes  -->
   <string name="minutes">"<xliff:g id="minutes">%s</xliff:g> خوله‌ک"</string>
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to repeat every day -->
   <string name="every_day">هه‌موو ڕۆژێک</string>
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to never repeat -->
   <string name="never">هیچکات</string>
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: concatenate days with
+         this character, i.e. "Mon, Tue, Wed" -->
   <string name="day_concat">", "</string>
+  <!-- Appears at the top of the Clock Picker screen: Tell user to
+         select a clock to display -->
   <string name="clock_instructions">دیاریکردنی کاتژمێر</string>
+  <!-- Label for analog clock gadget displayed on-screen when that gadget is represented to the user. -->
   <string name="analog_gadget">کاتژمێر پێوه‌ری</string>
+  <!-- Help activity name -->
   <string name="help">یارمه‌تیدان</string>
+  <!-- Settings activity name -->
+  <!-- Label for the Settings activity displayed on-screen when that activity must be represented to the user. -->
   <string name="settings">ڕێکخستنه‌کان</string>
+  <!-- Setting title for changing the snooze duration. -->
   <string name="snooze_duration_title">ماوه‌ی سووکه‌نوستن</string>
   <plurals name="snooze_duration">
+    <!-- Duration for one minute -->
     <item quantity="one">1 خوله‌ک</item>
+    <!-- Duration for more than one minute -->
     <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> خوله‌ک</item>
   </plurals>
   <plurals name="snooze_picker_label">
+    <!-- Duration for one minute -->
     <item quantity="one">خوله‌ک</item>
+    <!-- Duration for more than one minute -->
     <item quantity="other">خولەک</item>
   </plurals>
+  <!-- Auto silence preference title -->
   <string name="auto_silence_title">بێده‌نگ کردن دوای</string>
+  <!-- Auto silence summary string set based on the preference value. -->
   <string name="auto_silence_summary"><xliff:g id="minutes">%d</xliff:g> خوله‌ک</string>
+  <!-- Auto silence summary when turned off -->
   <string name="auto_silence_never">هەرگیز</string>
+  <!-- Entries listed in the ListPreference when invoking the auto silence
+         preference. -->
   <string-array name="auto_silence_entries">
     <item>1 minute</item>
     <item>5 minutes</item>
@@ -96,86 +191,170 @@
     <item>25 minutes</item>
     <item>هیچکات</item>
   </string-array>
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the auto_silence_entries above. -->
+  <!-- Done button when editing an alarm. -->
   <string name="done">ئه‌نجام درا</string>
+  <!-- Revert button when editing an alarm. -->
   <string name="revert">گه‌ڕانه‌وه‌ی باری سه‌ره‌تایی</string>
+  <!-- Delete button when editing an alarm. -->
   <string name="delete">سڕینه‌وه‌</string>
+  <!-- Setting title for changing the alarm volume. -->
   <string name="alarm_volume_title">ئاستی دەنگی ئاگادارکەرەوە</string>
+  <!-- Summary for the alarm preference when silent is chosen. -->
   <string name="silent_alarm_summary">بێدەنگ</string>
+  <!-- Text to display in the small text of the notification -->
   <string name="alarm_notify_text">سووکه‌نوستن یان لابردنی ئاگادارکه‌ره‌وه‌.</string>
+  <!-- Text to display in the notification ticker and label -->
   <string name="alarm_notify_snooze_label"><xliff:g id="label">%s</xliff:g> (سووکه‌نوستن کرا)</string>
+  <!-- Text to display in the notification when the alarm has been snoozed -->
   <string name="alarm_notify_snooze_text">ئاگادارکه‌ره‌وه‌ دانرا بۆ  <xliff:g id="time">%s</xliff:g>.په‌نچه‌ی پێدابنێ بۆ لابردن.</string>
+  <!-- Title of the setting to change hardware button behavior. This string
+         should be changed for each piece of hardware. [CHAR LIMIT=20] -->
   <string name="volume_button_setting_title">دوگمەی دەنگ</string>
+  <!-- Dialog title of the volume and power setting. -->
   <string name="volume_button_dialog_title">کاریگه‌ری دوگمه‌</string>
+  <!-- Entries listed in the setting for the side-button action. -->
   <string-array name="volume_button_setting_entries">
     <item>سووکه‌ نوستن</item>
     <item>گوێ نەدان</item>
     <item>هیچ نه‌کرێت</item>
   </string-array>
+  <!-- Values for the side-button setting. -->
+  <!-- Title of the ringtone setting. -->
   <string name="default_ringtone_setting_title">دیاریکردنی زه‌نگی بنێڕه‌ت</string>
+  <!-- Accessibility labels for Clock activity buttons -->
   <string name="alarm_button_description">ئاگادارکردنه‌وه‌</string>
   <string name="gallery_button_description">پێشەنگا</string>
   <string name="music_button_description">مۆسیقا</string>
   <string name="nightmode_button_description">ڵێڵ</string>
   <string name="home_button_description">به‌کارخه‌ر</string>
   <string name="desk_clock_button_description">ته‌ختی کاتژمێر</string>
+  <!-- Accessibility labels for alarm buttons -->
   <string name="label_description">پێناس</string>
   <string name="ringtone_description">زه‌نگ</string>
+  <!-- What to show the user if the weather widget exists but fails to
+         respond. This is a sign of an error; if the weather widget is not
+         present on the device, we show nothing at all. -->
   <string name="weather_fetch_failure">زانیاری له‌باره‌ی که‌ش و هه‌وا ئێستا ئاماده‌ نییه‌.</string>
+  <!-- A description for the DeskClock alarm sound playback service.
+         [CHAR LIMIT=NONE] -->
   <string name="alarm_klaxon_service_desc">خزمه‌تگوزاری گه‌ڕانه‌لێدانی ده‌نگ بۆ ئاگادارکردنه‌وه‌ دانرا له‌ کاژێردا.</string>
+  <!-- String displayed as the alert summary while loading the alert name from
+         the media player. [CHAR LIMIT=NONE] -->
   <string name="loading_ringtone">ئاماده‌کردنی زه‌نگ\u2026</string>
+  <!-- A description for the DeskClock timer sound playback service.
+         [CHAR LIMIT=NONE] -->
   <string name="timer_ring_service_desc">خزمه‌تگوزاری گه‌ڕانه‌لێدانی ده‌نگ بۆ ئاگادارکردنه‌وه‌ دانرا له‌ کاژێردا.</string>
+  <!-- Label on the main screen control used to set alarm [CHAR LIMIT=30]-->
   <string name="control_set_alarm">دانانی وریاکەرەوە</string>
+  <!-- Label on the main screen control used to set alarm when there is already an existing alarm [CHAR LIMIT=30]-->
   <string name="control_set_alarm_with_existing"><xliff:g id="time">%s</xliff:g></string>
+  <!--  ActionBar strings -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Alarm page -->
   <string name="menu_alarm">وریاکەرەوە</string>
+  <!-- Describes the purpose of the tab button which which switches the activity to the Timer page -->
   <string name="menu_timer">کاتپێو</string>
+  <!-- Describes the purpose of the tab button which which switches the activity to the Clock page -->
   <string name="menu_clock">کاتژمێر</string>
+  <!-- Describes the purpose of the tab button which which switches the activity to the Stopwatch page -->
   <string name="menu_stopwatch">کات وه‌ستێن</string>
+  <!-- Clock view buttons strings-->
+  <!-- Describes the purpose of the button to start the activity to add/edit/delete alarms -->
+  <!-- Describes the purpose of the button which provides a list of cities for the world clock settings -->
   <string name="button_cities">شاره‌کان</string>
+  <!-- Describes the purpose of the button which pops up a menu of setting choices -->
   <string name="button_menu">بەربژاردەی زیاتر</string>
+  <!-- Menu item on most screens to get to more settings -->
   <string name="menu_item_settings">ڕێکخستنه‌کان</string>
+  <!-- Menu item on most screens to get to the help information -->
   <string name="menu_item_help">یارمەتی</string>
+  <!-- Menu item on clock screen to enter night mode. -->
   <string name="menu_item_night_mode">جۆری شه‌و</string>
+  <!-- Menu item on Cities screen to sort by GMT offset -->
   <string name="menu_item_sort_by_gmt_offset">ڕیزکردن به‌پێی کات</string>
+  <!-- Menu item on Cities screen to sort by alphabetical order -->
   <string name="menu_item_sort_by_name">ڕیزکردن به‌ ناو</string>
+  <!-- Label for selected cities in Cities list view -->
   <string name="selected_cities_label">شاره‌ دیاریکراوه‌کان</string>
+  <!-- Stop Watch strings -->
+  <!-- Describes the purpose of the button to resume running a stopwatch -->
   <string name="sw_resume_button">دەستپێکردنەوە</string>
+  <!-- Describes the purpose of the button to begin running a stopwatch -->
   <string name="sw_start_button">دەستپێکردن</string>
+  <!-- Describes the purpose of the button to pause a stopwatch. -->
   <string name="sw_stop_button">وه‌ستاندن</string>
+  <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
   <string name="sw_lap_button">سوڕ</string>
+  <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
   <string name="sw_reset_button">ڕێکخستنەوە</string>
+  <!-- Describes the purpose of the button to share the stopwatch value.
+         Also used as title for chooser when sharing stopwatch results. -->
   <string name="sw_share_button">به‌شداریپێکردن</string>
+  <!-- Abbreviation for temporal hours [CHAR LIMIT=1] -->
   <string name="hours_label">ک</string>
+  <!-- Abbreviation for temporal minutes [CHAR LIMIT=1] -->
   <string name="minutes_label">خ</string>
+  <!-- Abbreviation for temporal seconds [CHAR LIMIT=1] -->
   <string name="seconds_label">چ</string>
+  <!-- Accessibility strings -->
   <string name="hours_label_description">کاژێر</string>
   <string name="minutes_label_description">خولەک</string>
   <string name="seconds_label_description">چرکە</string>
+  <!--  Stopwatch share strings -->
+  <!-- Sentence within the message created to share the total time recorded within the stopwatch -->
   <string name="sw_share_main">کاتی من بریتییه‌ له‌ <xliff:g id="time">%s</xliff:g></string>
+  <!-- Header within the message created to share a list of lap times (a new line is appended to this) -->
   <string name="sw_share_laps">ماوه‌ی سوڕ:</string>
+  <!-- Label to enumerate the number of laps in the notification the user has counted -->
   <string name="sw_notification_lap_number">سوڕی <xliff:g id="number">%d</xliff:g></string>
+  <!-- Formatted stopwatch time -->
+  <!-- Formatted stopwatch time for laps shared using the share button -->
+  <!-- Label to enumerate the number of laps the user has counted -->
+  <!-- Stopwatch accessibility strings -->
   <plurals name="Nhours_description">
+    <!-- 1 hour -->
     <item quantity="one">1 کاژێر</item>
+    <!-- more -->
     <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> کاتژژمێر</item>
   </plurals>
   <plurals name="Nminutes_description">
+    <!-- 1 minute -->
     <item quantity="one">1 خوله‌ک</item>
+    <!-- more -->
     <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g>خوله‌ک</item>
   </plurals>
   <plurals name="Nseconds_description">
+    <!-- 1 second -->
     <item quantity="one">1 چرکە</item>
+    <!-- more -->
     <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> چرکه‌</item>
   </plurals>
+  <!-- timer strings -->
+  <!-- Describes the purpose of the button to add a new timer -->
   <string name="timer_add_timer">دیاریکردنی کاتپێو</string>
+  <!-- Describes the purpose of the button to begin or continue running a timer -->
   <string name="timer_start">دەستپێکردن</string>
+  <!-- Describes the purpose of the button to delete a timer. -->
   <string name="timer_delete">سڕینه‌وه‌</string>
+  <!-- Describes the purpose of the button increase the remaining time on a timer by one minute. -->
   <string name="timer_plus_one">زیادکردنی یه‌ک خوله‌ک</string>
+  <!-- Like "timer_plus_one", but with 'minute' abbreviated for the notification. -->
   <string name="timer_plus_1_min">زیاد کردنی ۱ خوله‌ک</string>
+  <!-- Describes the purpose of the button to stop the timer. -->
   <string name="timer_stop">وه‌ستاندن</string>
+  <!-- Describes the purpose of the button to stop and delete the timer. -->
   <string name="timer_done">ئه‌نجام درا</string>
+  <!-- Describes the purpose of the button to return the timer to it's original starting value. -->
   <string name="timer_reset">ڕێکخستنەوە</string>
+  <!-- Describes the purpose of the button to discard the current dialog values. Will also close the dialog if other time's exist -->
   <string name="timer_cancel">هەڵوەشاندنەوە</string>
+  <!-- Notification content shown when a timer has completed and has no more time remaining -->
   <string name="timer_times_up">کات ته‌واو بوو</string>
+  <!-- Label associated with a notification for a Timer -->
   <string name="timer_notification_label">کاتپێو</string>
+  <!-- Toast content shown when user attempts to create a new timer when there are already 4 timers -->
+  <!-- Jocular content that user may append when sharing the lap times -->
   <string-array name="sw_share_strings" translatable="true">
     <item>تۆ خێرایی زۆر به‌رزت بێده‌نگ کرد.</item>
     <item>دڵخۆشبه‌ به به‌ری کاره‌که‌ت.</item>
@@ -189,26 +368,47 @@
     <item>ته‌قاندنه‌وه‌ی فۆتۆن.</item>
   </string-array>
   <plurals name="timers_num">
+    <!-- 1 timer -->
     <item quantity="one">1 خوله‌ک</item>
+    <!-- more -->
     <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> کاتپێو</item>
   </plurals>
+  <!-- Title with the clock on the main page displaying the user's regular timezone (shows when automatic_home_clock enabled) -->
   <string name="home_label">ماڵەوە</string>
+  <!-- Label for the Cities activity displayed on-screen when that activity must be represented to the user. -->
   <string name="cities_activity_title">شاره‌کان</string>
+  <!-- Settings strings -->
+  <!-- Header in the preferences settings for the section pertaining to clocks on the main fragment -->
+  <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->
   <string name="clock_style">ستایل</string>
+  <!-- Entries listed in the ListPreference when invoking the clock style
+         preference. -->
   <string-array name="clock_style_entries">
     <item>پێوه‌ری</item>
     <item>ژماره‌یی</item>
   </string-array>
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the clock_style_entries above. -->
+  <!-- Title for an option that will automtically show a clock representing the user's regular timezone on the main fragment whenever the user leaves their regular timezone-->
   <string name="automatic_home_clock">کاتژمێری ماڵه‌وه‌ی خۆکارانه‌</string>
+  <!-- Describes the functionality provided by the automatic_home_clock option -->
   <string name="automatic_home_clock_summary">کاتێک گه‌شت ده‌که‌یت و شوێن ده‌گۆڕیت که‌ کات جیاوازبێت،کاتژمێر زیاد بکه‌ بۆ ماڵ</string>
+  <!-- Title in the preferences change the time zone for the user's home -->
   <string name="home_time_zone">کاتی ماڵ</string>
+  <!-- Title in a list dialog box to pick a time zone for the user's home -->
   <string name="home_time_zone_title">کاتی ماڵ</string>
+  <!-- Textual content of the button to discard the current dialog values and close the dialog -->
   <string name="time_picker_cancel">هەڵوەشاندنەوە</string>
+  <!-- Textual content of the button to update an alarm with the current dialog values -->
   <string name="time_picker_set">باشه‌</string>
   <string name="time_picker_time_seperator">:</string>
+  <!--  place holder for am/pm label when it is not set -->
   <string name="time_picker_ampm_label">--</string>
+  <!-- add 00 as minutes to the time when pressing this button -->
   <string name="time_picker_00_label">:۰۰</string>
+  <!-- add 30 as minutes to the time when pressing this button -->
   <string name="time_picker_30_label">:۳۰</string>
+  <!-- Choices for timezones, must be kept in sync with timezone_values. CHAR LIMIT=25] -->
   <string-array name="timezone_labels">
     <item>"دوورگه‌کانی مارشاڵ"</item>
     <item>"دورگه‌کانی میدوه‌ی"</item>
@@ -296,32 +496,74 @@
     <item>"تۆنگا"</item>
     <item>"جاکارتا"</item>
   </string-array>
+  <!-- Choices for timezones, must be kept in sync with timezone_values. -->
+  <!-- Header in the preferences settings for the section pertaining to alarms -->
+  <!-- Describes the running service for the stopwatch -->
   <string name="stopwatch_service_desc">خزمه‌تگوزاری کات وه‌ستێنه‌ر بۆ ئاگاداری کارده‌کات.</string>
+  <!-- Desription for the stopped stop watch -->
   <string name="swn_stopped">وه‌ستا</string>
+  <!-- Text instruction for dismiss alarm on alarm lock screen. The dismiss button will still
+         be on the right even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Text instruction for snooze alarm on alarm lock screen. The snooze button will still
+         be on the left even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Notification title when timer is stopped. -->
   <string name="timer_stopped">کاتپێو وه‌ستا</string>
+  <!-- Notification title when multiple timers are stopped. -->
   <string name="timers_stopped"><xliff:g id="number" example="7">%d</xliff:g> کاتپێو وه‌ستا</string>
+  <!-- Notification text when multiple timers are stopped. -->
   <string name="all_timers_stopped_notif">په‌نجه‌ بنێ بێره‌دا بۆ بینینی کاتپێوه‌کان</string>
+  <!-- Notification title when at least one timer, of those in use, is counting down. -->
   <string name="timers_in_use"><xliff:g id="number" example="7">%d</xliff:g> کاتپێو</string>
+  <!-- Notification text when at least one timer, of those in use, is counting down. -->
   <string name="next_timer_notif">کاتپێوی دواتر: <xliff:g id="time_remaining" example="2 minutes remaining">%s</xliff:g></string>
+  <!-- screensaver settings strings -->
+  <!-- Label for the screen saver activity displayed on-screen when that activity must be represented to the user. -->
   <string name="screensaver_settings">ڕێکخستنه‌کانی تیمی خه‌یاڵ</string>
+  <!-- Title for check box to pick intensity of display diminuation during dream mode -->
   <string name="night_mode_title">شێوازی شەو</string>
+  <!-- Describes intensity of display diminuation during dream mode -->
   <string name="night_mode_summary">ڕوونمای زۆر تاریک (بۆ ژووری تاریک به‌کاردێت)</string>
+  <!-- Description of the down caret in the alarm alert screen to expand the alarm content to edit perspective. [CHAR LIMIT=NONE] -->
   <string name="expand_alarm">به‌ربڵاوی ئاگادارکه‌ره‌وه‌</string>
+  <!-- Description of the up caret in the alarm alert screen to collapse the alarm content to summary perspective. [CHAR LIMIT=NONE] -->
   <string name="collapse_alarm">له‌ناوچونی ئاگادارکه‌ره‌وه‌</string>
+  <!-- Description of the button to undo change to alarm -->
   <string name="alarm_undo">گه‌ڕانه‌وه‌</string>
+  <!-- Toast content when an alarm was deleted  -->
   <string name="alarm_deleted">ئاگادارکه‌ره‌وه‌ وه‌ستا.</string>
+  <!-- slash between date and next alarm in the clock -->
   <string name="slash"> / </string>
+  <!-- slash between date and next alarm in the clock -->
   <string name="world_day_of_week_label"> / <xliff:g id="label">%s</xliff:g></string>
+  <!-- Description of field showing the next alarm time in the clock page, for accessibility. -->
   <string name="next_alarm_description">ئاگادارکه‌ره‌وه‌ی داهاتوو:<xliff:g id="alarm_time" example="Wed 8:00am">%s</xliff:g></string>
+  <!-- Displays the number of alarms selected from the list of alarms. -->
   <string name="alarms_selected"><xliff:g id="alarms">%d</xliff:g> selected دیاریکراوه‌</string>
+  <!-- message used by the talkback accessebility app to say that something was deleted -->
   <string name="deleted_message">سڕدرایەوە</string>
+  <!-- Alarm deletion confirmation message-->
   <plurals name="alarm_delete_confirmation">
+    <!-- Confirmation for one alarm -->
     <item quantity="one">سڕینه‌وه‌ی ئاگادارکه‌ره‌وه‌ی دیاریکراو؟</item>
+    <!-- Confirmation more than one alarm  -->
     <item quantity="other">سڕینه‌وه‌ی ئاگادارکه‌ره‌وه‌ی دیاریکراو؟</item>
   </plurals>
+  <!-- Timer deletion confirmation -->
   <string name="timer_delete_confirmation">ئه‌م کاتپێوه‌ ده‌سڕیته‌وه‌؟</string>
+  <!-- world clock deletion confirmation -->
   <string name="city_delete_confirmation">ئه‌م شاره‌ ده‌سڕیته‌وه‌؟</string>
+  <!-- Label for digital clock gadget displayed on-screen when that gadget is represented to the user. -->
   <string name="digital_gadget">کاتژمێر ژماره‌یی</string>
+  <!-- format strings for clocks -->
+  <!-- Font size for AM/PM should match widget_label_font_size -->
+  <!-- Font size for AM/PM should match bottom_text_size -->
+  <!-- Font size for AM/PM should match label_font_size -->
+  <!-- Font size for AM/PM should match alarm_label_size -->
+  <!-- String for no alarms -->
   <string name="no_alarms">ئاگادارکردنه‌وه‌ نییه‌</string>
+  <!-- String for no alarms set [CHAR LIMIT=24] -->
+  <!-- String for no enabled alarms in timeline view [CHAR LIMIT=30] -->
   <string name="no_upcoming_alarms">هیچ ئاگادارکردنه‌وه‌یه‌کی ئاماده‌کراو نییه‌</string>
 </resources>
diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-ky-rKG/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 281a884ad..52e8e2150 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Symbol uweisen</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">E Symbol an der Statusläischt uweise wann en Alarm gesat ass</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Opsteigend Lautstäerkt</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Kee Profil ausgewielt</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Dobäisetzen</string>
   <string name="cities_add_city_title">Stad dobäisetzen</string>
   <string name="cities_add_city_city">Stad:</string>
@@ -35,25 +41,39 @@
   <string name="cities_delete_city_title">Stad läschen</string>
   <string name="cities_delete_city_msg">Wëlls du <xliff:g id="city">%s</xliff:g> läschen?</string>
   <string name="cities_delete_city_failed">Stad kann net geläscht ginn</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Op d\'Lautstäerktknäppercher drécke fir ze <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Aktioun beim Dréinen</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Den Tablet no ënnen dréine wäert <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Den Telefon no ënnen dréine wäert <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Aktioun beim Rëselen</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Den Tablet rësele wäert <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Den Telefon rësele wäert <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">Wecker näipen</string>
   <string name="action_summary_dismiss">Alarm verwerfen</string>
   <string name="action_summary_do_nothing">näischt maachen</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Alarmtyp auswielen</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Schelltoun</string>
   <string name="alarm_type_playlist">Ofspilllëscht</string>
   <string name="alarm_type_random">Zoufälleg</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Wecker ass roueg</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Alarmtoun auswielen</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Schelltoun</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Musek</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Standard-Schelltoun</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Konnt keng dauerhaf Erlabnis kréie fir de Schelltoun z\'änneren</string>
   <string name="menu_item_widget_settings">Widget-Astellungen</string>
   <string name="activity_not_found">Aktivitéit net fonnt!</string>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 217209403..e1eb6595a 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -15,53 +15,119 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label shown on launcher icon -->
+  <!-- Label for the this application displayed on-screen when this application must be represented to the user. -->
   <string name="app_label">Auer</string>
+  <!-- Title for AlarmClock activity -->
+  <!-- Label for the Alarms activity displayed on-screen when that activity must be represented to the user. -->
   <string name="alarm_list_title">Weckeren</string>
+  <!-- Menu item on Alarm Clock screen: Add alarm -->
   <string name="add_alarm">Wecker dobäisetzen</string>
+  <!-- Menu item on Alarm Clock screen: Desk clock -->
   <string name="menu_desk_clock">Dësch-Auer</string>
+  <!-- Menu item on Alarm Clock screen: Edit alarm -->
   <string name="menu_edit_alarm">Wecker änneren</string>
+  <!-- Context Menu Item on Alarm Settings screen: Delete alarm -->
   <string name="delete_alarm">Wecker läschen</string>
+  <!-- Context Menu Item on Alarm Settings screen: Enable alarm -->
   <string name="enable_alarm">Wecker uschalten</string>
+  <!-- Context Menu Item on Alarm Settings screen: Disable alarm -->
   <string name="disable_alarm">Wecker ausschalten</string>
+  <!-- Delete alarm confirmation dialog message. -->
   <string name="delete_alarm_confirm">Dëse Wecker läschen?</string>
+  <!-- Menu item on Alarm Clock screen: Show clock -->
   <string name="show_clock">Auer uweisen</string>
+  <!-- Menu item on Alarm Clock screen: Hide clock -->
   <string name="hide_clock">Auer verstoppen</string>
+  <!-- Setting label on Set alarm screen: Label -->
   <string name="label">Beschreiwung</string>
+  <!-- Default label to display for an alarm -->
   <string name="default_label">Wecker</string>
+  <!-- Preference category on Alarm Settings screen: Set alarm -->
+  <!-- Also label for the old Alarms dialog activity displayed on-screen when that activity must be represented to the user. -->
   <string name="set_alarm">Wecker setzen</string>
+  <!-- Setting labels on Set alarm screen: Vibration on or off -->
   <string name="alarm_vibrate">Vibréieren</string>
+  <!-- Setting labels on Set alarm screen: Repeat -->
   <string name="alarm_repeat">Widderhuelen</string>
+  <!-- Setting labels on Set alarm screen: Select alarm ringtone  -->
   <string name="alert">Weckerschelltoun</string>
+  <!-- Label on expanded alarm edit view. -->
   <string name="ringtone">Schelltoun</string>
+  <!-- Setting labels on Set alarm screen: Set time  -->
   <string name="time">Zäit</string>
+  <!-- Label shown when user is setting up non-repeating alarm for tomorrow [CHAR LIMIT=15] -->
   <string name="alarm_tomorrow">Muer</string>
+  <!-- Label shown when user is setting up non-repeating alarm for later today [CHAR LIMIT=15] -->
   <string name="alarm_today">Haut</string>
+  <!-- The text shown above the clock when alarm is alerting [CHAR LIMIT=10] -->
   <string name="alarm_alert_wake_up">Gëff waakreg\u0021</string>
+  <!-- The text shown as an option to dismiss an alerting alarm [CHAR LIMIT=5] -->
   <string name="alarm_alert_off_action_text">Aus</string>
+  <!-- Button labels on the alarm dialog: Dismiss -->
   <string name="alarm_alert_dismiss_text">Verwerfen</string>
+  <!-- Button labels on the pre-dismiss alarm notifications: Dismiss now -->
   <string name="alarm_alert_dismiss_now_text">Elo verwerfen</string>
+  <!-- Alarm Alert screen: this message is shown after an alarm rung
+         unattended for a number of minutes.  It tells the user that
+         the alarm has been silenced.-->
   <string name="alarm_missed_title">Verpasste Wecker</string>
   <string name="alarm_missed_text"><xliff:g id="alarm_time">%s</xliff:g> - <xliff:g id="alarm_label">%s</xliff:g></string>
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the number of minutes in two separate lines. For example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
   <string name="alarm_alert_snoozed_text">Genäipt</string>
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the word 'Snoozed' in two separate lines or example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
   <plurals name="alarm_alert_snooze_duration">
+    <!-- Duration for one minute -->
     <item quantity="one">1 Min.</item>
+    <!-- Duration for more than one minute -->
     <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> Min.</item>
   </plurals>
+  <!-- The text shown after user dismissed an alerting alarm [CHAR LIMIT=15] -->
   <string name="alarm_alert_off_text">Wecker aus</string>
+  <!-- Button labels on the alarm dialog: Snooze -->
   <string name="alarm_alert_snooze_text">Näipen</string>
+  <!-- Toast that appears after Alarm is snoozed from the Alarm
+         dialog. Says the alarm will snooze for xxx minutes.  -->
   <plurals name="alarm_alert_snooze_set">
+    <!-- Duration for one minute -->
     <item quantity="one">Näipe fir 1 Minutt.</item>
+    <!-- Duration for more than one minute -->
     <item quantity="other">Näipe fir <xliff:g id="minutes">%d</xliff:g> Minutten.</item>
   </plurals>
+  <!-- Text to appear inside a notification while an alarm is snoozing. -->
   <string name="alarm_alert_snooze_until">Näipe bis <xliff:g id="time">%s</xliff:g></string>
+  <!-- Text to appear in the notification title while an alarm is about to go off. -->
   <string name="alarm_alert_predismiss_title">Nächste Wecker</string>
+  <!-- Text to appear in when trying to view a missed alarm that has been deleted -->
   <string name="missed_alarm_has_been_deleted">Däi verpasste Wecker gouf geläscht</string>
+  <!-- 0: nothing
+         1: days
+         2:      hours
+         3: days hours
+         4:            minutes
+         5: days       minutes
+         6:      hours minutes
+         7: days hours minutes
+    -->
+  <!-- Timer notification: how long from now until timer goes off. -->
   <string-array name="timer_notifications">
     <item>Manner wéi eng Minutt iwwreg</item>
     <item><xliff:g id="HOURS" example="2 hours">%1$s</xliff:g> iwwreg</item>
     <item><xliff:g id="MINUTES" example="2 minutes">%2$s</xliff:g> iwwreg</item>
     <item><xliff:g id="HOURS" example="2 hours">%1$s</xliff:g> <xliff:g id="MINUTES" example="2 minutes">%2$s</xliff:g> iwwreg</item>
   </string-array>
+  <!-- Alarm confirmation toast: Describes how long from now until
+         alarm fires -->
   <string-array name="alarm_set">
     <item>Wecker gesat fir manner wéi 1 Minutt vun elo un.</item>
     <item>Wecker gesat fir <xliff:g id="DAYS" example="2 days">%1$s</xliff:g> vun elo un.</item>
@@ -72,31 +138,62 @@
     <item>Wecker gesat fir <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g> a(n) <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g> vun elo un.</item>
     <item>Wecker gesat fir <xliff:g id="DAYS" example="2 days">%1$s</xliff:g>, <xliff:g id="HOURS" example="2 hours">%2$s</xliff:g> a(n) <xliff:g id="MINUTES" example="2 minutes">%3$s</xliff:g> vun elo un.</item>
   </string-array>
+  <!-- Alarm confirmation toast: singular day -->
   <string name="day">"1 Dag"</string>
+  <!-- Alarm confirmation toast: plural days -->
   <string name="days">"<xliff:g id="days">%s</xliff:g> Deeg"</string>
+  <!-- Alarm confirmation toast: singular hour -->
   <string name="hour">1 Stonn</string>
+  <!-- Alarm confirmation toast: plural hours -->
   <string name="hours"><xliff:g id="hours">%s</xliff:g> Stonnen</string>
+  <!-- Alarm confirmation toast: singular minute  -->
   <string name="minute">"1 Minutt"</string>
+  <!-- Alarm confirmation toast: plural minutes  -->
   <string name="minutes">"<xliff:g id="minutes">%s</xliff:g> Minutten"</string>
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to repeat every day -->
   <string name="every_day">All Dag</string>
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to never repeat -->
   <string name="never">Ni</string>
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: concatenate days with
+         this character, i.e. "Mon, Tue, Wed" -->
   <string name="day_concat">", "</string>
+  <!-- Appears at the top of the Clock Picker screen: Tell user to
+         select a clock to display -->
   <string name="clock_instructions">Eng Auer auswielen</string>
+  <!-- Label for analog clock gadget displayed on-screen when that gadget is represented to the user. -->
   <string name="analog_gadget">Analogauer</string>
+  <!-- Help activity name -->
   <string name="help">Hëllef</string>
+  <!-- Settings activity name -->
+  <!-- Label for the Settings activity displayed on-screen when that activity must be represented to the user. -->
   <string name="settings">Astellungen</string>
+  <!-- Setting title for changing the snooze duration. -->
   <string name="snooze_duration_title">Näipdauer</string>
   <plurals name="snooze_duration">
+    <!-- Duration for one minute -->
     <item quantity="one">1 Minutt</item>
+    <!-- Duration for more than one minute -->
     <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> Minutten</item>
   </plurals>
   <plurals name="snooze_picker_label">
+    <!-- Duration for one minute -->
     <item quantity="one">Minutt</item>
+    <!-- Duration for more than one minute -->
     <item quantity="other">Minutten</item>
   </plurals>
+  <!-- Auto silence preference title -->
   <string name="auto_silence_title">Roueg no</string>
+  <!-- Auto silence summary string set based on the preference value. -->
   <string name="auto_silence_summary"><xliff:g id="minutes">%d</xliff:g> Minutten</string>
+  <!-- Auto silence summary when turned off -->
   <string name="auto_silence_never">Ni</string>
+  <!-- Entries listed in the ListPreference when invoking the auto silence
+         preference. -->
   <string-array name="auto_silence_entries">
     <item>1 Minutt</item>
     <item>5 Minutten</item>
@@ -106,88 +203,173 @@
     <item>25 Minutten</item>
     <item>Ni</item>
   </string-array>
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the auto_silence_entries above. -->
+  <!-- Done button when editing an alarm. -->
   <string name="done">Fäerdeg</string>
+  <!-- Revert button when editing an alarm. -->
   <string name="revert">Zrécksetzen</string>
+  <!-- Delete button when editing an alarm. -->
   <string name="delete">Läschen</string>
+  <!-- Setting title for changing the alarm volume. -->
   <string name="alarm_volume_title">Weckerlautstäerkt</string>
+  <!-- Summary for the alarm preference when silent is chosen. -->
   <string name="silent_alarm_summary">Roueg</string>
+  <!-- Text to display in the small text of the notification -->
   <string name="alarm_notify_text">Näipen oder Wecker verwerfen.</string>
+  <!-- Text to display in the notification ticker and label -->
   <string name="alarm_notify_snooze_label"><xliff:g id="label">%s</xliff:g> (genäipt)</string>
+  <!-- Text to display in the notification when the alarm has been snoozed -->
   <string name="alarm_notify_snooze_text">Wecker gesat fir <xliff:g id="time">%s</xliff:g>. Drécke fir ofzebriechen.</string>
+  <!-- Title of the setting to change hardware button behavior. This string
+         should be changed for each piece of hardware. [CHAR LIMIT=20] -->
   <string name="volume_button_setting_title">Lautstäerktknäppercher</string>
+  <!-- Dialog title of the volume and power setting. -->
   <string name="volume_button_dialog_title">Knäppercherseffekt</string>
+  <!-- Entries listed in the setting for the side-button action. -->
   <string-array name="volume_button_setting_entries">
     <item>Näipen</item>
     <item>Verwerfen</item>
     <item>Näischt maachen</item>
   </string-array>
+  <!-- Values for the side-button setting. -->
+  <!-- Title of the ringtone setting. -->
   <string name="default_ringtone_setting_title">Als Standard-Schelltoun setzen</string>
+  <!-- Accessibility labels for Clock activity buttons -->
   <string name="alarm_button_description">Weckeren</string>
   <string name="gallery_button_description">Galerie</string>
   <string name="music_button_description">Musek</string>
   <string name="nightmode_button_description">Dimmen</string>
   <string name="home_button_description">Startsäit-Knäppchen</string>
   <string name="desk_clock_button_description">Auerenusiicht</string>
+  <!-- Accessibility labels for alarm buttons -->
   <string name="label_description">Beschreiwung</string>
   <string name="ringtone_description">Schelltoun</string>
+  <!-- What to show the user if the weather widget exists but fails to
+         respond. This is a sign of an error; if the weather widget is not
+         present on the device, we show nothing at all. -->
   <string name="weather_fetch_failure">Wiederinformatioun momentan net disponibel.</string>
+  <!-- A description for the DeskClock alarm sound playback service.
+         [CHAR LIMIT=NONE] -->
   <string name="alarm_klaxon_service_desc">Tounservice fir d\'Weckeren.</string>
+  <!-- String displayed as the alert summary while loading the alert name from
+         the media player. [CHAR LIMIT=NONE] -->
   <string name="loading_ringtone">Schelltoun gëtt gelueden\u2026</string>
+  <!-- A description for the DeskClock timer sound playback service.
+         [CHAR LIMIT=NONE] -->
   <string name="timer_ring_service_desc">Tounservicer fir d\'Sandaueren.</string>
+  <!-- Label on the main screen control used to set alarm [CHAR LIMIT=30]-->
   <string name="control_set_alarm">Wecker setzen</string>
+  <!-- Label on the main screen control used to set alarm when there is already an existing alarm [CHAR LIMIT=30]-->
   <string name="control_set_alarm_with_existing"><xliff:g id="time">%s</xliff:g></string>
+  <!--  ActionBar strings -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Alarm page -->
   <string name="menu_alarm">Wecker</string>
+  <!-- Describes the purpose of the tab button which which switches the activity to the Timer page -->
   <string name="menu_timer">Sandauer</string>
+  <!-- Describes the purpose of the tab button which which switches the activity to the Clock page -->
   <string name="menu_clock">Auer</string>
+  <!-- Describes the purpose of the tab button which which switches the activity to the Stopwatch page -->
   <string name="menu_stopwatch">Stoppauer</string>
+  <!-- Clock view buttons strings-->
+  <!-- Describes the purpose of the button to start the activity to add/edit/delete alarms -->
   <string name="button_alarms">Wecker dobäisetzen</string>
+  <!-- Describes the purpose of the button which provides a list of cities for the world clock settings -->
   <string name="button_cities">Stied</string>
+  <!-- Describes the purpose of the button which pops up a menu of setting choices -->
   <string name="button_menu">Méi Optiounen</string>
+  <!-- Menu item on most screens to get to more settings -->
   <string name="menu_item_settings">Astellungen</string>
+  <!-- Menu item on most screens to get to the help information -->
   <string name="menu_item_help">Hëllef</string>
+  <!-- Menu item on clock screen to enter night mode. -->
   <string name="menu_item_night_mode">Nuetsmodus</string>
+  <!-- Menu item on Cities screen to sort by GMT offset -->
   <string name="menu_item_sort_by_gmt_offset">No Zäit zortéieren</string>
+  <!-- Menu item on Cities screen to sort by alphabetical order -->
   <string name="menu_item_sort_by_name">No Numm zortéieren</string>
+  <!-- Label for selected cities in Cities list view -->
   <string name="selected_cities_label">Ausgewielt Stied</string>
+  <!-- Stop Watch strings -->
+  <!-- Describes the purpose of the button to resume running a stopwatch -->
   <string name="sw_resume_button">Weider</string>
+  <!-- Describes the purpose of the button to begin running a stopwatch -->
   <string name="sw_start_button">Start</string>
+  <!-- Describes the purpose of the button to pause a stopwatch. -->
   <string name="sw_stop_button">Stopp</string>
+  <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
   <string name="sw_lap_button">Ronn</string>
+  <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
   <string name="sw_reset_button">Zrécksetzen</string>
+  <!-- Describes the purpose of the button to share the stopwatch value.
+         Also used as title for chooser when sharing stopwatch results. -->
   <string name="sw_share_button">Deelen</string>
+  <!-- Abbreviation for temporal hours [CHAR LIMIT=1] -->
   <string name="hours_label">St</string>
+  <!-- Abbreviation for temporal minutes [CHAR LIMIT=1] -->
   <string name="minutes_label">M</string>
+  <!-- Abbreviation for temporal seconds [CHAR LIMIT=1] -->
   <string name="seconds_label">S</string>
+  <!-- Accessibility strings -->
   <string name="hours_label_description">Stonnen</string>
   <string name="minutes_label_description">Minutten</string>
   <string name="seconds_label_description">Sekonnen</string>
+  <string name="zero">0</string>
+  <!--  Stopwatch share strings -->
+  <!-- Sentence within the message created to share the total time recorded within the stopwatch -->
   <string name="sw_share_main">Meng Zäit ass <xliff:g id="time">%s</xliff:g></string>
+  <!-- Header within the message created to share a list of lap times (a new line is appended to this) -->
   <string name="sw_share_laps">Ronnenzäiten:</string>
+  <!-- Label to enumerate the number of laps in the notification the user has counted -->
   <string name="sw_notification_lap_number"><xliff:g id="number">%d</xliff:g>. Ronn</string>
+  <!-- Formatted stopwatch time -->
+  <!-- Formatted stopwatch time for laps shared using the share button -->
+  <!-- Label to enumerate the number of laps the user has counted -->
+  <!-- Stopwatch accessibility strings -->
   <plurals name="Nhours_description">
+    <!-- 1 hour -->
     <item quantity="one">1 Stonn</item>
+    <!-- more -->
     <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> Stonnen</item>
   </plurals>
   <plurals name="Nminutes_description">
+    <!-- 1 minute -->
     <item quantity="one">1 Minutt</item>
+    <!-- more -->
     <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> Minutten</item>
   </plurals>
   <plurals name="Nseconds_description">
+    <!-- 1 second -->
     <item quantity="one">1 Sekonn</item>
+    <!-- more -->
     <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> Sekonnen</item>
   </plurals>
+  <!-- timer strings -->
+  <!-- Describes the purpose of the button to add a new timer -->
   <string name="timer_add_timer">Sandauer dobäisetzen</string>
+  <!-- Describes the purpose of the button to begin or continue running a timer -->
   <string name="timer_start">Start</string>
+  <!-- Describes the purpose of the button to delete a timer. -->
   <string name="timer_delete">Läschen</string>
+  <!-- Describes the purpose of the button increase the remaining time on a timer by one minute. -->
   <string name="timer_plus_one">Eng Minutt méi</string>
+  <!-- Like "timer_plus_one", but with 'minute' abbreviated for the notification. -->
   <string name="timer_plus_1_min">Eng Min. méi</string>
+  <!-- Describes the purpose of the button to stop the timer. -->
   <string name="timer_stop">Stopp</string>
+  <!-- Describes the purpose of the button to stop and delete the timer. -->
   <string name="timer_done">Fäerdeg</string>
+  <!-- Describes the purpose of the button to return the timer to it's original starting value. -->
   <string name="timer_reset">Zrécksetzen</string>
+  <!-- Describes the purpose of the button to discard the current dialog values. Will also close the dialog if other time's exist -->
   <string name="timer_cancel">Ofbriechen</string>
+  <!-- Notification content shown when a timer has completed and has no more time remaining -->
   <string name="timer_times_up">D\'Zäit ass eriwwer</string>
+  <!-- Label associated with a notification for a Timer -->
   <string name="timer_notification_label">Sandauer</string>
+  <!-- Toast content shown when user attempts to create a new timer when there are already 4 timers -->
   <string name="timers_max_count_reached">Maximal 4 Sandaueren</string>
+  <!-- Jocular content that user may append when sharing the lap times -->
   <string-array name="sw_share_strings" translatable="true">
     <item>Du bass verdäiwelt séier.</item>
     <item>Genéiss d\'Friichte vun denger Aarbecht.</item>
@@ -201,27 +383,48 @@
     <item>Photonevitess.</item>
   </string-array>
   <plurals name="timers_num">
+    <!-- 1 timer -->
     <item quantity="one">1 Minutt</item>
+    <!-- more -->
     <item quantity="other"><xliff:g id="number" example="7">%d</xliff:g> Sandaueren</item>
   </plurals>
+  <!-- Title with the clock on the main page displaying the user's regular timezone (shows when automatic_home_clock enabled) -->
   <string name="home_label">Doheem</string>
+  <!-- Label for the Cities activity displayed on-screen when that activity must be represented to the user. -->
   <string name="cities_activity_title">Stied</string>
+  <!-- Settings strings -->
+  <!-- Header in the preferences settings for the section pertaining to clocks on the main fragment -->
   <string name="clock_settings">Auer</string>
+  <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->
   <string name="clock_style">Stil</string>
+  <!-- Entries listed in the ListPreference when invoking the clock style
+         preference. -->
   <string-array name="clock_style_entries">
     <item>Analog</item>
     <item>Digital</item>
   </string-array>
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the clock_style_entries above. -->
+  <!-- Title for an option that will automtically show a clock representing the user's regular timezone on the main fragment whenever the user leaves their regular timezone-->
   <string name="automatic_home_clock">Automatesch Heemechtsauer</string>
+  <!-- Describes the functionality provided by the automatic_home_clock option -->
   <string name="automatic_home_clock_summary">Beim Reesen an engem Gebitt wou d\'Zäit anescht ass, eng Auer fir d\'Zäit doheem dobäisetzen</string>
+  <!-- Title in the preferences change the time zone for the user's home -->
   <string name="home_time_zone">Heemechtszäitzon</string>
+  <!-- Title in a list dialog box to pick a time zone for the user's home -->
   <string name="home_time_zone_title">Heemechtszäitzon</string>
+  <!-- Textual content of the button to discard the current dialog values and close the dialog -->
   <string name="time_picker_cancel">Ofbriechen</string>
+  <!-- Textual content of the button to update an alarm with the current dialog values -->
   <string name="time_picker_set">OK</string>
   <string name="time_picker_time_seperator">:</string>
+  <!--  place holder for am/pm label when it is not set -->
   <string name="time_picker_ampm_label">--</string>
+  <!-- add 00 as minutes to the time when pressing this button -->
   <string name="time_picker_00_label">:00</string>
+  <!-- add 30 as minutes to the time when pressing this button -->
   <string name="time_picker_30_label">:30</string>
+  <!-- Choices for timezones, must be kept in sync with timezone_values. CHAR LIMIT=25] -->
   <string-array name="timezone_labels">
     <item>"Marshallinselen"</item>
     <item>"Midwayinselen"</item>
@@ -309,36 +512,78 @@
     <item>"Tonga"</item>
     <item>"Jakarta"</item>
   </string-array>
+  <!-- Choices for timezones, must be kept in sync with timezone_values. -->
+  <!-- Header in the preferences settings for the section pertaining to alarms -->
   <string name="alarm_settings">Weckeren</string>
+  <!-- Describes the running service for the stopwatch -->
   <string name="stopwatch_service_desc">Notifikatioun iwwer de Stoppauer-Service.</string>
+  <!-- Desription for the stopped stop watch -->
   <string name="swn_stopped">Gestoppt</string>
+  <!-- Text instruction for dismiss alarm on alarm lock screen. The dismiss button will still
+         be on the right even on RTL languages so please do not reverse this during
+         translation. -->
   <string name="description_direction_right">No riets wësche fir ze verwerfen</string>
+  <!-- Text instruction for snooze alarm on alarm lock screen. The snooze button will still
+         be on the left even on RTL languages so please do not reverse this during
+         translation. -->
   <string name="description_direction_left">No lénks wësche fir ze näipen</string>
+  <!-- Notification title when timer is stopped. -->
   <string name="timer_stopped">Sandauer gestoppt</string>
+  <!-- Notification title when multiple timers are stopped. -->
   <string name="timers_stopped"><xliff:g id="number" example="7">%d</xliff:g> Sandauere gestoppt</string>
+  <!-- Notification text when multiple timers are stopped. -->
   <string name="all_timers_stopped_notif">Dréck fir deng Sandaueren ze gesinn</string>
+  <!-- Notification title when at least one timer, of those in use, is counting down. -->
   <string name="timers_in_use"><xliff:g id="number" example="7">%d</xliff:g> Sandaueren</string>
+  <!-- Notification text when at least one timer, of those in use, is counting down. -->
   <string name="next_timer_notif">Nächst Sandauer: <xliff:g id="time_remaining" example="2 minutes remaining">%s</xliff:g></string>
+  <!-- screensaver settings strings -->
+  <!-- Label for the screen saver activity displayed on-screen when that activity must be represented to the user. -->
   <string name="screensaver_settings">Dramastellungen</string>
+  <!-- Title for check box to pick intensity of display diminuation during dream mode -->
   <string name="night_mode_title">Nuetsmodus</string>
+  <!-- Describes intensity of display diminuation during dream mode -->
   <string name="night_mode_summary">Ganz ofgedonkelte Schierm (fir däischter Raim)</string>
+  <!-- Description of the down caret in the alarm alert screen to expand the alarm content to edit perspective. [CHAR LIMIT=NONE] -->
   <string name="expand_alarm">Wecker opklappen</string>
+  <!-- Description of the up caret in the alarm alert screen to collapse the alarm content to summary perspective. [CHAR LIMIT=NONE] -->
   <string name="collapse_alarm">Wecker zesummeklappen</string>
+  <!-- Description of the button to undo change to alarm -->
   <string name="alarm_undo">réckgängeg maachen</string>
+  <!-- Toast content when an alarm was deleted  -->
   <string name="alarm_deleted">Wecker geläscht.</string>
+  <!-- slash between date and next alarm in the clock -->
   <string name="slash"> / </string>
+  <!-- slash between date and next alarm in the clock -->
   <string name="world_day_of_week_label"> / <xliff:g id="label">%s</xliff:g></string>
+  <!-- Description of field showing the next alarm time in the clock page, for accessibility. -->
   <string name="next_alarm_description">Nächste Wecker: <xliff:g id="alarm_time" example="Wed 8:00am">%s</xliff:g></string>
+  <!-- Displays the number of alarms selected from the list of alarms. -->
   <string name="alarms_selected"><xliff:g id="alarms">%d</xliff:g> ausgewielt</string>
+  <!-- message used by the talkback accessebility app to say that something was deleted -->
   <string name="deleted_message">Geläscht</string>
+  <!-- Alarm deletion confirmation message-->
   <plurals name="alarm_delete_confirmation">
+    <!-- Confirmation for one alarm -->
     <item quantity="one">Den ausgewielte Wecker läschen?</item>
+    <!-- Confirmation more than one alarm  -->
     <item quantity="other">Déi ausgewielt Weckere läschen?</item>
   </plurals>
+  <!-- Timer deletion confirmation -->
   <string name="timer_delete_confirmation">Dës Sandauer läschen?</string>
+  <!-- world clock deletion confirmation -->
   <string name="city_delete_confirmation">Dës Stad läschen?</string>
+  <!-- Label for digital clock gadget displayed on-screen when that gadget is represented to the user. -->
   <string name="digital_gadget">Digitalauer</string>
+  <!-- format strings for clocks -->
+  <!-- Font size for AM/PM should match widget_label_font_size -->
+  <!-- Font size for AM/PM should match bottom_text_size -->
+  <!-- Font size for AM/PM should match label_font_size -->
+  <!-- Font size for AM/PM should match alarm_label_size -->
+  <!-- String for no alarms -->
   <string name="no_alarms">Keng Weckeren</string>
+  <!-- String for no alarms set [CHAR LIMIT=24] -->
   <string name="no_alarms_set">Keng Weckeren definéiert</string>
+  <!-- String for no enabled alarms in timeline view [CHAR LIMIT=30] -->
   <string name="no_upcoming_alarms">KENG WECKERE GEPLANGT</string>
 </resources>
diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-lo-rLA/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index a824e875b..eeebf3410 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Rodyti piktogramą</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Rodyti piktogramą būsenos juostoje, kai yra nustatytas signalas</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Didėjantis garsumas</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profilis <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Nepasirinktas profilis</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Pridėti</string>
   <string name="cities_add_city_title">Pridėti miestą</string>
   <string name="cities_add_city_city">Miestas:</string>
@@ -35,25 +41,39 @@
   <string name="cities_delete_city_title">Ištrinti miestą</string>
   <string name="cities_delete_city_msg">Ar norite ištrinti <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Negalima ištrinti miesto</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Paspaudus garsumo mygtukus <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Apvertimo veiksmas</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Apverčiant planšetinį kompiuterį <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Apverčiant telefoną <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Purtymo veiksmas</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Purtant planšetinį kompiuterį <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Purtant telefoną <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">snausti signalą</string>
   <string name="action_summary_dismiss">atsisakyti signalo</string>
   <string name="action_summary_do_nothing">nieko nedaryti</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Pasirinkti signalo tipą</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Skambėjimo tonas</string>
   <string name="alarm_type_playlist">Grojaraštis</string>
   <string name="alarm_type_random">Atsitiktinis</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Signalo garsumas yra tylus</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Pasirinkti signalą</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Skambėjimo tonas</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Muzika</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Numatytasis skambėjimo stonas</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Nepavyko nuolat suteikti leidimo skambėjimo tonui</string>
   <string name="menu_item_widget_settings">Valdiklio nustatymai</string>
   <string name="activity_not_found">Veikla nerasta!</string>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index 525821d28..82460cab6 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Rādīt ikonu</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Kad ir iestatīts modinātājs, rādīt ikonu statusa joslā</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Pieaugošs skaļums</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profils <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Profils nav izvēlēts</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Pievienot</string>
   <string name="cities_add_city_title">Pievienot pilsētu</string>
   <string name="cities_add_city_city">Pilsēta:</string>
@@ -35,24 +41,38 @@
   <string name="cities_delete_city_title">Dzēst pilsētu</string>
   <string name="cities_delete_city_msg">Vai vēlaties dzēst <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Neizdevās izdzēst pilsētu</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Nospiežot skaļuma pogas <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Apmešanas darbība</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Apmetot planšeti uz leju <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Apmetot telefonu uz leju <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Kratīšanas darbība</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Kratot planšeti tiks <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Kratot telefonu tiks <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">atlikt modinātāju</string>
   <string name="action_summary_dismiss">izslēgt modinātāju</string>
   <string name="action_summary_do_nothing">nedarīt neko</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Izvēlēties modinātāja veidu</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Zvana melodija</string>
   <string name="alarm_type_playlist">Atskaņošanas saraksts</string>
   <string name="alarm_type_random">Nejauši</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Modinātājs ir kluss</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Izvēlieties modinātāju</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Zvana melodija</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Mūzika</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Noklusētais signāls</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Neizdevās zvana signālam piešķirt pastāvīgas tiesības lietot melodiju</string>
 </resources>
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-mk-rMK/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
new file mode 100644
index 000000000..2cd80de1c
--- /dev/null
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -0,0 +1,80 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <string name="show_status_bar_icon_title">ഐക്കൺ കാണിക്കുക</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <string name="show_status_bar_icon_summary">ഒരു അലാറം സജ്ജമാക്കുമ്പോള്‍ സ്റ്റാറ്റസ് ബാറിൽ ഒരു ഐക്കൺ കാണിക്കുക</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <string name="alarm_increasing_volume">വര്‍ദ്ധിക്കുന്ന വോളിയം</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <string name="profile_description">പ്രൊഫൈൽ <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
+  <string name="profile_no_selected">പ്രൊഫൈൽ തിരഞ്ഞെടുത്തിട്ടില്ല</string>
+  <!-- User-defined cities -->
+  <string name="menu_item_add">ചേര്‍ക്കുക</string>
+  <string name="cities_add_city_title">നഗരം ചേർക്കുക</string>
+  <string name="cities_add_city_city">നഗരം:</string>
+  <string name="cities_add_city_timezone">സമയ മേഖല:</string>
+  <string name="cities_add_city_gps_cd">നിലവിലെ നിങ്ങളുടെ നഗരം പ്രാദേശികവൽക്കരിക്കുന്നതിന് തട്ടുക</string>
+  <string name="cities_add_loading">ലോഡുചെയ്യുന്നു...</string>
+  <string name="cities_add_searching">തിരയുന്നു…</string>
+  <string name="cities_add_gps_no_results">GPS അന്വേഷണം സ്ഥാന ഫലങ്ങൾ നൽകിയില്ല</string>
+  <string name="cities_add_gps_not_available">GPS ലഭ്യമല്ല</string>
+  <string name="cities_add_already_exists">നഗരം ഇതിനകം ഡാറ്റാബേസില്‍ നിലവിലുണ്ട്</string>
+  <string name="cities_add_city_failed">നഗരം സൃഷ്ടിക്കാൻ കഴിയില്ല</string>
+  <string name="cities_delete_city_title">നഗരം ഇല്ലാതാക്കുക</string>
+  <string name="cities_delete_city_msg">നിങ്ങള്‍ക്ക് <xliff:g id="city">%s</xliff:g> ഇല്ലാതാക്കണോ?</string>
+  <string name="cities_delete_city_failed">നഗരം ഇല്ലാതാക്കാൻ കഴിയില്ല</string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">വോളിയം ബട്ടണുകൾ അമർത്തുന്നത് <xliff:g id="action">%s</xliff:g> ചെയ്യുന്നതാണ്</string>
+  <!-- Setting title for the flip action setting. -->
+  <string name="flip_action_title">കമഴ്ത്തല്‍ നടപടി</string>
+  <!-- Setting summary for the flip action setting. -->
+  <string name="flip_action_summary" product="tablet">ടാബ്ലെറ്റ് താഴേക്ക് ഫ്ലിപ്പ് കമഴ്ത്തുന്നത് <xliff:g id="action">%s</xliff:g> ചെയ്യുന്നതാണ്</string>
+  <string name="flip_action_summary" product="default">ഫോണ്‍ താഴേക്ക് ഫ്ലിപ്പ് കമഴ്ത്തുന്നത് <xliff:g id="action">%s</xliff:g> ചെയ്യുന്നതാണ്</string>
+  <!-- Setting title for the shake action setting. -->
+  <string name="shake_action_title">കുലുക്കല്‍ നടപടി</string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">ടാബ്ലെറ്റ് കുലുക്കുന്നത് <xliff:g id="action">%s</xliff:g> ചെയ്യുന്നതാണ്</string>
+  <string name="shake_action_summary" product="default">ഫോണ്‍ കുലുക്കുന്നത് <xliff:g id="action">%s</xliff:g> ചെയ്യുന്നതാണ്</string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">അലാറം സ്നൂസ് ചെയ്യുക</string>
+  <string name="action_summary_dismiss">അലാറം നിരസിക്കുക</string>
+  <string name="action_summary_do_nothing">ഒന്നും ചെയ്യരുത്</string>
+  <!-- Alarm picker dialog title -->
+  <string name="alarm_picker_title">അലാറം തരം തിരഞ്ഞെടുക്കുക</string>
+  <!-- Alarm types -->
+  <string name="alarm_type_ringtone">റിംഗ്ടോൺ</string>
+  <string name="alarm_type_playlist">പ്ലേലിസ്റ്റ്</string>
+  <string name="alarm_type_random">ക്രമരഹിതമായി</string>
+  <!-- Warn Silent Alarm title -->
+  <string name="warn_silent_alarm_title">അലാറം വോളിയം നിശബ്ദമാണ്</string>
+  <!-- Select the source of the alarm -->
+  <string name="alarm_select">അലാറം തിരഞ്ഞെടുക്കുക</string>
+  <!-- Select the ringtone as alarm -->
+  <string name="alarm_select_ringtone">റിംഗ്ടോൺ</string>
+  <!-- Select the alarm from external device -->
+  <string name="alarm_select_external">സംഗീതം</string>
+  <!-- Ringtone selection default -->
+  <string name="ringtone_default">സ്ഥിര റിംഗ്‌ടോൺ</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">റിംഗ്ടോണിന് വേണ്ടി പെർസിസ്റ്റന്റ് ഗ്രാന്റ് അനുമതി എടുക്കുന്നത് പരാജയപ്പെട്ടു</string>
+  <string name="menu_item_widget_settings">വിജറ്റ് ക്രമീകരണങ്ങൾ</string>
+  <string name="activity_not_found">പ്രവർത്തനം കണ്ടെത്തിയില്ല!</string>
+</resources>
diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-mn-rMN/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
new file mode 100644
index 000000000..e2939d382
--- /dev/null
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -0,0 +1,80 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <string name="show_status_bar_icon_title">प्रतीक दर्शवा</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <string name="show_status_bar_icon_summary">अलार्म सेट केलेला असेल तेव्हा स्थिती बारमध्ये प्रतीक दर्शवा</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <string name="alarm_increasing_volume">व्हॉल्युम वाढवणे</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <string name="profile_description">प्रोफाइल <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
+  <string name="profile_no_selected">कोणताही प्रोफाइल निवडलेला नाही</string>
+  <!-- User-defined cities -->
+  <string name="menu_item_add">जोडा</string>
+  <string name="cities_add_city_title">शहर जोडा</string>
+  <string name="cities_add_city_city">शहर:</string>
+  <string name="cities_add_city_timezone">वेळक्षेत्र:</string>
+  <string name="cities_add_city_gps_cd">तुमचे चालू शहर लोकलाईज करा</string>
+  <string name="cities_add_loading">लोड करत आहे...</string>
+  <string name="cities_add_searching">शोधत आहे...</string>
+  <string name="cities_add_gps_no_results">GPS शंकेने कोणतेही स्थान निकाल दिले नाहीत</string>
+  <string name="cities_add_gps_not_available">GPS उपलब्ध नाही</string>
+  <string name="cities_add_already_exists">शहर आधीच डेटाबेसमध्ये विद्यमान आहे</string>
+  <string name="cities_add_city_failed">शहर तयार करू शकत नाही</string>
+  <string name="cities_delete_city_title">शहर हटवा</string>
+  <string name="cities_delete_city_msg">तुम्हाला <xliff:g id="city">%s</xliff:g>हटवायचे आहे का?</string>
+  <string name="cities_delete_city_failed">शहर हटवू शकत नाही</string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">व्हॉल्युम बटणे दाबल्यामुळे <xliff:g id="action">%s</xliff:g> होईल</string>
+  <!-- Setting title for the flip action setting. -->
+  <string name="flip_action_title">फ्लिप क्रिया</string>
+  <!-- Setting summary for the flip action setting. -->
+  <string name="flip_action_summary" product="tablet">टॅब्लेट खाली फ्लिप केल्यामुळे <xliff:g id="action">%s</xliff:g> होईल</string>
+  <string name="flip_action_summary" product="default">फोन खाली फ्लिप केल्यामुळे <xliff:g id="action">%s</xliff:g> होईल</string>
+  <!-- Setting title for the shake action setting. -->
+  <string name="shake_action_title">हलवणे क्रिया</string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">हलवण्यामुळे टॅब्लेट <xliff:g id="action">%s</xliff:g> होईल</string>
+  <string name="shake_action_summary" product="default">हलवण्यामुळे फोन <xliff:g id="action">%s</xliff:g> होईल</string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">अलार्म स्नूझ करा</string>
+  <string name="action_summary_dismiss">अलार्म रद्द करा</string>
+  <string name="action_summary_do_nothing">काहीही करू नका</string>
+  <!-- Alarm picker dialog title -->
+  <string name="alarm_picker_title">अलार्म प्रकार निवडा</string>
+  <!-- Alarm types -->
+  <string name="alarm_type_ringtone">रिंगटोन</string>
+  <string name="alarm_type_playlist">प्लेलिस्ट</string>
+  <string name="alarm_type_random">यादृच्छिकपणे</string>
+  <!-- Warn Silent Alarm title -->
+  <string name="warn_silent_alarm_title">अलार्म ध्वनी मूक आहे</string>
+  <!-- Select the source of the alarm -->
+  <string name="alarm_select">अलार्म निवडा</string>
+  <!-- Select the ringtone as alarm -->
+  <string name="alarm_select_ringtone">रिंगटोन</string>
+  <!-- Select the alarm from external device -->
+  <string name="alarm_select_external">संगीत</string>
+  <!-- Ringtone selection default -->
+  <string name="ringtone_default">डीफॉल्ट रिंगटोन</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">रींग टोनसाठी सातत्यपूर्ण मंजूरी परवानगी घेण्यात अपयशी</string>
+  <string name="menu_item_widget_settings">विजेट सेटिंग्ज</string>
+  <string name="activity_not_found">कार्यकलाप सापडला नाही</string>
+</resources>
diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-ms-rMY/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-my-rMM/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 636382230..11d66dd06 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Vis ikon</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Vis et ikon i statuslinjen når en alarm er innstilt</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Øke volumet</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Ingen profil valgt</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Legg til</string>
   <string name="cities_add_city_title">Legg til by</string>
   <string name="cities_add_city_city">By:</string>
@@ -35,25 +41,39 @@
   <string name="cities_delete_city_title">Slett byen</string>
   <string name="cities_delete_city_msg">Vil du slette <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Kan ikke slette byen</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Trykk på volum knapper vil <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Vend handling</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">vende tabletten ned vil<xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Vende telefonen ned vil <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Riste handling</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Riste tabletten vil <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Riste telefonen vil <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">utsett alarmen</string>
   <string name="action_summary_dismiss">avvise alarmen</string>
   <string name="action_summary_do_nothing">ikke gjør noe</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Velg alarmtype</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Ringetone</string>
   <string name="alarm_type_playlist">Spilleliste</string>
   <string name="alarm_type_random">Tilfeldig</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Alarmvolum er satt til lydløst</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Velg alarm</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Ringetone</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Musikk</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Standard ringetone</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Klarte ikke å ta over riktige tillatelser for ringetone</string>
   <string name="menu_item_widget_settings">Widget-innstillinger</string>
   <string name="activity_not_found">Aktivitet ikke funnet!</string>
diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-ne-rNP/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index afbfed8f0..f17c47ed1 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Statusbalkmelding</string>
-  <string name="show_status_bar_icon_summary">Pictogram tonen in de statusbalk als een alarm is ingesteld</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <string name="show_status_bar_icon_summary">Pictogram weergeven in de statusbalk als een alarm is ingesteld</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Toenemend volume</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profiel <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Geen profiel geselecteerd</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Toevoegen</string>
   <string name="cities_add_city_title">Stad toevoegen</string>
   <string name="cities_add_city_city">Stad:</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">Stad verwijderen</string>
   <string name="cities_delete_city_msg">Wilt u <xliff:g id="city">%s</xliff:g> verwijderen?</string>
   <string name="cities_delete_city_failed">Kan stad niet verwijderen</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Op de volumeknoppen drukken zal <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Omdraai-actie</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Omdraaien van uw tablet zal <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Omdraaien van uw telefoon zal <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Schudactie</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Schudden van uw tablet zal <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Schudden van uw telefoon zal <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">het alarm snoozen</string>
   <string name="action_summary_dismiss">het alarm uitschakelen</string>
   <string name="action_summary_do_nothing">niets doen</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Alarmtype</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Beltoon</string>
   <string name="alarm_type_playlist">Afspeellijst</string>
   <string name="alarm_type_random">Willekeurig</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Alarmvolume is stil</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Alarm selecteren</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Beltoon</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Muziek</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Standaardbeltoon</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Blijvend toestemming vragen voor toegang tot beltoon mislukt</string>
   <string name="menu_item_widget_settings">Instellingen widget</string>
   <string name="activity_not_found">Activiteit niet gevonden</string>
-  <string name="permlab_write_alarms">rechtstreeks alarmen wijzigen</string>
-  <string name="permdesc_write_alarms">Hiermee kan de app alarmen toevoegen, bewerken of verwijderen.</string>
-  <string name="permlab_manage_alarms">geplande alarmen in-/uitschakelen</string>
-  <string name="permdesc_manage_alarms">Hiermee kan de app uw geplande alarmen in-/uitschakelen.</string>
-  <string name="permlab_read_alarms">toegang tot geplande alarmen</string>
-  <string name="permdesc_read_alarms">Hiermee kan de app uw geplande alarmen lezen.</string>
-  <string name="alarm_modification_service_desc">Een service om derde partijen toegang te verlenen tot uw alarmen.</string>
 </resources>
diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-oc-rFR/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-oc-rFR/strings.xml b/res/values-oc-rFR/strings.xml
new file mode 100644
index 000000000..2ca9c3e5b
--- /dev/null
+++ b/res/values-oc-rFR/strings.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label shown on launcher icon -->
+  <!-- Label for the this application displayed on-screen when this application must be represented to the user. -->
+  <!-- Title for AlarmClock activity -->
+  <!-- Label for the Alarms activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Menu item on Alarm Clock screen: Add alarm -->
+  <!-- Menu item on Alarm Clock screen: Desk clock -->
+  <!-- Menu item on Alarm Clock screen: Edit alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Delete alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Enable alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Disable alarm -->
+  <!-- Delete alarm confirmation dialog message. -->
+  <!-- Menu item on Alarm Clock screen: Show clock -->
+  <!-- Menu item on Alarm Clock screen: Hide clock -->
+  <!-- Setting label on Set alarm screen: Label -->
+  <!-- Default label to display for an alarm -->
+  <!-- Preference category on Alarm Settings screen: Set alarm -->
+  <!-- Also label for the old Alarms dialog activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting labels on Set alarm screen: Vibration on or off -->
+  <!-- Setting labels on Set alarm screen: Repeat -->
+  <!-- Setting labels on Set alarm screen: Select alarm ringtone  -->
+  <!-- Label on expanded alarm edit view. -->
+  <!-- Setting labels on Set alarm screen: Set time  -->
+  <!-- Label shown when user is setting up non-repeating alarm for tomorrow [CHAR LIMIT=15] -->
+  <!-- Label shown when user is setting up non-repeating alarm for later today [CHAR LIMIT=15] -->
+  <!-- The text shown above the clock when alarm is alerting [CHAR LIMIT=10] -->
+  <!-- The text shown as an option to dismiss an alerting alarm [CHAR LIMIT=5] -->
+  <!-- Button labels on the alarm dialog: Dismiss -->
+  <!-- Button labels on the pre-dismiss alarm notifications: Dismiss now -->
+  <!-- Alarm Alert screen: this message is shown after an alarm rung
+         unattended for a number of minutes.  It tells the user that
+         the alarm has been silenced.-->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the number of minutes in two separate lines. For example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the word 'Snoozed' in two separate lines or example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user dismissed an alerting alarm [CHAR LIMIT=15] -->
+  <!-- Button labels on the alarm dialog: Snooze -->
+  <!-- Toast that appears after Alarm is snoozed from the Alarm
+         dialog. Says the alarm will snooze for xxx minutes.  -->
+  <!-- Text to appear inside a notification while an alarm is snoozing. -->
+  <!-- Text to appear in the notification title while an alarm is about to go off. -->
+  <!-- Text to appear in when trying to view a missed alarm that has been deleted -->
+  <!-- 0: nothing
+         1: days
+         2:      hours
+         3: days hours
+         4:            minutes
+         5: days       minutes
+         6:      hours minutes
+         7: days hours minutes
+    -->
+  <!-- Timer notification: how long from now until timer goes off. -->
+  <!-- Alarm confirmation toast: Describes how long from now until
+         alarm fires -->
+  <!-- Alarm confirmation toast: singular day -->
+  <!-- Alarm confirmation toast: plural days -->
+  <!-- Alarm confirmation toast: singular hour -->
+  <!-- Alarm confirmation toast: plural hours -->
+  <!-- Alarm confirmation toast: singular minute  -->
+  <!-- Alarm confirmation toast: plural minutes  -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to repeat every day -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to never repeat -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: concatenate days with
+         this character, i.e. "Mon, Tue, Wed" -->
+  <!-- Appears at the top of the Clock Picker screen: Tell user to
+         select a clock to display -->
+  <!-- Label for analog clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- Help activity name -->
+  <!-- Settings activity name -->
+  <!-- Label for the Settings activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting title for changing the snooze duration. -->
+  <!-- Auto silence preference title -->
+  <!-- Auto silence summary string set based on the preference value. -->
+  <!-- Auto silence summary when turned off -->
+  <!-- Entries listed in the ListPreference when invoking the auto silence
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the auto_silence_entries above. -->
+  <!-- Done button when editing an alarm. -->
+  <!-- Revert button when editing an alarm. -->
+  <!-- Delete button when editing an alarm. -->
+  <!-- Setting title for changing the alarm volume. -->
+  <!-- Summary for the alarm preference when silent is chosen. -->
+  <!-- Text to display in the small text of the notification -->
+  <!-- Text to display in the notification ticker and label -->
+  <!-- Text to display in the notification when the alarm has been snoozed -->
+  <!-- Title of the setting to change hardware button behavior. This string
+         should be changed for each piece of hardware. [CHAR LIMIT=20] -->
+  <!-- Dialog title of the volume and power setting. -->
+  <!-- Entries listed in the setting for the side-button action. -->
+  <!-- Values for the side-button setting. -->
+  <!-- Title of the ringtone setting. -->
+  <!-- Accessibility labels for Clock activity buttons -->
+  <!-- Accessibility labels for alarm buttons -->
+  <!-- What to show the user if the weather widget exists but fails to
+         respond. This is a sign of an error; if the weather widget is not
+         present on the device, we show nothing at all. -->
+  <!-- A description for the DeskClock alarm sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- String displayed as the alert summary while loading the alert name from
+         the media player. [CHAR LIMIT=NONE] -->
+  <!-- A description for the DeskClock timer sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- Label on the main screen control used to set alarm [CHAR LIMIT=30]-->
+  <!-- Label on the main screen control used to set alarm when there is already an existing alarm [CHAR LIMIT=30]-->
+  <!--  ActionBar strings -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Alarm page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Timer page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Clock page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Stopwatch page -->
+  <!-- Clock view buttons strings-->
+  <!-- Describes the purpose of the button to start the activity to add/edit/delete alarms -->
+  <!-- Describes the purpose of the button which provides a list of cities for the world clock settings -->
+  <!-- Describes the purpose of the button which pops up a menu of setting choices -->
+  <!-- Menu item on most screens to get to more settings -->
+  <!-- Menu item on most screens to get to the help information -->
+  <!-- Menu item on clock screen to enter night mode. -->
+  <!-- Menu item on Cities screen to sort by GMT offset -->
+  <!-- Menu item on Cities screen to sort by alphabetical order -->
+  <!-- Label for selected cities in Cities list view -->
+  <!-- Stop Watch strings -->
+  <!-- Describes the purpose of the button to resume running a stopwatch -->
+  <!-- Describes the purpose of the button to begin running a stopwatch -->
+  <!-- Describes the purpose of the button to pause a stopwatch. -->
+  <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
+  <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
+  <!-- Describes the purpose of the button to share the stopwatch value.
+         Also used as title for chooser when sharing stopwatch results. -->
+  <!-- Abbreviation for temporal hours [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal minutes [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal seconds [CHAR LIMIT=1] -->
+  <!-- Accessibility strings -->
+  <!--  Stopwatch share strings -->
+  <!-- Sentence within the message created to share the total time recorded within the stopwatch -->
+  <!-- Header within the message created to share a list of lap times (a new line is appended to this) -->
+  <!-- Label to enumerate the number of laps in the notification the user has counted -->
+  <!-- Formatted stopwatch time -->
+  <!-- Formatted stopwatch time for laps shared using the share button -->
+  <!-- Label to enumerate the number of laps the user has counted -->
+  <!-- Stopwatch accessibility strings -->
+  <!-- timer strings -->
+  <!-- Describes the purpose of the button to add a new timer -->
+  <!-- Describes the purpose of the button to begin or continue running a timer -->
+  <!-- Describes the purpose of the button to delete a timer. -->
+  <!-- Describes the purpose of the button increase the remaining time on a timer by one minute. -->
+  <!-- Like "timer_plus_one", but with 'minute' abbreviated for the notification. -->
+  <!-- Describes the purpose of the button to stop the timer. -->
+  <!-- Describes the purpose of the button to stop and delete the timer. -->
+  <!-- Describes the purpose of the button to return the timer to it's original starting value. -->
+  <!-- Describes the purpose of the button to discard the current dialog values. Will also close the dialog if other time's exist -->
+  <!-- Notification content shown when a timer has completed and has no more time remaining -->
+  <!-- Label associated with a notification for a Timer -->
+  <!-- Toast content shown when user attempts to create a new timer when there are already 4 timers -->
+  <!-- Jocular content that user may append when sharing the lap times -->
+  <!-- Title with the clock on the main page displaying the user's regular timezone (shows when automatic_home_clock enabled) -->
+  <!-- Label for the Cities activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Settings strings -->
+  <!-- Header in the preferences settings for the section pertaining to clocks on the main fragment -->
+  <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->
+  <!-- Entries listed in the ListPreference when invoking the clock style
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the clock_style_entries above. -->
+  <!-- Title for an option that will automtically show a clock representing the user's regular timezone on the main fragment whenever the user leaves their regular timezone-->
+  <!-- Describes the functionality provided by the automatic_home_clock option -->
+  <!-- Title in the preferences change the time zone for the user's home -->
+  <!-- Title in a list dialog box to pick a time zone for the user's home -->
+  <!-- Textual content of the button to discard the current dialog values and close the dialog -->
+  <!-- Textual content of the button to update an alarm with the current dialog values -->
+  <!--  place holder for am/pm label when it is not set -->
+  <!-- add 00 as minutes to the time when pressing this button -->
+  <!-- add 30 as minutes to the time when pressing this button -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. CHAR LIMIT=25] -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. -->
+  <!-- Header in the preferences settings for the section pertaining to alarms -->
+  <!-- Describes the running service for the stopwatch -->
+  <!-- Desription for the stopped stop watch -->
+  <!-- Text instruction for dismiss alarm on alarm lock screen. The dismiss button will still
+         be on the right even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Text instruction for snooze alarm on alarm lock screen. The snooze button will still
+         be on the left even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Notification title when timer is stopped. -->
+  <!-- Notification title when multiple timers are stopped. -->
+  <!-- Notification text when multiple timers are stopped. -->
+  <!-- Notification title when at least one timer, of those in use, is counting down. -->
+  <!-- Notification text when at least one timer, of those in use, is counting down. -->
+  <!-- screensaver settings strings -->
+  <!-- Label for the screen saver activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Title for check box to pick intensity of display diminuation during dream mode -->
+  <!-- Describes intensity of display diminuation during dream mode -->
+  <!-- Description of the down caret in the alarm alert screen to expand the alarm content to edit perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up caret in the alarm alert screen to collapse the alarm content to summary perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to undo change to alarm -->
+  <!-- Toast content when an alarm was deleted  -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- Description of field showing the next alarm time in the clock page, for accessibility. -->
+  <!-- Displays the number of alarms selected from the list of alarms. -->
+  <!-- message used by the talkback accessebility app to say that something was deleted -->
+  <!-- Alarm deletion confirmation message-->
+  <!-- Timer deletion confirmation -->
+  <!-- world clock deletion confirmation -->
+  <!-- Label for digital clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- format strings for clocks -->
+  <!-- Font size for AM/PM should match widget_label_font_size -->
+  <!-- Font size for AM/PM should match bottom_text_size -->
+  <!-- Font size for AM/PM should match label_font_size -->
+  <!-- Font size for AM/PM should match alarm_label_size -->
+  <!-- String for no alarms -->
+  <!-- String for no alarms set [CHAR LIMIT=24] -->
+  <!-- String for no enabled alarms in timeline view [CHAR LIMIT=30] -->
+</resources>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
new file mode 100644
index 000000000..c4309709a
--- /dev/null
+++ b/res/values-or-rIN/cm_strings.xml
@@ -0,0 +1,80 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <string name="show_status_bar_icon_title">ଆଇକନ୍‍ ଦେଖାନ୍ତୁ</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <string name="show_status_bar_icon_summary">ଆଲାର୍ମ୍‍ ସେଟ୍‍ ହୋଇଥିବା ସମୟରେ ଷ୍ଟାଟସ୍‍ ବାର୍‍ରେ ଏକ ଆଇକନ୍‍ ଦେଖାନ୍ତୁ</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <string name="alarm_increasing_volume">ଭୋଲ୍ୟୁମ୍‍ ବଢାଯାଉଛି</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <string name="profile_description">ପ୍ରୋଫାଇଲ୍‍ <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
+  <string name="profile_no_selected">କୌଣସି ପ୍ରୋଫାଇଲ୍‍ ଚୟନ କରାଯାଇନାହିଁ</string>
+  <!-- User-defined cities -->
+  <string name="menu_item_add">ଯୋଡନ୍ତୁ</string>
+  <string name="cities_add_city_title">ସହର ଯୋଗ କରନ୍ତୁ</string>
+  <string name="cities_add_city_city">ସହର:</string>
+  <string name="cities_add_city_timezone">ସମୟଜୋନ୍‍:</string>
+  <string name="cities_add_city_gps_cd">ଆପଣଙ୍କ ସମ୍ପ୍ରତି ସହର ଲୋକାଲାଇଜ୍‍ କରିବା ପାଇଁ ଟ୍ୟାପ୍‍ କରନ୍ତୁ</string>
+  <string name="cities_add_loading">ଲୋଡ୍ କରୁଛି\u2026</string>
+  <string name="cities_add_searching">ସନ୍ଧାନ କରୁଛି\u2026</string>
+  <string name="cities_add_gps_no_results">GPS ଜିଜ୍ଞାସାେରି କୌଣସି ଅବସ୍ଥାନ ଫଳାଫଳ ଦେଉନାହିଁ</string>
+  <string name="cities_add_gps_not_available">GPS ଉପଲ‍ବ୍ଧ ନାହିଁ</string>
+  <string name="cities_add_already_exists">ଡାଟାବେସ୍‍ରେ ସହର ଆଗରୁ ବିଦ୍ୟମାନ ରହିଛି</string>
+  <string name="cities_add_city_failed">ସହର ସୃଷ୍ଟି କରାଯାଇପାରିବ ନାହିଁ</string>
+  <string name="cities_delete_city_title">ସହର ବିଲୋପ କରନ୍ତୁ</string>
+  <string name="cities_delete_city_msg">ଆପଣ <xliff:g id="city">%s</xliff:g>ବିଲୋପ କରିବାକୁ ଚାହାନ୍ତି କି?</string>
+  <string name="cities_delete_city_failed">ସହର ବିଲୋପ କରାଯାଇପାରିବ ନାହିଁ</string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">ଭୋଲ୍ୟୁମ୍‍ ବଟନ୍‍ ଦବାଇବା <xliff:g id="action">%s</xliff:g>କରିବ</string>
+  <!-- Setting title for the flip action setting. -->
+  <string name="flip_action_title">ଫ୍ଲିପ୍‍ ସଂଚାଳନ</string>
+  <!-- Setting summary for the flip action setting. -->
+  <string name="flip_action_summary" product="tablet">ଟାବ୍‍ଲେଟ୍‍ ତଳକୁ ଫ୍ଲିପ୍‍ କରିବା <xliff:g id="action">%s</xliff:g>କରିବ</string>
+  <string name="flip_action_summary" product="default">ଫୋନ୍‍ ତଳକୁ ଫ୍ଲିପ୍‍ କରିବା <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
+  <string name="shake_action_title">ହଲାଇବା କ୍ରିୟା</string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">ଟାବ୍‍ଲେଟ୍‍ ହଲାଇବା <xliff:g id="action">%s</xliff:g>କରିବ</string>
+  <string name="shake_action_summary" product="default">ଫୋନ୍‍ ହଲାଇବା <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">ଆଲାର୍ମ୍‍ ସ୍ନୁଜ୍‍ କରନ୍ତୁ</string>
+  <string name="action_summary_dismiss">ଆଲା୍ର୍ମ୍‍ ଡିସ୍‍ମିସ୍‍‍ କରନ୍ତୁ</string>
+  <string name="action_summary_do_nothing">କିଛି କରନ୍ତୁ ନାହିଁ</string>
+  <!-- Alarm picker dialog title -->
+  <string name="alarm_picker_title">ଆଲାର୍ମ୍‍ ପ୍ରକାର ଚୟନ କରନ୍ତୁ</string>
+  <!-- Alarm types -->
+  <string name="alarm_type_ringtone">ରିଂଟୋନ୍</string>
+  <string name="alarm_type_playlist">ପ୍ଲେତାଲିକା</string>
+  <string name="alarm_type_random">ଅକ୍ରମିତଭାବେ</string>
+  <!-- Warn Silent Alarm title -->
+  <string name="warn_silent_alarm_title">ଆଲାର୍ମ୍‍ ଭୋଲ୍ୟୁମ୍‍ ମୌନ ଅଛି</string>
+  <!-- Select the source of the alarm -->
+  <string name="alarm_select">ଆଲାର୍ମ୍‍ ଚୟନ କରନ୍ତୁ</string>
+  <!-- Select the ringtone as alarm -->
+  <string name="alarm_select_ringtone">ରିଂଟୋନ୍</string>
+  <!-- Select the alarm from external device -->
+  <string name="alarm_select_external">ସଙ୍ଗୀତ</string>
+  <!-- Ringtone selection default -->
+  <string name="ringtone_default">ଡିଫଲ୍ଟ୍ ରିଂଟୋନ୍</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">ରିଙ୍ଗ୍‍ଟୋନ୍‍ ପାଇଁ ‍ସ୍ଥାୟୀ ଅନୁମତି ନେବାରେ ବିଫଳ ହେଲା</string>
+  <string name="menu_item_widget_settings">ୱି୍ଜେଟ ସେଟିଂସ୍‍</string>
+  <string name="activity_not_found">କାର୍ଯ୍ୟକଳାପ ପ୍ରାପ୍ତ ହେଉନାହିଁ</string>
+</resources>
diff --git a/res/values-or-rIN/strings.xml b/res/values-or-rIN/strings.xml
new file mode 100644
index 000000000..2ca9c3e5b
--- /dev/null
+++ b/res/values-or-rIN/strings.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label shown on launcher icon -->
+  <!-- Label for the this application displayed on-screen when this application must be represented to the user. -->
+  <!-- Title for AlarmClock activity -->
+  <!-- Label for the Alarms activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Menu item on Alarm Clock screen: Add alarm -->
+  <!-- Menu item on Alarm Clock screen: Desk clock -->
+  <!-- Menu item on Alarm Clock screen: Edit alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Delete alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Enable alarm -->
+  <!-- Context Menu Item on Alarm Settings screen: Disable alarm -->
+  <!-- Delete alarm confirmation dialog message. -->
+  <!-- Menu item on Alarm Clock screen: Show clock -->
+  <!-- Menu item on Alarm Clock screen: Hide clock -->
+  <!-- Setting label on Set alarm screen: Label -->
+  <!-- Default label to display for an alarm -->
+  <!-- Preference category on Alarm Settings screen: Set alarm -->
+  <!-- Also label for the old Alarms dialog activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting labels on Set alarm screen: Vibration on or off -->
+  <!-- Setting labels on Set alarm screen: Repeat -->
+  <!-- Setting labels on Set alarm screen: Select alarm ringtone  -->
+  <!-- Label on expanded alarm edit view. -->
+  <!-- Setting labels on Set alarm screen: Set time  -->
+  <!-- Label shown when user is setting up non-repeating alarm for tomorrow [CHAR LIMIT=15] -->
+  <!-- Label shown when user is setting up non-repeating alarm for later today [CHAR LIMIT=15] -->
+  <!-- The text shown above the clock when alarm is alerting [CHAR LIMIT=10] -->
+  <!-- The text shown as an option to dismiss an alerting alarm [CHAR LIMIT=5] -->
+  <!-- Button labels on the alarm dialog: Dismiss -->
+  <!-- Button labels on the pre-dismiss alarm notifications: Dismiss now -->
+  <!-- Alarm Alert screen: this message is shown after an alarm rung
+         unattended for a number of minutes.  It tells the user that
+         the alarm has been silenced.-->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the number of minutes in two separate lines. For example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the word 'Snoozed' in two separate lines or example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user dismissed an alerting alarm [CHAR LIMIT=15] -->
+  <!-- Button labels on the alarm dialog: Snooze -->
+  <!-- Toast that appears after Alarm is snoozed from the Alarm
+         dialog. Says the alarm will snooze for xxx minutes.  -->
+  <!-- Text to appear inside a notification while an alarm is snoozing. -->
+  <!-- Text to appear in the notification title while an alarm is about to go off. -->
+  <!-- Text to appear in when trying to view a missed alarm that has been deleted -->
+  <!-- 0: nothing
+         1: days
+         2:      hours
+         3: days hours
+         4:            minutes
+         5: days       minutes
+         6:      hours minutes
+         7: days hours minutes
+    -->
+  <!-- Timer notification: how long from now until timer goes off. -->
+  <!-- Alarm confirmation toast: Describes how long from now until
+         alarm fires -->
+  <!-- Alarm confirmation toast: singular day -->
+  <!-- Alarm confirmation toast: plural days -->
+  <!-- Alarm confirmation toast: singular hour -->
+  <!-- Alarm confirmation toast: plural hours -->
+  <!-- Alarm confirmation toast: singular minute  -->
+  <!-- Alarm confirmation toast: plural minutes  -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to repeat every day -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to never repeat -->
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: concatenate days with
+         this character, i.e. "Mon, Tue, Wed" -->
+  <!-- Appears at the top of the Clock Picker screen: Tell user to
+         select a clock to display -->
+  <!-- Label for analog clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- Help activity name -->
+  <!-- Settings activity name -->
+  <!-- Label for the Settings activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Setting title for changing the snooze duration. -->
+  <!-- Auto silence preference title -->
+  <!-- Auto silence summary string set based on the preference value. -->
+  <!-- Auto silence summary when turned off -->
+  <!-- Entries listed in the ListPreference when invoking the auto silence
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the auto_silence_entries above. -->
+  <!-- Done button when editing an alarm. -->
+  <!-- Revert button when editing an alarm. -->
+  <!-- Delete button when editing an alarm. -->
+  <!-- Setting title for changing the alarm volume. -->
+  <!-- Summary for the alarm preference when silent is chosen. -->
+  <!-- Text to display in the small text of the notification -->
+  <!-- Text to display in the notification ticker and label -->
+  <!-- Text to display in the notification when the alarm has been snoozed -->
+  <!-- Title of the setting to change hardware button behavior. This string
+         should be changed for each piece of hardware. [CHAR LIMIT=20] -->
+  <!-- Dialog title of the volume and power setting. -->
+  <!-- Entries listed in the setting for the side-button action. -->
+  <!-- Values for the side-button setting. -->
+  <!-- Title of the ringtone setting. -->
+  <!-- Accessibility labels for Clock activity buttons -->
+  <!-- Accessibility labels for alarm buttons -->
+  <!-- What to show the user if the weather widget exists but fails to
+         respond. This is a sign of an error; if the weather widget is not
+         present on the device, we show nothing at all. -->
+  <!-- A description for the DeskClock alarm sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- String displayed as the alert summary while loading the alert name from
+         the media player. [CHAR LIMIT=NONE] -->
+  <!-- A description for the DeskClock timer sound playback service.
+         [CHAR LIMIT=NONE] -->
+  <!-- Label on the main screen control used to set alarm [CHAR LIMIT=30]-->
+  <!-- Label on the main screen control used to set alarm when there is already an existing alarm [CHAR LIMIT=30]-->
+  <!--  ActionBar strings -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Alarm page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Timer page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Clock page -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Stopwatch page -->
+  <!-- Clock view buttons strings-->
+  <!-- Describes the purpose of the button to start the activity to add/edit/delete alarms -->
+  <!-- Describes the purpose of the button which provides a list of cities for the world clock settings -->
+  <!-- Describes the purpose of the button which pops up a menu of setting choices -->
+  <!-- Menu item on most screens to get to more settings -->
+  <!-- Menu item on most screens to get to the help information -->
+  <!-- Menu item on clock screen to enter night mode. -->
+  <!-- Menu item on Cities screen to sort by GMT offset -->
+  <!-- Menu item on Cities screen to sort by alphabetical order -->
+  <!-- Label for selected cities in Cities list view -->
+  <!-- Stop Watch strings -->
+  <!-- Describes the purpose of the button to resume running a stopwatch -->
+  <!-- Describes the purpose of the button to begin running a stopwatch -->
+  <!-- Describes the purpose of the button to pause a stopwatch. -->
+  <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
+  <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
+  <!-- Describes the purpose of the button to share the stopwatch value.
+         Also used as title for chooser when sharing stopwatch results. -->
+  <!-- Abbreviation for temporal hours [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal minutes [CHAR LIMIT=1] -->
+  <!-- Abbreviation for temporal seconds [CHAR LIMIT=1] -->
+  <!-- Accessibility strings -->
+  <!--  Stopwatch share strings -->
+  <!-- Sentence within the message created to share the total time recorded within the stopwatch -->
+  <!-- Header within the message created to share a list of lap times (a new line is appended to this) -->
+  <!-- Label to enumerate the number of laps in the notification the user has counted -->
+  <!-- Formatted stopwatch time -->
+  <!-- Formatted stopwatch time for laps shared using the share button -->
+  <!-- Label to enumerate the number of laps the user has counted -->
+  <!-- Stopwatch accessibility strings -->
+  <!-- timer strings -->
+  <!-- Describes the purpose of the button to add a new timer -->
+  <!-- Describes the purpose of the button to begin or continue running a timer -->
+  <!-- Describes the purpose of the button to delete a timer. -->
+  <!-- Describes the purpose of the button increase the remaining time on a timer by one minute. -->
+  <!-- Like "timer_plus_one", but with 'minute' abbreviated for the notification. -->
+  <!-- Describes the purpose of the button to stop the timer. -->
+  <!-- Describes the purpose of the button to stop and delete the timer. -->
+  <!-- Describes the purpose of the button to return the timer to it's original starting value. -->
+  <!-- Describes the purpose of the button to discard the current dialog values. Will also close the dialog if other time's exist -->
+  <!-- Notification content shown when a timer has completed and has no more time remaining -->
+  <!-- Label associated with a notification for a Timer -->
+  <!-- Toast content shown when user attempts to create a new timer when there are already 4 timers -->
+  <!-- Jocular content that user may append when sharing the lap times -->
+  <!-- Title with the clock on the main page displaying the user's regular timezone (shows when automatic_home_clock enabled) -->
+  <!-- Label for the Cities activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Settings strings -->
+  <!-- Header in the preferences settings for the section pertaining to clocks on the main fragment -->
+  <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->
+  <!-- Entries listed in the ListPreference when invoking the clock style
+         preference. -->
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the clock_style_entries above. -->
+  <!-- Title for an option that will automtically show a clock representing the user's regular timezone on the main fragment whenever the user leaves their regular timezone-->
+  <!-- Describes the functionality provided by the automatic_home_clock option -->
+  <!-- Title in the preferences change the time zone for the user's home -->
+  <!-- Title in a list dialog box to pick a time zone for the user's home -->
+  <!-- Textual content of the button to discard the current dialog values and close the dialog -->
+  <!-- Textual content of the button to update an alarm with the current dialog values -->
+  <!--  place holder for am/pm label when it is not set -->
+  <!-- add 00 as minutes to the time when pressing this button -->
+  <!-- add 30 as minutes to the time when pressing this button -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. CHAR LIMIT=25] -->
+  <!-- Choices for timezones, must be kept in sync with timezone_values. -->
+  <!-- Header in the preferences settings for the section pertaining to alarms -->
+  <!-- Describes the running service for the stopwatch -->
+  <!-- Desription for the stopped stop watch -->
+  <!-- Text instruction for dismiss alarm on alarm lock screen. The dismiss button will still
+         be on the right even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Text instruction for snooze alarm on alarm lock screen. The snooze button will still
+         be on the left even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Notification title when timer is stopped. -->
+  <!-- Notification title when multiple timers are stopped. -->
+  <!-- Notification text when multiple timers are stopped. -->
+  <!-- Notification title when at least one timer, of those in use, is counting down. -->
+  <!-- Notification text when at least one timer, of those in use, is counting down. -->
+  <!-- screensaver settings strings -->
+  <!-- Label for the screen saver activity displayed on-screen when that activity must be represented to the user. -->
+  <!-- Title for check box to pick intensity of display diminuation during dream mode -->
+  <!-- Describes intensity of display diminuation during dream mode -->
+  <!-- Description of the down caret in the alarm alert screen to expand the alarm content to edit perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up caret in the alarm alert screen to collapse the alarm content to summary perspective. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to undo change to alarm -->
+  <!-- Toast content when an alarm was deleted  -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- slash between date and next alarm in the clock -->
+  <!-- Description of field showing the next alarm time in the clock page, for accessibility. -->
+  <!-- Displays the number of alarms selected from the list of alarms. -->
+  <!-- message used by the talkback accessebility app to say that something was deleted -->
+  <!-- Alarm deletion confirmation message-->
+  <!-- Timer deletion confirmation -->
+  <!-- world clock deletion confirmation -->
+  <!-- Label for digital clock gadget displayed on-screen when that gadget is represented to the user. -->
+  <!-- format strings for clocks -->
+  <!-- Font size for AM/PM should match widget_label_font_size -->
+  <!-- Font size for AM/PM should match bottom_text_size -->
+  <!-- Font size for AM/PM should match label_font_size -->
+  <!-- Font size for AM/PM should match alarm_label_size -->
+  <!-- String for no alarms -->
+  <!-- String for no alarms set [CHAR LIMIT=24] -->
+  <!-- String for no enabled alarms in timeline view [CHAR LIMIT=30] -->
+</resources>
diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-pa-rIN/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 0f51d2013..b9ca87b79 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Pokaż ikonę alarmu</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Pokaż ikonę na pasku stanu, jeśli zaplanowano alarm</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Narastający dźwięk</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Nie wybrano profilu</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Dodaj</string>
   <string name="cities_add_city_title">Dodaj miasto</string>
   <string name="cities_add_city_city">Miasto:</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">Usuń miasto</string>
   <string name="cities_delete_city_msg">Czy chcesz usunąć miasto <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Nie można usunąć miasta</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Naciśnięcie klawiszy głośności spowoduje <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Reakcja na odwrócenie</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Tablet po odwróceniu ekranem do dołu <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Telefon po odwróceniu ekranem do dołu <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Reakcja na potrząśnięcie</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Potrząśnięcie tabletem <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Potrząśnięcie telefonem <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">włączenie drzemki alarmu</string>
   <string name="action_summary_dismiss">wyłączenie alarmu</string>
   <string name="action_summary_do_nothing">nic nie robi</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Wybierz rodzaj alarmu</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Dzwonek</string>
   <string name="alarm_type_playlist">Lista odtwarzania</string>
   <string name="alarm_type_random">Losowo</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Głośność alarmu jest ustawiona na minimum</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Wybierz alarm</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Dzwonek</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Muzyka</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Domyślny dzwonek</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Nie udało się nadać trwałych uprawnień dla dzwonka</string>
   <string name="menu_item_widget_settings">Ustawienia widżetów</string>
   <string name="activity_not_found">Aktywność nie znaleziona!</string>
-  <string name="permlab_write_alarms">bezpośrednio zmienia alarmy</string>
-  <string name="permdesc_write_alarms">Pozwala aplikacji dodać, zmodyfikować lub usunąć wszystkie alarmy.</string>
-  <string name="permlab_manage_alarms">przełącza zaplanowane alarmy</string>
-  <string name="permdesc_manage_alarms">Pozwala aplikacji na włączenie lub wyłączenie zaplanowanych alarmów.</string>
-  <string name="permlab_read_alarms">dostęp do zaplanowanych alarmów</string>
-  <string name="permdesc_read_alarms">Pozwala aplikacji na odczyt zaplanowanych alarmów.</string>
-  <string name="alarm_modification_service_desc">Usługa umożliwiająca manipulację alarmami przez inne aplikacje.</string>
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 373ec002d..ddacc5535 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Exibir ícone</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Exibir um ícone na barra de status quando um alarme for definido</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Volume crescente</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Perfil <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Nenhum perfil selecionado</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Adicionar</string>
   <string name="cities_add_city_title">Adicionar cidade</string>
   <string name="cities_add_city_city">Cidade:</string>
@@ -29,39 +35,46 @@
   <string name="cities_add_loading">Carregando\2026</string>
   <string name="cities_add_searching">Buscando\2026</string>
   <string name="cities_add_gps_no_results">A busca com GPS não retornou nenhum local</string>
-  <string name="cities_add_gps_not_available">GPS não está disponível</string>
+  <string name="cities_add_gps_not_available">GPS indisponível</string>
   <string name="cities_add_already_exists">A cidade já existe no banco de dados</string>
   <string name="cities_add_city_failed">Não foi possível criar a cidade</string>
   <string name="cities_delete_city_title">Excluir cidade</string>
-  <string name="cities_delete_city_msg">Você deseja excluir <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="city">%s</xliff:g>?</string>
+  <string name="cities_delete_city_msg">Você deseja excluir <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Não foi possível excluir a cidade</string>
-  <string name="volume_buttons_summary">Pressionar os botões do volume vai <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">Pressionar o botão de volume vai <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Ação de virar</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Virar o tablet irá <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Virar o telefone irá <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Ação de agitar</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Agitar o tablet irá <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Agitar o telefone irá <xliff:g id="action">%s</xliff:g></string>
-  <string name="action_summary_snooze">ignora o alarme</string>
-  <string name="action_summary_dismiss">suspender o alarme</string>
-  <string name="action_summary_do_nothing">Fazer nada</string>
-  <string name="alarm_picker_title">Escolher tipo de alarme</string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">ignorar o alarme</string>
+  <string name="action_summary_dismiss">dispensar o alarme</string>
+  <string name="action_summary_do_nothing">fazer nada</string>
+  <!-- Alarm picker dialog title -->
+  <string name="alarm_picker_title">Escolha o tipo de alarme</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Toque</string>
   <string name="alarm_type_playlist">Lista de reprodução</string>
   <string name="alarm_type_random">Aleatório</string>
-  <string name="warn_silent_alarm_title">Volume do alarme está silenciado</string>
+  <!-- Warn Silent Alarm title -->
+  <string name="warn_silent_alarm_title">Volume do alarme silenciado</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Selecione o alarme</string>
-  <string name="alarm_select_ringtone">Toque de telefone</string>
+  <!-- Select the ringtone as alarm -->
+  <string name="alarm_select_ringtone">Toque</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Música</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Toque padrão</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Falha ao conceder permissão persistente para o toque</string>
   <string name="menu_item_widget_settings">Configurações do widget</string>
   <string name="activity_not_found">Atividade não encontrada!</string>
-  <string name="permlab_write_alarms">alterar os alarmes diretamente</string>
-  <string name="permdesc_write_alarms">Permite a um aplicativo adicionar, modificar ou excluir todos os seus alarmes.</string>
-  <string name="permlab_manage_alarms">alternar os alarmes agendados</string>
-  <string name="permdesc_manage_alarms">Permite a um aplicativo ativar ou desativar seus alarmes agendados.</string>
-  <string name="permlab_read_alarms">acessar os alarmes agendados</string>
-  <string name="permdesc_read_alarms">Permite a um aplicativo ler os alarmes agendados.</string>
-  <string name="alarm_modification_service_desc">Um serviço para permitir a manipulação dos alarmes por terceiros.</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 2cc009c4e..86b815e4f 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Mostrar ícone</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Mostrar um ícone na barra de estado quando estiver definido um alarme</string>
-  <string name="alarm_increasing_volume">Aumentar volume</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <string name="alarm_increasing_volume">Volume progressivo</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Perfil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Nenhum perfil selecionado</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Adicionar</string>
   <string name="cities_add_city_title">Adicionar cidade</string>
   <string name="cities_add_city_city">Cidade:</string>
@@ -28,40 +34,47 @@
   <string name="cities_add_city_gps_cd">Toque para localizar a sua cidade atual</string>
   <string name="cities_add_loading">A carregar\u2026</string>
   <string name="cities_add_searching">A pesquisar\u2026</string>
-  <string name="cities_add_gps_no_results">A consulta de localização por GPS não retornou resultados</string>
+  <string name="cities_add_gps_no_results">A consulta de localização por GPS não devolveu resultados</string>
   <string name="cities_add_gps_not_available">GPS não disponível</string>
   <string name="cities_add_already_exists">A cidade já existe na base de dados</string>
   <string name="cities_add_city_failed">Não é possível criar a cidade</string>
   <string name="cities_delete_city_title">Eliminar cidade</string>
   <string name="cities_delete_city_msg">Deseja eliminar <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Não é possível eliminar a cidade</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Pressionar os botões do volume <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Ação de virar</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Virar o tablet ao contrário <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Virar o telefone ao contrário <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Ação de agitar</string>
-  <string name="shake_action_summary" product="tablet">Agitar o tablet  <xliff:g id="action">%s</xliff:g></string>
-  <string name="shake_action_summary" product="default">Agitar o telefone  <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">Agitar o tablet <xliff:g id="action">%s</xliff:g></string>
+  <string name="shake_action_summary" product="default">Agitar o telefone <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">suspende o alarme</string>
   <string name="action_summary_dismiss">ignora o alarme</string>
   <string name="action_summary_do_nothing">não faz nada</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Escolher o tipo de alarme</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Toque</string>
   <string name="alarm_type_playlist">Lista de reprodução</string>
   <string name="alarm_type_random">Aleatoriamente</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Alarme sem som</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Selecionar alarme</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Toque</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Música</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Toque predefinido</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Falha ao conceder permissão permanente para o toque</string>
-  <string name="menu_item_widget_settings">Definições de widget</string>
+  <string name="menu_item_widget_settings">Definições do widget</string>
   <string name="activity_not_found">Atividade não encontrada!</string>
-  <string name="permlab_write_alarms">alterar diretamente os alarmes</string>
-  <string name="permdesc_write_alarms">Permite a uma aplicação adicionar, modificar ou eliminar todos os seus alarmes.</string>
-  <string name="permlab_manage_alarms">alternar os alarmes agendados</string>
-  <string name="permdesc_manage_alarms">Permite a uma aplicação ativar ou desativar os alarmes agendados.</string>
-  <string name="permlab_read_alarms">aceder aos alarmes agendados</string>
-  <string name="permdesc_read_alarms">Permite a uma aplicação ler os seus alarmes agendados.</string>
-  <string name="alarm_modification_service_desc">Serviço para permitir a manipulação de alarmes por terceiros.</string>
 </resources>
diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-rm/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index a09a5fb5f..a78d8cdb1 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -16,18 +16,24 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Afișează icon-ul</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Afișează un icon în bara de stare când este setată o alarmă</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Volum crescător</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Niciun profil selectat</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Adăugare</string>
   <string name="cities_add_city_title">Adaugă orașul</string>
   <string name="cities_add_city_city">Oraș:</string>
   <string name="cities_add_city_timezone">Fus orar:</string>
   <string name="cities_add_city_gps_cd">Apasă pentru a localiza orașul curent</string>
   <string name="cities_add_loading">Încărcare\u2026</string>
-  <string name="cities_add_searching">Căutare\u2026</string>
+  <string name="cities_add_searching">Se caută\u2026</string>
   <string name="cities_add_gps_no_results">Interogarea GPS nu a returnat rezultate de localizare</string>
   <string name="cities_add_gps_not_available">GPS-ul nu este disponibil</string>
   <string name="cities_add_already_exists">Orașul există deja în baza de date</string>
@@ -35,25 +41,39 @@
   <string name="cities_delete_city_title">Șterge orașul</string>
   <string name="cities_delete_city_msg">Doriți să ștergeți <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Nu pot șterge orașul</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Apăsarea butoanelor de volum va <xliff:g id="action">%s </xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Acțiune de rotire</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Rotirea tabletei în jos va <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Rotirea telefonului în jos va <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Acțiunea de agitare</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Agitarea tabletei va <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Agitarea telefonului va <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">amânare alarmă</string>
   <string name="action_summary_dismiss">anulare alarmă</string>
   <string name="action_summary_do_nothing">nu fă nimic</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Selectați tipul de alarmă</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Ton de apel</string>
   <string name="alarm_type_playlist">Listă de redare</string>
   <string name="alarm_type_random">Aleator</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Volumul alarmei este silențios</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Selectați alarma</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Ton de apel</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Muzică</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Ton de apel implicit</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Nu s-a reușit preluarea permisiunii persistente pentru tonul de apel</string>
   <string name="menu_item_widget_settings">Setări widget</string>
   <string name="activity_not_found">Activitatea nu a fost găsită!</string>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 93957c61f..1b7fde5bb 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Показывать значок</string>
-  <string name="show_status_bar_icon_summary">Отображать значок в строке состояния при установленном будильнике</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <string name="show_status_bar_icon_summary">Показывать значок в строке состояния, когда будильник установлен</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Возрастающая громкость</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Профиль «<xliff:g id="profile">%s</xliff:g>»</string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Профиль не выбран</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Добавить</string>
   <string name="cities_add_city_title">Добавить город</string>
   <string name="cities_add_city_city">Город:</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">Удалить город</string>
   <string name="cities_delete_city_msg">Вы действительно хотите удалить <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Не удаётся удалить город</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">При нажатии на кнопки громкости <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Переворот</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">При переворачивании планшета <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">При переворачивании телефона <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Встряхивание</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">При встряхивании планшета <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">При встряхивании телефона <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">отложить сигнал будильника</string>
   <string name="action_summary_dismiss">отключить будильник</string>
   <string name="action_summary_do_nothing">ничего не делать</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Звук будильника</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Рингтон</string>
   <string name="alarm_type_playlist">Плейлист</string>
   <string name="alarm_type_random">Случайная мелодия</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Звук будильника отключён</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Выбор сигнала</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Рингтон</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Музыка</string>
-  <string name="ringtone_default">Мелодия по умолчанию</string>
-  <string name="take_persistent_grant_uri_permission_failed_msg">Не удалось задать мелодию в качестве сигнала</string>
+  <!-- Ringtone selection default -->
+  <string name="ringtone_default">Рингтон по умолчанию</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">Не удалось задать рингтон в качестве сигнала</string>
   <string name="menu_item_widget_settings">Настройки виджетов</string>
   <string name="activity_not_found">Приложение не найдено!</string>
-  <string name="permlab_write_alarms">изменение будильников</string>
-  <string name="permdesc_write_alarms">Разрешить приложению добавлять, изменять или удалять будильники.</string>
-  <string name="permlab_manage_alarms">отключение установленных будильников</string>
-  <string name="permdesc_manage_alarms">Разрешить приложению включать или отключать установленные будильники.</string>
-  <string name="permlab_read_alarms">доступ к установленным будильникам</string>
-  <string name="permdesc_read_alarms">Разрешить приложению доступ к установленным будильникам.</string>
-  <string name="alarm_modification_service_desc">Служба, позволяющая сторонним приложениям управлять будильниками.</string>
 </resources>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index df2d705a5..f1a75e212 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">නිරූපකය පෙන්වන්න</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">ඇඟවීමක් පිහිට වූ විට ඇඟවීමේ නිරූපකය තත්ව තීරුවේ පෙන්වන්න</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">වැඩිවන හඬ තීව්‍රතාව</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">පැතිකඩ <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">පැතිකඩක් තෝරා නොමැත</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">එක් කරන්න</string>
   <string name="cities_add_city_title">නගරය එක් කරන්න</string>
   <string name="cities_add_city_city">නගරය:</string>
@@ -35,20 +41,34 @@
   <string name="cities_delete_city_title">නගරය මකන්න</string>
   <string name="cities_delete_city_msg">ඔබට <xliff:g id="city">%s</xliff:g> මැකීමට අවශ්‍යද?</string>
   <string name="cities_delete_city_failed">නගරය මැකිය නොහැක</string>
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">පෙරළීමේ ක්‍රියාව</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">ටැබ්ලටය පහළට පෙරළීමේදී <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">උපාංගය පහළට පෙරළීමේදී <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">සෙලවීමේ ක්‍රියාව</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">ටැබ්ලටය සෙලවීමේදී <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">උපාංගය සෙලවීමේදී <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_do_nothing">කිසිවක් නොකරන්න</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">ඇඟවීම් විලාසය තෝරන්න</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">රින්ග්ටෝනය</string>
   <string name="alarm_type_random">අහඹු ලෙස</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">ඇඟවීමේ නාදය නිශ්ශබ්දය</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">ඇඟවීම තෝරන්න</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">රින්ග්ටෝනය</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">සංගීත</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">පෙරනිමි රිංටෝනය</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">රිංටෝනය සඳහා නිබැඳි අනුමැතිය ලබාගැනීමට අසමත් විය</string>
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index e25eff13d..3e6fb58dd 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Zobraziť ikonu</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Zobraziť ikonu v stavovom riadku, keď je nastavený budík</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Zvyšovanie hlasitosti</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Žiadny profil nebol vybraný</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Pridať</string>
   <string name="cities_add_city_title">Pridať mesto</string>
   <string name="cities_add_city_city">Mesto:</string>
@@ -35,25 +41,39 @@
   <string name="cities_delete_city_title">Vymazať mesto</string>
   <string name="cities_delete_city_msg">Vymazať <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Nemožno vymazať mesto</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Stlačením tlačidiel hlasitosti sa <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Akcia pri prevrátení</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Otočením tabletu sa <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Otočením telefónu sa <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Akcia pri zatrasení</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Zatrasením tabletu sa <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Zatrasením telefónu sa <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">odloží budík</string>
   <string name="action_summary_dismiss">vypne budík</string>
   <string name="action_summary_do_nothing">neurobí nič</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Vyberte typ budíka</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Tón zvonenia</string>
   <string name="alarm_type_playlist">Zoznam skladieb</string>
   <string name="alarm_type_random">Náhodne</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Hlasitosť budíka je tichá</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Vyberte budík</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Zvonenie</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Hudba</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Predvolené zvonenie</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Nepodarilo sa získať trvalé udelenie povolenia pre zvonenie</string>
   <string name="menu_item_widget_settings">Nastavenia miniaplikácie</string>
   <string name="activity_not_found">Aktivita sa nenašla!</string>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 5842302b6..cc87736bf 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Prikaži ikono</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Prikaži ikono v vrstici stanja, ko je nastavljena budilka</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Povečanje glasnosti</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Noben profil ni izbran</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Dodaj</string>
   <string name="cities_add_city_title">Dodaj mesto</string>
   <string name="cities_add_city_city">Mesto:</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">Izbriši mesto</string>
   <string name="cities_delete_city_msg">Ali želite izbrisati <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Mesta ni mogoče izbrisati</string>
-  <string name="volume_buttons_summary">Pritisk na gumba za glasnost bo <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">Pritisk na gumba za glasnost <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Dejanje obračanja</string>
-  <string name="flip_action_summary" product="tablet">Obračanje tablice navzdol bo <xliff:g id="action">%s</xliff:g></string>
-  <string name="flip_action_summary" product="default">Obračanje telefona navzdol bo <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting summary for the flip action setting. -->
+  <string name="flip_action_summary" product="tablet">Obračanje tablice navzdol <xliff:g id="action">%s</xliff:g></string>
+  <string name="flip_action_summary" product="default">Obračanje telefona navzdol <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Dejanje tresenja</string>
-  <string name="shake_action_summary" product="tablet">Tresenje tablice bo <xliff:g id="action">%s</xliff:g></string>
-  <string name="shake_action_summary" product="default">Tresenje telefona bo <xliff:g id="action">%s</xliff:g></string>
-  <string name="action_summary_snooze">dalo budilko v dremež</string>
-  <string name="action_summary_dismiss">opustilo budilko</string>
-  <string name="action_summary_do_nothing">naredilo ničesar</string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">Tresenje tablice <xliff:g id="action">%s</xliff:g></string>
+  <string name="shake_action_summary" product="default">Tresenje telefona <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">bo dalo budilko v dremež</string>
+  <string name="action_summary_dismiss">bo opustilo budilko</string>
+  <string name="action_summary_do_nothing">ne bo naredilo ničesar</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Izberite vrsto budilke</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Melodija zvonjenja</string>
   <string name="alarm_type_playlist">Seznam predvajanja</string>
   <string name="alarm_type_random">Naključno</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Glasnost budilke je utišana</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Izberite budilko</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Melodija zvonjenja</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Glasba</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Privzeta melodija zvonjenja</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Privzemanje vztrajnega dovoljenja za melodijo zvonjenja je spodletelo</string>
-  <string name="menu_item_widget_settings">Nastavitve gradnika</string>
+  <string name="menu_item_widget_settings">Nastavitve pripomočka</string>
   <string name="activity_not_found">Dejavnost ni bila najdena!</string>
-  <string name="permlab_write_alarms">neposredno spreminjanje budilk</string>
-  <string name="permdesc_write_alarms">Omogoča programu dodajanje, spreminjanje in brisanje vseh vaših budilk.</string>
-  <string name="permlab_manage_alarms">preklop načrtovanih budilk</string>
-  <string name="permdesc_manage_alarms">Omogoča programu vklop in izklop vaših načrtovanih budilk.</string>
-  <string name="permlab_read_alarms">dostop do načrtovanih budilk</string>
-  <string name="permdesc_read_alarms">Omogoča programu branje vaših načrtovanih budilk.</string>
-  <string name="alarm_modification_service_desc">Storitev, ki tretjim osebam omogoča upravljanje z budilkami.</string>
 </resources>
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 0e642139d..e98c9a531 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Прикажи икону</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Прикажи икону на статусној траци када је аларм постављен</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Повећање јачине</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Профил <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Профил није изабран</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Додај</string>
   <string name="cities_add_city_title">Додај град</string>
   <string name="cities_add_city_city">Град:</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">Избриши град</string>
   <string name="cities_delete_city_msg">Желиш ли да избришеш <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Не може се избрисати град</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Притиском тастера за јачину звука ће <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Акција окретања</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Окретање таблета надоле ће <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Окретање телефона надоле ће <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Акција дрмања</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Дрмање таблета ће <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Дрмање телефона ће <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">одложи аларм</string>
   <string name="action_summary_dismiss">одбаци аларм</string>
   <string name="action_summary_do_nothing">не ради ништа</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Изабери тип аларма</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Тон звона</string>
   <string name="alarm_type_playlist">Плејлиста</string>
   <string name="alarm_type_random">Насумично</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Јачина аларма je утишана</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Изабери аларм</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Тон звона</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Музика</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Подразумевани тон звона</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Постављање упорне дозволе за тон звона није успело</string>
   <string name="menu_item_widget_settings">Подешавања виџета</string>
   <string name="activity_not_found">Није пронађена активност!</string>
-  <string name="permlab_write_alarms">директна промена аларма</string>
-  <string name="permdesc_write_alarms">Дозвола апликацији да дода, промени или обрише све твоје аларме.</string>
-  <string name="permlab_manage_alarms">Укључи/искључи заказане аларме</string>
-  <string name="permdesc_manage_alarms">Дозвола апликацији да укључи или искључи заказане аларме.</string>
-  <string name="permlab_read_alarms">приступ заказаним алармима</string>
-  <string name="permdesc_read_alarms">Дозвола апликацији да чита заказане аларме.</string>
-  <string name="alarm_modification_service_desc">Услуга за дозволу рада са алармима од треће стране.</string>
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index ab45d7ae1..99b0dd209 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Visa ikon</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Visa en ikon i statusfältet när ett alarm är ställt</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Ökande volym</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Ingen profil vald</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Lägg till</string>
   <string name="cities_add_city_title">Lägg till stad</string>
   <string name="cities_add_city_city">Stad:</string>
@@ -35,25 +41,39 @@
   <string name="cities_delete_city_title">Ta bort stad</string>
   <string name="cities_delete_city_msg">Vill du ta bort <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Kan inte ta bort staden</string>
-  <string name="volume_buttons_summary">Att trycka på volymknapparna kommer att <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">Ett tryck på volymknapparna kommer att <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Vändåtgärd</string>
-  <string name="flip_action_summary" product="tablet">Att vända surfplattan kommer att <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting summary for the flip action setting. -->
+  <string name="flip_action_summary" product="tablet">Att vända surfplattan nedåt kommer att <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Att vända telefonen kommer att <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Skakåtgärd</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Att skaka på surfplattan kommer att <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Att skaka på telefonen kommer att <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">snoozea alarmet</string>
   <string name="action_summary_dismiss">stäng av alarmet</string>
   <string name="action_summary_do_nothing">göra ingenting</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Välj alarmtyp</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Ringsignal</string>
   <string name="alarm_type_playlist">Spellista</string>
   <string name="alarm_type_random">Slumpmässigt</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Alarmvolym är tyst</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Välj alarm</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Ringsignal</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Musik</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Standardringsignal</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Det gick inte att ge behörighet för ringsignal</string>
   <string name="menu_item_widget_settings">Widget-inställningar</string>
   <string name="activity_not_found">Aktivitet hittades inte!</string>
diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-sw/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index 4c4397084..43beb1e09 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -16,5 +16,65 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="show_status_bar_icon_title">படவுருவை காண்பி</string>
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <string name="show_status_bar_icon_title">படவுருவைக் காண்பி</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <string name="show_status_bar_icon_summary">ஒரு அலாரம் அமைக்கப்படும்போது ஒரு படவுருவை நிலை பட்டியில் காண்பி</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <string name="alarm_increasing_volume">ஒலியளவை அதிகரித்தல்</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <string name="profile_description">சுயவிவரம் <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
+  <string name="profile_no_selected">சுயவிவரம் எதுவும் தேர்வுசெய்யப்படவில்லை</string>
+  <!-- User-defined cities -->
+  <string name="menu_item_add">சேர்</string>
+  <string name="cities_add_city_title">நகரத்தை சேர்</string>
+  <string name="cities_add_city_city">நகரம்:</string>
+  <string name="cities_add_city_timezone">நேரமண்டலம்:</string>
+  <string name="cities_add_city_gps_cd">உங்கள் நடப்பு நகரத்தை உள்ளூர்மயமாக்க தட்டு</string>
+  <string name="cities_add_loading">ஏற்றுகிறது...</string>
+  <string name="cities_add_searching">தேடுகிறது...</string>
+  <string name="cities_add_gps_no_results">GPS வினவல் இட முடிவுகள் எதுவும் பதிலளிக்கப்படவில்லை</string>
+  <string name="cities_add_gps_not_available">GPS கிடைக்கவில்லை</string>
+  <string name="cities_add_already_exists">இந்நகரம் முன்பே தரவுதளத்தில் இருக்கிறது</string>
+  <string name="cities_add_city_failed">நகரத்தை உருவாக்க முடியாது</string>
+  <string name="cities_delete_city_title">நகரத்தை நீக்கு</string>
+  <string name="cities_delete_city_msg">நீங்கள் <xliff:g id="city">%s</xliff:g>ஐ நீக்க விரும்புகிறீர்களா?</string>
+  <string name="cities_delete_city_failed">நகரத்தை நீக்க முடியவில்லை</string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">ஒலியளவு பொத்தான்களை அழுத்துதல் <xliff:g id="action">%s</xliff:g> செய்யும்</string>
+  <!-- Setting title for the flip action setting. -->
+  <string name="flip_action_title">திருப்புதல் செயல்பாடு</string>
+  <!-- Setting summary for the flip action setting. -->
+  <string name="flip_action_summary" product="tablet">டேப்ளட்டை கீழே திருப்புதல் <xliff:g id="action">%s</xliff:g> செய்யும்</string>
+  <string name="flip_action_summary" product="default">தொலைப்பேசியை கீழே திருப்புதல் <xliff:g id="action">%s</xliff:g> செய்யும்</string>
+  <!-- Setting title for the shake action setting. -->
+  <string name="shake_action_title">அதிர்வு செயல்பாடு</string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">டேப்ளட்டை அதிரச்செய்தல் <xliff:g id="action">%s</xliff:g> செய்யும்</string>
+  <string name="shake_action_summary" product="default">தொலைப்பேசியை அதிரச்செய்தல் <xliff:g id="action">%s</xliff:g> செய்யும்</string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">அலாரத்தை ஒத்திவை</string>
+  <string name="action_summary_dismiss">அலாரத்தை நிராகரி</string>
+  <string name="action_summary_do_nothing">எதுவும் செய்யாதே</string>
+  <!-- Alarm picker dialog title -->
+  <string name="alarm_picker_title">அலாரம் வகையை தேர்வுசெய்க</string>
+  <!-- Alarm types -->
+  <string name="alarm_type_ringtone">ரிங்டோன்</string>
+  <string name="alarm_type_playlist">இசைப்பட்டியல்</string>
+  <string name="alarm_type_random">தற்செயலாக</string>
+  <!-- Warn Silent Alarm title -->
+  <string name="warn_silent_alarm_title">அலாரம் ஒலியளவு நிசப்தமாக உள்ளது</string>
+  <!-- Select the source of the alarm -->
+  <string name="alarm_select">அலாரத்தை தேர்வுசெய்க</string>
+  <!-- Select the ringtone as alarm -->
+  <string name="alarm_select_ringtone">ரிங்டோன்</string>
+  <!-- Select the alarm from external device -->
+  <string name="alarm_select_external">இசை</string>
+  <!-- Ringtone selection default -->
+  <string name="ringtone_default">இயல்புநிலை ரிங்டோன்</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">ரிங்டோனுக்கு விடாமுயற்சி அனுமதி வழங்கலை எடுக்கத் தவறியது</string>
+  <string name="menu_item_widget_settings">விட்ஜெட் அமைப்புகள்</string>
+  <string name="activity_not_found">செயல்பாடு கண்டுபிடிக்கப்படவில்லை!</string>
 </resources>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
new file mode 100644
index 000000000..35c94f13e
--- /dev/null
+++ b/res/values-te-rIN/cm_strings.xml
@@ -0,0 +1,80 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <string name="show_status_bar_icon_title">చిహ్నాన్ని చూపుము</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <string name="show_status_bar_icon_summary">అలారం సెట్ చేసి ఉన్నప్పుడు స్థితి పట్టీలో ఒక సూక్ష్మచిత్రం చూపుము</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <string name="alarm_increasing_volume">వాల్యూమును పెంచడం</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <string name="profile_description"><xliff:g id="profile">%s</xliff:g> ప్రొఫైల్</string>
+  <!-- No profile selected label -->
+  <string name="profile_no_selected">ఎటువంటి ప్రొఫైల్ ఎంచుకోబడలేదు</string>
+  <!-- User-defined cities -->
+  <string name="menu_item_add">జోడించండి</string>
+  <string name="cities_add_city_title">నగరాన్ని జోడించుము</string>
+  <string name="cities_add_city_city">నగరం:</string>
+  <string name="cities_add_city_timezone">సమయమండలం</string>
+  <string name="cities_add_city_gps_cd">మీ యొక్క ప్రస్తుత నగరాన్ని స్థానికీకరించడానికి ట్యాప్ చేయండి</string>
+  <string name="cities_add_loading">లోడ్ చేస్తోంది…</string>
+  <string name="cities_add_searching">శోధిస్తోంది...</string>
+  <string name="cities_add_gps_no_results">GPS ప్రశ్న ఎటువంటి స్థాన ఫలితాలను అందించలేదు</string>
+  <string name="cities_add_gps_not_available">GPS అందుబాటులో లేదు</string>
+  <string name="cities_add_already_exists">నగరం ఇప్పటికే డేటాబేసులో ఉంది</string>
+  <string name="cities_add_city_failed">నగరాన్ని సృష్టించడం సాధ్యపడలేదు</string>
+  <string name="cities_delete_city_title">నగరాన్ని తొలిగించుము</string>
+  <string name="cities_delete_city_msg">మీరు <xliff:g id="city">%s</xliff:g> ను తొలిగించాలని అనుకుంటున్నారా?</string>
+  <string name="cities_delete_city_failed">నగరాన్ని తొలిగించడం సాధ్యపడలేదు</string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">వాల్యూమ్ బటన్లను నొక్కడం <xliff:g id="action">%s</xliff:g> వలన</string>
+  <!-- Setting title for the flip action setting. -->
+  <string name="flip_action_title">చర్యను ఫ్లిప్ చేయుము</string>
+  <!-- Setting summary for the flip action setting. -->
+  <string name="flip_action_summary" product="tablet">టాబ్లెటును క్రిందికి ఫ్లిప్ చేయడం <xliff:g id="action">%s</xliff:g></string>
+  <string name="flip_action_summary" product="default">ఫోనును క్రిందికి ఫ్లిప్ చేయడం <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
+  <string name="shake_action_title">కదుపు చర్య</string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">టాబ్లెటును కదపడం <xliff:g id="action">%s</xliff:g></string>
+  <string name="shake_action_summary" product="default">ఫోనును కదపడం <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">అలారమును స్నూజ్ చేయుము</string>
+  <string name="action_summary_dismiss">అలారమును తొలగించుము</string>
+  <string name="action_summary_do_nothing">ఏమీ చేయవద్దు</string>
+  <!-- Alarm picker dialog title -->
+  <string name="alarm_picker_title">అలారం రకాన్ని ఎంచుకొనుము</string>
+  <!-- Alarm types -->
+  <string name="alarm_type_ringtone">రింగ్‌టోన్</string>
+  <string name="alarm_type_playlist">ప్లేజాబితా</string>
+  <string name="alarm_type_random">యాదృచ్ఛికంగా</string>
+  <!-- Warn Silent Alarm title -->
+  <string name="warn_silent_alarm_title">అలారం వాల్యూమ్ నిశబ్దంగా ఉంది</string>
+  <!-- Select the source of the alarm -->
+  <string name="alarm_select">అలారంను ఎంచుకొనుము</string>
+  <!-- Select the ringtone as alarm -->
+  <string name="alarm_select_ringtone">రింగ్‌టోన్</string>
+  <!-- Select the alarm from external device -->
+  <string name="alarm_select_external">సంగీతం</string>
+  <!-- Ringtone selection default -->
+  <string name="ringtone_default">డిఫాల్ట్ రింగ్‌టోన్</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">రింగ్‌టోన్ కొరకు నిరంతరంగా మంజూరు చేయబడిన అనుమతిని తీసుకోవడం విఫలమయింది</string>
+  <string name="menu_item_widget_settings">విడ్జెట్ సెట్టింగులు</string>
+  <string name="activity_not_found">కార్యకలాపం కనుగొనబడలేదు!</string>
+</resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 155435681..8834d54ed 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -16,45 +16,65 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">แสดงไอคอน</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">แสดงไอคอนบนแถบสถานะเมื่อการตั้งปลุกถูกกำหนด</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">เพิ่มระดับเสียง</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">โปรไฟล์ <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">ไม่ได้เลือกโปรไฟล์</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">เพิ่ม</string>
   <string name="cities_add_city_title">เพิ่มเมือง</string>
   <string name="cities_add_city_city">เมือง:</string>
   <string name="cities_add_city_timezone">เขตเวลา:</string>
-  <string name="cities_add_city_gps_cd">แตะเพื่อกำหนดเมือปัจจุบันของคุณ</string>
+  <string name="cities_add_city_gps_cd">แตะเพื่อกำหนดเมืองปัจจุบันของคุณ</string>
   <string name="cities_add_loading">กำลังโหลด\u2026</string>
   <string name="cities_add_searching">กำลังค้นหา\u2026</string>
-  <string name="cities_add_gps_no_results">ไม่พบตำแหน่งจากค่าที่ได้กลับมาจาก GPS</string>
+  <string name="cities_add_gps_no_results">ไม่พบผลลัพธ์ตำแหน่งที่ตั้งจากการตรวจสอบ GPS</string>
   <string name="cities_add_gps_not_available">GPS ไม่สามารถใช้งานได้</string>
-  <string name="cities_add_already_exists">เมืองนี้มีในฐานข้อมูลอยู่แล้ว</string>
+  <string name="cities_add_already_exists">เมืองดังกล่าวมีอยู่ในฐานข้อมูลแล้ว</string>
   <string name="cities_add_city_failed">ไม่สามารถสร้างเมืองได้</string>
   <string name="cities_delete_city_title">ลบเมือง</string>
-  <string name="cities_delete_city_msg">คุณต้องการลบ <xliff:g id="city">%s</xliff:g>?</string>
+  <string name="cities_delete_city_msg">ต้องการลบ <xliff:g id="city">%s</xliff:g> หรือไม่</string>
   <string name="cities_delete_city_failed">ไม่สามารถลบเมืองได้</string>
-  <string name="volume_buttons_summary">จะ<xliff:g id="action">%s</xliff:g>เมื่อกดปุ่มปรับระดับเสียง</string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">การกดปุ่มปรับระดับเสียงจะ <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">การพลิก</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">การคว่ำแท็บเล็ตของคุณจะ<xliff:g id="action">%s</xliff:g></string>
-  <string name="flip_action_summary" product="default">การคว่ำโทรศัพท์มือถือของคุณจะ<xliff:g id="action">%s</xliff:g></string>
+  <string name="flip_action_summary" product="default">การคว่ำโทรศัพท์ลงจะ<xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">การเขย่า</string>
-  <string name="shake_action_summary" product="tablet">เมื่อเขย่าจะ <xliff:g id="action">%s</xliff:g></string>
-  <string name="shake_action_summary" product="default">เมื่อเขย่าจะ <xliff:g id="action">%s</xliff:g></string>
-  <string name="action_summary_snooze">งีบต่อ</string>
+  <!-- Setting summary for the shake action setting. -->
+  <string name="shake_action_summary" product="tablet">เมื่อเขย่าแท็บเล็ตจะ <xliff:g id="action">%s</xliff:g></string>
+  <string name="shake_action_summary" product="default">เมื่อเขย่าโทรศัพท์จะ <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">พักการปลุก</string>
   <string name="action_summary_dismiss">ปิดนาฬิกาปลุก</string>
   <string name="action_summary_do_nothing">ไม่ทำอะไร</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">เลือกชนิดการปลุก</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">เสียง​เรียก​เข้า</string>
   <string name="alarm_type_playlist">รายการที่จะเล่น</string>
   <string name="alarm_type_random">สุ่ม</string>
-  <string name="warn_silent_alarm_title">เสียงปลุกจะไม่ดัง</string>
+  <!-- Warn Silent Alarm title -->
+  <string name="warn_silent_alarm_title">ไม่ส่งเสียงปลุก</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">เลือกปลุก</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">เสียง​เรียก​เข้า</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">เพลง</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">เสียงเรียกเข้าเริ่มต้น</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">ไม่สามารถใช้เสียงเรียกเข้าได้เนื่องจากไม่ได้รับอนุญาต</string>
-  <string name="menu_item_widget_settings">ตั้งค่าวิดเจ็ท</string>
-  <string name="activity_not_found">ไม่พบกิจกรรมนี้!</string>
+  <string name="menu_item_widget_settings">การตั้งค่าวิจิท</string>
+  <string name="activity_not_found">ไม่พบกิจกรรม!</string>
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index de0788aa3..02e22fbb8 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Simgeyi göster</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Alarm ayarlandığında durum çubuğunda bir simge göster</string>
-  <string name="alarm_increasing_volume">Artan ses düzeyi</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <string name="alarm_increasing_volume">Ses düzeyini artırma</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Profil <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Profil seçilmedi</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Ekle</string>
   <string name="cities_add_city_title">Şehir ekle</string>
   <string name="cities_add_city_city">Şehir:</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">Şehri sil</string>
   <string name="cities_delete_city_msg"><xliff:g id="city">%s</xliff:g> şehrini silmek istiyor musunuz?</string>
   <string name="cities_delete_city_failed">Şehir silinemiyor</string>
-  <string name="volume_buttons_summary">Ses tuşları <xliff:g id="action">%s</xliff:g></string>
-  <string name="flip_action_title">Çevirme işlevi</string>
+  <!-- Setting summary for volume buttons setting. -->
+  <string name="volume_buttons_summary">Ses tuşlarına basılması <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
+  <string name="flip_action_title">Çevirme eylemi</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Tableti ters çevirince <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Telefonu ters çevirince <xliff:g id="action">%s</xliff:g></string>
-  <string name="shake_action_title">Sallama işlevi</string>
+  <!-- Setting title for the shake action setting. -->
+  <string name="shake_action_title">Sallama eylemi</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Tableti sallayınca <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Telefonu sallayınca <xliff:g id="action">%s</xliff:g></string>
-  <string name="action_summary_snooze">alarmı erteleyecek</string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">alarmı ertele</string>
   <string name="action_summary_dismiss">alarmı kapatacak</string>
   <string name="action_summary_do_nothing">hiçbir şey yapma</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Alarm türünü seçin</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Zil Sesi</string>
   <string name="alarm_type_playlist">Çalma listesi</string>
   <string name="alarm_type_random">Rastgele</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Alarm sessizde</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Alarmı seç</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Zil sesi</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Müzik</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Varsayılan zil sesi</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Zil sesi için kalıcı izin alınamadı</string>
   <string name="menu_item_widget_settings">Widget ayarları</string>
   <string name="activity_not_found">İşlem bulunamadı!</string>
-  <string name="permlab_write_alarms">doğrudan alarmları değiştir</string>
-  <string name="permdesc_write_alarms">Uygulamalara alarm ekleme, değiştirme ya da tümünü silme izni verir.</string>
-  <string name="permlab_manage_alarms">alarmları aç/kapa</string>
-  <string name="permdesc_manage_alarms">Uygulamalara planlanmış alarmlara açma kapama izni verir.</string>
-  <string name="permlab_read_alarms">alarmlara eriş</string>
-  <string name="permdesc_read_alarms">Uygulamalara planlanan alarmları okuma izni verir.</string>
-  <string name="alarm_modification_service_desc">Bu hizmet alarmların üçüncü taraflarca değiştirilmesine izin verir.</string>
 </resources>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index 05e05ef21..58218d54b 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">سىنبەلگىنى كۆرسەت</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">قوڭغۇراق سائەتنى تەڭشىگەندە ھالەت بالداقتا سىنبەلگىدىن بىرنى كۆرسىتىدۇ</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">ئاۋازنى يۇقىرىلات</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">سەپلىمە ھۆججەت <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">ھېچقانداق سەپلىمە ھۆججەت تاللانمىدى</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">قوش</string>
   <string name="cities_add_city_title">شەھەر قوش</string>
   <string name="cities_add_city_city">شەھەر:</string>
@@ -35,24 +41,40 @@
   <string name="cities_delete_city_title">شەھەرنى ئۆچۈر</string>
   <string name="cities_delete_city_msg">راستلا <xliff:g id="city">%s</xliff:g> نى ئۆچۈرەمسىز؟</string>
   <string name="cities_delete_city_failed">بۇ شەھەرنى ئۆچۈرەلمەيدۇ</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">ئاۋاز مىقدارى توپچىسى بېسىلسا <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">ئايلاندۇرۇش مەشغۇلاتى</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">تاختا كومپيۇتېر تۆۋەنگە ئايلاندۇرۇلسا <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">تېلېفون تۆۋەنگە ئايلاندۇرۇلسا <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">پۇلاڭلىتىش مەشغۇلاتى</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">تاختا كومپيۇتېر پۇلاڭلىتىلسا <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">تېلېفون پۇلاڭلىتىلسا <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">قوڭغۇراقنى كېچىكتۈرىدۇ</string>
   <string name="action_summary_dismiss">قوڭغۇراقنى توختىتىدۇ</string>
   <string name="action_summary_do_nothing">ھېچقانداق قىلما</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">قوڭغۇراق تىپىنى تاللاڭ</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">زىل ئاۋازى</string>
   <string name="alarm_type_playlist">چالىدىغان تىزىم</string>
   <string name="alarm_type_random">خالىغانچە</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">قوڭغۇراق ئاۋازى جىمجىت</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">قوڭغۇراق تاللاڭ</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">زىل ئاۋازى</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">نەغمە</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">كۆڭۈلدىكى زىل ئاۋازى</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">بۇ زىل ئاۋازىنىڭ مەڭگۈلۈك ھوقۇقىغا ئېرىشەلمىدى</string>
+  <string name="menu_item_widget_settings">كىچىك قىستۇرمىلار تەڭشىكى</string>
+  <string name="activity_not_found">پائالىيەت تاپالمىدى!</string>
 </resources>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index b3fc6b076..14bc198db 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -15,42 +15,106 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Label shown on launcher icon -->
+  <!-- Label for the this application displayed on-screen when this application must be represented to the user. -->
   <string name="app_label">سائەت</string>
+  <!-- Title for AlarmClock activity -->
+  <!-- Label for the Alarms activity displayed on-screen when that activity must be represented to the user. -->
   <string name="alarm_list_title">قوڭغۇراقلىق سائەت</string>
+  <!-- Menu item on Alarm Clock screen: Add alarm -->
   <string name="add_alarm">قوڭغۇراق قوش</string>
+  <!-- Menu item on Alarm Clock screen: Desk clock -->
   <string name="menu_desk_clock">شىرە سائەت</string>
+  <!-- Menu item on Alarm Clock screen: Edit alarm -->
   <string name="menu_edit_alarm">قوڭغۇراق تەھرىر</string>
+  <!-- Context Menu Item on Alarm Settings screen: Delete alarm -->
   <string name="delete_alarm">قوڭغۇراق ئۆچۈر</string>
+  <!-- Context Menu Item on Alarm Settings screen: Enable alarm -->
   <string name="enable_alarm">قوڭغۇراق ئاچ</string>
+  <!-- Context Menu Item on Alarm Settings screen: Disable alarm -->
   <string name="disable_alarm">قوڭغۇراق تاقا</string>
+  <!-- Delete alarm confirmation dialog message. -->
   <string name="delete_alarm_confirm">بۇ قوڭغۇراقنى ئۆچۈرەمدۇ؟</string>
+  <!-- Menu item on Alarm Clock screen: Show clock -->
   <string name="show_clock">سائەتنى كۆرسەت</string>
+  <!-- Menu item on Alarm Clock screen: Hide clock -->
   <string name="hide_clock">سائەتنى يوشۇر</string>
+  <!-- Setting label on Set alarm screen: Label -->
   <string name="label">بەلگە</string>
+  <!-- Default label to display for an alarm -->
   <string name="default_label">قوڭغۇراق</string>
+  <!-- Preference category on Alarm Settings screen: Set alarm -->
+  <!-- Also label for the old Alarms dialog activity displayed on-screen when that activity must be represented to the user. -->
   <string name="set_alarm">قوڭغۇراق تەڭشەك</string>
+  <!-- Setting labels on Set alarm screen: Vibration on or off -->
   <string name="alarm_vibrate">تىترەت</string>
+  <!-- Setting labels on Set alarm screen: Repeat -->
   <string name="alarm_repeat">قايتىلا</string>
+  <!-- Setting labels on Set alarm screen: Select alarm ringtone  -->
   <string name="alert">قوڭغۇراق زىل ئاۋازى</string>
+  <!-- Label on expanded alarm edit view. -->
   <string name="ringtone">زىل ئاۋازى</string>
+  <!-- Setting labels on Set alarm screen: Set time  -->
   <string name="time">ۋاقىت</string>
+  <!-- Label shown when user is setting up non-repeating alarm for tomorrow [CHAR LIMIT=15] -->
+  <!-- Label shown when user is setting up non-repeating alarm for later today [CHAR LIMIT=15] -->
+  <!-- The text shown above the clock when alarm is alerting [CHAR LIMIT=10] -->
+  <!-- The text shown as an option to dismiss an alerting alarm [CHAR LIMIT=5] -->
+  <!-- Button labels on the alarm dialog: Dismiss -->
   <string name="alarm_alert_dismiss_text">تاقا</string>
+  <!-- Button labels on the pre-dismiss alarm notifications: Dismiss now -->
   <string name="alarm_alert_dismiss_now_text">دەرھال تاقا</string>
+  <!-- Alarm Alert screen: this message is shown after an alarm rung
+         unattended for a number of minutes.  It tells the user that
+         the alarm has been silenced.-->
   <string name="alarm_missed_title">ئۆتكۈزۈۋەتكەن قوڭغۇراق</string>
   <string name="alarm_missed_text"><xliff:g id="ALARM_TIME">%s</xliff:g> - <xliff:g id="ALARM_LABEL">%s</xliff:g></string>
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the number of minutes in two separate lines. For example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user snoozed an alerting alarm. The text will be shown
+         together with the word 'Snoozed' in two separate lines or example:
+             Snoozed
+             10 min
+         [CHAR LIMIT=10]
+    -->
+  <!-- The text shown after user dismissed an alerting alarm [CHAR LIMIT=15] -->
+  <!-- Button labels on the alarm dialog: Snooze -->
   <string name="alarm_alert_snooze_text">قايتا جىرىڭلاتما</string>
+  <!-- Toast that appears after Alarm is snoozed from the Alarm
+         dialog. Says the alarm will snooze for xxx minutes.  -->
   <plurals name="alarm_alert_snooze_set">
+    <!-- Duration for one minute -->
+    <!-- Duration for more than one minute -->
     <item quantity="other">1 مىنۇتقىچە جىرىڭلاتما.</item>
   </plurals>
+  <!-- Text to appear inside a notification while an alarm is snoozing. -->
   <string name="alarm_alert_snooze_until"><xliff:g id="TIME">%s</xliff:g> غىچە كېچىكتۈر</string>
+  <!-- Text to appear in the notification title while an alarm is about to go off. -->
   <string name="alarm_alert_predismiss_title">ئالدىن بېكىتىلگەن قوڭغۇراق</string>
+  <!-- Text to appear in when trying to view a missed alarm that has been deleted -->
   <string name="missed_alarm_has_been_deleted">ئۆتكۈزۈۋەتكەن قوڭغۇراق ئۆچۈرۈلدى</string>
+  <!-- 0: nothing
+         1: days
+         2:      hours
+         3: days hours
+         4:            minutes
+         5: days       minutes
+         6:      hours minutes
+         7: days hours minutes
+    -->
+  <!-- Timer notification: how long from now until timer goes off. -->
   <string-array name="timer_notifications">
     <item>بىر مىنۇتمۇ قالمىدى</item>
     <item><xliff:g id="HOURS">%1$S</xliff:g> قالدى</item>
     <item><xliff:g id="MINUTES">%2$s</xliff:g> قالدى</item>
     <item><xliff:g id="HOURS">%1$S</xliff:g>, <xliff:g id="MINUTES">%2$S</xliff:g> قالدى</item>
   </string-array>
+  <!-- Alarm confirmation toast: Describes how long from now until
+         alarm fires -->
   <string-array name="alarm_set">
     <item>قوڭغۇراق ھازىردىن باشلاپ 1 مىنۇتقا يەتمىگەن ۋاقىتتا ئەسكەرتىشكە تەڭشەلدى.</item>
     <item>قوڭغۇراق ھازىردىن باشلاپ <xliff:g id="DAYS">%1$s</xliff:g> دىن كېيىن ئەسكەرتىشكە تەڭشەلدى.</item>
@@ -61,29 +125,60 @@
     <item>قوڭغۇراق ھازىردىن باشلاپ <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g> دىن كېيىن ئەسكەرتىشكە تەڭشەلدى.</item>
     <item>قوڭغۇراق ھازىردىن باشلاپ <xliff:g id="DAYS">%1$s</xliff:g> <xliff:g id="HOURS">%2$s</xliff:g> <xliff:g id="MINUTES">%3$s</xliff:g>  دىن كېيىن ئەسكەرتىشكە تەڭشەلدى.</item>
   </string-array>
+  <!-- Alarm confirmation toast: singular day -->
   <string name="day">"«1 كۈن»"</string>
+  <!-- Alarm confirmation toast: plural days -->
   <string name="days">"<xliff:g id="DAYS">%s</xliff:g> كۈن"</string>
+  <!-- Alarm confirmation toast: singular hour -->
   <string name="hour">1 سائەت</string>
+  <!-- Alarm confirmation toast: plural hours -->
   <string name="hours"><xliff:g id="HOURS">%s</xliff:g> سائەت</string>
+  <!-- Alarm confirmation toast: singular minute  -->
   <string name="minute">"1 مىنۇت"</string>
+  <!-- Alarm confirmation toast: plural minutes  -->
   <string name="minutes">"<xliff:g id="MINUTES">%s</xliff:g> مىنۇت"</string>
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to repeat every day -->
   <string name="every_day">ھەر كۈنى</string>
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: special case for when
+         the alarm is set to never repeat -->
   <string name="never">ھەرگىز</string>
+  <!-- Repeat options that appear under an alarm on main Alarm Clock
+         screen to identify repetition schedule: concatenate days with
+         this character, i.e. "Mon, Tue, Wed" -->
   <string name="day_concat">"« ،»"</string>
+  <!-- Appears at the top of the Clock Picker screen: Tell user to
+         select a clock to display -->
   <string name="clock_instructions">بىر سائەت تاللاڭ</string>
+  <!-- Label for analog clock gadget displayed on-screen when that gadget is represented to the user. -->
   <string name="analog_gadget">تەقلىد سائەت</string>
+  <!-- Help activity name -->
   <string name="help">ياردەم</string>
+  <!-- Settings activity name -->
+  <!-- Label for the Settings activity displayed on-screen when that activity must be represented to the user. -->
   <string name="settings">تەڭشەكلەر</string>
+  <!-- Setting title for changing the snooze duration. -->
   <string name="snooze_duration_title">مۈگدەش ئۇزۇنلۇقى</string>
   <plurals name="snooze_duration">
+    <!-- Duration for one minute -->
+    <!-- Duration for more than one minute -->
     <item quantity="other">1 مىنۇت</item>
   </plurals>
   <plurals name="snooze_picker_label">
+    <!-- Duration for one minute -->
+    <!-- Duration for more than one minute -->
     <item quantity="other">مىنۇت</item>
   </plurals>
+  <!-- Auto silence preference title -->
   <string name="auto_silence_title">قوڭغۇراق ۋاقتى</string>
+  <!-- Auto silence summary string set based on the preference value. -->
   <string name="auto_silence_summary"><xliff:g id="MINUTES">%d</xliff:g> مىنۇت</string>
+  <!-- Auto silence summary when turned off -->
   <string name="auto_silence_never">ھەرگىز</string>
+  <!-- Entries listed in the ListPreference when invoking the auto silence
+         preference. -->
   <string-array name="auto_silence_entries">
     <item>1 minute</item>
     <item>5 minutes</item>
@@ -93,83 +188,167 @@
     <item>25 minutes</item>
     <item>ھەرگىز</item>
   </string-array>
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the auto_silence_entries above. -->
+  <!-- Done button when editing an alarm. -->
   <string name="done">تامام</string>
+  <!-- Revert button when editing an alarm. -->
   <string name="revert">ئەسلىگە قايتۇر</string>
+  <!-- Delete button when editing an alarm. -->
   <string name="delete">ئۆچۈر</string>
+  <!-- Setting title for changing the alarm volume. -->
   <string name="alarm_volume_title">قوڭغۇراق ئاۋازى</string>
+  <!-- Summary for the alarm preference when silent is chosen. -->
   <string name="silent_alarm_summary">ئۈنسىز</string>
+  <!-- Text to display in the small text of the notification -->
   <string name="alarm_notify_text">قوڭغۇراقنى ۋاقىتلىق توختىتىش ياكى تاقاشنى تاللاڭ.</string>
+  <!-- Text to display in the notification ticker and label -->
   <string name="alarm_notify_snooze_label"><xliff:g id="LABEL">%s</xliff:g> (جىرىڭلاتمىدى)</string>
+  <!-- Text to display in the notification when the alarm has been snoozed -->
   <string name="alarm_notify_snooze_text">بۇ قوڭغۇراق ھازىردىن باشلاپ <xliff:g id="TIME">%s</xliff:g> دىن كېيىن ئەسكەرتىشكە تەڭشەلدى. چېكىلسە بىكار قىلىنىدۇ.</string>
+  <!-- Title of the setting to change hardware button behavior. This string
+         should be changed for each piece of hardware. [CHAR LIMIT=20] -->
   <string name="volume_button_setting_title">ئاۋاز توپچىسى</string>
+  <!-- Dialog title of the volume and power setting. -->
   <string name="volume_button_dialog_title">توپچا ئۈنۈمى</string>
+  <!-- Entries listed in the setting for the side-button action. -->
   <string-array name="volume_button_setting_entries">
     <item>قايتا جىرىڭلاتما</item>
     <item>تاقا</item>
     <item>ھېچقانداق قىلما</item>
   </string-array>
+  <!-- Values for the side-button setting. -->
+  <!-- Title of the ringtone setting. -->
   <string name="default_ringtone_setting_title">كۆڭۈلدىكى قوڭغۇراق ئاۋاز تەڭشىكى</string>
+  <!-- Accessibility labels for Clock activity buttons -->
   <string name="alarm_button_description">قوڭغۇراقلىق سائەت</string>
   <string name="gallery_button_description">سۈرەت يىغقۇچ</string>
   <string name="music_button_description">نەغمە</string>
   <string name="nightmode_button_description">غۇۋالاشتۇر</string>
   <string name="home_button_description">قوزغاتقۇچ</string>
   <string name="desk_clock_button_description">سائەتنى كۆرسەت</string>
+  <!-- Accessibility labels for alarm buttons -->
   <string name="label_description">بەلگە</string>
   <string name="ringtone_description">زىل ئاۋازى</string>
+  <!-- What to show the user if the weather widget exists but fails to
+         respond. This is a sign of an error; if the weather widget is not
+         present on the device, we show nothing at all. -->
   <string name="weather_fetch_failure">ھاۋارايى ئۇچۇرىنى ھازىر ئىشلەتكىلى بولمايدۇ.</string>
+  <!-- A description for the DeskClock alarm sound playback service.
+         [CHAR LIMIT=NONE] -->
   <string name="alarm_klaxon_service_desc">سائەت قوڭغۇراق تەڭشىكىنىڭ ئاۋاز چېلىش مۇلازىمىتى</string>
+  <!-- String displayed as the alert summary while loading the alert name from
+         the media player. [CHAR LIMIT=NONE] -->
   <string name="loading_ringtone">قوڭغۇراق ئاۋازىنى يۈكلەۋاتىدۇ…</string>
+  <!-- A description for the DeskClock timer sound playback service.
+         [CHAR LIMIT=NONE] -->
   <string name="timer_ring_service_desc">قوڭغۇراق سائەتتە تەڭشەيدىغان ۋاقىت خاتىرىلىگۈچنىڭ ئاۋاز چىقىرىش مۇلازىمىتى.</string>
+  <!-- Label on the main screen control used to set alarm [CHAR LIMIT=30]-->
   <string name="control_set_alarm">قوڭغۇراق تەڭشەك</string>
+  <!-- Label on the main screen control used to set alarm when there is already an existing alarm [CHAR LIMIT=30]-->
   <string name="control_set_alarm_with_existing"><xliff:g id="time">%s</xliff:g></string>
+  <!--  ActionBar strings -->
+  <!-- Describes the purpose of the tab button which which switches the activity to the Alarm page -->
   <string name="menu_alarm">قوڭغۇراق</string>
+  <!-- Describes the purpose of the tab button which which switches the activity to the Timer page -->
   <string name="menu_timer">ۋاقىت خاتىرىلىگۈچ</string>
+  <!-- Describes the purpose of the tab button which which switches the activity to the Clock page -->
   <string name="menu_clock">سائەت</string>
+  <!-- Describes the purpose of the tab button which which switches the activity to the Stopwatch page -->
   <string name="menu_stopwatch">دەقىقە سائەت</string>
+  <!-- Clock view buttons strings-->
+  <!-- Describes the purpose of the button to start the activity to add/edit/delete alarms -->
+  <!-- Describes the purpose of the button which provides a list of cities for the world clock settings -->
   <string name="button_cities">شەھەرلەر</string>
+  <!-- Describes the purpose of the button which pops up a menu of setting choices -->
   <string name="button_menu">تېخىمۇ كۆپ تاللانما</string>
+  <!-- Menu item on most screens to get to more settings -->
   <string name="menu_item_settings">تەڭشەكلەر</string>
+  <!-- Menu item on most screens to get to the help information -->
   <string name="menu_item_help">ياردەم</string>
+  <!-- Menu item on clock screen to enter night mode. -->
   <string name="menu_item_night_mode">كېچە ھالىتى</string>
+  <!-- Menu item on Cities screen to sort by GMT offset -->
   <string name="menu_item_sort_by_gmt_offset">ۋاقىت بويىچە تەرتىپلە</string>
+  <!-- Menu item on Cities screen to sort by alphabetical order -->
   <string name="menu_item_sort_by_name">ئات بويىچە تەرتىپلە</string>
+  <!-- Label for selected cities in Cities list view -->
   <string name="selected_cities_label">تاللانغان شەھەرلەر</string>
+  <!-- Stop Watch strings -->
+  <!-- Describes the purpose of the button to resume running a stopwatch -->
   <string name="sw_resume_button">داۋاملاشتۇر</string>
+  <!-- Describes the purpose of the button to begin running a stopwatch -->
   <string name="sw_start_button">باشلا</string>
+  <!-- Describes the purpose of the button to pause a stopwatch. -->
   <string name="sw_stop_button">توختا</string>
+  <!-- Describes the purpose of the button to record current the stopwatch value into the4 collection of lap times. -->
   <string name="sw_lap_button">ئايلانما</string>
+  <!-- Describes the purpose of the button to return the stopwatch to zero and remove the lap times. -->
   <string name="sw_reset_button">ئەسلىگە قايتۇر</string>
+  <!-- Describes the purpose of the button to share the stopwatch value.
+         Also used as title for chooser when sharing stopwatch results. -->
   <string name="sw_share_button">ھەمبەھىر</string>
+  <!-- Abbreviation for temporal hours [CHAR LIMIT=1] -->
   <string name="hours_label">h</string>
+  <!-- Abbreviation for temporal minutes [CHAR LIMIT=1] -->
   <string name="minutes_label">m</string>
+  <!-- Abbreviation for temporal seconds [CHAR LIMIT=1] -->
   <string name="seconds_label">s</string>
+  <!-- Accessibility strings -->
   <string name="hours_label_description">سائەت</string>
   <string name="minutes_label_description">مىنۇت</string>
   <string name="seconds_label_description">سېكۇنت</string>
+  <!--  Stopwatch share strings -->
+  <!-- Sentence within the message created to share the total time recorded within the stopwatch -->
   <string name="sw_share_main">ۋاقتىم <xliff:g id="TIME">%s</xliff:g></string>
+  <!-- Header within the message created to share a list of lap times (a new line is appended to this) -->
   <string name="sw_share_laps">ئايلانما ۋاقتى:</string>
+  <!-- Label to enumerate the number of laps in the notification the user has counted -->
   <string name="sw_notification_lap_number"><xliff:g id="NUMBER">%d</xliff:g> ئايلانما</string>
+  <!-- Formatted stopwatch time -->
+  <!-- Formatted stopwatch time for laps shared using the share button -->
+  <!-- Label to enumerate the number of laps the user has counted -->
+  <!-- Stopwatch accessibility strings -->
   <plurals name="Nhours_description">
+    <!-- 1 hour -->
+    <!-- more -->
     <item quantity="other">1 سائەت</item>
   </plurals>
   <plurals name="Nminutes_description">
+    <!-- 1 minute -->
+    <!-- more -->
     <item quantity="other">1 مىنۇت</item>
   </plurals>
   <plurals name="Nseconds_description">
+    <!-- 1 second -->
+    <!-- more -->
     <item quantity="other">1 سېكۇنت</item>
   </plurals>
+  <!-- timer strings -->
+  <!-- Describes the purpose of the button to add a new timer -->
   <string name="timer_add_timer">ۋاقىت خاتىرىلىگۈچنى قوش</string>
+  <!-- Describes the purpose of the button to begin or continue running a timer -->
   <string name="timer_start">باشلا</string>
+  <!-- Describes the purpose of the button to delete a timer. -->
   <string name="timer_delete">ئۆچۈر</string>
+  <!-- Describes the purpose of the button increase the remaining time on a timer by one minute. -->
   <string name="timer_plus_one">1 مىنۇت قوش</string>
+  <!-- Like "timer_plus_one", but with 'minute' abbreviated for the notification. -->
   <string name="timer_plus_1_min">1 مىنۇت قوش</string>
+  <!-- Describes the purpose of the button to stop the timer. -->
   <string name="timer_stop">توختا</string>
+  <!-- Describes the purpose of the button to stop and delete the timer. -->
   <string name="timer_done">تاماملاندى</string>
+  <!-- Describes the purpose of the button to return the timer to it's original starting value. -->
   <string name="timer_reset">ئەسلىگە قايتۇر</string>
+  <!-- Describes the purpose of the button to discard the current dialog values. Will also close the dialog if other time's exist -->
   <string name="timer_cancel">ۋاز كەچ</string>
+  <!-- Notification content shown when a timer has completed and has no more time remaining -->
   <string name="timer_times_up">ۋاقىت توشتى</string>
+  <!-- Label associated with a notification for a Timer -->
   <string name="timer_notification_label">ۋاقىت خاتىرىلىگۈچ</string>
+  <!-- Toast content shown when user attempts to create a new timer when there are already 4 timers -->
+  <!-- Jocular content that user may append when sharing the lap times -->
   <string-array name="sw_share_strings" translatable="true">
     <item>چاقماق پەلۋاندەك تېزكەنسىز.</item>
     <item>ئەمگەك مىۋىڭىزدىن ھوزۇرلىنىڭ.</item>
@@ -183,25 +362,46 @@
     <item>نۇر تېزلىكى.</item>
   </string-array>
   <plurals name="timers_num">
+    <!-- 1 timer -->
+    <!-- more -->
     <item quantity="other">1 مىنۇت</item>
   </plurals>
+  <!-- Title with the clock on the main page displaying the user's regular timezone (shows when automatic_home_clock enabled) -->
   <string name="home_label">باش بەت</string>
+  <!-- Label for the Cities activity displayed on-screen when that activity must be represented to the user. -->
   <string name="cities_activity_title">شەھەرلەر</string>
+  <!-- Settings strings -->
+  <!-- Header in the preferences settings for the section pertaining to clocks on the main fragment -->
+  <!-- Header for a Clock Dream Setting referring to choosing analog or digital style -->
   <string name="clock_style">ئۇسلۇب</string>
+  <!-- Entries listed in the ListPreference when invoking the clock style
+         preference. -->
   <string-array name="clock_style_entries">
     <item>تەقلىد</item>
     <item>رەقەملىك</item>
   </string-array>
+  <!-- Values that are retrieved from the ListPreference. These must match
+         the clock_style_entries above. -->
+  <!-- Title for an option that will automtically show a clock representing the user's regular timezone on the main fragment whenever the user leaves their regular timezone-->
   <string name="automatic_home_clock">ئۆيدىكى ۋاقىتنى ئاپتوماتىك كۆرسىتىدۇ</string>
+  <!-- Describes the functionality provided by the automatic_home_clock option -->
   <string name="automatic_home_clock_summary">باشقا ۋاقىت رايونىدا ساياھەت قىلغاندا ئۆيدىكى ۋاقىتنى كۆرسىتىدۇ</string>
+  <!-- Title in the preferences change the time zone for the user's home -->
   <string name="home_time_zone">يەرلىك ۋاقىت رايونى</string>
+  <!-- Title in a list dialog box to pick a time zone for the user's home -->
   <string name="home_time_zone_title">يەرلىك ۋاقىت رايونى</string>
+  <!-- Textual content of the button to discard the current dialog values and close the dialog -->
   <string name="time_picker_cancel">ۋاز كەچ</string>
+  <!-- Textual content of the button to update an alarm with the current dialog values -->
   <string name="time_picker_set">جەزملە</string>
   <string name="time_picker_time_seperator">:</string>
+  <!--  place holder for am/pm label when it is not set -->
   <string name="time_picker_ampm_label">--</string>
+  <!-- add 00 as minutes to the time when pressing this button -->
   <string name="time_picker_00_label">:00</string>
+  <!-- add 30 as minutes to the time when pressing this button -->
   <string name="time_picker_30_label">:30</string>
+  <!-- Choices for timezones, must be kept in sync with timezone_values. CHAR LIMIT=25] -->
   <string-array name="timezone_labels">
     <item>"مارشال ئاراللىرى"</item>
     <item>"مىدۋېي ئارىلى"</item>
@@ -289,31 +489,73 @@
     <item>"تونگا"</item>
     <item>"جاكارتا"</item>
   </string-array>
+  <!-- Choices for timezones, must be kept in sync with timezone_values. -->
+  <!-- Header in the preferences settings for the section pertaining to alarms -->
+  <!-- Describes the running service for the stopwatch -->
   <string name="stopwatch_service_desc">دەقىقە سائەت ئارقىلىق ئۇقتۇرۇش ئىقتىدارىنى ئىجرا قىلىدۇ.</string>
+  <!-- Desription for the stopped stop watch -->
   <string name="swn_stopped">توختىدى</string>
+  <!-- Text instruction for dismiss alarm on alarm lock screen. The dismiss button will still
+         be on the right even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Text instruction for snooze alarm on alarm lock screen. The snooze button will still
+         be on the left even on RTL languages so please do not reverse this during
+         translation. -->
+  <!-- Notification title when timer is stopped. -->
   <string name="timer_stopped">ۋاقىت خاتىرىلىگۈچ توختىدى</string>
+  <!-- Notification title when multiple timers are stopped. -->
   <string name="timers_stopped"><xliff:g id="NUMBER">%d</xliff:g> ۋاقىت خاتىرىلىگۈچ توختىدى</string>
+  <!-- Notification text when multiple timers are stopped. -->
   <string name="all_timers_stopped_notif">چېكىپ ۋاقىت خاتىرىلىگۈچىڭىزنى كۆرەلەيسىز</string>
+  <!-- Notification title when at least one timer, of those in use, is counting down. -->
   <string name="timers_in_use"><xliff:g id="NUMBER">%d</xliff:g> ۋاقىت خاتىرىلىگۈچ</string>
+  <!-- Notification text when at least one timer, of those in use, is counting down. -->
   <string name="next_timer_notif">كېيىنكى ۋاقىت خاتىرىلىگۈچ: <xliff:g id="TIME_REMAINING">%s</xliff:g></string>
+  <!-- screensaver settings strings -->
+  <!-- Label for the screen saver activity displayed on-screen when that activity must be represented to the user. -->
   <string name="screensaver_settings">تەسىرلىشىشچان ئېكران قوغداش تەڭشەكلىرى</string>
+  <!-- Title for check box to pick intensity of display diminuation during dream mode -->
   <string name="night_mode_title">كېچە ھالىتى</string>
+  <!-- Describes intensity of display diminuation during dream mode -->
   <string name="night_mode_summary">ئېكران يورۇقلۇقىنى بەك تۆۋەن تەڭشەيدۇ (قاراڭغۇ ئۆيگە ماس كېلىدۇ)</string>
+  <!-- Description of the down caret in the alarm alert screen to expand the alarm content to edit perspective. [CHAR LIMIT=NONE] -->
   <string name="expand_alarm">قوڭغۇراقنى ياي</string>
+  <!-- Description of the up caret in the alarm alert screen to collapse the alarm content to summary perspective. [CHAR LIMIT=NONE] -->
   <string name="collapse_alarm">قوڭغۇراقنى يىغ</string>
+  <!-- Description of the button to undo change to alarm -->
   <string name="alarm_undo">يېنىۋال</string>
+  <!-- Toast content when an alarm was deleted  -->
   <string name="alarm_deleted">قوڭغۇراق ئۆچۈرۈلدى.</string>
+  <!-- slash between date and next alarm in the clock -->
   <string name="slash">/</string>
+  <!-- slash between date and next alarm in the clock -->
   <string name="world_day_of_week_label">/ <xliff:g id="LABEL">%s</xliff:g></string>
+  <!-- Description of field showing the next alarm time in the clock page, for accessibility. -->
   <string name="next_alarm_description">كېيىنكى قوڭغۇراق: <xliff:g id="ALARM_TIME">%s</xliff:g></string>
+  <!-- Displays the number of alarms selected from the list of alarms. -->
   <string name="alarms_selected"><xliff:g id="ALARMS">%d</xliff:g> تاللاندى</string>
+  <!-- message used by the talkback accessebility app to say that something was deleted -->
   <string name="deleted_message">ئۆچۈرۈلدى</string>
+  <!-- Alarm deletion confirmation message-->
   <plurals name="alarm_delete_confirmation">
+    <!-- Confirmation for one alarm -->
+    <!-- Confirmation more than one alarm  -->
     <item quantity="other">تاللانغان قوڭغۇراقنى ئۆچۈرەمدۇ؟\"</item>
   </plurals>
+  <!-- Timer deletion confirmation -->
   <string name="timer_delete_confirmation">بۇ ۋاقىت خاتىرىلىگۈچنى ئۆچۈرەمدۇ؟</string>
+  <!-- world clock deletion confirmation -->
   <string name="city_delete_confirmation">بۇ شەھەرنى چىقىرىۋېتەمدۇ؟</string>
+  <!-- Label for digital clock gadget displayed on-screen when that gadget is represented to the user. -->
   <string name="digital_gadget">رەقەملىك سائەت</string>
+  <!-- format strings for clocks -->
+  <!-- Font size for AM/PM should match widget_label_font_size -->
+  <!-- Font size for AM/PM should match bottom_text_size -->
+  <!-- Font size for AM/PM should match label_font_size -->
+  <!-- Font size for AM/PM should match alarm_label_size -->
+  <!-- String for no alarms -->
   <string name="no_alarms">قوڭغۇراقلىق سائەت يوق</string>
+  <!-- String for no alarms set [CHAR LIMIT=24] -->
+  <!-- String for no enabled alarms in timeline view [CHAR LIMIT=30] -->
   <string name="no_upcoming_alarms">ئالدىن بىكىتىلگەن قوڭغۇراقلىق سائەت يوق</string>
 </resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 137c4f3b7..c0e863624 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Показати іконку</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Показувати значок в рядку стану коли будильник увімкнено</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Наростаюча гучність</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Профіль <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Жодний профіль не обраний</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Додати</string>
   <string name="cities_add_city_title">Додати місто</string>
   <string name="cities_add_city_city">Місто:</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">Видалити місто</string>
   <string name="cities_delete_city_msg">Ви дійсно бажаєте видалити <xliff:g id="city">%s</xliff:g>?</string>
   <string name="cities_delete_city_failed">Неможливо видалити місто</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Натиск на кнопку гучності <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Дії перевертання</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Переверніть планшет вниз, щоб <xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">Переверніть телефон вниз, щоб <xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Дії при струшуванні</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Струсніть планшет, щоб <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Струсніть телефон, щоб <xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">відкладе будильник</string>
   <string name="action_summary_dismiss">відключить будильник</string>
   <string name="action_summary_do_nothing">не робити нічого</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Звук будильника</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Мелодія</string>
   <string name="alarm_type_playlist">Список відтворення</string>
   <string name="alarm_type_random">Випадкова мелодія</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Звук будильника вимкнено</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Обрати сигнал</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Мелодія</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Музика</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Типова мелодія</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">Не вдалося задати мелодію як сигнал</string>
   <string name="menu_item_widget_settings">Параметри віджета</string>
   <string name="activity_not_found">Додаток не знайдено!</string>
-  <string name="permlab_write_alarms">безпосередньо змінювати установки будильника</string>
-  <string name="permdesc_write_alarms">Дозволяє програмі додавати, змінювати або видаляти налаштування сигналів будильника.</string>
-  <string name="permlab_manage_alarms">перемикання запланованих будильнників</string>
-  <string name="permdesc_manage_alarms">Дозволяє програмі вмикати або вимикати будильники.</string>
-  <string name="permlab_read_alarms">доступ до запланованих будильників</string>
-  <string name="permdesc_read_alarms">Дозволяє програмі читати заплановані сигнали будильника.</string>
-  <string name="alarm_modification_service_desc">Служба, що дозволяє маніпуляції з сигналами будильника.</string>
 </resources>
diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-ur-rPK/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-uz-rUZ/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 5fd1a0d94..5f31f4287 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -16,46 +16,65 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">Hiện biểu tượng</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">Hiện biểu tượng trên thanh trạng thái khi đặt báo thức</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">Âm lượng tăng dần</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">Cấu hình <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">Không có cấu hình được chọn</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">Thêm</string>
   <string name="cities_add_city_title">Thêm thành phố</string>
   <string name="cities_add_city_city">Thành phố:</string>
   <string name="cities_add_city_timezone">Múi giờ:</string>
-  <string name="cities_add_city_gps_cd">Chạm để bản địa hoá thành phố của bạn</string>
+  <string name="cities_add_city_gps_cd">Chạm để xác định thành phố hiện tại của bạn</string>
   <string name="cities_add_loading">Đang tải\u2026</string>
   <string name="cities_add_searching">Đang tìm kiếm\u2026</string>
-  <string name="cities_add_gps_no_results">Truy vấn GPS không có kết quả vị trí</string>
+  <string name="cities_add_gps_no_results">Truy vấn GPS không trả về kết quả vị trí</string>
   <string name="cities_add_gps_not_available">GPS không có sẵn</string>
   <string name="cities_add_already_exists">Thành phố đã tồn tại trong cơ sở dữ liệu</string>
   <string name="cities_add_city_failed">Không thể tạo ra thành phố</string>
   <string name="cities_delete_city_title">Xóa thành phố</string>
   <string name="cities_delete_city_msg">Bạn có muốn xóa <xliff:g id="city">%s </xliff:g>?</string>
   <string name="cities_delete_city_failed">Không thể xóa bỏ thành phố</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">Nhấn nút âm lượng sẽ <xliff:g id="action">%s </xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">Hành động Lật</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">Lật máy tính bảng xuống sẽ <xliff:g id="action">%s </xliff:g></string>
   <string name="flip_action_summary" product="default">Lật điện thoại xuống sẽ <xliff:g id="action">%s </xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">Hành động Lắc</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">Lắc máy tính bảng sẽ <xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">Lắc điện thoại sẽ <xliff:g id="action">%s</xliff:g></string>
-  <string name="action_summary_snooze">tạm dừng báo thức</string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">báo lại báo thức</string>
   <string name="action_summary_dismiss">bỏ qua báo thức</string>
   <string name="action_summary_do_nothing">không làm gì</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">Chọn loại báo thức</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">Nhạc chuông</string>
-  <string name="alarm_type_playlist">Danh sách bài hát</string>
+  <string name="alarm_type_playlist">Danh sách phát</string>
   <string name="alarm_type_random">Ngẫu nhiên</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">Âm lượng báo thức được tắt</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">Chọn báo thức</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">Nhạc chuông</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">Nhạc</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">Nhạc chuông mặc định</string>
-  <string name="take_persistent_grant_uri_permission_failed_msg">Lỗi cấp quyền liên tục cho nhạc chuông</string>
-  <string name="menu_item_widget_settings">Cài đặt tiện ích</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">Không thể cấp quyền vĩnh viễn cho nhạc chuông</string>
+  <string name="menu_item_widget_settings">Cài đặt tiện ích con</string>
   <string name="activity_not_found">Không tìm thấy hoạt động!</string>
-  <string name="alarm_modification_service_desc">Dịch vụ cho phép các bên thứ ba thao tác với báo thức.</string>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index b8fb5aa7d..279417061 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">显示图标</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">闹钟设定时在状态栏上显示一个图标</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">渐强音量</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">情景模式 <xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">未选择情景模式</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">添加</string>
   <string name="cities_add_city_title">添加城市</string>
   <string name="cities_add_city_city">城市：</string>
@@ -35,33 +41,40 @@
   <string name="cities_delete_city_title">删除城市</string>
   <string name="cities_delete_city_msg">确定要删除 <xliff:g id="city">%s</xliff:g> 吗?</string>
   <string name="cities_delete_city_failed">不能删除该城市</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">按下音量按钮将<xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">翻转行为</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">翻转设备将<xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">翻转设备将<xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">摇动行为</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">摇动平板将<xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">摇动设备将<xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">暂停闹钟</string>
   <string name="action_summary_dismiss">停止闹钟</string>
   <string name="action_summary_do_nothing">不产生任何作用</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">选择提醒类型</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">铃声</string>
   <string name="alarm_type_playlist">播放列表</string>
   <string name="alarm_type_random">随机</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">闹钟音量为静音</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">选择闹钟</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">铃声</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">音乐</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">默认铃声</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">获取此铃声的永久授权失败。</string>
   <string name="menu_item_widget_settings">小部件设置</string>
   <string name="activity_not_found">没有找到活动！</string>
-  <string name="permlab_write_alarms">直接修改闹钟</string>
-  <string name="permdesc_write_alarms">允许应用添加、修改或删除您的闹钟。</string>
-  <string name="permlab_manage_alarms">开关已计划的闹钟</string>
-  <string name="permdesc_manage_alarms">允许应用开启或关闭您已计划的闹钟。</string>
-  <string name="permlab_read_alarms">访问已计划的闹钟</string>
-  <string name="permdesc_read_alarms">允许应用读取您已计划的闹钟。</string>
-  <string name="alarm_modification_service_desc">允许第三方控制闹钟的服务。</string>
 </resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 87bcab683..bd1edbb5d 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">顯示圖示</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">當鬧鐘設定後，在狀態列顯示圖示</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">漸增音量</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">設定檔<xliff:g id="profile">%s</xliff:g></string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">未選取設定檔</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">新增</string>
   <string name="cities_add_city_title">新增城市</string>
   <string name="cities_add_city_city">城市：</string>
@@ -35,19 +41,38 @@
   <string name="cities_delete_city_title">刪除城市</string>
   <string name="cities_delete_city_msg">您要刪除<xliff:g id="city">%s</xliff:g>嗎？</string>
   <string name="cities_delete_city_failed">無法刪除城市</string>
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">翻轉操作</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">翻轉平板電腦將<xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">翻轉電話將<xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">搖動操作</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">搖動平板電腦將<xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">搖動電話將<xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
+  <string name="action_summary_snooze">延遲鬧鐘</string>
   <string name="action_summary_do_nothing">什麼都不做</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">選擇鈴響類型</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">鈴聲</string>
+  <string name="alarm_type_playlist">播放清單</string>
   <string name="alarm_type_random">隨機</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">鬧鐘音量是無聲的</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">選擇鬧鐘</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">鈴聲</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">音樂</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">預設鈴聲</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+  <string name="take_persistent_grant_uri_permission_failed_msg">未能取得此鈴聲的永久授權</string>
+  <string name="menu_item_widget_settings">小工具設定</string>
+  <string name="activity_not_found">找不到活動！</string>
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 2c2abd7da..10f36c047 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
   <string name="show_status_bar_icon_title">顯示圖示</string>
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
   <string name="show_status_bar_icon_summary">有設定鬧鐘時在狀態列顯示圖示</string>
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
   <string name="alarm_increasing_volume">漸強音量</string>
+  <!-- Setting labels on Set alarm screen: Choose profile -->
   <string name="profile_description">設定檔「<xliff:g id="profile">%s</xliff:g>」</string>
+  <!-- No profile selected label -->
   <string name="profile_no_selected">未選取設定檔</string>
+  <!-- User-defined cities -->
   <string name="menu_item_add">新增</string>
   <string name="cities_add_city_title">新增城市</string>
   <string name="cities_add_city_city">城市：</string>
@@ -35,24 +41,40 @@
   <string name="cities_delete_city_title">刪除城市</string>
   <string name="cities_delete_city_msg">您要刪除「<xliff:g id="city">%s</xliff:g>」嗎？</string>
   <string name="cities_delete_city_failed">無法刪除城市</string>
+  <!-- Setting summary for volume buttons setting. -->
   <string name="volume_buttons_summary">按下音量鍵將<xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the flip action setting. -->
   <string name="flip_action_title">翻面動作</string>
+  <!-- Setting summary for the flip action setting. -->
   <string name="flip_action_summary" product="tablet">將平板電腦翻轉將<xliff:g id="action">%s</xliff:g></string>
   <string name="flip_action_summary" product="default">將手機翻轉將<xliff:g id="action">%s</xliff:g></string>
+  <!-- Setting title for the shake action setting. -->
   <string name="shake_action_title">搖動動作</string>
+  <!-- Setting summary for the shake action setting. -->
   <string name="shake_action_summary" product="tablet">搖動平板電腦將<xliff:g id="action">%s</xliff:g></string>
   <string name="shake_action_summary" product="default">搖動手機將<xliff:g id="action">%s</xliff:g></string>
+  <!-- Summary texts for shake and flip actions -->
   <string name="action_summary_snooze">延遲鬧鐘</string>
   <string name="action_summary_dismiss">停止鬧鐘</string>
   <string name="action_summary_do_nothing">不執行任何操作</string>
+  <!-- Alarm picker dialog title -->
   <string name="alarm_picker_title">選取鬧鐘類型</string>
+  <!-- Alarm types -->
   <string name="alarm_type_ringtone">鈴聲</string>
   <string name="alarm_type_playlist">播放清單</string>
   <string name="alarm_type_random">隨機</string>
+  <!-- Warn Silent Alarm title -->
   <string name="warn_silent_alarm_title">鬧鐘音量靜音</string>
+  <!-- Select the source of the alarm -->
   <string name="alarm_select">選取鬧鐘</string>
+  <!-- Select the ringtone as alarm -->
   <string name="alarm_select_ringtone">鈴聲</string>
+  <!-- Select the alarm from external device -->
   <string name="alarm_select_external">音樂</string>
+  <!-- Ringtone selection default -->
   <string name="ringtone_default">預設鈴聲</string>
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
   <string name="take_persistent_grant_uri_permission_failed_msg">無法取得此鈴聲的永久授權</string>
+  <string name="menu_item_widget_settings">小工具設定</string>
+  <string name="activity_not_found">找不到活動！</string>
 </resources>
diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml
new file mode 100644
index 000000000..82b795adc
--- /dev/null
+++ b/res/values-zu/cm_strings.xml
@@ -0,0 +1,39 @@
+<?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">
+  <!-- Setting title for showing/hiding the alarm status bar icon -->
+  <!-- Setting summary for showing/hiding the alarm statusbar icon -->
+  <!-- Setting labels on Set alarm screen: Increasing volume on or off -->
+  <!-- Setting labels on Set alarm screen: Choose profile -->
+  <!-- No profile selected label -->
+  <!-- User-defined cities -->
+  <!-- Setting summary for volume buttons setting. -->
+  <!-- Setting title for the flip action setting. -->
+  <!-- Setting summary for the flip action setting. -->
+  <!-- Setting title for the shake action setting. -->
+  <!-- Setting summary for the shake action setting. -->
+  <!-- Summary texts for shake and flip actions -->
+  <!-- Alarm picker dialog title -->
+  <!-- Alarm types -->
+  <!-- Warn Silent Alarm title -->
+  <!-- Select the source of the alarm -->
+  <!-- Select the ringtone as alarm -->
+  <!-- Select the alarm from external device -->
+  <!-- Ringtone selection default -->
+  <!-- Message that describe an error trying to take a persistent grant permission for an uri ringtone -->
+</resources>