Automatic translation import

Change-Id: I6accc5d5e84063b20a7837ccac93dbcd78c67f21
Ticket: -

99 files changed, 607 insertions, 684 deletions

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