From 5b2a4dd9729edddd68924e8b5eaf6e7d920385c7 Mon Sep 17 00:00:00 2001
From: "pinky@build01" <jenkins@cyanogenmod.com>
Date: Thu, 15 Dec 2016 18:13:12 -0800
Subject: Automatic translation import

Change-Id: Ibfa6607fad1b0f84a126a87abb6c4116a44adc2f
Ticket: -
---
 res/values-be/cm_strings.xml     | 35 ++++++++++++++++++-----------------
 res/values-ca/cm_strings.xml     |  2 +-
 res/values-cs/cm_strings.xml     |  1 +
 res/values-da/cm_strings.xml     | 14 ++++++++++++++
 res/values-eu-rES/cm_strings.xml |  2 +-
 res/values-fr/cm_strings.xml     | 20 ++++++++++++++++++++
 res/values-in/cm_strings.xml     |  2 +-
 res/values-nb/cm_strings.xml     | 16 ++++++++--------
 res/values-nl/cm_strings.xml     | 10 +++++-----
 res/values-pt-rBR/cm_strings.xml |  1 +
 res/values-sl/cm_strings.xml     |  2 +-
 11 files changed, 71 insertions(+), 34 deletions(-)

diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index 1579b54..05f6cac 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -94,9 +94,9 @@
   <string name="profile_populate_profile_from_state">Стварыць профіль з бягучых налад прылады?</string>
   <string name="profile_menu_fill_from_state">Выкарыстоўваць бягучыя налады</string>
   <string name="profile_remove_current_profile">Немагчыма выдаліць бягучы профіль!</string>
-  <string name="profile_app_group_category_title">Апавяшчэнні</string>
+  <string name="profile_app_group_category_title">Паведамленьні</string>
   <string name="profile_app_group_item_instructions">Дадаць ці выдаліць групы</string>
-  <string name="profile_app_group_item_instructions_summary">Змена налад апавяшчэнняў для груп дадаткаў у гэтым профілі</string>
+  <string name="profile_app_group_item_instructions_summary">Дадаць, альбо выдаліць дадаткі, для якіх будуць зьменены налады</string>
   <!-- Profile mode options. -->
   <string name="profile_entries_on">Укл.</string>
   <string name="profile_entries_off">Выкл.</string>
@@ -223,17 +223,17 @@
   <string name="profile_setup_setup_triggers_description">Пакажыце ўмовы, пры якіх будзе ўлучацца дадзены профіль</string>
   <string name="profile_setup_actions_description">Зараз можна наладзіць, што павінна адбывацца пры актывацыі профілю</string>
   <!-- Navigation Bar -->
-  <string name="navigation_bar_category">Радок стану</string>
+  <string name="navigation_bar_category">Навігацыйны радок</string>
   <string name="navigation_bar_left_title">Рэжым ляўшы</string>
   <string name="navigation_bar_left_summary">Адлюстроўваць радок стану злева ў альбомнай арыентацыі экрана</string>
-  <string name="navigation_bar_title">Кнопкі і іх размяшчэнне</string>
-  <string name="navigation_bar_help_text">Для разблакоўкі панэлі навігацыі і пачатку рэдагавання дакраніцеся значка праўкі.\n\nДакраніцеся віртуальнай кнопкі для змены функцыі ці ўтрымвайце яе для перасоўвання.\n\nпасля гэтага націсніце \"Захаваць\" для пацверджання змен ці \"Аднавіць\", каб вярнуць стандартныя налады.</string>
+  <string name="navigation_bar_title">Кнопкі і іх месцазнаходжаньне</string>
+  <string name="navigation_bar_help_text">Для разблакаваньня навігацыйнага радка і пачатку рэдагаваньня краніся значыка праўкі.\n\nДакраніцеся віртуальнай кнопкі для зьмены функцыі ці ўтрымлівай яе для перасоўваньня.\n\nпасьля гэтага націсьні \"Захаваць\" для пацверджаньня змен ці \"Аднавіць\", каб вярнуць першапачатковыя налады.</string>
   <string name="navigation_restore_button_text">Узнавіць\n</string>
   <string name="navigation_edit_button_text">Рэдагаваць</string>
   <string name="navigation_save_button_text">Захаваць</string>
-  <string name="navigation_bar_reset_message">Выдаліць бягучыя налады і ўзнавіць стандартны набор?</string>
+  <string name="navigation_bar_reset_message">Выдаліць бягучыя налады і ўзнавіць першапачатковы набор?</string>
   <string name="navigation_bar_arrow_keys_title">Перасоўванне курсора</string>
-  <string name="navigation_bar_arrow_keys_summary">Адлюстроўваць кнопкі перасоўвання курсора налева ці направа пры ўводзе. Кнопка выбару метаду ўводу адлюстроўвацца не будзе.</string>
+  <string name="navigation_bar_arrow_keys_summary">Адлюстроўваць кнопкі перасоўваньня курсора налева ці направа падчас друкаваньня. Кнопка выбару метаду ўводу адлюстроўвацца не будзе.</string>
   <string name="navigation_bar_recents_title">Доўгі націск кнопкі \"Агляд\"</string>
   <!-- Notification light dialogs -->
   <string name="edit_light_settings">Змена налад індыкатара</string>
@@ -288,12 +288,12 @@
   <!-- Warning for Adb over Network -->
   <string name="adb_over_network_warning">УВАГА: калі ўключана адладка па сетцы, прылада адкрыта для некантралюемага доступу з усіх падлучаных сетак!\n\nСкарыстайце гэту функцыю толькі тады, калі вы падлучаны да давераных сетак.\n\nВы сапраўды хочаце ўключыць гэту функцыю?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
-  <string name="adb_notify">Апавяшчэнне пра адладку</string>
-  <string name="adb_notify_summary">Паказваць апавяшчэнне пра ўлучаны рэжым адладкі па USB ці па сетцы</string>
+  <string name="adb_notify">Паведамленьні наладжваньня</string>
+  <string name="adb_notify_summary">Паказваць паведамленьне аб тым, што задзейнічана наладка па USB ці сетцы</string>
   <!-- Names of categories of app ops tabs - extension of AOSP -->
   <string name="app_ops_categories_location">Месцазнаходжанне</string>
   <string name="app_ops_categories_personal">Асабістыя дадзеныя</string>
-  <string name="app_ops_categories_messaging">Паведамленні</string>
+  <string name="app_ops_categories_messaging">Паведамленьні</string>
   <string name="app_ops_categories_media">Мультымедыя</string>
   <string name="app_ops_categories_device">Прылада</string>
   <string name="app_ops_categories_bootup">Загрузка</string>
@@ -324,7 +324,7 @@
   <string name="app_ops_summaries_write_icc_sms">запіс SMS на SIM-карту</string>
   <string name="app_ops_summaries_modify_settings">змена налад</string>
   <string name="app_ops_summaries_draw_on_top">адлюстраванне па-над іншымі элементамі</string>
-  <string name="app_ops_summaries_access_notifications">доступ да апавяшчэнняў</string>
+  <string name="app_ops_summaries_access_notifications">дазволіць паведамленьні</string>
   <string name="app_ops_summaries_camera">камера</string>
   <string name="app_ops_summaries_record_audio">запіс аўдыя</string>
   <string name="app_ops_summaries_play_audio">прайграванне аўдыя</string>
@@ -717,7 +717,7 @@
   <string name="status_bar_icons_summary">Налады бачнасці значыкаў</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">Блакіяваць падзеі жэстаў</string>
-  <string name="edge_gesture_service_summary">Не перадаваць дадаткам жэсты паказу радка стану і панэлі навігацыі</string>
+  <string name="edge_gesture_service_summary">Не перадаваць дадаткам жэсты паказу радка стану і радок навігацыі</string>
   <!-- Keep screen on strings -->
   <string name="keep_screen_on_never">Ніколі</string>
   <string name="keep_screen_on_debugging">Пры ўключанай адладцы</string>
@@ -765,7 +765,7 @@
   <!-- Memory -->
   <string name="memory_startup_apps_title">Улучана падчас запуску прылады</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
-  <string name="notification_ringtone_title_cm">Гук апавяшчэння</string>
+  <string name="notification_ringtone_title_cm">Гук паведамленьня</string>
   <!-- Advanced reboot options -->
   <string name="advanced_reboot_title">Варыянты перазагрузкі</string>
   <string name="advanced_reboot_summary">Паказваць дадатковыя опцыі перазагрузкі прылады ў рэжым \"загрузчык\", \"аднаўлення\" ці \"перазапуску інтэрфейсу\" у меню кнопкі сілкавання</string>
@@ -774,7 +774,7 @@
   <string name="power_menu_expanded_desktop">Пашыраны экран</string>
   <string name="expanded_hide_nothing">Нічога не хаваць</string>
   <string name="expanded_hide_status">Хаваць радок стану</string>
-  <string name="expanded_hide_navigation">Хаваць панэль навігацыі</string>
+  <string name="expanded_hide_navigation">Схаваць навігацыйны радок</string>
   <string name="expanded_hide_both">Хаваць абедзве</string>
   <string name="expanded_nothing_to_show">Для налады параметраў пашыранага экрана для асобных дадаткаў, перавядзіце пераключальнік \"Уключыць для ўсіх\" у адключаны стан</string>
   <string name="expanded_enabled_for_all">Уключыць для ўсіх</string>
@@ -1000,15 +1000,16 @@
   <string name="weather_settings_temp_celsius">Цэльсій</string>
   <string name="weather_settings_temp_fahrenheit">Фарэнгейт</string>
   <string name="weather_settings_keyword">надвор\'е</string>
+  <string name="allow_background_none">Адсутнічае дазвол</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">Звесткі пра надвор\'е</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">На экране блакавання</string>
-  <string name="app_notification_show_on_keyguard_summary">Паказваць апавяшчэнні з гэтага дадатку на экране блакавання</string>
-  <string name="app_notification_no_ongoing_on_keyguard_title">Адключыць шторазовыя апавяшчэнні пра блакаванне экрана</string>
-  <string name="app_notification_no_ongoing_on_keyguard_summary">Не паказваць шторазовыя апавяшчэнні з гэтага дадатку на экране блакавання</string>
+  <string name="app_notification_show_on_keyguard_summary">Паказваць паведамленьні гэтага дадатку на экране блакаваньня</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Не паказваць паведамленьні на экране блакаваньня</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Не паказваць паведамленьні гэтага дадатку на экране блакаваньня</string>
   <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 640de57..6ededb5 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -552,7 +552,7 @@
   <string name="double_tap_to_sleep_summary">Pica dues vegades a la barra d\'estat per apagar la pantalla</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Evita l\'encesa accidental</string>
-  <string name="proximity_wake_summary">Comprova el sensor de proximitat abans dels despertars provocats per gestos</string>
+  <string name="proximity_wake_summary">Comprova el sensor de proximitat abans d\'encendre\'s a través de gestos</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Encén en endollar</string>
   <string name="wake_when_plugged_or_unplugged_summary">Encén la pantalla en connectar o desconnectar d\'una font d\'energia</string>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 3bfbd36..3a3feca 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -554,6 +554,7 @@
   <string name="double_tap_to_sleep_summary">Dvojitým poklepáním na stavovou lištu vypnout obrazovku</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Zabránit nechtěnému probuzení</string>
+  <string name="proximity_wake_summary">Před probuzením gesty zkontrolovat senzor přiblížení</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Probudit při nabíjení</string>
   <string name="wake_when_plugged_or_unplugged_summary">Zapnout obrazovku při připojení nebo odpojení nabíječky</string>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index fd6b248..ac84597 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -280,6 +280,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Lysindstillinger</string>
   <string name="led_notification_text">LED-lys aktiveret via indstillinger</string>
+  <string name="notification_light_no_apps_summary">Aktivér \'%1$s\' og tryk på \'\u002b\' på menulinjen for at tilføje per app-kontrol</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android-fejlfinding</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -388,6 +389,7 @@
   <string name="app_ops_labels_receive_sms">Modtag SMS/MMS</string>
   <string name="app_ops_labels_receive_emergency_sms">Modtag nød-SMS</string>
   <string name="app_ops_labels_receive_mms">Modtag SMS/MMS</string>
+  <string name="app_ops_labels_receive_wap_push">Modtag WAP push</string>
   <string name="app_ops_labels_send_sms">Send SMS/MMS</string>
   <string name="app_ops_labels_read_icc_sms">Læs ICC SMS</string>
   <string name="app_ops_labels_write_icc_sms">Skriv ICC SMS</string>
@@ -1025,6 +1027,13 @@
   <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 -->
+  <string name="app_notification_sound_timeout_value_none">Ingen begrænsning</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 minut</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">Udvidet radiokontrol</string>
   <!-- Radio Control (IMS/MBN etc.) -->
@@ -1045,5 +1054,10 @@
   <string name="not_available_with_app">Ikke tilgængelig med %1$s</string>
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">tilbage</string>
+  <string name="security_settings_fingerprint_sensor_location_front">front</string>
+  <string name="security_settings_fingerprint_sensor_location_left">venstre side</string>
+  <string name="security_settings_fingerprint_sensor_location_right">højre side</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Stemme: <xliff:g id="voice_state">%1$s</xliff:g>, data: <xliff:g id="data_state">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 728be8c..eaa76f9 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -536,7 +536,7 @@
   <string name="power_menu_screenshot_title">Pantaila-argazkia</string>
   <string name="power_menu_airplane_title">Hegaldi modua</string>
   <string name="power_menu_users_title">Erabiltzaile aldaketa</string>
-  <string name="power_menu_settings_title">Ezarpenera lasterbidea</string>
+  <string name="power_menu_settings_title">Ezarpenetara lasterbidea</string>
   <string name="power_menu_lockdown_title">Gailu blokeoa</string>
   <string name="power_menu_bug_report_title">Errore-txostena</string>
   <string name="power_menu_sound_title">Soinu panela</string>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 0a566e2..df8c16c 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -44,6 +44,8 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="root_access_adb">ADB uniquement</string>
   <string name="root_access_all">Applications et ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Gérer les accès root</string>
+  <string name="root_appops_summary">Visualiser et contrôler les règles root</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -935,6 +937,10 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <!-- [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 -->
+  <string name="zen_mode_vibration">Vibreur</string>
+  <string name="zen_mode_vibration_never">Ne pas vibrer</string>
+  <string name="zen_mode_vibration_calls_only">Vibrer uniquement pour les appels</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Vibrer pour les appels et les notifications</string>
   <!-- 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>
@@ -1040,11 +1046,25 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <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 -->
+  <string name="app_notification_sound_timeout_title">Temps minimum entre les sons de notification</string>
+  <string name="app_notification_sound_timeout_summary_template">Ne pas permettre plus d\'un son ou une vibration toutes les <xliff:g id="duration">%1$s</xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Aucune restriction</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 secondes</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 secondes</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 minute</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 minutes</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 minutes</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 minutes</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Fond d\'écran</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Localiser le capteur d’empreintes digitales sur <xliff:g id="sensor_location">%1$s </xliff:g> de votre téléphone.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">l\'arrière</string>
+  <string name="security_settings_fingerprint_sensor_location_front">la façade</string>
+  <string name="security_settings_fingerprint_sensor_location_left">le côté gauche</string>
+  <string name="security_settings_fingerprint_sensor_location_right">le côté droit</string>
   <!-- SIM status format string -->
 </resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 77fbfb5..18701a3 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -604,7 +604,7 @@
   <string name="live_display_color_profile_natural_title">Alami</string>
   <string name="live_display_color_profile_natural_summary">Warna realistis dan nada daging</string>
   <string name="live_display_color_profile_dynamic_title">Dinamis</string>
-  <string name="live_display_color_profile_dynamic_summary">Warna yang ditingkatkan dan putih terang</string>
+  <string name="live_display_color_profile_dynamic_summary">Peningkatan warna dan putih terang</string>
   <string name="live_display_color_profile_cinema_title">Bioskop</string>
   <string name="live_display_color_profile_cinema_summary">Reproduksi warna yang sempurna untuk video</string>
   <string name="live_display_color_profile_astronomy_title">Ilmu perbintangan</string>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index ac7380e..2f8d1a0 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -48,7 +48,7 @@
   <string name="root_access_none">Deaktivert</string>
   <string name="root_access_apps">Kun apper</string>
   <string name="root_access_adb">Kun ADB</string>
-  <string name="root_access_all">Apps og ADB</string>
+  <string name="root_access_all">Apper og ADB</string>
   <!-- Preference link for root appops -->
   <string name="root_appops_title">Administrer root tilganger</string>
   <string name="root_appops_summary">Se over og endre root reglene</string>
@@ -154,7 +154,7 @@
   <string name="soundtone_title">Notifikasjonstone</string>
   <!-- Title for application group setting screen -->
   <string name="profile_appgroups_title">App grupper</string>
-  <string name="profile_applist_title">Apps</string>
+  <string name="profile_applist_title">Apper</string>
   <string name="profile_new_appgroup">Ny app gruppe</string>
   <string name="profile_delete_appgroup">Slett denne app  gruppen?</string>
   <string name="profile_appgroup_name_prompt">Angi et navn for den nye app gruppen</string>
@@ -273,7 +273,7 @@
   <!-- Lights settings screen, notification light settings -->
   <string name="notification_light_title">Notifikasjonslys</string>
   <string name="notification_light_general_title">Generelt</string>
-  <string name="notification_light_applist_title">Apps</string>
+  <string name="notification_light_applist_title">Apper</string>
   <string name="notification_light_phonelist_title">Telefon</string>
   <string name="notification_light_use_custom">Bruk egendefinerte verdier</string>
   <string name="notification_light_default_value">Standard</string>
@@ -459,7 +459,7 @@
   <string name="app_ops_both_count">Tillatte <xliff:g id="count">%1$s</xliff:g>, avslåtte <xliff:g id="count">%2$s</xliff:g></string>
   <string name="app_ops_disabled_by_optimization">Deaktivert av batterioptimalisering</string>
   <!-- App ops menu options -->
-  <string name="app_ops_show_user_apps">Vis brukerinstallerte apps</string>
+  <string name="app_ops_show_user_apps">Vis brukerinstallerte apper</string>
   <string name="app_ops_show_system_apps">Vis systemapper</string>
   <string name="app_ops_reset_counters">Tilbakestill tillate/avkrefte tellerne</string>
   <string name="app_ops_reset_confirm_title">Bekreft tilbakestilling av tellere</string>
@@ -483,7 +483,7 @@
   <string name="hardware_keys_double_tap_title">Dobbelttrykk handling</string>
   <string name="hardware_keys_action_nothing">Ingen handling</string>
   <string name="hardware_keys_action_menu">Åpne/lukke menyen</string>
-  <string name="hardware_keys_action_app_switch">Siste apps</string>
+  <string name="hardware_keys_action_app_switch">Siste apper</string>
   <string name="hardware_keys_action_search">Søkeassistent</string>
   <string name="hardware_keys_action_voice_search">Talesøk</string>
   <string name="hardware_keys_action_in_app_search">I-app søk</string>
@@ -735,7 +735,7 @@
   <string name="status_bar_icons_summary">Kontroller hvilke av status ikonene som skal vises</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">Blokker touchbevegelseshendelser</string>
-  <string name="edge_gesture_service_summary">Ikke send touch hendelser for navigering og status bar bevegelser til apps</string>
+  <string name="edge_gesture_service_summary">Ikke send touch hendelser for navigering og status bar bevegelser til apper</string>
   <!-- Keep screen on strings -->
   <string name="keep_screen_on_never">Aldri</string>
   <string name="keep_screen_on_debugging">Under USB feilsøking</string>
@@ -746,7 +746,7 @@
   <string name="privacy_guard_default_title">Aktivert som standard</string>
   <string name="privacy_guard_default_summary">Aktiver som standard for nylig installerte programmer</string>
   <string name="privacy_guard_manager_title">Personvernvakt</string>
-  <string name="privacy_guard_manager_summary">Administrere hvilke apps som har tilgang til dine personopplysninger</string>
+  <string name="privacy_guard_manager_summary">Administrer hvilke apper som har tilgang til dine personopplysninger</string>
   <string name="privacy_guard_no_user_apps">Ingen programmer er installert</string>
   <string name="privacy_guard_help_title">Hjelp</string>
   <string name="privacy_guard_reset_title">Tilbakestill</string>
@@ -878,7 +878,7 @@
   <!-- Protected Apps -->
   <string name="menu_hidden_apps_delete">Tilbakestille</string>
   <string name="menu_hidden_apps_reset_lock">Tilbakestille mønster lås</string>
-  <string name="protected_apps">Beskyttede apps</string>
+  <string name="protected_apps">Beskyttede apper</string>
   <string name="protected_apps_summary">Administrer hvilke apper som er skjult bak en sikkerhetslås</string>
   <string name="saving_protected_components">Lagre komponent status\u2026</string>
   <string name="pa_login_username_hint">Brukernavn (epost)</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 0431376..365b7dc 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -87,18 +87,18 @@
   <string name="profiles_add">Toevoegen</string>
   <string name="profile_menu_delete">Verwijderen</string>
   <string name="profile_settings_title">Profiel</string>
-  <string name="profile_empty_list_profiles_off">Om systeemprofielen te gebruiken, schakelt u Profielen in</string>
+  <string name="profile_empty_list_profiles_off">Om systeemprofielen te gebruiken, schakelt u Profielen in.</string>
   <string name="profile_trigger_configure">Trigger instellen</string>
   <string name="profile_write_nfc_tag">Schrijven naar NFC-tag</string>
   <string name="profile_write_touch_tag">Raak tag aan om te schrijven</string>
   <string name="profile_write_success">Tag succesvol geschreven</string>
   <string name="profile_write_failed">Tag schrijven mislukt</string>
-  <string name="profile_selected">Geselecteerd profiel: %1$s</string>
+  <string name="profile_selected">Gekozen profiel: %1$s</string>
   <string name="profile_nfc_text">Een profiel naar een NFC-tag schrijven maakt het mogelijk een profiel te kiezen door de tag aan te raken. Een tweede keer aanraken selecteert het vorig gekozen profiel.</string>
   <string name="profile_unknown_nfc_tag">Onbekend profiel</string>
   <string name="profile_add_nfc_text">Deze NFC-tag verwijst naar een onbekend profiel. Door deze NFC-tag toe te wijzen aan een bestaand profiel wordt het kiezen van het profiel mogelijk.</string>
   <string name="profile_select">Profiel kiezen</string>
-  <string name="profile_remove_dialog_message">Profiel verwijderen %1$s?</string>
+  <string name="profile_remove_dialog_message">Profiel %1$s verwijderen?</string>
   <string name="profile_populate_profile_from_state">Profiel instellen met behulp van huidige apparaatinstellingen?</string>
   <string name="profile_menu_fill_from_state">Huidige apparaatinstellingen importeren</string>
   <string name="profile_remove_current_profile">Kan huidige profiel niet verwijderen.</string>
@@ -287,7 +287,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Verlichtingsinstellingen</string>
   <string name="led_notification_text">LED-verlichting ingeschakeld door instellingen</string>
-  <string name="notification_light_no_apps_summary">Om controle per app toe te voegen, activeer %1$s en klik \'\u002b\' op de menubalk</string>
+  <string name="notification_light_no_apps_summary">Om controle per app toe te voegen, activeer %1$s en tik \'\u002b\' op de menubalk</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android-foutopsporing</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -894,7 +894,7 @@
   <string name="contributor_info_menu">Informatie over bijdragers</string>
   <string name="contributor_info_msg">
         <![CDATA[<b>Naam:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
-                 <b>Alias::</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
+                 <b>Alias:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
                  <b>Commits:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
   <string name="contributions_info_menu">Informatie over bijdragers</string>
   <string name="contributions_info_msg">
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 40deacb..05fdb64 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -552,6 +552,7 @@
   <string name="double_tap_to_sleep_summary">Toque duas vezes na barra de status para desligar a tela</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Evitar despertar acidental</string>
+  <string name="proximity_wake_summary">Verifique o sensor de proximidade antes de acordar o dispositivo com gestos</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Acordar ao plugar</string>
   <string name="wake_when_plugged_or_unplugged_summary">Ativar a tela ao ligar ou desligar do carregador</string>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index b3d9f91..daac0d6 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -878,7 +878,7 @@
   <string name="preview_country_title">Država</string>
   <string name="preview_carrier_title">Ponudnik</string>
   <string name="stats_collection_title">Zbiranje statistike</string>
-  <string name="stats_collection_summary">Ko je omogočeno, dovoli zbiranje metrik</string>
+  <string name="stats_collection_summary">Ko je omogočeno, dovoli zbiranje meritev</string>
   <!-- Protected apps lockpattern reset button -->
   <string name="lockpattern_reset_button">Ponastavi vzorec</string>
   <string name="lockpattern_settings_reset_summary">Vnesite glavni e-poštni račun in povezano geslo, da ponastavite vzorec za zaklepanje</string>
-- 
cgit v1.1


From 43e0d3d3b74ae9bbdaafa90e122515acc253c323 Mon Sep 17 00:00:00 2001
From: "clyde@build01" <jenkins@cyanogenmod.com>
Date: Fri, 16 Dec 2016 17:43:00 -0800
Subject: Automatic translation import

Change-Id: I163776c38e0240ccbe78cb752a87658cec7c9975
Ticket: -
---
 res/values-sk/cm_strings.xml | 202 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 202 insertions(+)

diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index a939e05..d31f473 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/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">Ste <xliff:g id="step_count">%1$d </xliff:g> krok od otázky na ID zariadenia.</item>
+    <item quantity="few">Ste <xliff:g id="step_count">%1$d </xliff:g> kroky od otázky na ID zariadenia.</item>
+    <item quantity="other">Ste <xliff:g id="step_count">%1$d </xliff:g> krokov od dopytovania ID zariadení.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">ID zariadenia: [<xliff:g id="device_id">%1$s </xliff:g>] zkopírované do schránky</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">ID zariadenia nie je k dispozícii v tomto zostavení</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">ID zariadenia</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Teraz ste <xliff:g id="step_count">%1$d</xliff:g> krok od povolenia možnosti pre vývojárov.</item>
@@ -44,6 +52,8 @@
   <string name="root_access_adb">Iba ADB</string>
   <string name="root_access_all">Aplikácie a ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Spravovať prístupy root</string>
+  <string name="root_appops_summary">Zobraziť a spravovať pravidlá prístupu root</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -54,6 +64,7 @@
   <!-- About phone screen, Device name -->
   <string name="device_name">Názov zariadenia</string>
   <!-- About phone screen, CyanogenMod Api Level -->
+  <string name="mod_api_level">CyanogenMod API úroveň</string>
   <string name="mod_api_level_default">Neznáme</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Dátum zostavy</string>
@@ -110,6 +121,7 @@
   <string name="rename_dialog_hint">Zadajte názov profilu</string>
   <!-- Reset Profiles -->
   <string name="profile_reset_title">Obnoviť</string>
+  <string name="profile_reset_message">Vymazať všetky používateľské profily a skupiny aplikácií a obnoviť ich na predvolené?</string>
   <!-- Delete confimation messages -->
   <string name="profile_app_delete_confirm">Odstrániť túto aplikáciu?</string>
   <!-- Profile network mode -->
@@ -169,6 +181,7 @@
   <string name="toggleData">Mobilné dáta</string>
   <string name="toggleSync">Automatická synchronizácia dát</string>
   <string name="toggle2g3g4g">Preferovaný typ siete</string>
+  <string name="toggle2g3g4g_msim">Preferovaný typ siete (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Kód oblasti Wi\u2011Fi</string>
@@ -269,9 +282,14 @@
   <string name="notification_light_missed_call_title">Zmeškaný hovor</string>
   <string name="notification_light_voicemail_title">Hlasový hovor</string>
   <string name="notification_light_screen_on">Upozorňovať pomocou LED pri zapnutej obrazovke</string>
+  <string name="notification_light_zen_mode">Svetlná signalizácia v režime Nerušiť</string>
   <string name="notification_light_use_multiple_leds">Viaceré LED</string>
   <string name="keywords_lights_brightness_level">stlmiť jas LED svetiel</string>
+  <string name="notification_light_automagic">Automaticky zvoliť farby</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Nastavenia svetla</string>
+  <string name="led_notification_text">LED svetlo povolené v Nastaveniach</string>
+  <string name="notification_light_no_apps_summary">Na pridanie ovládania podľa aplikácie, aktivujte \'%1$s\' a stlačte \'\u002b\' v ponuke</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Ladenie systému Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -303,6 +321,8 @@
   <string name="app_ops_summaries_modify_call_log">upraviť denník hovorov</string>
   <string name="app_ops_summaries_read_calendar">čítať údaje z kalendára</string>
   <string name="app_ops_summaries_modify_calendar">upraviť údaje v kalendári</string>
+  <string name="app_ops_summaries_wifi_scan">Wi-Fi prehľadávanie</string>
+  <string name="app_ops_summaries_notification">oznámenia/upozornenia</string>
   <string name="app_ops_summaries_cell_scan">prehľadávanie bunky</string>
   <string name="app_ops_summaries_call_phone">telefonovať</string>
   <string name="app_ops_summaries_read_sms">čítať SMS</string>
@@ -330,15 +350,39 @@
   <string name="app_ops_summaries_media_volume">hlasitosť médií</string>
   <string name="app_ops_summaries_alarm_volume">hlasitosť budíka</string>
   <string name="app_ops_summaries_notification_volume">hlasitosť oznámenia</string>
+  <string name="app_ops_summaries_bluetooth_volume">hlasitosť Bluetooth</string>
   <string name="app_ops_summaries_keep_awake">zabrániť zariadeniu prejsť do režimu spánku</string>
   <string name="app_ops_summaries_monitor_location">sledovať polohu</string>
   <string name="app_ops_summaries_monitor_high_power_location">sledovať polohu v režime vysokej spotreby</string>
+  <string name="app_ops_summaries_get_usage_stats">získať štatistiky používania</string>
   <string name="app_ops_summaries_mute_unmute_microphone">stlmiť/zrušiť stlmenie mikrofónu</string>
   <string name="app_ops_summaries_toast_window">Zobraziť vyskakovacie upozornenia</string>
   <string name="app_ops_summaries_project_media">premietať médiá</string>
   <string name="app_ops_summaries_activate_vpn">aktivovať VPN</string>
+  <string name="app_ops_summaries_write_wallpaper">uložiť tapetu</string>
+  <string name="app_ops_summaries_assist_structure">asistent štruktúry</string>
+  <string name="app_ops_summaries_assist_screenshot">asistent snímky obrazovky</string>
+  <string name="app_ops_summaries_read_phone_state">čítať stav telefónu</string>
+  <string name="app_ops_summaries_add_voicemail">pridať hlasovú poštu</string>
+  <string name="app_ops_summaries_use_sip">použiť SIP</string>
+  <string name="app_ops_summaries_make_call">zavolať</string>
+  <string name="app_ops_summaries_use_fingerprint">použiť odtlačok prsta</string>
+  <string name="app_ops_summaries_use_body_sensors">použiť telové senzory</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">čítať správy GSM buniek</string>
+  <string name="app_ops_summaries_mock_location">falšovať polohu</string>
+  <string name="app_ops_summaries_read_external_storage">čítať externé úložisko</string>
+  <string name="app_ops_summaries_write_external_storage">zapisovať do externého úložiska</string>
+  <string name="app_ops_summaries_turn_screen_on">zapnúť obrazovku</string>
+  <string name="app_ops_summaries_get_accounts">získať účty</string>
+  <string name="app_ops_summaries_toggle_wifi">prepnúť Wi-Fi</string>
+  <string name="app_ops_summaries_toggle_bluetooth">prepnúť bluetooth</string>
+  <string name="app_ops_summaries_start_at_boot">spustiť pri štarte</string>
+  <string name="app_ops_summaries_toggle_nfc">prepnúť NFC</string>
+  <string name="app_ops_summaries_toggle_mobile_data">prepnúť mobilné dáta</string>
   <string name="app_ops_summaries_superuser">root prístup</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">Získať približnú polohu</string>
+  <string name="app_ops_labels_fine_location">Získať presnú polohu</string>
   <string name="app_ops_labels_gps">GPS</string>
   <string name="app_ops_labels_vibrate">Vibrovať</string>
   <string name="app_ops_labels_read_contacts">Čítať údaje z kontaktov</string>
@@ -347,11 +391,19 @@
   <string name="app_ops_labels_modify_call_log">Upraviť denník hovorov</string>
   <string name="app_ops_labels_read_calendar">Čítať údaje z kalendára</string>
   <string name="app_ops_labels_modify_calendar">Upraviť údaje v kalendári</string>
+  <string name="app_ops_labels_wifi_scan">Wi-Fi prehľadávanie</string>
   <string name="app_ops_labels_notification">Oznámenie/Toast</string>
+  <string name="app_ops_labels_cell_scan">Mobilné prehľadanie</string>
   <string name="app_ops_labels_call_phone">Telefonovať</string>
+  <string name="app_ops_labels_read_sms">Čítanie SMS</string>
+  <string name="app_ops_labels_write_sms">Písanie SMS</string>
   <string name="app_ops_labels_receive_sms">Prijať SMS</string>
+  <string name="app_ops_labels_receive_emergency_sms">Prijať núdzové SMS</string>
   <string name="app_ops_labels_receive_mms">Prijať MMS</string>
+  <string name="app_ops_labels_receive_wap_push">Prijať správy WAP push</string>
   <string name="app_ops_labels_send_sms">Odoslať SMS</string>
+  <string name="app_ops_labels_read_icc_sms">Čítať ICC SMS</string>
+  <string name="app_ops_labels_write_icc_sms">Napísať ICC SMS</string>
   <string name="app_ops_labels_modify_settings">Upraviť nastavenia</string>
   <string name="app_ops_labels_draw_on_top">Vykresliť do najvyššej vrstvy</string>
   <string name="app_ops_labels_access_notifications">Pristupovať k oznámeniam</string>
@@ -370,10 +422,33 @@
   <string name="app_ops_labels_notification_volume">Hlasitosť oznámenia</string>
   <string name="app_ops_labels_bluetooth_volume">Hlasitosť bluetooth</string>
   <string name="app_ops_labels_keep_awake">Zabrániť zariadeniu prejsť do režimu spánku</string>
+  <string name="app_ops_labels_monitor_location">Sledovať polohu</string>
+  <string name="app_ops_labels_monitor_high_power_location">Sledovať polohu v režime vysokej spotreby</string>
+  <string name="app_ops_labels_get_usage_stats">Získať štatistiky používania</string>
   <string name="app_ops_labels_mute_unmute_microphone">Stlmiť/zrušiť stlmenie mikrofónu</string>
   <string name="app_ops_labels_toast_window">Zobraziť vyskakovacie upozornenia</string>
   <string name="app_ops_labels_project_media">Premietať médiá</string>
   <string name="app_ops_labels_activate_vpn">Aktivovať VPN</string>
+  <string name="app_ops_labels_write_wallpaper">Zapísať tapetu</string>
+  <string name="app_ops_labels_assist_structure">Asistent štruktúry</string>
+  <string name="app_ops_labels_assist_screenshot">Asistent snímky obrazovky</string>
+  <string name="app_ops_labels_read_phone_state">Čítať stav telefónu</string>
+  <string name="app_ops_labels_add_voicemail">Pridať hlasovú poštu</string>
+  <string name="app_ops_labels_use_sip">Použiť SIP</string>
+  <string name="app_ops_labels_make_call">Vykonať hovor</string>
+  <string name="app_ops_labels_use_fingerprint">Použiť odtlačok prsta</string>
+  <string name="app_ops_labels_use_body_sensors">Použiť telové senzory</string>
+  <string name="app_ops_labels_read_cell_broadcasts">Čítať správy GSM buniek</string>
+  <string name="app_ops_labels_mock_location">Falšovať polohu</string>
+  <string name="app_ops_labels_read_external_storage">Čítať externé úložisko</string>
+  <string name="app_ops_labels_write_external_storage">Zapisovať do externého úložiska</string>
+  <string name="app_ops_labels_turn_screen_on">Zapnúť obrazovku</string>
+  <string name="app_ops_labels_get_accounts">Získať účty</string>
+  <string name="app_ops_labels_toggle_wifi">Prepnúť Wi-Fi</string>
+  <string name="app_ops_labels_toggle_bluetooth">Prepnúť bluetooth</string>
+  <string name="app_ops_labels_start_at_boot">Spustiť pri štarte</string>
+  <string name="app_ops_labels_toggle_nfc">Prepnúť NFC</string>
+  <string name="app_ops_labels_toggle_mobile_data">Prepnúť mobilné dáta</string>
   <string name="app_ops_labels_superuser">Root prístup</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">Povolené</string>
@@ -384,6 +459,7 @@
   <string name="app_ops_allowed_count">Povolené <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Zakázané <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Povolené <xliff:g id="count">%1$s</xliff:g>, zakázané <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Zakázané optimalizáciou batérie</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Zobraziť používateľské aplikácie</string>
   <string name="app_ops_show_system_apps">Zobraziť vstavané aplikácie</string>
@@ -478,6 +554,7 @@
   <string name="double_tap_to_sleep_summary">Vypnúť displej dvojitým poklepaním na stavový riadok</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Zabrániť nechcenému prebudeniu</string>
+  <string name="proximity_wake_summary">Pred prebudením gestami skontrolovať senzor priblíženia</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Prebudiť po pripojení</string>
   <string name="wake_when_plugged_or_unplugged_summary">Zapnúť obrazovku pri pripojení alebo odpojení zdroja nabíjania</string>
@@ -488,6 +565,7 @@
   <string name="volume_adjust_sounds_title">Zvuk pri úprave hlasitosti</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intenzita vibrácií</string>
+  <string name="vibrator_warning">Nedoporučuje se použiťhodnoty väčšie ako %1$d%%</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Kalibrácia farieb</string>
   <string name="color_calibration_summary">Kalibrovať farby na obrazovke</string>
@@ -532,10 +610,21 @@
   <string name="live_display_color_profile_dynamic_title">Dynamické</string>
   <string name="live_display_color_profile_dynamic_summary">Vylepšené farby a jasná biela</string>
   <string name="live_display_color_profile_cinema_title">Kino</string>
+  <string name="live_display_color_profile_cinema_summary">Dokonalá farebná reprodukcia pre video</string>
   <string name="live_display_color_profile_astronomy_title">Astronómia</string>
   <string name="live_display_color_profile_astronomy_summary">Tmavo červená pre zachovanie nočného videnia</string>
+  <string name="live_display_color_profile_photography_title">Fotografia</string>
+  <string name="live_display_color_profile_photography_summary">Dokonalá farebná reprodukcia pre fotografie</string>
+  <string name="live_display_color_profile_basic_title">Základné</string>
+  <string name="live_display_color_profile_basic_summary">Použiť displej nekalibrovaný</string>
+  <string name="live_display_color_profile_adaptive_title">Adaptívne</string>
+  <string name="live_display_color_profile_adaptive_summary">Farby prispôsobiť podmienkam okolia</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Nastavenia obrazu</string>
+  <string name="picture_adjustment_summary">Upravte odtieň, sýtosť, intenzitu a kontrast</string>
+  <string name="adj_hue_title">Odtieň</string>
   <string name="adj_saturation_title">Sýtosť</string>
+  <string name="adj_intensity_title">Intenzita</string>
   <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ikona výberu metódy vstupu</string>
@@ -645,6 +734,8 @@
   <string name="status_bar_battery_percentage_text_inside">Vnútri ikony</string>
   <string name="status_bar_battery_percentage_text_next">Vedľa ikony</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">Ikony stavového riadku</string>
+  <string name="status_bar_icons_summary">Upraviť zobrazenie ikon v stavovom riadku</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">Blokovať akcie na dotykové gestá</string>
   <string name="edge_gesture_service_summary">Neprenášať dotyky pre stavový alebo navigačný panel do aplikácií</string>
@@ -681,6 +772,9 @@
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">Zobraziť hudobnú vizualizáciu</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">Zakázané cez rýchle nastavenie</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">Kliknite pre povolenie obrazovky uzamknutia</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">Obrazovka uzamknutia povolená!</string>
   <!-- Battery saver -->
   <string name="battery_saver_threshold">Úroveň šetriča batérie</string>
   <string name="battery_saver_summary">Znižuje výkon a obmedzuje dáta na pozadí</string>
@@ -690,6 +784,7 @@
   <string name="autoperf_summary">Automaticky vybrať vhodný režim batérie pre rôzne aplikácie</string>
   <string name="perf_profile_title">Režim batérie</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">Aplikácie spustené pri štarte</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">Tón oznámenia</string>
   <!-- Advanced reboot options -->
@@ -718,6 +813,7 @@
   <string name="voice_wakeup_retrain_title">Preškoliť váš hlas</string>
   <string name="voice_wakeup_activity_title">Spustiť aktivitu</string>
   <string name="voice_wakeup_default_activity">Google Now</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">Prebudenie pomocou hlasu vyžaduje povolenie pre telefonát pre zvolenie rýchlej voľby.</string>
   <string name="picker_activities">Aktivity</string>
   <string name="select_custom_app_title">Vyberte vlastnú aplikáciu</string>
   <string name="select_custom_activity_title">Vyberte vlastnú aktivitu</string>
@@ -786,17 +882,23 @@
   <string name="menu_hidden_apps_delete">Obnoviť</string>
   <string name="menu_hidden_apps_reset_lock">Obnoviť uzamknutie vzorom</string>
   <string name="protected_apps">Chránené aplikácie</string>
+  <string name="protected_apps_summary">Spravovať aplikácie, ktoré sú skryté za bezpečným zámkom</string>
   <string name="saving_protected_components">Ukladanie stavu komponentu\u2026</string>
   <string name="pa_login_username_hint">Používateľské meno (e-mail)</string>
   <string name="pa_login_password_hint">Heslo</string>
   <string name="pa_login_submit_button">Prihlásiť sa</string>
   <string name="pa_login_checking_password">Kontrola účtu\u2026</string>
   <string name="pa_login_incorrect_login">Prihlasovacie údaje sú nesprávne</string>
+  <string name="pa_pattern_or_fingerprint_header">Musíte nakresliť vzor alebo použiť odtlačok prsta na odomknutie</string>
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">Prispievatelia</string>
   <string name="contributors_cloud_loading_message">Načítavanie údajov o prispievateľoch\u2026</string>
   <string name="contributors_cloud_failed_message">Nie je možné načítať údaje o prispievateľoch</string>
   <string name="contributor_info_menu">Informácie o prispievateľovi</string>
+  <string name="contributor_info_msg">
+        <![CDATA[<b>Name:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
+                 <b>Prezývka:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
+                 <b>Commity:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
   <string name="contributions_info_menu">Informácie o príspevkoch</string>
   <string name="contributions_info_msg">
         <![CDATA[<b>Celkový počet prispievateľov:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
@@ -812,25 +914,49 @@
   <string name="title_general">Všeobecné</string>
   <string name="advanced">Pokročilé</string>
   <string name="link_volume_option_title">Prepojiť hlasitosti zvonenia a oznámení</string>
+  <string name="lcd_density_prompt_message">Niektoré aplikácie nemusia fungovať pri neštandardnom dpi.\n\nTýmto sa váš telefón reštartuje.</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">APN PPP telefónne číslo</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">Duplikovať APN</string>
+  <string name="duplicate_apn_error_message">Táto APN už existuje. Zrušte alebo zmeňte parametre.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> je <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
   <string name="sim_disabled">zakázaná</string>
   <string name="sim_missing">chýbajúca alebo chybná</string>
+  <string name="sim_enabler_need_disable_sim">SIM karta bude deaktivovaná. Chcete pokračovať?</string>
+  <string name="sim_enabler_will_disable_sim_title">Varovanie</string>
+  <string name="sim_enabler_need_switch_data_service">Táto SIM karta bude zakázaná a SIM karta <xliff:g id="slotid">%1$s</xliff:g> bude použitá pre dátové služby. Naozaj chcete pokračovať?</string>
   <string name="sim_enabler_airplane_on">Nepodarilo sa vykonať operáciu počas zapnutého režimu v lietadle.</string>
   <string name="sim_enabler_in_call">Nepodarilo sa vykonať operáciu počas prebiehajúceho hovoru.</string>
   <string name="sim_enabler_both_inactive">Nemožno zakázať všetky karty SIM</string>
+  <string name="sim_enabler_enabling">Aktivovanie\u2026</string>
+  <string name="sim_enabler_disabling">Deaktivovanie\u2026</string>
+  <string name="sub_activate_success">SIM bola aktivovaná.</string>
+  <string name="sub_activate_failed">Aktivácia zlyhala.</string>
+  <string name="sub_deactivate_success">SIM bola deaktivovaná.</string>
+  <string name="sub_deactivate_failed">Deaktivácia zlyhala.</string>
   <string name="primary_sub_select_title">Predvolený poskytovateľ 3G/LTE</string>
+  <string name="select_sim_card">Vybrať SIM kartu</string>
   <!-- MSIM SIM status -->
   <string name="sim_card_status_title">Stav SIM %d</string>
   <string name="sim_card_lock_settings_title">Nastavenia zámku SIM %d</string>
   <string name="sim_card_summary_empty">Karta SIM nie je vložená</string>
+  <string name="sim_mobile_network_settings_category_title">Nastavenia mobilnej siete</string>
   <string name="sim_mobile_network_settings_title">Nastavenia SIM %d</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">pripomenutia</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">udalosti</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">vybraní volajúci</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é správy</string>
   <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Vibrácie</string>
+  <string name="zen_mode_vibration_never">Nevibrovať</string>
+  <string name="zen_mode_vibration_calls_only">Vibrovať iba pre hovory</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Vibrovať pre hovory a upozornenia</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>
@@ -840,8 +966,11 @@
   <string name="ic_code_full">IC: %1$s</string>
   <string name="sim_ringtone_title">Tón zvonenia SIM %d</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">Aplikácia:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">Naposledy použité:</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">Doba použitia:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <string name="master_clear_desc_cm" product="tablet">Vymažú sa všetky údaje z <b>interného úložiska</b> vášho tabletu a tiež:\n\n<li>Vaše účty v zariadení</li>\n<li>Údaje a nastavenia systémových a používateľských aplikácií</li>\n<li>Stiahnuté aplikácií</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
@@ -858,14 +987,24 @@
   <string name="factory_reset_warning_text_reset_now">OBNOVIŤ TERAZ</string>
   <string name="factory_reset_warning_text_message">Všetky vaše účty, aplikácie, údaje aplikácií a nastavenia systému v tomto zariadení budú odstránené z tohto zariadenia. Túto akciu nie je možné vrátiť späť.</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">Iné</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Časový limit Wi\u2011Fi hotspotu</string>
   <string name="hotstpot_inactivity_timeout_never">Nikdy</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 minúta</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 minút</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 minút</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">Prenosný Wi\u2011Fi hotspot nemá žiadny časový limit</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">Prenosný Wi\u2011Fi hotspot vyprší po <xliff:g id="timeout">%1$s </xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">Živá zamykacia obrazovka</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">Povoliť a nastaviť Živú zamykaciu obrazovku</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">Nastavenia</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">Na zobrazenie dostupných Živých zamykacích obrazoviek, zapnite Živú zamykaciu obrazovku.</string>
   <string name="interruptions_ignore_while_media_title">Zabrániť znižovaniu zvuku</string>
   <string name="interruptions_ignore_while_media_summary">Neznižovať hlasitosť pri prehrávaní médií po doručení upozornenia</string>
   <!-- CM Legal -->
@@ -880,10 +1019,42 @@
   <string name="battery_info_status_charging_dock_ac">Nabíjanie pomocou napájania doku</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Nabíjení pomocí USB doku</string>
+  <string name="restrict_app_wlan_title">Zakázať aplikácii používať Wi\u2011Fi</string>
+  <string name="restrict_app_wlan_summary">Zabrániť aplikácii používať dátové spojenie Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">Zakázať použitie mobilných dát</string>
+  <string name="restrict_app_cellular_summary">Zabrániť aplikácii použiť mobilné dátové pripojenie</string>
+  <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <string name="weather_settings_title">Počasie</string>
+  <string name="weather_settings_no_services_prompt">Žiadne nainštalované služby poskytovateľa počasia</string>
+  <string name="weather_settings_button">Nastavenia poskytovateľa</string>
+  <string name="weather_settings_activity_not_found">Nepodarilo sa spustiť ponuku nastavení toto poskytovateľa</string>
+  <string name="weather_settings_add_weather_provider">Pridať poskytovateľa počasia</string>
   <string name="weather_settings_general_settings_title">Všeobecné</string>
+  <string name="weather_settings_providers_title">Poskytovatelia</string>
+  <string name="weather_settings_temp_units_title">Jednotka teploty</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">počasie</string>
+  <string name="background_data_access">Prístup k údajom na pozadí</string>
+  <string name="allow_background_both">Cez mobilné dáta &amp; Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Iba cez Wi-Fi</string>
+  <string name="allow_background_none">Bez prístupu</string>
+  <string name="mobile_data_alert">Upozornenie mobilných dát</string>
+  <string name="mobile_data_alert_summary">Upozorniť, ak aplikácia používa veľké množstvo údajov</string>
+  <string name="data_usage_menu_enable_data_alerts">Zapnúť upozornenia na využitie údajov</string>
+  <string name="data_usage_menu_disable_data_alerts">Vypnúť upozornenia na využitie údajov</string>
+  <string name="data_usage_menu_reset_stats">Vynulovať údaje štatistiky</string>
+  <string name="reset_data_stats_msg">Toto vymaže všetky minulé a súčasné informácie o sledovaní</string>
+  <string name="reset_stats_confirm">Potvrdiť</string>
+  <string name="restrict_cellular_access_title">Obmedziť mobilné dátové pripojenie</string>
+  <string name="restrict_cellular_access_summary">Zakázať dátový prístup v mobilnej sieti</string>
+  <string name="restrict_cellular_access_dialog_title">Obmedziť mobilné dátové pripojenie?</string>
+  <string name="restrict_cellular_access_dialog_summary">Táto funkcia môže spôsobiť, že aplikácia, ktorá závisí na prístupe k sieti, prestane pracovať, ak sú k dispozícii iba mobilné siete.\n\nViac ovládacích prvkov pre dáta môžete nájsť v aplikácii.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Sieťoví operátori</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Rozmazanie pozadia</string>
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">Zobraziť počasie</string>
   <!-- Per app controls for LP keyguard notifications -->
@@ -892,10 +1063,41 @@
   <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 -->
+  <string name="app_notification_sound_timeout_title">Minimálny čas medzi zvukmi upozornenia</string>
+  <string name="app_notification_sound_timeout_summary_template">Povoliť zvuky alebo vibrácie nie viac ako raz za <xliff:g id="duration">%1$s </xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Bez obmedzení</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 sekúnd</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 sekúnd</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 minúta</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 minút</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 minút</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 minút</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Rozšírené ovládanie rádia</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Vypnúť automatické spustenie MBN</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Zapnúť automatické spustenie MBN</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Vypnúť VoLTE ladenie</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Zapnutie služby VoLTE ladenie</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Vypnúť VT ladenie</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Zapnutie VT ladenia</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Vypnúť WFC ladenie</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Zapnúť WFC ladenie</string>
+  <string name="cm_radio_info_adb_log_on_label">Vypnúť protokol ADB radio</string>
+  <string name="cm_radio_info_adb_log_off_label">Zapnúť protokol ADB radio</string>
+  <string name="cm_radio_info_diag_log_on_label">Vypnúť protokol Diag</string>
+  <string name="cm_radio_info_diag_log_off_label">Zapnúť protokol Diag</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Tapeta</string>
+  <string name="not_available_with_app">Nie je k dispozícii %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Vyhľadajte snímač odtlačku prstov <xliff:g id="sensor_location">%1$s</xliff:g> na telefóne.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">Zadný</string>
+  <string name="security_settings_fingerprint_sensor_location_front">Predný</string>
+  <string name="security_settings_fingerprint_sensor_location_left">ľavá strana</string>
+  <string name="security_settings_fingerprint_sensor_location_right">pravá strana</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Hlas: <xliff:g id="voice_status">%1$s</xliff:g> / Data: 
+<xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
-- 
cgit v1.1


From d4bcbcf97cd46fa608f62a3d100ab6adf08adb65 Mon Sep 17 00:00:00 2001
From: "blinky@build01" <jenkins@cyanogenmod.com>
Date: Sun, 18 Dec 2016 17:21:46 -0800
Subject: Automatic translation import

Change-Id: Ie58e94430b39ee70545b95962155be1d41be4e90
Ticket: -
---
 res/values-nl/cm_strings.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 365b7dc..39045e1 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -496,7 +496,7 @@
   <string name="camera_launch_summary">Lang indrukken en loslaten om camera te openen</string>
   <string name="volbtn_music_controls_title">Muziek beheren</string>
   <string name="volbtn_music_controls_summary">Bij scherm uit door nummers spoelen door volumeknoppen lang in te drukken</string>
-  <string name="volbtn_cursor_control_title">Toetsenbordcursor beheren</string>
+  <string name="volbtn_cursor_control_title">Toetsenbordcursor</string>
   <string name="volbtn_cursor_control_off">Uitgeschakeld</string>
   <string name="volbtn_cursor_control_on">Volume omhoog/omlaag beweegt cursor naar links/rechts</string>
   <string name="volbtn_cursor_control_on_reverse">Volume omhoog/omlaag beweegt cursor naar rechts/links</string>
@@ -552,6 +552,7 @@
   <string name="double_tap_to_sleep_summary">Dubbeltikken op de statusbalk voor slaapstand</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Per ongeluk ontwaken voorkomen</string>
+  <string name="proximity_wake_summary">Nabijheidssensor gebruiken voorafgaand aan ontwaken door gebaren</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Ontwaken door lader</string>
   <string name="wake_when_plugged_or_unplugged_summary">Scherm aan bij het aansluiten of loskoppelen van een lader</string>
@@ -786,7 +787,7 @@
   <string name="notification_ringtone_title_cm">Meldingstoon</string>
   <!-- Advanced reboot options -->
   <string name="advanced_reboot_title">Geavanceerd herstarten</string>
-  <string name="advanced_reboot_summary">Indien ontgrendeld, opties tonen in het afsluitmenu voor herstarten naar recovery of bootloader of het uitvoeren van een soft reboot</string>
+  <string name="advanced_reboot_summary">Indien ontgrendeld, opties tonen in het afsluitmenu voor herstarten naar recovery of bootloader of het uitvoeren van een snelle herstart</string>
   <string name="category_interface">Uiterlijk</string>
   <!-- Expanded desktop -->
   <string name="power_menu_expanded_desktop">Uitgebreid bureaublad</string>
-- 
cgit v1.1


From 1e09c05d6ef176bfe817a059a0281aadb013701d Mon Sep 17 00:00:00 2001
From: "clyde@build01" <jenkins@cyanogenmod.com>
Date: Tue, 20 Dec 2016 17:09:28 -0800
Subject: Automatic translation import

Change-Id: I82e8903deb0d37f2da11699493f0cdaf2c3f5dde
Ticket: -
---
 res/values-am/cm_plurals.xml      | 18 ++++++++++++++++++
 res/values-br-rFR/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-bs-rBA/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-csb-rPL/cm_plurals.xml | 18 ++++++++++++++++++
 res/values-cy/cm_plurals.xml      | 18 ++++++++++++++++++
 res/values-en-rAU/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-en-rGB/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-en-rPT/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-eo/cm_plurals.xml      | 18 ++++++++++++++++++
 res/values-es-rCO/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-es-rMX/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-fil-rPH/cm_plurals.xml | 18 ++++++++++++++++++
 res/values-fr-rCA/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-frp-rIT/cm_plurals.xml | 18 ++++++++++++++++++
 res/values-fy-rNL/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-ga-rIE/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-gd-rGB/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-hy-rAM/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-is-rIS/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-ka-rGE/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-kk-rKZ/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-km-rKH/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-ky-rKG/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-lo-rLA/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-mk-rMK/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-mn-rMN/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-ms-rMY/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-my-rMM/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-ne-rNP/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-oc-rFR/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-pa-rIN/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-rm/cm_plurals.xml      | 18 ++++++++++++++++++
 res/values-sk/cm_plurals.xml      |  2 +-
 res/values-sk/cm_strings.xml      | 40 +++++++++++++++++++--------------------
 res/values-sq-rAL/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-sw/cm_plurals.xml      | 18 ++++++++++++++++++
 res/values-ur-rPK/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-uz-rUZ/cm_plurals.xml  | 18 ++++++++++++++++++
 res/values-zu/cm_plurals.xml      | 18 ++++++++++++++++++
 39 files changed, 687 insertions(+), 21 deletions(-)
 create mode 100644 res/values-am/cm_plurals.xml
 create mode 100644 res/values-br-rFR/cm_plurals.xml
 create mode 100644 res/values-bs-rBA/cm_plurals.xml
 create mode 100644 res/values-csb-rPL/cm_plurals.xml
 create mode 100644 res/values-cy/cm_plurals.xml
 create mode 100644 res/values-en-rAU/cm_plurals.xml
 create mode 100644 res/values-en-rGB/cm_plurals.xml
 create mode 100644 res/values-en-rPT/cm_plurals.xml
 create mode 100644 res/values-eo/cm_plurals.xml
 create mode 100644 res/values-es-rCO/cm_plurals.xml
 create mode 100644 res/values-es-rMX/cm_plurals.xml
 create mode 100644 res/values-fil-rPH/cm_plurals.xml
 create mode 100644 res/values-fr-rCA/cm_plurals.xml
 create mode 100644 res/values-frp-rIT/cm_plurals.xml
 create mode 100644 res/values-fy-rNL/cm_plurals.xml
 create mode 100644 res/values-ga-rIE/cm_plurals.xml
 create mode 100644 res/values-gd-rGB/cm_plurals.xml
 create mode 100644 res/values-hy-rAM/cm_plurals.xml
 create mode 100644 res/values-is-rIS/cm_plurals.xml
 create mode 100644 res/values-ka-rGE/cm_plurals.xml
 create mode 100644 res/values-kk-rKZ/cm_plurals.xml
 create mode 100644 res/values-km-rKH/cm_plurals.xml
 create mode 100644 res/values-ky-rKG/cm_plurals.xml
 create mode 100644 res/values-lo-rLA/cm_plurals.xml
 create mode 100644 res/values-mk-rMK/cm_plurals.xml
 create mode 100644 res/values-mn-rMN/cm_plurals.xml
 create mode 100644 res/values-ms-rMY/cm_plurals.xml
 create mode 100644 res/values-my-rMM/cm_plurals.xml
 create mode 100644 res/values-ne-rNP/cm_plurals.xml
 create mode 100644 res/values-oc-rFR/cm_plurals.xml
 create mode 100644 res/values-pa-rIN/cm_plurals.xml
 create mode 100644 res/values-rm/cm_plurals.xml
 create mode 100644 res/values-sq-rAL/cm_plurals.xml
 create mode 100644 res/values-sw/cm_plurals.xml
 create mode 100644 res/values-ur-rPK/cm_plurals.xml
 create mode 100644 res/values-uz-rUZ/cm_plurals.xml
 create mode 100644 res/values-zu/cm_plurals.xml

diff --git a/res/values-am/cm_plurals.xml b/res/values-am/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-am/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-br-rFR/cm_plurals.xml b/res/values-br-rFR/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-br-rFR/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-bs-rBA/cm_plurals.xml b/res/values-bs-rBA/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-bs-rBA/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-csb-rPL/cm_plurals.xml b/res/values-csb-rPL/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-csb-rPL/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-cy/cm_plurals.xml b/res/values-cy/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-cy/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-en-rAU/cm_plurals.xml b/res/values-en-rAU/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-en-rAU/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-en-rGB/cm_plurals.xml b/res/values-en-rGB/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-en-rGB/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-en-rPT/cm_plurals.xml b/res/values-en-rPT/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-en-rPT/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-eo/cm_plurals.xml b/res/values-eo/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-eo/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-es-rCO/cm_plurals.xml b/res/values-es-rCO/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-es-rCO/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-es-rMX/cm_plurals.xml b/res/values-es-rMX/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-es-rMX/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-fil-rPH/cm_plurals.xml b/res/values-fil-rPH/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-fil-rPH/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-fr-rCA/cm_plurals.xml b/res/values-fr-rCA/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-fr-rCA/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-frp-rIT/cm_plurals.xml b/res/values-frp-rIT/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-frp-rIT/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-fy-rNL/cm_plurals.xml b/res/values-fy-rNL/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-fy-rNL/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-ga-rIE/cm_plurals.xml b/res/values-ga-rIE/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-ga-rIE/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-gd-rGB/cm_plurals.xml b/res/values-gd-rGB/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-gd-rGB/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-hy-rAM/cm_plurals.xml b/res/values-hy-rAM/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-hy-rAM/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-is-rIS/cm_plurals.xml b/res/values-is-rIS/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-is-rIS/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-ka-rGE/cm_plurals.xml b/res/values-ka-rGE/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-ka-rGE/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-kk-rKZ/cm_plurals.xml b/res/values-kk-rKZ/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-kk-rKZ/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-km-rKH/cm_plurals.xml b/res/values-km-rKH/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-km-rKH/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-ky-rKG/cm_plurals.xml b/res/values-ky-rKG/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-ky-rKG/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-lo-rLA/cm_plurals.xml b/res/values-lo-rLA/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-lo-rLA/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-mk-rMK/cm_plurals.xml b/res/values-mk-rMK/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-mk-rMK/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-mn-rMN/cm_plurals.xml b/res/values-mn-rMN/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-mn-rMN/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-ms-rMY/cm_plurals.xml b/res/values-ms-rMY/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-ms-rMY/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-my-rMM/cm_plurals.xml b/res/values-my-rMM/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-my-rMM/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-ne-rNP/cm_plurals.xml b/res/values-ne-rNP/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-ne-rNP/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-oc-rFR/cm_plurals.xml b/res/values-oc-rFR/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-oc-rFR/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-pa-rIN/cm_plurals.xml b/res/values-pa-rIN/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-pa-rIN/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-rm/cm_plurals.xml b/res/values-rm/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-rm/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-sk/cm_plurals.xml b/res/values-sk/cm_plurals.xml
index 61bb890..f6b76e0 100644
--- a/res/values-sk/cm_plurals.xml
+++ b/res/values-sk/cm_plurals.xml
@@ -24,6 +24,6 @@
   <plurals name="app_ops_count">
     <item quantity="one">raz</item>
     <item quantity="few">%d razy</item>
-    <item quantity="other">%d ráz</item>
+    <item quantity="other">%d krát</item>
   </plurals>
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index d31f473..cba1587 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -82,7 +82,7 @@
   <string name="ring_mode_title">Režim vyzváňania</string>
   <string name="ring_mode_normal">Normálny</string>
   <string name="ring_mode_vibrate">Vibrovať</string>
-  <string name="ring_mode_mute">Stlmený</string>
+  <string name="ring_mode_mute">Stlmiť</string>
   <string name="settings_reset_button">Obnoviť</string>
   <!-- Profiles settings  -->
   <string name="profiles_settings_title">Systémové profily</string>
@@ -234,17 +234,17 @@
   <string name="profile_setup_setup_triggers_description">Prosím, vyberte spúšťače, ktoré aktivujú tento profil</string>
   <string name="profile_setup_actions_description">Teraz nastavte, čo sa stane, keď je profil aktívny</string>
   <!-- Navigation Bar -->
-  <string name="navigation_bar_category">Navigačný panel</string>
+  <string name="navigation_bar_category">Softvérové tlačidlá na obrazovke</string>
   <string name="navigation_bar_left_title">Režim pre ľavákov</string>
-  <string name="navigation_bar_left_summary">Umiestniť navigačný panel na ľavú stranu obrazovky v režime na šírku</string>
-  <string name="navigation_bar_title">Tlačidlá a rozloženie</string>
+  <string name="navigation_bar_left_summary">Pri otočení telefónu na šírku umiestniť navigačný panel na ľavú stranu obrazovky</string>
+  <string name="navigation_bar_title">Výber tlačidiel a ich umiestnenie</string>
   <string name="navigation_bar_help_text">Ak chcete začať, kliknite na ikonu zámku pre odomknutie úprav navigačného panela.\n\nDotykom na ikonu zmeníte jej skratku a dlhým stlačením ikony zmeníte jej poradie.\n\nDotykom na tlačidlo \'Uložiť\' uložíte vaše zmeny a dotykom na tlačidlo \'Obnoviť predvolené\' obnovíte rozloženie na predvolené nastavenia.</string>
   <string name="navigation_restore_button_text">Obnoviť\npredvolené</string>
   <string name="navigation_edit_button_text">Upraviť</string>
   <string name="navigation_save_button_text">Uložiť</string>
   <string name="navigation_bar_reset_message">Vymazať súčasné nastavenia a obnoviť ich na predvolené?</string>
   <string name="navigation_bar_arrow_keys_title">Zobraziť šípky pri písaní</string>
-  <string name="navigation_bar_arrow_keys_summary">Zobraziť ľavé a pravé kurzorové tlačidlá pri písaní. Potlačí prepínač metódy vstupu.</string>
+  <string name="navigation_bar_arrow_keys_summary">Zobraziť ľavé a pravé kurzorové tlačítko pri písaní. Potlačí prepínač metódy vstupu.</string>
   <string name="navigation_bar_recents_title">Akcia dlhého stlačenia na tlačidle Nedávne</string>
   <!-- Notification light dialogs -->
   <string name="edit_light_settings">Upraviť nastavenia svetiel</string>
@@ -465,27 +465,27 @@
   <string name="app_ops_show_system_apps">Zobraziť vstavané aplikácie</string>
   <string name="app_ops_reset_counters">Obnoviť počítadlá povolení/zakázaní</string>
   <string name="app_ops_reset_confirm_title">Potvrdiť obnovu počítadiel</string>
-  <string name="app_ops_reset_confirm_mesg">Ste si istý, že chcete obnoviť počítadla?</string>
+  <string name="app_ops_reset_confirm_mesg">Naozaj chcete vyresetovať počítadlá?</string>
   <string name="ok">OK</string>
   <!-- Hostname setting -->
   <string name="device_hostname">Názov zariadenia</string>
   <string name="unlock_scramble_pin_layout_title">Dynamické rozloženie</string>
   <string name="unlock_scramble_pin_layout_summary">Prehádzať rozloženie pre zadanie kódu PIN pri odomykaní zariadenia</string>
   <string name="button_pref_title">Tlačidlá</string>
-  <string name="hardware_keys_power_key_title">Tlačidlo napájania</string>
+  <string name="hardware_keys_power_key_title">Tlačidlo Napájanie</string>
   <string name="hardware_keys_home_key_title">Tlačidlo Domov</string>
   <string name="hardware_keys_back_key_title">Tlačidlo Späť</string>
   <string name="hardware_keys_menu_key_title">Tlačidlo Ponuka</string>
   <string name="hardware_keys_assist_key_title">Tlačidlo Hľadať</string>
-  <string name="hardware_keys_appswitch_key_title">Tlačidlo Nedávne</string>
+  <string name="hardware_keys_appswitch_key_title">Tlačidlo Nedávno spustené</string>
   <string name="hardware_keys_camera_key_title">Tlačidlo fotoaparátu</string>
-  <string name="hardware_keys_volume_keys_title">Tlačidlá hlasitosti</string>
+  <string name="hardware_keys_volume_keys_title">Tlačidlá ovládania hlasitosti</string>
   <string name="hardware_keys_short_press_title">Akcia po krátkom stlačení</string>
   <string name="hardware_keys_long_press_title">Akcia po dlhom stlačení</string>
   <string name="hardware_keys_double_tap_title">Akcia po dvojitom poklepaní</string>
-  <string name="hardware_keys_action_nothing">Žiadne akcie</string>
-  <string name="hardware_keys_action_menu">Otvoriť/zavrieť ponuku</string>
-  <string name="hardware_keys_action_app_switch">Prepínač nedávnych aplikácií</string>
+  <string name="hardware_keys_action_nothing">Žiadna akcia</string>
+  <string name="hardware_keys_action_menu">Menu Otvoriť/zavrieť</string>
+  <string name="hardware_keys_action_app_switch">Prepínač nedávno spustených apl.</string>
   <string name="hardware_keys_action_search">Asistent vyhľadávania</string>
   <string name="hardware_keys_action_voice_search">Hlasové vyhľadávanie</string>
   <string name="hardware_keys_action_in_app_search">Vyhľadávanie v aplikácii</string>
@@ -503,7 +503,7 @@
   <string name="volbtn_cursor_control_on">Hlasitosť nahor/nadol presunie kurzor doľava/doprava</string>
   <string name="volbtn_cursor_control_on_reverse">Hlasitosť nahor/nadol presunie kurzor doprava/doľava</string>
   <string name="power_end_call_title">Ukončiť hovor</string>
-  <string name="power_end_call_summary">Stlačením tlačidla napájania sa ukončí aktuálny hovor</string>
+  <string name="power_end_call_summary">Stlačením tlačidla Napájanie sa ukončí aktuálny hovor</string>
   <string name="swap_volume_buttons_title">Preorientovať</string>
   <string name="swap_volume_buttons_summary">Po otočení obrazovky prevrátiť zmysel tlačidiel hlasitosti</string>
   <string name="button_wake_title">Prebudiť zariadenie</string>
@@ -533,8 +533,8 @@
   <!-- Settings main menu entry -->
   <string name="gesture_settings_title">Gestá</string>
   <!-- Power menu -->
-  <string name="power_menu_title">Ponuka napájania</string>
-  <string name="power_menu_reboot_title">Ponuka reštartu</string>
+  <string name="power_menu_title">Rozšírené možnosti tlačidla</string>
+  <string name="power_menu_reboot_title">Rozšířené možnosti reštartovania</string>
   <string name="power_menu_screenshot_title">Snímka obrazovky</string>
   <string name="power_menu_airplane_title">Režim v lietadle</string>
   <string name="power_menu_users_title">Prepínač používateľov</string>
@@ -544,8 +544,8 @@
   <string name="power_menu_sound_title">Panel zvuku</string>
   <string name="power_menu_bug_report_disabled">Hlásenie chýb je zakázané v nastaveniach pre vývojárov</string>
   <!-- Buttons - Enable navbar -->
-  <string name="disable_navkeys_title">Povoliť navigačný panel na obrazovke</string>
-  <string name="disable_navkeys_summary">Povoliť navigačný panel na obrazovke a zakázať hardvérové tlačidlá</string>
+  <string name="disable_navkeys_title">Softvérové tlačidlá na obrazovke</string>
+  <string name="disable_navkeys_summary">Povoliť softvérové tlačidlá na obrazovke a zakázať hardvérové tlačidlá</string>
   <!-- tap-to-wake -->
   <string name="double_tap_to_wake_title">Prebudiť dvojitým poklepaním</string>
   <string name="double_tap_to_wake_summary">Zapnúť displej dvojitým poklepaním na obrazovku</string>
@@ -661,7 +661,7 @@
   <string name="gestures_long_spen_title_head">Dlhé stlačenie</string>
   <string name="gestures_double_spen_title_head">Dvojité poklepanie</string>
   <!-- Gestures Options -->
-  <string name="gestures_action_empty">Žiadne akcia</string>
+  <string name="gestures_action_empty">Žiadna akcia</string>
   <string name="gestures_action_home">Domov</string>
   <string name="gestures_action_back">Späť</string>
   <string name="gestures_action_menu">Ponuka</string>
@@ -756,7 +756,7 @@
   <string name="privacy_guard_reset_text">Obnoviť povolenia?</string>
   <string name="privacy_guard_help_text">Na tejto obrazovke môžete jednoduchým kliknutím vybrať, pre ktoré aplikácie bude Ochrana súkromia aktívna. Vybraným aplikáciám nebude umožnený prístup k vašim osobným údajom ako sú kontakty, správy alebo denníky hovorov. Dlhým kliknutím na položku sa otvorí obrazovka s podrobnosťami o danej aplikácii.\n\nPredvolene nie sú zobrazené vstavané aplikácie. Ak ich chcete zobraziť, vyberte príslušnú možnosť v ponuke.</string>
   <string name="privacy_guard_manager_show_system_apps">Zobraziť vstavané aplikácie</string>
-  <string name="privacy_guard_advanced_settings_title">Pokročilé</string>
+  <string name="privacy_guard_advanced_settings_title">Rozšírené</string>
   <string name="privacy_guard_notification_title">Zobraziť oznámenie</string>
   <!-- Sizes for pattern lockscreen -->
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
@@ -1091,7 +1091,7 @@
   <string name="lockscreen_wallpaper_title">Tapeta</string>
   <string name="not_available_with_app">Nie je k dispozícii %1$s</string>
   <!-- Format string for fingerprint location message -->
-  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Vyhľadajte snímač odtlačku prstov <xliff:g id="sensor_location">%1$s</xliff:g> na telefóne.</string>
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Vyhľadajte snímač odtlačkov prstov <xliff:g id="sensor_location">%1$s</xliff:g> na telefóne.</string>
   <!-- Fingerprint sensor locations -->
   <string name="security_settings_fingerprint_sensor_location_back">Zadný</string>
   <string name="security_settings_fingerprint_sensor_location_front">Predný</string>
diff --git a/res/values-sq-rAL/cm_plurals.xml b/res/values-sq-rAL/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-sq-rAL/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-sw/cm_plurals.xml b/res/values-sw/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-sw/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-ur-rPK/cm_plurals.xml b/res/values-ur-rPK/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-ur-rPK/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-uz-rUZ/cm_plurals.xml b/res/values-uz-rUZ/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-uz-rUZ/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
diff --git a/res/values-zu/cm_plurals.xml b/res/values-zu/cm_plurals.xml
new file mode 100644
index 0000000..27ad002
--- /dev/null
+++ b/res/values-zu/cm_plurals.xml
@@ -0,0 +1,18 @@
+<?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"></resources>
-- 
cgit v1.1


From 8ed5285d1751aec413adab051910bbeae52bfc94 Mon Sep 17 00:00:00 2001
From: "blinky@build01" <jenkins@cyanogenmod.com>
Date: Wed, 21 Dec 2016 17:19:06 -0800
Subject: Automatic translation import

Change-Id: Ie790fe3f1b922d25f91b4c4f2338e9f8a7d115bf
Ticket: -
---
 res/values-zh-rTW/cm_strings.xml | 293 +++++++++++++++++++++++++++------------
 1 file changed, 208 insertions(+), 85 deletions(-)

diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 9b02499..a1c5ac7 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/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> 個步驟，即可查詢裝置 ID。</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>
@@ -36,13 +42,16 @@
   <!-- Setting checkbox title for root access -->
   <string name="root_access">Root 權限</string>
   <string name="root_access_warning_title">允許 root 權限？</string>
-  <string name="root_access_warning_message">允許應用程式要求 root 權限是很危險的，而且可能會影響您系統的安全！</string>
+  <string name="root_access_warning_message">允許應用程式請求 root 權限是很危險的，而且可能會影響您系統的安全！</string>
   <string name="root_access_none">已停用</string>
   <string name="root_access_apps">僅限應用程式</string>
   <string name="root_access_adb">僅限 ADB</string>
   <string name="root_access_all">應用程式與 ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">管理 root 存取權限</string>
+  <string name="root_appops_summary">查看和控制 root 規則</string>
   <!-- NFC PreferenceCategory title -->
+  <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
   <string name="mod_version">CyanogenMod 版本</string>
   <string name="mod_version_default">未知</string>
@@ -76,18 +85,18 @@
   <string name="profiles_add">新增</string>
   <string name="profile_menu_delete">刪除</string>
   <string name="profile_settings_title">設定檔</string>
-  <string name="profile_empty_list_profiles_off">開啟設定檔功能以設定與使用設定檔。</string>
+  <string name="profile_empty_list_profiles_off">開啟設定檔功能即可設定與使用設定檔。</string>
   <string name="profile_trigger_configure">設定觸發器</string>
   <string name="profile_write_nfc_tag">寫到 NFC 標籤</string>
-  <string name="profile_write_touch_tag">輕觸標籤以寫入</string>
+  <string name="profile_write_touch_tag">觸碰標籤即可寫入</string>
   <string name="profile_write_success">標籤寫入成功</string>
   <string name="profile_write_failed">標籤寫入失敗！</string>
   <string name="profile_selected">選取的設定檔：%1$s</string>
-  <string name="profile_nfc_text">將設定檔寫入 NFC 標籤允許透過輕按標籤來選取此設定檔。再次輕按將會回到之前選取的設定檔。</string>
+  <string name="profile_nfc_text">將設定檔寫入至 NFC 標籤允許透過輕觸標籤來選取此設定檔。再次輕觸將會回到之前選取的設定檔。</string>
   <string name="profile_unknown_nfc_tag">未知的設定檔</string>
   <string name="profile_add_nfc_text">此 NFC 標籤指向了一個未知的設定檔，連結此 NFC 標籤到現有的設定檔將允許您以後選取那個設定檔。</string>
   <string name="profile_select">選取設定檔</string>
-  <string name="profile_remove_dialog_message">刪除設定檔「%1$s」？</string>
+  <string name="profile_remove_dialog_message">移除設定檔「%1$s」？</string>
   <string name="profile_populate_profile_from_state">使用目前的裝置設定配置設定檔嗎?</string>
   <string name="profile_menu_fill_from_state">匯入目前裝置的設定</string>
   <string name="profile_remove_current_profile">無法刪除目前的設定檔</string>
@@ -153,7 +162,7 @@
   <!-- Profiles - system settings -->
   <string name="profile_system_settings_title">系統設定</string>
   <string name="profile_lockmode_title">鎖定螢幕模式</string>
-  <string name="profile_lockmode_policy_disabled_summary">此設定檔被裝置管理員禁用</string>
+  <string name="profile_lockmode_policy_disabled_summary">此設定檔被裝置管理員停用</string>
   <string name="profile_lockmode_insecure_summary">不要詢問 PIN 或密碼</string>
   <string name="profile_lockmode_disabled_summary">停用鎖定螢幕</string>
   <string name="profile_airplanemode_title">飛航模式</string>
@@ -165,14 +174,17 @@
   <string name="toggleWifiAp">可攜式 Wi\u2011Fi 無線基地台</string>
   <string name="toggleBluetooth">藍牙</string>
   <string name="toggleGPS">GPS</string>
-  <string name="toggleData">數據連接</string>
+  <string name="toggleData">數據連線</string>
   <string name="toggleSync">自動同步資料</string>
   <string name="toggle2g3g4g">首選網路類型</string>
   <string name="toggle2g3g4g_msim">網路類型偏好 (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
+  <string name="wifi_setting_countrycode_title">Wi\u2011Fi區碼</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <string name="wifi_setting_countrycode_summary">指定Wi\u2011Fi區碼</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <string name="wifi_setting_countrycode_error">設定區碼時遇到問題。</string>
   <string name="wifi_countrycode_us">美國</string>
   <string name="wifi_countrycode_ca">加拿大，台灣</string>
   <string name="wifi_countrycode_de">德國</string>
@@ -211,25 +223,25 @@
   <string name="profile_appgroup_name_title">名稱</string>
   <string name="duplicate_appgroup_name">重複的應用程式群組名稱！</string>
   <string name="profile_app_delete_confirm">移除此應用程式？</string>
-  <string name="no_bluetooth_triggers">沒有藍牙設備配對。 \n在配置觸發器之前，點擊配對藍牙設備。</string>
-  <string name="no_wifi_triggers">沒有已設定的 Wi\u2011Fi 連結。 \n設定前輕按以連接 Wi\u2011Fi</string>
-  <string name="no_triggers_configured">觸法器未設定，輕按以新建。</string>
-  <string name="no_triggers_configured_nfc">輕觸以設置一個新的 NFC 觸發器。</string>
+  <string name="no_bluetooth_triggers">沒有藍牙裝置配對。 \n在配置觸發器之前，輕觸配對藍牙裝置。</string>
+  <string name="no_wifi_triggers">沒有已設定的 Wi\u2011Fi 連結。 \n設定前輕觸即可連線 Wi\u2011Fi</string>
+  <string name="no_triggers_configured">觸發器未設定，輕觸即可建立。</string>
+  <string name="no_triggers_configured_nfc">輕觸即可設定新的 NFC 觸發器。</string>
   <string name="profile_setup_setup_triggers_description">請選擇啟動此設定檔的觸發器</string>
   <string name="profile_setup_actions_description">現在配置設定檔啟動時將發生的操作</string>
   <!-- Navigation Bar -->
-  <string name="navigation_bar_category">導覽列</string>
+  <string name="navigation_bar_category">導航列</string>
   <string name="navigation_bar_left_title">左撇子模式</string>
-  <string name="navigation_bar_left_summary">橫向模式下將導覽列置於螢幕左側</string>
-  <string name="navigation_bar_title">按鈕與配置</string>
-  <string name="navigation_bar_help_text">要開始編輯，請輕觸編輯圖示來解鎖導航列的編輯功能。\n\n您可以輕觸一個圖示來變更它的捷徑，或長按一個圖示以變更它的外觀。\n\n輕觸 \"儲存\" 以確認您的變更，或 \"還原預設值\" 以重設外觀為預設設定。</string>
+  <string name="navigation_bar_left_summary">橫向模式下將導航列置於螢幕左側</string>
+  <string name="navigation_bar_title">按鍵與配置</string>
+  <string name="navigation_bar_help_text">要開始編輯，請輕觸編輯圖示來解鎖導航列的編輯功能。\n\n您可以輕觸一個圖示來變更它的捷徑，或長按一個圖示以變更它的外觀。\n\n輕觸「儲存」以確認您的變更，或「還原預設值」以重設外觀為預設設定。</string>
   <string name="navigation_restore_button_text">還原\n預設</string>
   <string name="navigation_edit_button_text">編輯</string>
   <string name="navigation_save_button_text">儲存</string>
   <string name="navigation_bar_reset_message">刪除目前的設定並還原預設的佈局嗎？</string>
   <string name="navigation_bar_arrow_keys_title">輸入時顯示方向鍵</string>
   <string name="navigation_bar_arrow_keys_summary">輸入時顯示游標鍵。取代輸入法切換器。</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>
@@ -265,21 +277,24 @@
   <string name="notification_light_default_value">預設</string>
   <string name="notification_light_missed_call_title">未接來電</string>
   <string name="notification_light_voicemail_title">語音信箱</string>
-  <string name="notification_light_zen_mode">在勿擾模式下啟用指示燈</string>
+  <string name="notification_light_screen_on">螢幕開啟時依然啟用指示燈</string>
+  <string name="notification_light_zen_mode">在勿干擾模式下啟用指示燈</string>
+  <string name="notification_light_use_multiple_leds">多重 LED</string>
+  <string name="keywords_lights_brightness_level">降低 LED 亮度</string>
   <string name="notification_light_automagic">自動選擇顏色</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">指示燈設定</string>
   <string name="led_notification_text">已透過設定啟用 LED 指示燈</string>
   <string name="notification_light_no_apps_summary">若要控制個別應用程式，在功能列中啟動 \'%1$s\' 和 \'\u002b\'</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
-  <string name="enable_adb_cm">Android 調試</string>
+  <string name="enable_adb_cm">Android 偵錯</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
   <string name="enable_adb_summary_cm">啟用 Android Debug Bridge (adb) 介面</string>
   <!-- Android debugging over WiFi -->
   <string name="adb_over_network">網路 ADB</string>
-  <string name="adb_over_network_summary">啟用透過網絡介面 (Wi-Fi、USB 網絡) 進行 TCP/IP 偵錯。此設定會於重啟後重設</string>
+  <string name="adb_over_network_summary">啟用透過網路介面 (Wi\u2011Fi、USB 網路) 進行 TCP/IP 偵錯。該設定會在重新啟動後重設</string>
   <!-- Warning for Adb over Network -->
-  <string name="adb_over_network_warning">警告：當啟用網路 ADB 時，您的手機將開放於所有已連接的網路！\n\n建議您已連接到信任的網路才使用此功能。\n\n您確定你想啟用此功能嗎？</string>
+  <string name="adb_over_network_warning">警告：當啟用網路 ADB 時，您的手機將開放於所有已連線的網路！\n\n建議您已連線到信任的網路才使用此功能。\n\n您確定您想啟用此功能嗎？</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
   <string name="adb_notify">偵錯通知</string>
   <string name="adb_notify_summary">當啟用 USB 或 網路偵錯時顯示通知</string>
@@ -323,7 +338,7 @@
   <string name="app_ops_summaries_play_audio">播放音訊</string>
   <string name="app_ops_summaries_read_clipboard">讀取剪貼簿</string>
   <string name="app_ops_summaries_modify_clipboard">修改剪貼簿</string>
-  <string name="app_ops_summaries_media_buttons">媒體按鈕</string>
+  <string name="app_ops_summaries_media_buttons">媒體鍵</string>
   <string name="app_ops_summaries_audio_focus">音訊焦點</string>
   <string name="app_ops_summaries_master_volume">主音量</string>
   <string name="app_ops_summaries_voice_volume">語音音量</string>
@@ -340,6 +355,9 @@
   <string name="app_ops_summaries_toast_window">顯示浮動通知</string>
   <string name="app_ops_summaries_project_media">媒體投放</string>
   <string name="app_ops_summaries_activate_vpn">啟用 VPN</string>
+  <string name="app_ops_summaries_write_wallpaper">設定桌布</string>
+  <string name="app_ops_summaries_assist_structure">協助結構</string>
+  <string name="app_ops_summaries_assist_screenshot">協助螢幕截圖</string>
   <string name="app_ops_summaries_read_phone_state">讀取手機狀態</string>
   <string name="app_ops_summaries_add_voicemail">新增語音郵件</string>
   <string name="app_ops_summaries_use_sip">使用 SIP</string>
@@ -352,11 +370,11 @@
   <string name="app_ops_summaries_write_external_storage">寫到外部存儲空間</string>
   <string name="app_ops_summaries_turn_screen_on">開啟螢幕</string>
   <string name="app_ops_summaries_get_accounts">取得帳戶</string>
-  <string name="app_ops_summaries_toggle_wifi">切換 Wi-Fi</string>
-  <string name="app_ops_summaries_toggle_bluetooth">切換藍芽</string>
+  <string name="app_ops_summaries_toggle_wifi">切換至 Wi-Fi</string>
+  <string name="app_ops_summaries_toggle_bluetooth">切換至藍牙</string>
   <string name="app_ops_summaries_start_at_boot">在開機時啟動</string>
-  <string name="app_ops_summaries_toggle_nfc">切換 NFC</string>
-  <string name="app_ops_summaries_toggle_mobile_data">切換行動網路</string>
+  <string name="app_ops_summaries_toggle_nfc">切換至 NFC</string>
+  <string name="app_ops_summaries_toggle_mobile_data">切換至行動數據</string>
   <string name="app_ops_summaries_superuser">Root 權限</string>
   <!-- User display names for app ops codes - extension of AOSP -->
   <string name="app_ops_labels_coarse_location">粗略位置</string>
@@ -407,6 +425,9 @@
   <string name="app_ops_labels_toast_window">顯示 toasts 通知</string>
   <string name="app_ops_labels_project_media">媒體投放</string>
   <string name="app_ops_labels_activate_vpn">啟用 VPN</string>
+  <string name="app_ops_labels_write_wallpaper">設定桌布</string>
+  <string name="app_ops_labels_assist_structure">協助結構</string>
+  <string name="app_ops_labels_assist_screenshot">協助螢幕截圖</string>
   <string name="app_ops_labels_read_phone_state">讀取電話狀態</string>
   <string name="app_ops_labels_add_voicemail">新增語音郵件</string>
   <string name="app_ops_labels_use_sip">使用 SIP</string>
@@ -419,11 +440,11 @@
   <string name="app_ops_labels_write_external_storage">寫到外部存儲空間</string>
   <string name="app_ops_labels_turn_screen_on">開啟螢幕</string>
   <string name="app_ops_labels_get_accounts">取得帳戶</string>
-  <string name="app_ops_labels_toggle_wifi">切換 Wi-Fi</string>
-  <string name="app_ops_labels_toggle_bluetooth">切換藍芽</string>
+  <string name="app_ops_labels_toggle_wifi">切換至 Wi-Fi</string>
+  <string name="app_ops_labels_toggle_bluetooth">切換至藍牙</string>
   <string name="app_ops_labels_start_at_boot">在開機時啟動</string>
-  <string name="app_ops_labels_toggle_nfc">切換 NFC</string>
-  <string name="app_ops_labels_toggle_mobile_data">切換行動網路</string>
+  <string name="app_ops_labels_toggle_nfc">切換至 NFC</string>
+  <string name="app_ops_labels_toggle_mobile_data">切換至行動數據</string>
   <string name="app_ops_labels_superuser">Root 權限</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">允許</string>
@@ -434,6 +455,7 @@
   <string name="app_ops_allowed_count">已允許 <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">已拒絕 <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">已允許  <xliff:g id="count">%1$s</xliff:g>，已拒絕 <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">透過電池最佳化停用</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">顯示使用者應用程式</string>
   <string name="app_ops_show_system_apps">顯示內建應用程式</string>
@@ -446,7 +468,7 @@
   <string name="unlock_scramble_pin_layout_title">亂序布局</string>
   <string name="unlock_scramble_pin_layout_summary">解鎖裝置時使用亂序 PIN 布局</string>
   <string name="button_pref_title">按鍵</string>
-  <string name="hardware_keys_power_key_title">電源按鈕</string>
+  <string name="hardware_keys_power_key_title">電源鍵</string>
   <string name="hardware_keys_home_key_title">主螢幕鍵</string>
   <string name="hardware_keys_back_key_title">返回鍵</string>
   <string name="hardware_keys_menu_key_title">選單鍵</string>
@@ -456,7 +478,7 @@
   <string name="hardware_keys_volume_keys_title">音量鍵</string>
   <string name="hardware_keys_short_press_title">短按動作</string>
   <string name="hardware_keys_long_press_title">長按動作</string>
-  <string name="hardware_keys_double_tap_title">輕按兩下動作</string>
+  <string name="hardware_keys_double_tap_title">輕觸兩次動作</string>
   <string name="hardware_keys_action_nothing">無動作</string>
   <string name="hardware_keys_action_menu">開啟/關閉選單</string>
   <string name="hardware_keys_action_app_switch">最近使用程式切換器</string>
@@ -466,7 +488,10 @@
   <string name="hardware_keys_action_launch_camera">啟動相機</string>
   <string name="hardware_keys_action_sleep">關閉螢幕</string>
   <string name="hardware_keys_action_last_app">最後一個應用程式</string>
+  <string name="camera_sleep_on_release_title">螢幕窺視</string>
+  <string name="camera_sleep_on_release_summary">僅有當按住按鍵時，半按鍵即可保持螢幕開啟。</string>
   <string name="camera_launch_title">開啟相機</string>
+  <string name="camera_launch_summary">按住並放開將會啟動相機</string>
   <string name="volbtn_music_controls_title">播放控制</string>
   <string name="volbtn_music_controls_summary">螢幕關閉時，長按音量鍵將可以改變音樂曲目</string>
   <string name="volbtn_cursor_control_title">鍵盤游標控制</string>
@@ -474,15 +499,15 @@
   <string name="volbtn_cursor_control_on">音量上/下使游標左/右移動</string>
   <string name="volbtn_cursor_control_on_reverse">音量上/下使游標右/左移動</string>
   <string name="power_end_call_title">結束通話</string>
-  <string name="power_end_call_summary">按下電源按鈕將會結束目前通話</string>
+  <string name="power_end_call_summary">按下電源鍵將會結束目前通話</string>
   <string name="swap_volume_buttons_title">調整方向</string>
   <string name="swap_volume_buttons_summary">旋轉螢幕時交換上/下音量鍵</string>
   <string name="button_wake_title">喚醒裝置</string>
   <string name="home_answer_call_title">接聽電話</string>
-  <string name="home_answer_call_summary">按主螢幕鍵將會接通當前來電</string>
+  <string name="home_answer_call_summary">按主螢幕鍵將會接通目前來電</string>
   <!-- Backlight brightness settings screen -->
   <string name="adaptive_backlight_title">自動背光調整</string>
-  <string name="adaptive_backlight_summary">在使用中動態調整螢幕背光亮度，以最佳化電池使用時間</string>
+  <string name="adaptive_backlight_summary">在使用中動態調整螢幕背光亮度，即可最佳化電池使用時間</string>
   <!-- Sunlight readability enhancement screen -->
   <string name="sunlight_enhancement_title">陽光增強</string>
   <string name="sunlight_enhancement_summary">在明亮的陽光下提高螢幕亮度和可讀性</string>
@@ -493,20 +518,20 @@
   <string name="button_backlight_title">背光</string>
   <string name="button_backlight_enabled">開啟按鈕背光</string>
   <string name="keyboard_backlight_enabled">開啟鍵盤背光</string>
-  <string name="button_backlight_seekbar_title">按鈕亮度</string>
+  <string name="button_backlight_seekbar_title">按鍵亮度</string>
   <string name="keyboard_backlight_seekbar_title">鍵盤亮度</string>
-  <string name="backlight_timeout_title">背光自動關閉時間</string>
+  <string name="backlight_timeout_title">背光逾時</string>
   <string name="backlight_timeout_unlimited">不要關閉</string>
   <string name="backlight_summary_disabled">已停用</string>
   <string name="backlight_summary_enabled_with_timeout">啟用 <xliff:g id="timeout">%s</xliff:g></string>
   <string name="backlight_summary_enabled">已啟用</string>
   <!-- Gesture Settings -->
   <!-- Settings main menu entry -->
-  <string name="gesture_settings_title">手勢操作</string>
+  <string name="gesture_settings_title">手勢</string>
   <!-- Power menu -->
   <string name="power_menu_title">電源功能表</string>
   <string name="power_menu_reboot_title">重新啟動選單</string>
-  <string name="power_menu_screenshot_title">螢幕擷取</string>
+  <string name="power_menu_screenshot_title">螢幕截圖</string>
   <string name="power_menu_airplane_title">飛航模式</string>
   <string name="power_menu_users_title">使用者切換器</string>
   <string name="power_menu_settings_title">設定捷徑</string>
@@ -515,19 +540,20 @@
   <string name="power_menu_sound_title">音效面板</string>
   <string name="power_menu_bug_report_disabled">已在開發人員選項中停用錯誤報告</string>
   <!-- Buttons - Enable navbar -->
-  <string name="disable_navkeys_title">啟用螢幕上的導覽列</string>
-  <string name="disable_navkeys_summary">啟用螢幕上的導航欄和停用硬件按鈕</string>
+  <string name="disable_navkeys_title">啟用螢幕上的導航列</string>
+  <string name="disable_navkeys_summary">啟用螢幕上的導航列和停用硬體按鍵</string>
   <!-- tap-to-wake -->
-  <string name="double_tap_to_wake_title">輕按兩下即可喚醒</string>
+  <string name="double_tap_to_wake_title">輕觸兩次即可喚醒</string>
   <string name="double_tap_to_wake_summary">輕點螢幕兩次來喚醒手機</string>
   <!-- tap-to-sleep -->
-  <string name="double_tap_to_sleep_title">輕按兩下即可休眠</string>
-  <string name="double_tap_to_sleep_summary">輕點兩次狀態欄來關閉螢幕</string>
+  <string name="double_tap_to_sleep_title">輕觸兩次即可休眠</string>
+  <string name="double_tap_to_sleep_summary">輕觸兩次狀態列來關閉螢幕</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">防止意外喚醒</string>
+  <string name="proximity_wake_summary">手勢觸發喚醒前檢查接近感應器</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">接上或移除電源時喚醒</string>
-  <string name="wake_when_plugged_or_unplugged_summary">連接或拔除電源時開啟螢幕</string>
+  <string name="wake_when_plugged_or_unplugged_summary">接上或拔除電源時開啟螢幕</string>
   <!-- Font size sample text. This needs to be a very short string, as it is shown in
     multiple font sizes in a limited amount of space. -->
   <string name="font_size_sample">範例</string>
@@ -535,6 +561,7 @@
   <string name="volume_adjust_sounds_title">音量調整指示音</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">震動強度</string>
+  <string name="vibrator_warning">數值不建議大於%1$d%%</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">顏色校準</string>
   <string name="color_calibration_summary">校準螢幕上的顏色</string>
@@ -545,19 +572,20 @@
   <string name="headset_connect_player_title">啟動音樂應用程式</string>
   <string name="headset_connect_player_summary">插入耳機時啟動預設音樂應用程式</string>
   <!-- WiFi auto-configure priorities -->
+  <string name="wifi_auto_config_priorities">自動優先順序</string>
   <string name="auto_brightness_reset_button">重設</string>
   <!-- Display : Rotation  -->
   <string name="display_rotation_title">旋轉</string>
   <string name="display_rotation_disabled">已停用</string>
   <string name="display_rotation_unit">度</string>
-  <string name="display_lockscreen_rotation_title">旋轉鎖定畫面</string>
+  <string name="display_lockscreen_rotation_title">旋轉鎖定螢幕</string>
   <string name="display_rotation_category_title">旋轉模式</string>
   <string name="display_rotation_0_title">0 度</string>
   <string name="display_rotation_90_title">90 度</string>
   <string name="display_rotation_180_title">180 度</string>
   <string name="display_rotation_270_title">270 度</string>
   <!-- LiveDisplay -->
-  <string name="live_display_summary">基於日夜和環境條件調整您的螢幕色溫，以改善可讀性和減少眼睛疲勞</string>
+  <string name="live_display_summary">根據日夜和環境條件調整您的螢幕色溫，即可改善可讀性和減少眼睛疲勞</string>
   <string name="live_display_mode">顯示模式</string>
   <string name="live_display_color_temperature_title">色溫</string>
   <string name="live_display_color_temperature_summary">白天：<xliff:g id="day_temperature">%1$d</xliff:g>K 夜晚：<xliff:g id="night_temperature">%2$d</xliff:g>K</string>
@@ -570,17 +598,29 @@
   <string name="live_display_low_power_summary">在不降低亮度的情況下調整顯示以降低耗電</string>
   <string name="live_display_enhance_color_title">增強色彩</string>
   <string name="live_display_enhance_color_summary">為色調、 風景和其他圖片提高色調</string>
+  <string name="live_display_color_profile_title">色彩設定檔</string>
   <string name="live_display_color_profile_standard_title">標準</string>
+  <string name="live_display_color_profile_standard_summary">準確的色彩和明亮的白色</string>
   <string name="live_display_color_profile_natural_title">自然</string>
+  <string name="live_display_color_profile_natural_summary">現實的色彩和自然的膚色</string>
   <string name="live_display_color_profile_dynamic_title">動態</string>
+  <string name="live_display_color_profile_dynamic_summary">增強的色彩和明亮的白色</string>
   <string name="live_display_color_profile_cinema_title">劇院</string>
   <string name="live_display_color_profile_cinema_summary">完美重現影片色彩</string>
+  <string name="live_display_color_profile_astronomy_title">天文學</string>
+  <string name="live_display_color_profile_astronomy_summary">深紅色即可保護夜間視力</string>
   <string name="live_display_color_profile_photography_title">攝影</string>
   <string name="live_display_color_profile_photography_summary">完美重現照片色彩</string>
   <string name="live_display_color_profile_basic_title">基本</string>
   <string name="live_display_color_profile_basic_summary">使用未校正的顯示</string>
+  <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>
@@ -592,14 +632,14 @@
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
   <string name="bluetooth_accept_all_files">接受所有檔案類型</string>
   <!-- High touch sensitivity -->
-  <string name="high_touch_sensitivity_title">高觸摸靈敏度</string>
+  <string name="high_touch_sensitivity_title">高觸控靈敏度</string>
   <string name="high_touch_sensitivity_summary">增加觸控螢幕的靈敏度，因此戴著手套也可以使用手機</string>
   <!-- Display & Lights screen, setting options for LCD density -->
   <string name="lcd_density">LCD密度</string>
   <string name="dialog_title_lcd_density">LCD密度</string>
   <string name="lcd_density_value_format">DPI %d</string>
   <string name="lcd_density_default_value_format">%d DPI (預設值)</string>
-  <string name="restarting_ui">重新開機 UI\u2026</string>
+  <string name="restarting_ui">正在重新啟動使用者介面\u2026</string>
   <!-- Stylus Icon -->
   <string name="stylus_icon_enabled_title">使用觸控筆時顯示圖示</string>
   <string name="stylus_icon_enabled_summary">使用觸控筆漂浮或繪圖時顯示指標圖示</string>
@@ -608,14 +648,14 @@
   <string name="category_spen_title">觸控筆手勢</string>
   <string name="enable_subcat_title">觸控筆</string>
   <string name="enable_spen_title_head">啟用手勢</string>
-  <string name="enable_spen_summary_head">按住觸控筆按鈕以使用滑動手勢</string>
+  <string name="enable_spen_summary_head">按住觸控筆按鍵以使用滑動手勢</string>
   <string name="gestures_subcat_title">手勢</string>
   <string name="gestures_left_spen_title_head">向左滑動</string>
   <string name="gestures_right_spen_title_head">向右滑動</string>
   <string name="gestures_up_spen_title_head">向上滑動</string>
   <string name="gestures_down_spen_title_head">向下滑動</string>
   <string name="gestures_long_spen_title_head">長按</string>
-  <string name="gestures_double_spen_title_head">輕按兩下</string>
+  <string name="gestures_double_spen_title_head">輕觸兩次</string>
   <!-- Gestures Options -->
   <string name="gestures_action_empty">無動作</string>
   <string name="gestures_action_home">首頁</string>
@@ -633,6 +673,12 @@
   <string name="increasing_ring_min_volume_title">開始音量</string>
   <string name="increasing_ring_ramp_up_time_title">漸強時間</string>
   <!-- LTO download data over wi-fi only -->
+  <string name="lto_download_data_wifi_only">GPS 輔助資料已下載</string>
+  <string name="lto_download_data_wifi_only_on">透過任何網絡</string>
+  <string name="lto_download_data_wifi_only_off">僅透過 Wi\u2011Fi 網路</string>
+  <string name="volume_keys_control_ring_stream_title">控制鈴聲音量</string>
+  <string name="volume_keys_control_ring_stream_summary_on">音量鍵控制鈴聲音量</string>
+  <string name="volume_keys_control_ring_stream_summary_off">音量鍵控制媒體音量</string>
   <string name="category_calibration">校正</string>
   <string name="display_and_lights">顯示與指示燈</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
@@ -658,13 +704,13 @@
   <string name="status_bar_quick_qs_pulldown_summary_left">居左</string>
   <string name="status_bar_quick_qs_pulldown_summary_right">居右</string>
   <string name="status_bar_quick_qs_pulldown_off">關閉</string>
-  <string name="status_bar_quick_qs_pulldown_left">居左</string>
-  <string name="status_bar_quick_qs_pulldown_right">居右</string>
+  <string name="status_bar_quick_qs_pulldown_left">靠左</string>
+  <string name="status_bar_quick_qs_pulldown_right">靠右</string>
   <!-- Status bar - Clock -->
-  <string name="status_bar_clock_style_title">時鐘風格</string>
-  <string name="status_bar_clock_style_right">居右</string>
-  <string name="status_bar_clock_style_left">居左</string>
-  <string name="status_bar_clock_style_center">中間</string>
+  <string name="status_bar_clock_style_title">時鐘樣式</string>
+  <string name="status_bar_clock_style_right">靠右</string>
+  <string name="status_bar_clock_style_left">靠左</string>
+  <string name="status_bar_clock_style_center">置中</string>
   <string name="status_bar_clock_style_hidden">隱藏</string>
   <string name="status_bar_am_pm_title">上午/下午樣式</string>
   <string name="status_bar_am_pm_info">24小時制時鐘已啟用</string>
@@ -688,7 +734,7 @@
   <string name="status_bar_icons_summary">控制顯示哪些狀態列圖示</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">攔截手勢觸控事件</string>
-  <string name="edge_gesture_service_summary">不向應用程式傳送導覽列與狀態列手勢的觸控事件</string>
+  <string name="edge_gesture_service_summary">不向應用程式傳送導航列與狀態列手勢的觸控事件</string>
   <!-- Keep screen on strings -->
   <string name="keep_screen_on_never">永不</string>
   <string name="keep_screen_on_debugging">在 USB 偵錯時</string>
@@ -704,22 +750,26 @@
   <string name="privacy_guard_help_title">說明</string>
   <string name="privacy_guard_reset_title">重設</string>
   <string name="privacy_guard_reset_text">重設權限？</string>
-  <string name="privacy_guard_help_text">在此畫面您只要輕按應用程式即可選擇是否對其啟用隱私守衛。被選取的應用程式將不能存取您的個人資料，例如聯絡人、訊息或通話記錄。長按應用程式可開啟其應用程式資訊畫面。\n\n內建應用程式預設不會顯示，但是可從選單中開啟顯示。</string>
+  <string name="privacy_guard_help_text">在此畫面您只要輕觸應用程式即可選擇是否對其啟用隱私守衛。被選取的應用程式將不能存取您的個人資料，例如聯絡人、訊息或通話記錄。長按應用程式可開啟其應用程式資訊畫面。\n\n內建應用程式預設不會顯示，但是可從選單中開啟顯示。</string>
   <string name="privacy_guard_manager_show_system_apps">顯示系統應用程式</string>
   <string name="privacy_guard_advanced_settings_title">進階</string>
+  <string name="privacy_guard_notification_title">顯示通知</string>
   <!-- Sizes for pattern lockscreen -->
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
   <string name="lockpattern_settings_enable_error_path_title">顯示解鎖圖形錯誤</string>
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
   <string name="lockpattern_settings_enable_dots_title">顯示解鎖圖形點</string>
   <!-- Whether the keyguard will directly pass to password entry -->
+  <string name="lock_directly_show_password">直接顯示密碼輸入框</string>
   <!-- Whether the keyguard will directly pass to pattern view -->
+  <string name="lock_directly_show_pattern">直接顯示圖形密碼輸入</string>
   <!-- Whether the keyguard will directly pass to PIN entry -->
+  <string name="lock_directly_show_pin">直接顯示 PIN 碼輸入框</string>
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">顯示音樂視覺效果</string>
   <!-- lock screen disabled by QS tile warning -->
   <string name="lockscreen_disabled_by_qs_tile_title">經由快速設定瓷磚停用</string>
-  <string name="lockscreen_disabled_by_qs_tile_summary">點擊以啟用螢幕鎖定</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">輕觸即可啟用螢幕鎖定</string>
   <string name="lockscreen_disabled_by_qs_tile_summary_enabled">螢幕鎖定已啟用</string>
   <!-- Battery saver -->
   <string name="battery_saver_threshold">省電助手的閾值</string>
@@ -727,6 +777,7 @@
   <string name="battery_saver_summary_unavailable">無法在充電時啟用</string>
   <!-- Battery : Automatic performance profiles -->
   <string name="autoperf_title">啟用應用程式專屬 (per-app) 設定檔</string>
+  <string name="autoperf_summary">為不同應用程式自動選擇合適的電池模式</string>
   <string name="perf_profile_title">電池模式</string>
   <!-- Memory -->
   <string name="memory_startup_apps_title">開機時啟動的應用程式</string>
@@ -737,22 +788,22 @@
   <string name="advanced_reboot_summary">當解鎖後，加入重啟進入 recovery 或 bootloader 或進行軟重啟的選項至電源選單</string>
   <string name="category_interface">介面</string>
   <!-- Expanded desktop -->
-  <string name="power_menu_expanded_desktop">擴展桌面</string>
+  <string name="power_menu_expanded_desktop">延伸桌面</string>
   <string name="expanded_hide_nothing">不隱藏</string>
   <string name="expanded_hide_status">隱藏狀態列</string>
-  <string name="expanded_hide_navigation">隱藏導覽列</string>
+  <string name="expanded_hide_navigation">隱藏導航列</string>
   <string name="expanded_hide_both">全部隱藏</string>
-  <string name="expanded_nothing_to_show">若要添加一個讓應用程式啟動的擴展狀態，請先關閉“全部開啟”</string>
-  <string name="expanded_enabled_for_all">啟動全部</string>
-  <string name="expanded_desktop_style">擴展桌面樣式</string>
-  <string name="expanded_desktop_style_description">選擇個默認的擴展桌面樣式</string>
-  <string name="expanded_desktop_title">擴展桌面選項</string>
+  <string name="expanded_nothing_to_show">若要新增一個讓應用程式啟動的延伸狀態，請先關閉「全部啟用」</string>
+  <string name="expanded_enabled_for_all">全部啟用</string>
+  <string name="expanded_desktop_style">延伸桌面樣式</string>
+  <string name="expanded_desktop_style_description">選擇個預設的延伸桌面樣式</string>
+  <string name="expanded_desktop_title">延伸桌面選項</string>
   <!-- Kill app long-press back -->
-  <string name="kill_app_longpress_back">返回按鈕可終止應用程式</string>
+  <string name="kill_app_longpress_back">返回鍵可終止應用程式</string>
   <string name="kill_app_longpress_back_summary">長按返回鍵終止前景應用程式</string>
   <!-- Show/Hide Search Bar -->
   <string name="recents_show_searchbar">在最近使用總覽中顯示搜尋列</string>
-  <string name="keywords_recents_show_searchbar">最近 最近 停用 啟用 顯示 隱藏 搜索欄 搜索欄</string>
+  <string name="keywords_recents_show_searchbar">最近 最近 停用 啟用 顯示 隱藏 搜尋列 搜尋列</string>
   <!-- Voice Wakeup -->
   <string name="voice_wakeup_settings_title">語音喚醒</string>
   <string name="voice_wakeup_retrain_title">重新訓練您的語音</string>
@@ -767,7 +818,7 @@
   <string name="blacklist_edit_dialog_title">更改已封鎖的電話號碼</string>
   <string name="blacklist_prefs">設定</string>
   <string name="blacklist_button_delete">刪除</string>
-  <string name="blacklist_empty_text">您沒有任何已封鎖的號碼，輕觸新增 (+) 按鈕加入號碼。</string>
+  <string name="blacklist_empty_text">您沒有任何已封鎖的號碼，輕觸新增 (+) 按鍵加入號碼。</string>
   <string name="blacklist_disabled_empty_text">為了防止某些電話號碼打電話或傳簡訊給您，請啟用已封鎖來電者名單功能。</string>
   <string name="blacklist_summary_disabled">已停用</string>
   <string name="blacklist_summary">您將不會收到任何在已封鎖來電者名單上的電話號碼的來電或簡訊</string>
@@ -807,9 +858,9 @@
   <string name="anonymous_statistics_title">CyanogenMod 統計</string>
   <string name="anonymous_statistics_summary">加入匿名統計報告以協助改進 CyanogenMod</string>
   <string name="anonymous_statistics_warning_title">關於</string>
-  <string name="anonymous_statistics_warning">加入 CyanogenMod 統計將允許非個人資料被提交到 CyanogenMod 的開發者，
+  <string name="anonymous_statistics_warning">加入 CyanogenMod 統計將允許非個人資料被提交到 CyanogenMod 的開發人員，
         以追蹤每個裝置上的獨特安裝。提交的資訊包含一個唯一識別碼，此識別碼並不會泄露您的隱私或個人資料。
-        該資料在每次開機時被提交。\n\n輕按預覽資料以預覽被提交資料的例子。</string>
+        該資料在每次開機時被提交。\n\n輕觸預覽資料以預覽被提交資料的例子。</string>
   <string name="enable_reporting_title">啟用報告</string>
   <string name="preview_data_title">預覽資料</string>
   <string name="view_stats_title">檢視統計</string>
@@ -829,21 +880,29 @@
   <string name="menu_hidden_apps_delete">重設</string>
   <string name="menu_hidden_apps_reset_lock">重設圖形鎖</string>
   <string name="protected_apps">受保護的應用程式</string>
+  <string name="protected_apps_summary">管理安全鎖下隱藏的應用程式</string>
   <string name="saving_protected_components">儲存組件狀態\u2026</string>
-  <string name="pa_login_username_hint">使用者名稱（電子郵件）</string>
   <string name="pa_login_password_hint">密碼</string>
   <string name="pa_login_submit_button">登入</string>
   <string name="pa_login_checking_password">正在檢查帳戶\u2026</string>
   <string name="pa_login_incorrect_login">登入不正確</string>
-  <string name="pa_pattern_or_fingerprint_header">必須使用圖形或指紋解鎖</string>
+  <string name="pa_pattern_or_fingerprint_header">必須使用解鎖圖形或指紋解鎖</string>
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">貢獻者</string>
   <string name="contributors_cloud_loading_message">貢獻者名單載入中\u2026</string>
+  <string name="contributors_cloud_failed_message">無法載入貢獻者資料</string>
   <string name="contributor_info_menu">貢獻者名單</string>
+  <string name="contributor_info_msg"> <![CDATA[<b>名稱：</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
+          <b>暱稱：</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
+          <b>提交：</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
   <string name="contributions_info_menu">貢獻者名單</string>
+  <string name="contributions_info_msg">
+        <![CDATA[<b>總貢獻者：</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
+                 <b>總認可：</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
+                 <b>最後一次更新：</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
   <string name="category_sounds">音效</string>
   <string name="notification_manager">通知</string>
-  <string name="lockscreen_settings">鎖定畫面</string>
+  <string name="lockscreen_settings">鎖定螢幕</string>
   <string name="category_lights">指示燈</string>
   <string name="category_volume">音量</string>
   <string name="category_vibrate">震動</string>
@@ -851,11 +910,13 @@
   <string name="title_general">一般</string>
   <string name="advanced">進階</string>
   <string name="link_volume_option_title">同步鈴聲和通知音量</string>
-  <string name="lcd_density_prompt_message">有些應用程式可能無法在非標準 DPI 下運行。\n\n這將重啟您的設備。</string>
+  <string name="lcd_density_prompt_message">有些應用程式可能無法在非標準 DPI 下執行。\n\n這將重新啟動您的裝置。</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">APN PPP 電話號碼</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
   <string name="duplicate_apn_error_title">重覆的 APN</string>
   <string name="duplicate_apn_error_message">此 APN 已存在，請放棄或修改參數。</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g>是<xliff:g id="status" example="disabled">%2$s</xliff:g></string>
   <string name="sim_disabled">已停用</string>
   <string name="sim_missing">遺失或毀損</string>
   <string name="sim_enabler_need_disable_sim">SIM 卡將被停用，確定要繼續嗎？</string>
@@ -865,7 +926,7 @@
   <string name="sim_enabler_in_call">通話時無法進行此操作。</string>
   <string name="sim_enabler_both_inactive">無法停用所有 SIM 卡</string>
   <string name="sim_enabler_enabling">啟用中\u2026</string>
-  <string name="sim_enabler_disabling">禁用中\u2026</string>
+  <string name="sim_enabler_disabling">正在停用\u2026</string>
   <string name="sub_activate_success">SIM 卡已經啟用。</string>
   <string name="sub_activate_failed">啟用失敗。</string>
   <string name="sub_deactivate_success">SIM 卡已經停用。</string>
@@ -874,7 +935,7 @@
   <string name="select_sim_card">選擇 SIM 卡</string>
   <!-- MSIM SIM status -->
   <string name="sim_card_status_title">Sim 卡 %d 狀態</string>
-  <string name="sim_card_lock_settings_title">Sim 卡 %d 鎖定設置</string>
+  <string name="sim_card_lock_settings_title">Sim 卡 %d 鎖定設定</string>
   <string name="sim_card_summary_empty">沒有插入Sim卡</string>
   <string name="sim_mobile_network_settings_category_title">行動網路設定</string>
   <string name="sim_mobile_network_settings_title">Sim 卡 %d 設定</string>
@@ -884,9 +945,14 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_events">事件</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">已選的來電者</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">已選的訊息</string>
   <!-- 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>
@@ -902,45 +968,63 @@
   <!-- label for usage time -->
   <string name="usage_time_label_cm">使用時間：</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="tablet">該操作將從您的平板電腦<b>內部存儲裝置</b>清除所有資料，其中包括：\n\n <li>您的裝置帳戶</li>\n<li>系統和應用程式的資料及設定</li> \n <li>已下載的應用程式</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="default">該操作將從您的手機<b>內部存儲裝置</b>清除所有資料，其中包括：\n\n <li>您的裝置帳戶</li>\n<li>系統和應用程式的資料及設定</li> \n <li>已下載的應用程式</li></string>
   <!-- Factory reset strings -->
   <string name="factory_reset_instructions_title">個人資料和應用程式</string>
-  <string name="factory_reset_instructions_summary">這將移除在此設備上您所有帳戶、應用程式、應用程式資料及系統設置</string>
+  <string name="factory_reset_instructions_summary">這將移除在此裝置上您所有帳戶、應用程式、應用程式資料及系統設定</string>
   <string name="factory_reset_personal_content">個人內容</string>
   <string name="factory_reset_erase_stored_content">移除存儲內容</string>
-  <string name="factory_reset_erase_stored_content_summary">移除音樂、相片、視頻及其他儲存在此設備上的用戶資料</string>
-  <string name="factory_reset_erase_stored_content_summary_forced">移除音樂、相片、視頻及其他儲存在此設備上的用戶資料。\n\n<b>由於設備加密，無法儲存內容。</b></string>
+  <string name="factory_reset_erase_stored_content_summary">移除音樂、照片、影片及其他儲存在此裝置上的使用者資料</string>
+  <string name="factory_reset_erase_stored_content_summary_forced">移除音樂、照片、影片及其他儲存在此裝置上的使用者資料。\n\n<b>由於裝置加密，無法儲存內容。</b></string>
   <string name="factory_reset_erase_sd_card">格式化SD卡</string>
   <string name="factory_reset_erase_sd_card_summary">移除SD卡上所有資料，包括音樂和相片。</string>
   <string name="factory_reset_warning_text_reset_now">現在重置</string>
-  <string name="factory_reset_warning_text_message">您所有帳戶、應用程式、應用程式資料及系統設置將從此設備上移除，並不可逆轉。</string>
+  <string name="factory_reset_warning_text_message">您所有帳戶、應用程式、應用程式資料及系統設定將從此裝置上移除，並不可逆轉。</string>
   <!-- Tethering & portable hotspot other category -->
   <string name="tethering_other_category_text">其他</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Wi\u2011Fi 熱點逾時</string>
   <string name="hotstpot_inactivity_timeout_never">永不</string>
   <string name="hotstpot_inactivity_timeout_1_minute">1 分鐘</string>
   <string name="hotstpot_inactivity_timeout_5_minutes">5 分鐘</string>
   <string name="hotstpot_inactivity_timeout_10_minutes">10 分鐘</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">可攜式 Wi\u2011Fi 熱點將永不逾時</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">可攜式 Wi\u2011Fi 熱點將於 <xliff:g id="timeout">%1$s</xliff:g> 後逾時</string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">活動鎖定螢幕</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">啟用並設定活動鎖定螢幕</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">設定</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">要查看可用的活動鎖定螢幕，請啟用活動鎖定螢幕。</string>
   <string name="interruptions_ignore_while_media_title">防止聲音回避</string>
   <string name="interruptions_ignore_while_media_summary">有通知時，不減少媒體播放的音量</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod 法律條款</string>
   <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">重設統計</string>
   <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">將會重設電池記錄數據</string>
   <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">座架電池不存在</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">正在 AC 插口上充電</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">正在透過 USB 插口充電</string>
+  <string name="restrict_app_wlan_title">停用應用程式使用 Wi\u2011Fi</string>
+  <string name="restrict_app_wlan_summary">防止應用程式使用 Wi\u2011Fi 數據連線</string>
+  <string name="restrict_app_cellular_title">停用應用程式使用行動網路</string>
+  <string name="restrict_app_cellular_summary">防止應用程式使用行動數據連線</string>
   <string name="privacy_guard_internet_category">網路</string>
   <!-- Weather -->
   <string name="weather_settings_title">天氣</string>
   <string name="weather_settings_no_services_prompt">沒有安裝任何天氣服務</string>
   <string name="weather_settings_button">服務選項</string>
+  <string name="weather_settings_activity_not_found">無法為此天氣服務啟動設定選單</string>
   <string name="weather_settings_add_weather_provider">新增天氣服務</string>
   <string name="weather_settings_general_settings_title">一般</string>
   <string name="weather_settings_providers_title">天氣服務</string>
@@ -948,9 +1032,21 @@
   <string name="weather_settings_temp_celsius">攝氏</string>
   <string name="weather_settings_temp_fahrenheit">華氏</string>
   <string name="weather_settings_keyword">天氣</string>
+  <string name="background_data_access">背景資料存取權限</string>
+  <string name="allow_background_both">透過行動數據和 Wi\u2011Fi</string>
+  <string name="allow_background_wlan">僅限 Wi-Fi</string>
+  <string name="allow_background_none">無存取權限</string>
+  <string name="mobile_data_alert">行動數據警報</string>
+  <string name="mobile_data_alert_summary">當應用程式使用大量數據時通知</string>
   <string name="data_usage_menu_enable_data_alerts">啟用資料使用警告</string>
-  <string name="data_usage_menu_disable_data_alerts">關閉資料使用警告</string>
+  <string name="data_usage_menu_disable_data_alerts">停用資料使用警告</string>
+  <string name="data_usage_menu_reset_stats">重設資料統計資料</string>
+  <string name="reset_data_stats_msg">這將清除所有過去和現在的追蹤資料</string>
   <string name="reset_stats_confirm">確認</string>
+  <string name="restrict_cellular_access_title">限制行動數據存取</string>
+  <string name="restrict_cellular_access_summary">停用行動數據資料存取權限</string>
+  <string name="restrict_cellular_access_dialog_title">限制行動數據存取？</string>
+  <string name="restrict_cellular_access_dialog_summary">此功能可能會導致依賴於網路存取的應用程式停止工作時，只有行動網路可用。\n\n您可以在應用程式中的可用設定中找到更合適的使用數據控制。</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">電信業者</string>
   <!-- title for lock screen blur preference -->
@@ -959,17 +1055,44 @@
   <string name="lockscreen_weather_enabled_title">顯示天氣資訊</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">在鎖定螢幕上顯示</string>
-  <string name="app_notification_show_on_keyguard_summary">在鎖定畫面中顯示此應用程式的通知</string>
-  <string name="app_notification_no_ongoing_on_keyguard_title">在鎖屏上停用持久通知</string>
-  <string name="app_notification_no_ongoing_on_keyguard_summary">在鎖屏上不再顯示來自此應用程式的持久通知</string>
+  <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.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">關閉MBN自動存取</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">開啟MBN自動存取</string>
   <string name="cm_radio_info_volte_avail_ovr_on_label">關閉 VoLTE 偵錯</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">開啟 VoLTE 偵錯</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">關閉 VT 偵錯</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">開啟 VT 偵錯</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">關閉 WFC 偵錯</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">開啟 WFC 偵錯</string>
+  <string name="cm_radio_info_adb_log_on_label">關閉 ADB 無線電記錄</string>
+  <string name="cm_radio_info_adb_log_off_label">開啟 ADB 無線電記錄</string>
+  <string name="cm_radio_info_diag_log_on_label">關閉診斷記錄</string>
+  <string name="cm_radio_info_diag_log_off_label">開啟診斷記錄</string>
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">桌布</string>
+  <string name="not_available_with_app">不適用於 %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">在您的手機 <xliff:g id="sensor_location">%1$s</xliff:g> 找到指紋感應器。</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">後置</string>
+  <string name="security_settings_fingerprint_sensor_location_front">前置</string>
+  <string name="security_settings_fingerprint_sensor_location_left">左側</string>
+  <string name="security_settings_fingerprint_sensor_location_right">右側</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">語音︰ <xliff:g id="voice_status">%1$s </xliff:g> / 資料︰ <xliff:g id="data_status">%2$s </xliff:g></string>
 </resources>
-- 
cgit v1.1


From 25d0c7dff111a4b977c3cedd7de065e1717f97f3 Mon Sep 17 00:00:00 2001
From: "blinky@build01" <jenkins@cyanogenmod.com>
Date: Thu, 22 Dec 2016 18:14:51 -0800
Subject: Automatic translation import

Change-Id: I4385697ba782926faa8cfcbdc6267a7f29e2c35b
Ticket: -
---
 res/values-as-rIN/arrays.xml     | 11 ++++++++
 res/values-as-rIN/strings.xml    | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-ast-rES/arrays.xml    | 15 +++++++++--
 res/values-ast-rES/strings.xml   | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-br-rFR/arrays.xml     | 11 ++++++++
 res/values-br-rFR/strings.xml    | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-csb-rPL/arrays.xml    | 11 ++++++++
 res/values-csb-rPL/strings.xml   | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-cy/arrays.xml         | 11 ++++++++
 res/values-cy/strings.xml        | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-en-rPT/arrays.xml     | 11 ++++++++
 res/values-en-rPT/strings.xml    | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-eo/arrays.xml         | 11 ++++++++
 res/values-eo/strings.xml        | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-es-rCO/arrays.xml     | 11 ++++++++
 res/values-es-rCO/strings.xml    | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-es-rMX/arrays.xml     | 11 ++++++++
 res/values-es-rMX/strings.xml    | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-frp-rIT/arrays.xml    | 11 ++++++++
 res/values-frp-rIT/strings.xml   | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-fy-rNL/arrays.xml     | 11 ++++++++
 res/values-fy-rNL/strings.xml    | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-ga-rIE/arrays.xml     | 11 ++++++++
 res/values-ga-rIE/strings.xml    | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-gd-rGB/arrays.xml     | 11 ++++++++
 res/values-gd-rGB/strings.xml    | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-ku/arrays.xml         | 15 +++++++++--
 res/values-ku/strings.xml        | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-lb/arrays.xml         | 15 +++++++++--
 res/values-lb/strings.xml        | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-oc-rFR/arrays.xml     | 11 ++++++++
 res/values-oc-rFR/strings.xml    | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-or-rIN/arrays.xml     | 11 ++++++++
 res/values-or-rIN/strings.xml    | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-ug/arrays.xml         | 15 +++++++++--
 res/values-ug/strings.xml        | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-zh-rTW/cm_strings.xml | 32 ++++++++++++------------
 37 files changed, 1194 insertions(+), 24 deletions(-)

diff --git a/res/values-as-rIN/arrays.xml b/res/values-as-rIN/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-as-rIN/arrays.xml
+++ b/res/values-as-rIN/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-as-rIN/strings.xml b/res/values-as-rIN/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-as-rIN/strings.xml
+++ b/res/values-as-rIN/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-ast-rES/arrays.xml b/res/values-ast-rES/arrays.xml
index 3179cdf..82f0dab 100644
--- a/res/values-ast-rES/arrays.xml
+++ b/res/values-ast-rES/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <string-array name="timezone_filters">
     <!-- The next level of the time zoner picker should show time zones from the Americas. -->
@@ -119,10 +120,11 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <string-array name="wifi_status">
     <!-- Status message of Wi-Fi when it is idle. -->
-    <item/>
+    <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
     <item>Guetando...</item>
     <!-- Status message of Wi-Fi when it is connecting. -->
@@ -147,10 +149,11 @@
     <item>Inhabilitando conexón inestable temporalmente...</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <string-array name="wifi_status_with_ssid">
     <!-- Status message of Wi-Fi when it is idle. -->
-    <item/>
+    <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
     <item>Guetando...</item>
     <!-- Status message of Wi-Fi when it is connecting to a network. -->
@@ -175,12 +178,15 @@
     <item>Inhabilitando conexón inestable temporalmente...</item>
   </string-array>
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <string-array name="wifi_eap_method">
     <!-- Do not translate. -->
@@ -246,6 +252,7 @@
     <item>Siempre visible</item>
   </string-array>
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <string-array name="wifi_signal">
     <item>Mala</item>
@@ -273,6 +280,7 @@
     <item>Enxamás</item>
   </string-array>
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <string-array name="wifi_sleep_policy_values">
     <!-- Do not translate. -->
@@ -703,8 +711,10 @@
   </string-array>
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <string-array name="vpn_types_long">
     <item>Rede privada virtual PPTP</item>
@@ -715,6 +725,7 @@
     <item>Rede privada virtual IPSec con certificaos y autenticación híbrida</item>
   </string-array>
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <string-array name="vpn_states">
     <!-- Status message when VPN is disconnected. -->
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 8bb657e..5ad1e33 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -30,6 +30,7 @@
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <string name="dlg_switch">Camudar</string>
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <string name="device_info_default">Desconocíu</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
@@ -42,6 +43,7 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <string name="show_dev_already">Nun hai necesidá, yá yes un desendolcador.</string>
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <string name="header_category_wireless_networks">Conexones inalámbriques y redes</string>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
@@ -208,6 +210,7 @@
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <string name="bluetooth_disable_profile_message">Va inhabilitase&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;de&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;.</string>
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <string name="bluetooth_device">Preséu Bluetooth ensin nome</string>
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
@@ -529,6 +532,7 @@
   <!-- mobile network settings screen, setting option summary text -->
   <string name="sum_carrier_select">Esbillar un operador de rede</string>
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <string name="date_and_time_settings_title">Data y hora</string>
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
@@ -578,6 +582,7 @@
          [CHAR LIMIT=20] -->
   <string name="time_picker_title">Hora</string>
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <string name="lock_after_timeout">Bloquiar automáticamente</string>
   <!-- Security settings screen, setting option summary to change screen timeout -->
@@ -621,6 +626,7 @@
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <string name="security_passwords_title">Contraseñes</string>
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <string name="security_settings_fingerprint_preference_title">Buelga dixital</string>
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
@@ -637,6 +643,7 @@
     <item quantity="other">Configuráronsese <xliff:g id="count">%1$d</xliff:g> buelgues dixitales</item>
   </plurals>
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <string name="security_settings_fingerprint_enroll_onboard_title">Configuración de buelga dixital</string>
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
@@ -802,12 +809,15 @@
   <!-- Image button description to switch input method -->
   <string name="crypt_keeper_switch_input_method">Camudar métodu d\'entrada</string>
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <string name="lock_settings_picker_title">Escoyer bloquéu de pantalla</string>
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <string name="lock_settings_picker_fingerprint_message">Escoyer el métodu secundariu de bloquéu de pantalla</string>
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_launch_picker_title">Bloquéu de pantalla</string>
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
@@ -819,6 +829,7 @@
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_off_title">Ensin seguridá</string>
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_none_title">Eslizar</string>
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
@@ -993,6 +1004,7 @@
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <string name="bluetooth_pairing_shares_phonebook">Permitir que <xliff:g id="device_name">%1$s</xliff:g> acceda a los contautos y al historial de llamaes</string>
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <string name="bluetooth_connecting_error_message">Nun pudo afitase conexón con <xliff:g id="device_name">%1$s</xliff:g>.</string>
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
@@ -1156,6 +1168,7 @@
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <string name="nsd_quick_toggle_summary">Permitir que les aplicaciones d\'otros preseos puedan ver les aplicaciones d\'esti preséu</string>
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <string name="wifi_quick_toggle_title">Wi-Fi</string>
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
@@ -1251,6 +1264,7 @@
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <string name="wifi_setup_wps">Configuración automática (WPS)</string>
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <string name="wifi_show_advanced">Opciones avanzaes</string>
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
@@ -1376,6 +1390,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <string name="wifi_connect_failed_message" product="default">El teléfonu nun pudo coneutase a esta rede Wi‑Fi.</string>
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <string name="wifi_saved_access_points_titlebar">Redes guardaes</string>
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
@@ -1543,6 +1558,7 @@
   </string-array>
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <string name="home_settings">Aniciu</string>
   <string name="display_settings_title">Pantalla</string>
@@ -1651,6 +1667,7 @@
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <string name="search_settings_summary">Alministrar historial y configuración de gueta</string>
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <string name="display_settings">Pantalla</string>
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
@@ -1922,7 +1939,9 @@
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <string name="sd_mount" product="default">Activar tarxeta SD</string>
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <string name="sd_format" product="nosdcard">Desaniciar almacenamientu USB</string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
@@ -1947,7 +1966,9 @@
   <!-- SD card eject confirmation dialog  -->
   <string name="dlg_confirm_unmount_text" product="default">Si desactives la tarxeta SD, van parase dalgunes aplicaciones que tas usando y nun van tar disponibles hasta que vuelvas activala.</string>
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <string name="dlg_error_unmount_text" product="nosdcard">Nun pudo desmontase l\'almacenamientu USB. Inténtalo dempués.</string>
   <!-- SD card eject error dialog text   -->
@@ -2167,6 +2188,7 @@
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <string name="menu_cancel">Descartar</string>
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <string name="error_apn_empty">El APN nun pue quedar baleru.</string>
@@ -2394,6 +2416,7 @@
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <string name="location_sources_heading">Fontes de llocalización</string>
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <string name="about_settings" product="tablet">Información de la tablet</string>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
@@ -2409,15 +2432,19 @@
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <string name="regulatory_information">Información regulatoria</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <string name="copyright_title">Derechos d\'autor</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <string name="license_title">Llicencia</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <string name="terms_title">Términos y condiciones</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <string name="wallpaper_attributions">Fondos de pantalla</string>
@@ -2428,6 +2455,7 @@
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <string name="settings_manual_activity_unavailable">Hebo un fallu al cargar el manual.</string>
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <string name="settings_license_activity_title">Llicencies de códigu abiertu</string>
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
@@ -2538,6 +2566,7 @@
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <string name="activity_not_found">L\'aplicación nun ta instalada nel teléfonu.</string>
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <string name="manageapplications_settings_title">Alministrar aplicaciones</string>
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
@@ -2694,6 +2723,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <string name="dlg_cancel">Encaboxar</string>
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <string name="app_not_found_dlg_text"> Nun s\'atopó l\'aplicación na llista d\'aplicaciones instalaes.</string>
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
@@ -2759,6 +2789,7 @@
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <string name="force_stop_dlg_text">Si se detién una aplicación, ye dable que nun funcione correcho.</string>
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <string name="move_app_failed_dlg_text">Nun pudo movese l\'aplicación. <xliff:g id="reason">%1$s</xliff:g></string>
   <!-- Manage applications, application installation location title -->
@@ -2779,6 +2810,7 @@
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <string name="app_disable_notifications_dlg_text">Si desactives les notificaciones d\'esta aplicación, ye dable que nun recibas anovamientos y alertes importantes.</string>
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <string name="app_ops_settings">Operaciones de l\'aplicación</string>
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
@@ -2878,6 +2910,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <string name="runningservicedetails_stop_dlg_text" product="default">Si detienes esti serviciu, ye dable que dalgunes funciones del teléfonu dexen de funcionar correcho hasta que reanicies el preséu.</string>
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <string name="language_settings">Llingua y tecláu</string>
   <!-- Title of Language and keyboard settings screen -->
@@ -2928,6 +2961,7 @@
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <string name="vibrate_input_devices_summary">Redireicionar vibración al controlador de videoxuegu cuando tea coneutáu</string>
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_dialog_title">Esbilla un tipu de tecláu</string>
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
@@ -2937,9 +2971,11 @@
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <string name="keyboard_layout_default_label">Predetermináu</string>
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_picker_title">Diseños de tecláu</string>
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <string name="user_dict_settings_title">Diccionariu personal</string>
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
@@ -3170,6 +3206,7 @@
   <!-- label for usage time -->
   <string name="usage_time_label">Tiempu d\'usu</string>
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <string name="accessibility_settings">Accesibilidá</string>
   <!-- Settings title for accessibility settings screen -->
@@ -3338,6 +3375,7 @@
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <string name="settings_button">Axustes</string>
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <string name="print_settings">Impresión</string>
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
@@ -3393,6 +3431,7 @@
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_hidden_utterance">Cuadru de gueta anubríu</string>
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <string name="power_usage_summary_title">Batería</string>
   <!-- Activity title summary for App Fuel Gauge summary -->
@@ -3601,6 +3640,7 @@
   <string name="battery_saver_turn_on_automatically_never">Enxamás</string>
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <string name="process_stats_summary_title">Estadístiques de procesos</string>
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
@@ -3684,6 +3724,7 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <string name="menu_proc_stats_type_cached">En caché</string>
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <string name="voice_input_output_settings">Entrada y salida de voz</string>
   <!-- Main voice input/output settings screen title -->
@@ -3695,6 +3736,7 @@
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <string name="voice_category">Voz</string>
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <string name="voice_input_settings">Axustes d\'entrada de voz</string>
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
@@ -3720,6 +3762,7 @@
         entrada de voz en to nome. Remanez de l\'aplicación <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>.
         ¿Quies habilitar l\'usu d\'esti serviciu?</string>
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <string name="tts_settings">Configuración síntesis voz</string>
   <!-- TTS option item name in the main settings screen -->
@@ -3894,6 +3937,7 @@
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <string name="credentials_settings_not_available">Les credenciales nun tán disponibles pa esti usuariu</string>
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <string name="credentials_unlock_hint">Escribi la contraseña del almacenamientu de credenciales.</string>
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
@@ -3921,6 +3965,7 @@
   <!-- Sound settings screen, setting option summary text -->
   <string name="emergency_tone_summary">Afitar comportamientu al facer una llamada d\'emerxencia</string>
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <string name="privacy_settings">Copia de seguranza</string>
   <!-- Privacy settings activity title -->
@@ -3955,11 +4000,13 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <string name="local_backup_password_toast_validation_failure">Fallu al afitar contraseña de seguranza</string>
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <string name="backup_erase_dialog_message">¿Quies dexar de facer copies de seguranza de les contraseñes Wi-Fi, de los marcadores y d\'otros axustes y datos d\'aplicaciones, arriendes de desaniciar toles copies de los sirvidores de Google?</string>
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <string name="device_admin_settings_title">Axustes d\'alministración de preseos</string>
   <!-- Label for screen showing the active device policy -->
@@ -4130,6 +4177,7 @@
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <string name="sync_automatically">Sincronizar datos aplicaciones autom.</string>
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <string name="sync_enabled">Sincronización activa</string>
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
@@ -4617,6 +4665,7 @@
   <string name="selinux_status_permissive">Permisivu</string>
   <string name="selinux_status_enforcing">Obligatoriu</string>
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">Pue que la rede tea supervisada</string>
@@ -4631,6 +4680,7 @@
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <string name="ssl_ca_cert_settings_button">Comprobar credenciales de confianza</string>
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <string name="user_settings_title">Usuarios</string>
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
@@ -4767,6 +4817,7 @@
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <string name="global_font_change_title">Camudar tamañu de fonte</string>
   <!-- NFC payment settings -->
+  <skip></skip>
   <string name="nfc_payment_settings_title">Tocar y pagar</string>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <string name="nfc_payment_how_it_works">Cómo funciona</string>
@@ -4799,6 +4850,7 @@
   <string name="nfc_payment_set_default">¿Quies usar <xliff:g id="app">%1$s</xliff:g> siempre con Tocar y pagar?</string>
   <string name="nfc_payment_set_default_instead_of">¿Quies usar <xliff:g id="app">%1$s</xliff:g> siempre en cuenta de <xliff:g id="app">%2$s</xliff:g> con Tocar y pagar?</string>
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <string name="restriction_settings_title">Restricciones</string>
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
@@ -4808,6 +4860,7 @@
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <string name="app_notifications_switch_label">Amosar notificaciones</string>
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <string name="help_label">Ayuda &amp; comentarios</string>
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
@@ -4928,6 +4981,7 @@
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <string name="user_image_photo_selector">Esbillar semeya</string>
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <string name="sim_setup_wizard_title">Tarxetes SIM</string>
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-br-rFR/arrays.xml b/res/values-br-rFR/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-br-rFR/arrays.xml
+++ b/res/values-br-rFR/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-br-rFR/strings.xml b/res/values-br-rFR/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-br-rFR/strings.xml
+++ b/res/values-br-rFR/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-csb-rPL/arrays.xml b/res/values-csb-rPL/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-csb-rPL/arrays.xml
+++ b/res/values-csb-rPL/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-csb-rPL/strings.xml b/res/values-csb-rPL/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-csb-rPL/strings.xml
+++ b/res/values-csb-rPL/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-cy/arrays.xml b/res/values-cy/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-cy/arrays.xml
+++ b/res/values-cy/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-en-rPT/arrays.xml b/res/values-en-rPT/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-en-rPT/arrays.xml
+++ b/res/values-en-rPT/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-en-rPT/strings.xml b/res/values-en-rPT/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-en-rPT/strings.xml
+++ b/res/values-en-rPT/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-eo/arrays.xml b/res/values-eo/arrays.xml
index 2731296..f090536 100644
--- a/res/values-eo/arrays.xml
+++ b/res/values-eo/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <string-array name="timezone_filters">
     <!-- The next level of the time zoner picker should show time zones from the Americas. -->
@@ -102,16 +103,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -136,6 +142,7 @@
     <item>Never time out</item>
   </string-array>
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <string-array name="wifi_sleep_policy_entries">
@@ -157,6 +164,7 @@
     <item>Neniam</item>
   </string-array>
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <string-array name="wifi_sleep_policy_values">
     <!-- Do not translate. -->
@@ -346,10 +354,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index 6d2c217..6293304 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -25,12 +25,14 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <string name="device_info_default">Nekonata</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -122,6 +124,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -294,6 +297,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -323,6 +327,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -347,6 +352,7 @@
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <string name="security_passwords_title">Pasvortoj</string>
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -354,6 +360,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -432,16 +439,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -533,6 +544,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -629,6 +641,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -684,6 +697,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -756,6 +770,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -871,6 +886,7 @@
   </string-array>
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -931,6 +947,7 @@
   <string name="search_settings">Serĉi</string>
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1076,7 +1093,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1090,7 +1109,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1219,6 +1240,7 @@
   <string name="menu_save">Konservi</string>
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1339,6 +1361,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1347,18 +1370,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1419,6 +1447,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1507,6 +1536,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <string name="dlg_cancel">Nuligi</string>
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1540,6 +1570,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1551,6 +1582,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1611,6 +1643,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1641,13 +1674,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1780,6 +1816,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <string name="accessibility_settings">Alirebleco</string>
   <!-- Settings title for accessibility settings screen -->
@@ -1873,6 +1910,7 @@
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <string name="settings_button">Agordoj</string>
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1908,6 +1946,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -2018,6 +2057,7 @@
   <string name="battery_saver_turn_on_automatically_never">Neniam</string>
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -2067,12 +2107,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -2089,6 +2131,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2186,6 +2229,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2200,6 +2244,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2219,10 +2264,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2337,6 +2384,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2605,6 +2653,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2613,6 +2662,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <string name="user_settings_title">Uzantoj</string>
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
@@ -2692,6 +2742,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2709,11 +2760,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2792,6 +2845,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-es-rCO/arrays.xml b/res/values-es-rCO/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-es-rCO/arrays.xml
+++ b/res/values-es-rCO/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-es-rCO/strings.xml b/res/values-es-rCO/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-es-rCO/strings.xml
+++ b/res/values-es-rCO/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-es-rMX/arrays.xml b/res/values-es-rMX/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-es-rMX/arrays.xml
+++ b/res/values-es-rMX/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-es-rMX/strings.xml b/res/values-es-rMX/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-es-rMX/strings.xml
+++ b/res/values-es-rMX/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-frp-rIT/arrays.xml b/res/values-frp-rIT/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-frp-rIT/arrays.xml
+++ b/res/values-frp-rIT/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-frp-rIT/strings.xml b/res/values-frp-rIT/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-frp-rIT/strings.xml
+++ b/res/values-frp-rIT/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-fy-rNL/arrays.xml b/res/values-fy-rNL/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-fy-rNL/arrays.xml
+++ b/res/values-fy-rNL/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-fy-rNL/strings.xml b/res/values-fy-rNL/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-fy-rNL/strings.xml
+++ b/res/values-fy-rNL/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-ga-rIE/arrays.xml b/res/values-ga-rIE/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-ga-rIE/arrays.xml
+++ b/res/values-ga-rIE/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-ga-rIE/strings.xml b/res/values-ga-rIE/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-ga-rIE/strings.xml
+++ b/res/values-ga-rIE/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-gd-rGB/arrays.xml b/res/values-gd-rGB/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-gd-rGB/arrays.xml
+++ b/res/values-gd-rGB/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-gd-rGB/strings.xml b/res/values-gd-rGB/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-gd-rGB/strings.xml
+++ b/res/values-gd-rGB/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-ku/arrays.xml b/res/values-ku/arrays.xml
index 0177dc3..aff892d 100644
--- a/res/values-ku/arrays.xml
+++ b/res/values-ku/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <string-array name="timezone_filters">
     <!-- The next level of the time zoner picker should show time zones from the Americas. -->
@@ -119,10 +120,11 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <string-array name="wifi_status">
     <!-- Status message of Wi-Fi when it is idle. -->
-    <item/>
+    <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
     <item>گه‌ڕان\u2026</item>
     <!-- Status message of Wi-Fi when it is connecting. -->
@@ -147,10 +149,11 @@
     <item>دورخستنه‌وه‌ی په‌یوه‌ندی کز</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <string-array name="wifi_status_with_ssid">
     <!-- Status message of Wi-Fi when it is idle. -->
-    <item/>
+    <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
     <item>گه‌ڕان\u2026</item>
     <!-- Status message of Wi-Fi when it is connecting to a network. -->
@@ -175,12 +178,15 @@
     <item>دورخستنه‌وه‌ی تۆڕی کز</item>
   </string-array>
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <string-array name="wifi_eap_method">
     <!-- Do not translate. -->
@@ -239,6 +245,7 @@
     <item>هه‌رگیز کات ته‌واو نه‌بێت</item>
   </string-array>
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <string-array name="wifi_signal">
     <item>کز</item>
@@ -266,6 +273,7 @@
     <item>هه‌رگیز</item>
   </string-array>
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <string-array name="wifi_sleep_policy_values">
     <!-- Do not translate. -->
@@ -655,8 +663,10 @@
   </string-array>
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <string-array name="vpn_types_long">
     <item>PPTP VPN</item>
@@ -667,6 +677,7 @@
     <item>IPSec VPN with certificates and hybrid authentication</item>
   </string-array>
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <string-array name="vpn_states">
     <!-- Status message when VPN is disconnected. -->
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index a58ac91..a6f99d9 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -28,6 +28,7 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <string name="device_info_default">نەناسراو</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
@@ -36,6 +37,7 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <string name="show_dev_already">پێویست ناکا، پێشتر گه‌شه‌ پێده‌ری.</string>
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -189,6 +191,7 @@
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <string name="bluetooth_disable_profile_message">ئه‌مه‌ وlt;brوgt;وlt;bوgt;<xliff:g id="profile_name">%1$s</xliff:g>وlt;/bوgt;وlt;brوgt;وlt;brوgt;From:وlt;brوgt;وlt;bوgt;<xliff:g id="device_name">%2$s</xliff:g>وlt;/bوgt; له‌کارده‌خات.</string>
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <string name="bluetooth_device">بلوتوسه‌ بێناوه‌کان</string>
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
@@ -486,6 +489,7 @@
   <!-- mobile network settings screen, setting option summary text -->
   <string name="sum_carrier_select">هه‌ڵسوڕێنه‌ری هێڵه‌که‌ت هه‌ڵبژێره‌</string>
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <string name="date_and_time_settings_title">ڕۆژ وamp; کات</string>
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
@@ -531,6 +535,7 @@
          [CHAR LIMIT=20] -->
   <string name="time_picker_title">کات</string>
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <string name="lock_after_timeout">قفڵکردنی خۆکاری</string>
   <!-- Security settings screen, setting option summary to change screen timeout -->
@@ -567,6 +572,7 @@
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <string name="security_passwords_title">وشه‌ نهێنییه‌کان</string>
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -574,6 +580,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -672,11 +679,14 @@
   <!-- Image button description to switch input method -->
   <string name="crypt_keeper_switch_input_method">گۆڕینی ته‌خته‌کلیل</string>
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <string name="lock_settings_picker_title">ده‌ستنیشانکردنی قوفڵی ڕوونما</string>
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_launch_picker_title">قوفڵی ڕوونما</string>
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
@@ -688,6 +698,7 @@
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_off_title">هیچ</string>
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <string name="unlock_set_unlock_none_summary">پاراستنی نیه‌</string>
@@ -846,6 +857,7 @@
   <string name="bluetooth_display_passkey_pin_msg">جووت لەگەڵ :<xliff:g id="bold1">وlt;brوgt;وlt;bوgt;</xliff:g><xliff:g id="device_name">%1$s</xliff:g><xliff:g id="end_bold1">وlt;/bوgt;وlt;brوgt;وlt;brوgt;</xliff:g>بنوسە لەسەری:<xliff:g id="bold2">وlt;brوgt;وlt;bوgt;</xliff:g><xliff:g id="passkey">%2$s</xliff:g><xliff:g id="end_bold2">وlt;/bوgt;</xliff:g>,وە لێبدە بۆ ئەوەی بگەڕێتەوە.</string>
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <string name="bluetooth_preference_scan_title">پشکنین بۆ ئامێرەکان</string>
@@ -989,6 +1001,7 @@
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <string name="nsd_quick_toggle_summary">ڕێگە بە بەرنامەکانی ناو ئامێرێکی دیکە بدە کە بەرنامەکانی ناو ئامێری من ببینێت</string>
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <string name="wifi_quick_toggle_title">Wi\u2011Fi</string>
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
@@ -1075,6 +1088,7 @@
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <string name="wifi_setup_wps">دامه‌زراندنی خۆکارانه‌(WPS)</string>
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <string name="wifi_wps_setup_title">دامه‌زراندنی Wi\u2011Fi پارێزراو</string>
@@ -1185,6 +1199,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <string name="wifi_connect_failed_message" product="default">مۆبایل نەیتوانی گرێبدات بە تۆڕی وای\u2011فای.</string>
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <string name="wifi_advanced_titlebar">ڕێکبەندەکانی پەرەسەندوی وای\u2011فای</string>
@@ -1334,6 +1349,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <string name="home_settings">ماڵەوە</string>
   <string name="display_settings_title">شاشە</string>
@@ -1437,6 +1453,7 @@
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <string name="search_settings_summary">به‌ڕێوه‌بردنی گه‌ڕان و مێژوو</string>
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <string name="display_settings">پیشاندان</string>
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
@@ -1687,7 +1704,9 @@
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <string name="sd_mount" product="default">به‌ستنه‌وه‌ی بیرگه‌ی SD</string>
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <string name="sd_format" product="nosdcard">سڕینەوەی بیرگەی USB</string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
@@ -1712,7 +1731,9 @@
   <!-- SD card eject confirmation dialog  -->
   <string name="dlg_confirm_unmount_text" product="default">ئەگەر کارتی بیرگە دەربکەی لەوانەیە هەندێ لە بەرنامەکانت بوەستن وە نەکەونە کار تاکو دوبارە دایدەنێی.</string>
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1888,6 +1909,7 @@
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <string name="menu_cancel">ڕەتکردنەوە</string>
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -2074,6 +2096,7 @@
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <string name="location_sources_heading">سەرچاوەی دۆزینەوەی شوێنەکەت</string>
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <string name="about_settings" product="tablet">ده‌رباره‌ی بیرگه‌</string>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
@@ -2088,21 +2111,26 @@
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <string name="regulatory_information">زانیاری ڕێک</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <string name="copyright_title">مافی له‌به‌رگرتنه‌وه‌</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <string name="license_title">مۆڵه‌ت</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <string name="terms_title">زاراوه‌ و مه‌رجه‌کان</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <string name="settings_license_activity_title">کردنەوەی مۆڵەتی سەرچاوە</string>
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
@@ -2202,6 +2230,7 @@
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <string name="activity_not_found">بەرنامەکە دانەمەزراوە لەسەر تەلەفۆنەکەت.</string>
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <string name="manageapplications_settings_title">ڕێکخستنی بەرنامەکان</string>
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
@@ -2356,6 +2385,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <string name="dlg_cancel">هەڵوەشاندنەوە</string>
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -2419,6 +2449,7 @@
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <string name="force_stop_dlg_text">ئەگەر هێز بکەی بۆ وەستاندن. لەوە دەچێت تێکبچێت.</string>
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <string name="app_install_location_title">شوێنی دابەزاندنی خوازراو</string>
@@ -2436,6 +2467,7 @@
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <string name="app_disable_notifications_dlg_text">ئەگەر ئاگەداریەکەنی ئەم بەرنامەیە لەکار بخەی.لەوانەیە ئاگەدارکردنەوەی گرنگت لەدەست بچێ سەبارەت بە بەرنامەکە</string>
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <string name="app_ops_settings">کارەکانی بەرنامەکە</string>
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
@@ -2538,6 +2570,7 @@
 شێوازی تەلەفۆنەکە لەوە دەچێت لە کاربکەوێت تاوەکو ئەکوژێتەوە
 وە دوبارە هەوڵبدەرەوە.</string>
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <string name="language_settings">زمانەکان</string>
   <!-- Title of Language and keyboard settings screen -->
@@ -2593,6 +2626,7 @@
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <string name="vibrate_input_devices_summary">لەرەلەر بگوازەوە بۆ دەسکەکە .کاتێ بەسترایەوە</string>
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_dialog_title">شێوازی کیبۆرد هەڵبژێرە</string>
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
@@ -2602,9 +2636,11 @@
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <string name="keyboard_layout_default_label">بنێڕه‌ت</string>
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_picker_title">گه‌ڵاڵه‌به‌ندی تەختەکلیل</string>
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <string name="user_dict_settings_title">فەرهەنگی کەسی</string>
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
@@ -2816,6 +2852,7 @@
   <!-- label for usage time -->
   <string name="usage_time_label">کاتی به‌کارهێنان</string>
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <string name="accessibility_settings">توانای ده‌ستپێگه‌شتن</string>
   <!-- Settings title for accessibility settings screen -->
@@ -2963,6 +3000,7 @@
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <string name="settings_button">ڕێکخستنه‌کان</string>
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <string name="print_settings">چاپکردن</string>
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
@@ -3020,6 +3058,7 @@
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_hidden_utterance">گەڕان بۆ سندوقی شاراوە</string>
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <string name="power_usage_summary_title">باتری</string>
   <!-- Activity title summary for App Fuel Gauge summary -->
@@ -3194,6 +3233,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <string name="process_stats_summary_title">ئاماری پرۆسە</string>
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
@@ -3260,6 +3300,7 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <string name="menu_proc_stats_type_cached">حەشار درا</string>
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <string name="voice_input_output_settings">دەنگ لەناو وamp; دەرەوە</string>
   <!-- Main voice input/output settings screen title -->
@@ -3271,6 +3312,7 @@
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <string name="voice_category">قسە</string>
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -3287,6 +3329,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <string name="tts_settings">دەق-بۆ-ڕێکخستنی قسە</string>
   <!-- TTS option item name in the main settings screen -->
@@ -3462,6 +3505,7 @@
   <string name="credential_storage_type_software">تەنها نەرمەکاڵا</string>
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <string name="credentials_unlock_hint">ئەبێت تێپەڕەوشە بنوسیت بۆ بیرگە.</string>
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
@@ -3488,6 +3532,7 @@
   <!-- Sound settings screen, setting option summary text -->
   <string name="emergency_tone_summary">دانانی کرداری كۆمەڵە كاتێك تەلەفۆن كردنێكى بارى ناكاو دا دەنێرێت</string>
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <string name="privacy_settings">پاڵپشت و ڕێکخستنەوە</string>
   <!-- Privacy settings activity title -->
@@ -3521,12 +3566,14 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <string name="local_backup_password_toast_validation_failure">هەڵوەشانەوەی تێپەڕەوشەی پاشەکەوتی پاشەکەوت</string>
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <string name="backup_erase_dialog_message">گەڕانەوەى Wi\u2011Fi  وشەى نهێنيت ڕا بگرە، پەڕتووك نيشانەكەر، دانانەوەى ديكە، و زانياريى بەرنامە، كۆ هەموو وێنە
  لەسەر سێرڤەرى گووگل لەناودەبات دات?</string>
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <string name="device_admin_settings_title">ڕێکخستنی بەڕێوەبەرایەتی ئامیر</string>
   <!-- Label for screen showing the active device policy -->
@@ -3690,6 +3737,7 @@
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <string name="sync_automatically">خۆکارانە-ناردنی داتای بەرنامە</string>
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <string name="sync_enabled">ناردن لەکارە</string>
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
@@ -4128,6 +4176,7 @@
   <string name="selinux_status_permissive">شل</string>
   <string name="selinux_status_enforcing">سەپاندن</string>
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">لەوانەیە تۆڕ چاودێری کرابێت</string>
@@ -4142,6 +4191,7 @@
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <string name="ssl_ca_cert_settings_button">پشکنینی بەڵگەی باوەڕپێکراو.</string>
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <string name="user_settings_title">بەکارهێنەر</string>
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
@@ -4246,6 +4296,7 @@
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <string name="global_font_change_title">گوڕینی جۆره‌پیت قەبارە</string>
   <!-- NFC payment settings -->
+  <skip></skip>
   <string name="nfc_payment_settings_title">لێدان وamp; پێدان</string>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
@@ -4265,6 +4316,7 @@
          preferred payment application -->
   <string name="nfc_payment_set_default_label">كۆمەڵە وەك بژاردەت?</string>
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <string name="restriction_settings_title">سنووردارەکان</string>
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
@@ -4274,6 +4326,7 @@
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <string name="app_notifications_switch_label">نیشاندانی تێبینیەکان</string>
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -4369,6 +4422,7 @@
   <string name="user_image_choose_photo" msgid="3746334626214970837">هه‌ڵبژاردنی وینه‌یه‌ک له‌ پێشەنگا</string>
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-lb/arrays.xml b/res/values-lb/arrays.xml
index 6c656f1..6cd02a6 100644
--- a/res/values-lb/arrays.xml
+++ b/res/values-lb/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <string-array name="timezone_filters">
     <!-- The next level of the time zoner picker should show time zones from the Americas. -->
@@ -119,10 +120,11 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <string-array name="wifi_status">
     <!-- Status message of Wi-Fi when it is idle. -->
-    <item/>
+    <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
     <item>Scan leeft\u2026</item>
     <!-- Status message of Wi-Fi when it is connecting. -->
@@ -147,10 +149,11 @@
     <item>Schlecht Internetconnectioun gëtt temporär ignoréiert</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <string-array name="wifi_status_with_ssid">
     <!-- Status message of Wi-Fi when it is idle. -->
-    <item/>
+    <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
     <item>Scan leeft\u2026</item>
     <!-- Status message of Wi-Fi when it is connecting to a network. -->
@@ -175,12 +178,15 @@
     <item>Schlecht Internetconnectioun gëtt temporär ignoréiert</item>
   </string-array>
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <string-array name="wifi_eap_method">
     <!-- Do not translate. -->
@@ -239,6 +245,7 @@
     <item>Keen Timeout</item>
   </string-array>
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <string-array name="wifi_signal">
     <item>Schwaach</item>
@@ -266,6 +273,7 @@
     <item>Ni</item>
   </string-array>
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <string-array name="wifi_sleep_policy_values">
     <!-- Do not translate. -->
@@ -696,8 +704,10 @@
   </string-array>
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <string-array name="vpn_types_long">
     <item>PPTP VPN</item>
@@ -708,6 +718,7 @@
     <item>IPSec-VPN mat Zertifikaten an Hybrid-Authentifizéierung</item>
   </string-array>
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <string-array name="vpn_states">
     <!-- Status message when VPN is disconnected. -->
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index a75eacf..8321f63 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -30,6 +30,7 @@
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <string name="dlg_switch">Wiesselen</string>
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <string name="device_info_default">Onbekannt</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
@@ -42,6 +43,7 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <string name="show_dev_already">Net néideg, du bass schonn en Entwéckler.</string>
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <string name="header_category_wireless_networks">Kabellos an Netzwierker</string>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
@@ -211,6 +213,7 @@
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <string name="bluetooth_disable_profile_message">Dëse Profil gëtt desaktivéiert:&lt;br&gt;&lt;b&gt;<xliff:g id="profile_name">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vu(n):&lt;br&gt;&lt;b&gt;<xliff:g id="device_name">%2$s</xliff:g>&lt;/b&gt;</string>
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <string name="bluetooth_device">Onbenannte Bluetooth-Apparat</string>
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
@@ -520,6 +523,7 @@
   <!-- mobile network settings screen, setting option summary text -->
   <string name="sum_carrier_select">Netzwierkprovider auswielen</string>
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <string name="date_and_time_settings_title">Datum an Zäit</string>
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
@@ -569,6 +573,7 @@
          [CHAR LIMIT=20] -->
   <string name="time_picker_title">Zäit</string>
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <string name="lock_after_timeout">Automatesch spären</string>
   <!-- Security settings screen, setting option summary to change screen timeout -->
@@ -608,6 +613,7 @@
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <string name="security_passwords_title">Passwierder</string>
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -615,6 +621,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -720,11 +727,14 @@
   <!-- Image button description to switch input method -->
   <string name="crypt_keeper_switch_input_method">Method fir anzeginn wiesselen</string>
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <string name="lock_settings_picker_title">Schiermspär auswielen</string>
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_launch_picker_title">Schiermspär</string>
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
@@ -736,6 +746,7 @@
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_off_title">Ouni</string>
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_none_title">Wëschen</string>
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
@@ -901,6 +912,7 @@
   <string name="bluetooth_display_passkey_pin_msg">Gëff fir eng Koppelung mat <xliff:g id="bold1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="device_name">%1$s</xliff:g><xliff:g id="end_bold1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> <xliff:g id="bold2">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="passkey">%2$s</xliff:g><xliff:g id="end_bold2">&lt;/b&gt;</xliff:g> an, an dréck duerno d\'Bestätegungstast.</string>
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <string name="bluetooth_preference_scan_title">Apparater sichen</string>
@@ -1057,6 +1069,7 @@
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <string name="nsd_quick_toggle_summary">Erlaabt Appen op aneren Apparater fir Appen op dësem Apparat z\'entdecken</string>
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <string name="wifi_quick_toggle_title">WLAN</string>
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
@@ -1156,6 +1169,7 @@
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <string name="wifi_setup_wps">Automatesch Astellungen (WPS)</string>
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <string name="wifi_show_advanced">Erweidert Optiounen</string>
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
@@ -1275,6 +1289,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <string name="wifi_connect_failed_message" product="default">Den Telefon konnt net mam WLAN-Netzwierk connectéieren.</string>
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <string name="wifi_saved_access_points_titlebar">Gespäichert Netzwierker</string>
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
@@ -1429,6 +1444,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <string name="home_settings">Heem</string>
   <string name="display_settings_title">Usiicht</string>
@@ -1534,6 +1550,7 @@
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <string name="search_settings_summary">Geréier d\'Sich-Astellungen an den Historique</string>
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <string name="display_settings">Usiicht</string>
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
@@ -1795,7 +1812,9 @@
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <string name="sd_mount" product="default">SD-Kaart abannen</string>
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <string name="sd_format" product="nosdcard">USB-Späicher läschen</string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
@@ -1820,7 +1839,9 @@
   <!-- SD card eject confirmation dialog  -->
   <string name="dlg_confirm_unmount_text" product="default">Wann s du d\'SD-Kaart trenns, gi verschidden Appen déi s du benotz gestoppt a kéinten ophale mat funktionéiere bis du d\'SD-Kaart nees verbënns.</string>
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1996,6 +2017,7 @@
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <string name="menu_cancel">Verwerfen</string>
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -2195,6 +2217,7 @@
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <string name="location_sources_heading">Standuertquellen</string>
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <string name="about_settings" product="tablet">Iwwer den Tablet</string>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
@@ -2209,15 +2232,19 @@
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <string name="regulatory_information">Reguléierungsinformatiounen</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <string name="copyright_title">Auteursrecht</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <string name="license_title">Lizenz</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <string name="terms_title">Geschäftsbedéngungen</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <string name="webview_license_title">System-WebView-Lizenz</string>
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
@@ -2227,6 +2254,7 @@
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <string name="settings_license_activity_title">Open-Source-Lizenzen</string>
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
@@ -2328,6 +2356,7 @@
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <string name="activity_not_found">D\'App ass net op dengem Telefon installéiert.</string>
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <string name="manageapplications_settings_title">Appe geréieren</string>
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
@@ -2485,6 +2514,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <string name="dlg_cancel">Ofbriechen</string>
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -2544,6 +2574,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <string name="force_stop_dlg_text">Wann s du eng App stopps kéint se sech onerwënscht verhalen.</string>
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <string name="app_install_location_title">Preferréiert Installatiounsplaz</string>
@@ -2561,6 +2592,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <string name="app_disable_notifications_dlg_text">Wann s du d\'Notifikatioune fir dës App ausschalts kéints du wichteg Warnungen an Aktualiséierunge verpassen.</string>
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <string name="app_ops_settings">App-Virgäng</string>
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
@@ -2664,6 +2696,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <string name="runningservicedetails_stop_dlg_text" product="default">Wann s du dëse Service stopps kéinte verschidde Funktiounen um Telefon ophale mat funktionéiere bis de den Telefon ausschalts an nei uschalts.</string>
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <string name="language_settings">Sprooch an Agab</string>
   <!-- Title of Language and keyboard settings screen -->
@@ -2714,6 +2747,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <string name="vibrate_input_devices_summary">Vibratioun op de Spillcontroller ëmleede wann ugeschloss.</string>
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_dialog_title">Tastatur-Layout auswielen</string>
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
@@ -2723,9 +2757,11 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <string name="keyboard_layout_default_label">Standard</string>
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_picker_title">Tastaturlayouten</string>
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <string name="user_dict_settings_title">Perséinlechen Dictionnaire</string>
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
@@ -2956,6 +2992,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- label for usage time -->
   <string name="usage_time_label">Benotzungszäit</string>
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <string name="accessibility_settings">Accessibilitéit</string>
   <!-- Settings title for accessibility settings screen -->
@@ -3121,6 +3158,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <string name="settings_button">Astellungen</string>
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <string name="print_settings">Drécken</string>
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
@@ -3176,6 +3214,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_hidden_utterance">Sichkëscht verstoppt</string>
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <string name="power_usage_summary_title">Akku</string>
   <!-- Activity title summary for App Fuel Gauge summary -->
@@ -3385,6 +3424,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <string name="battery_saver_turn_on_automatically_pct">bei %1$s Akku</string>
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <string name="process_stats_summary_title">Prozess-Statistiken</string>
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
@@ -3462,6 +3502,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <string name="menu_proc_stats_type_cached">Am Tëschespäicher</string>
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <string name="voice_input_output_settings">Stëmm-Agab an -Ausgab</string>
   <!-- Main voice input/output settings screen title -->
@@ -3473,6 +3514,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <string name="voice_category">Sprooch</string>
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <string name="voice_input_settings">Astellunge fir d\'Sproochagab</string>
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
@@ -3495,6 +3537,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
          message when the user selects to enable a service. -->
   <string name="voice_interaction_security_warning">Dëse Sproochagabservice ka Sproochagaben all Moment iwwerwaachen an Appen, déi Sproochbefehler ënnerstëtzen, fir dech steieren. E gëtt vun der App <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> bereetgestallt. Wëlls du dëse Service aktivéieren?</string>
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <string name="tts_settings">Astellunge vun der Sproochausgab</string>
   <!-- TTS option item name in the main settings screen -->
@@ -3668,6 +3711,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <string name="credentials_settings_not_available">Zouganksdate fir dëse Benotzer sinn net disponibel</string>
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <string name="credentials_unlock_hint">Gëff d\'Passuwert fir den Umeldungsinformatiounsspäicher an.</string>
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
@@ -3695,6 +3739,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Sound settings screen, setting option summary text -->
   <string name="emergency_tone_summary">Definéier d\'Behuele wann en Noutruff ofgesat gëtt</string>
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <string name="privacy_settings">Sécheren an zrécksetzen</string>
   <!-- Privacy settings activity title -->
@@ -3730,11 +3775,13 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <string name="local_backup_password_toast_validation_failure">Feeler beim setze vum Sécherungspasswuert</string>
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <string name="backup_erase_dialog_message">D\'Sécherung vun App-Daten, WLAN-Passwierder an aner Astellunge stoppen an all d\'Kopien op de Google-Servere läschen?</string>
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <string name="device_admin_settings_title">Apparatverwaltungsastellungen</string>
   <!-- Label for screen showing the active device policy -->
@@ -3904,6 +3951,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <string name="sync_automatically">App-Daten automatesch synchroniséieren</string>
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <string name="sync_enabled">Sync ass UN</string>
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
@@ -4374,6 +4422,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <string name="selinux_status_permissive">Moderat</string>
   <string name="selinux_status_enforcing">Strikt</string>
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">D\'Netzwierk kéint iwwerwaacht sinn</string>
@@ -4388,6 +4437,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <string name="ssl_ca_cert_settings_button">Vertrauenswierdeg Zouganksdaten iwwerpréiwen</string>
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <string name="user_settings_title">Benotzer</string>
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
@@ -4512,6 +4562,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <string name="global_font_change_title">Schrëftgréisst änneren</string>
   <!-- NFC payment settings -->
+  <skip></skip>
   <string name="nfc_payment_settings_title">Drécken a bezuelen</string>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
@@ -4532,6 +4583,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
          preferred payment application -->
   <string name="nfc_payment_set_default_label">Als deng Preferenz setzen?</string>
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <string name="restriction_settings_title">Aschränkungen</string>
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
@@ -4541,6 +4593,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <string name="app_notifications_switch_label">Notifikatiounen uweisen</string>
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <string name="help_label">Hëllef a Feedback</string>
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
@@ -4659,6 +4712,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <string name="user_image_photo_selector">Foto auswielen</string>
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <string name="sim_setup_wizard_title">SIM-Kaarten</string>
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-oc-rFR/arrays.xml b/res/values-oc-rFR/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-oc-rFR/arrays.xml
+++ b/res/values-oc-rFR/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-oc-rFR/strings.xml b/res/values-oc-rFR/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-oc-rFR/strings.xml
+++ b/res/values-oc-rFR/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-or-rIN/arrays.xml b/res/values-or-rIN/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-or-rIN/arrays.xml
+++ b/res/values-or-rIN/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-or-rIN/strings.xml b/res/values-or-rIN/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-or-rIN/strings.xml
+++ b/res/values-or-rIN/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-ug/arrays.xml b/res/values-ug/arrays.xml
index 471bc29..da28810 100644
--- a/res/values-ug/arrays.xml
+++ b/res/values-ug/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <string-array name="timezone_filters">
     <!-- The next level of the time zoner picker should show time zones from the Americas. -->
@@ -119,10 +120,11 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <string-array name="wifi_status">
     <!-- Status message of Wi-Fi when it is idle. -->
-    <item/>
+    <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
     <item>تەكشۈرۈۋاتىدۇ…</item>
     <!-- Status message of Wi-Fi when it is connecting. -->
@@ -147,10 +149,11 @@
     <item>سىگنال ناچار باغلىنىشنى ۋاقىتلىق تاقايدۇ</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <string-array name="wifi_status_with_ssid">
     <!-- Status message of Wi-Fi when it is idle. -->
-    <item/>
+    <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
     <item>تەكشۈرۈۋاتىدۇ…</item>
     <!-- Status message of Wi-Fi when it is connecting to a network. -->
@@ -175,12 +178,15 @@
     <item>سىگنال ناچار باغلىنىشنى ۋاقىتلىق تاقايدۇ</item>
   </string-array>
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <string-array name="wifi_eap_method">
     <!-- Do not translate. -->
@@ -239,6 +245,7 @@
     <item>ھەرگىز ۋاقىت ھالقىمايدۇ</item>
   </string-array>
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <string-array name="wifi_signal">
     <item>ناچار</item>
@@ -266,6 +273,7 @@
     <item>ھەرگىز</item>
   </string-array>
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <string-array name="wifi_sleep_policy_values">
     <!-- Do not translate. -->
@@ -649,8 +657,10 @@
   </string-array>
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <string-array name="vpn_types_long">
     <item>PPTP VPN</item>
@@ -661,6 +671,7 @@
     <item>گۇۋاھنامەلىك ھەمدە ئارىلاش سالاھىيەت دەلىللەيدىغان IPSec VPN</item>
   </string-array>
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <string-array name="vpn_states">
     <!-- Status message when VPN is disconnected. -->
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index b20fdea..07c9843 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -29,6 +29,7 @@
   <string name="dlg_close">تاقاش</string>
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <string name="device_info_default">يوچۇن</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
@@ -40,6 +41,7 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <string name="show_dev_already">ھاجەتسىز، سىز ئاللىبۇرۇن ئىجادكار ھالىتىدە.</string>
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -193,6 +195,7 @@
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <string name="bluetooth_disable_profile_message">بۇ مەشغۇلات چەكلەيدۇ: &lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ئورنى:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;</string>
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <string name="bluetooth_device">ئاتسىز كۆكچىش ئۈسكۈنە</string>
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
@@ -490,6 +493,7 @@
   <!-- mobile network settings screen, setting option summary text -->
   <string name="sum_carrier_select">تور مۇلازىمەت تەمىنلىگۈچىنى تاللاڭ</string>
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <string name="date_and_time_settings_title">چىسلا ۋە ۋاقىت</string>
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
@@ -535,6 +539,7 @@
          [CHAR LIMIT=20] -->
   <string name="time_picker_title">ۋاقىت</string>
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <string name="lock_after_timeout">ئۆزلۈكىدىن قۇلۇپلا</string>
   <!-- Security settings screen, setting option summary to change screen timeout -->
@@ -571,6 +576,7 @@
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <string name="security_passwords_title">ئىم</string>
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -578,6 +584,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -676,11 +683,14 @@
   <!-- Image button description to switch input method -->
   <string name="crypt_keeper_switch_input_method">كىرگۈزگۈچ ئالماشتۇر</string>
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <string name="lock_settings_picker_title">ئېكران قۇلۇپىنى تاللاڭ</string>
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_launch_picker_title">ئېكران قۇلۇپلا</string>
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
@@ -692,6 +702,7 @@
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_off_title">يوق</string>
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <string name="unlock_set_unlock_none_summary">بىخەتەرلىك تەدبىرى يوق</string>
@@ -843,6 +854,7 @@
   <string name="bluetooth_display_passkey_pin_msg"><xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> بىلەن جۈپلەشتە <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> نى كىرگۈزۈڭ، ئاندىن Return ياكى Enter نى بېسىڭ.</string>
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <string name="bluetooth_preference_scan_title">ئۈسكۈنە تەكشۈرۈۋاتىدۇ</string>
@@ -986,6 +998,7 @@
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <string name="nsd_quick_toggle_summary">باشقا ئۈسكۈنىدىكى ئەپنىڭ بۇ ئۈسكۈنىدىكى ئەپنى بايقىشىغا يول قويىدۇ</string>
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <string name="wifi_quick_toggle_title">Wi‑Fi</string>
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
@@ -1072,6 +1085,7 @@
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <string name="wifi_setup_wps">ئاپتوماتىك تەڭشەك (WPS)</string>
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <string name="wifi_wps_setup_title">Wi-Fi قوغداش تەڭشىكى</string>
@@ -1182,6 +1196,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <string name="wifi_connect_failed_message" product="default">تېلېفون بۇ Wi-Fi تورىغا باغلىنالمايدۇ.</string>
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <string name="wifi_advanced_titlebar">ئالىي WiFi</string>
@@ -1331,6 +1346,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <string name="home_settings">باش بەت</string>
   <string name="display_settings_title">ئېكران</string>
@@ -1434,6 +1450,7 @@
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <string name="search_settings_summary">ئىزدەش تەڭشىكى ۋە تارىخ خاتىرىنى باشقۇرۇش</string>
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <string name="display_settings">ئېكران</string>
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
@@ -1679,7 +1696,9 @@
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <string name="sd_mount" product="default">SD كارتىنى ئېگەرلە</string>
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <string name="sd_format" product="nosdcard">بۇ USB ساقلىغۇچنى ئۆچۈرىدۇ</string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
@@ -1704,7 +1723,9 @@
   <!-- SD card eject confirmation dialog  -->
   <string name="dlg_confirm_unmount_text" product="default">ئەگەر SD كارتىنى ئېگەرسىزلىسىڭىز، ئىشلىتىلىۋاتقان بەزى ئەپلەر ئىشتىن توختايدۇ ھەم SD كارتىنى قايتا ئىگەرلىمىگۈچە ئىشلەتكىلى بولماسلىقى مۇمكىن.</string>
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1880,6 +1901,7 @@
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <string name="menu_cancel">تاشلىۋەت</string>
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -2065,6 +2087,7 @@
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <string name="location_sources_heading">ئورۇن مەنبەلىرى</string>
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <string name="about_settings" product="tablet">تاختا كومپيۇتېر ھەققىدە</string>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
@@ -2079,21 +2102,26 @@
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <string name="regulatory_information">باشقۇرۇش ئۇچۇرى</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <string name="copyright_title">نەشر ھوقوقى</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <string name="license_title">ئىجازەت</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <string name="terms_title">ماددا ۋە شەرتلەر</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <string name="settings_license_activity_title">ئوچۇق كودلۇق ئىجازەتنامە</string>
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
@@ -2193,6 +2221,7 @@
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <string name="activity_not_found">ئەپ تېلېفونىڭىزغا  ئورنىتىلمىغان.</string>
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <string name="manageapplications_settings_title">ئەپ باشقۇرۇش</string>
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
@@ -2341,6 +2370,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <string name="dlg_cancel">ۋاز كەچ</string>
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -2398,6 +2428,7 @@
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <string name="force_stop_dlg_text">ئەپ مەجبۇرىي توختىتىلسا نورمالسىزلىق كەلتۈرۈپ چىقىرىشى مۇمكىن.</string>
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <string name="app_install_location_title">ئالدىن بەلگىلەنگەن ئورنىتىدىغان ئورۇن</string>
@@ -2415,6 +2446,7 @@
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <string name="app_disable_notifications_dlg_text">ئەگەر بۇ ئەپنىڭ ئۇقتۇرۇشىنى تاقىسىڭىز، مۇھىم ئاگاھلاندۇرۇش ۋە يېڭىلاشلاردىن بىخەۋەر قېلىشىڭىز مۇمكىن.</string>
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <string name="app_ops_settings">ئەپ مەشغۇلاتى</string>
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
@@ -2506,6 +2538,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <string name="runningservicedetails_stop_dlg_text" product="default">ئەگەر بۇ مۇلازىمەتنى توختاتسىڭىز، تاختا كومپيۇتېرىڭىزدىكى بەزى ئىقتىدارلار ئۇنى تاقاپ قايتا ئاچقۇچە خىزمەتتىن توختىشى مۇمكىن.</string>
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <string name="language_settings">تىل ۋە كىرگۈزۈش </string>
   <!-- Title of Language and keyboard settings screen -->
@@ -2556,6 +2589,7 @@
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <string name="vibrate_input_devices_summary">باغلانغاندىن كېيىن تىترەتكۈچ ئويۇن تىزگىنەككە قايتا نىشانلايدۇ.</string>
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_dialog_title">ھەرپتاختا ئورۇنلاشتۇرۇلۇشىنى تاللاڭ</string>
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
@@ -2565,9 +2599,11 @@
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <string name="keyboard_layout_default_label">كۆڭۈلدىكى</string>
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_picker_title">ھەرپتاختا ئورۇنلاشتۇرۇلۇشى</string>
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <string name="user_dict_settings_title">شەخسىي لۇغەت</string>
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
@@ -2777,6 +2813,7 @@
   <!-- label for usage time -->
   <string name="usage_time_label">ئىشلىتىش ۋاقتى</string>
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <string name="accessibility_settings">قوشۇمچە ئىقتىدار</string>
   <!-- Settings title for accessibility settings screen -->
@@ -2919,6 +2956,7 @@
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <string name="settings_button">تەڭشەكلەر</string>
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <string name="print_settings">بېسىش</string>
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
@@ -2973,6 +3011,7 @@
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_hidden_utterance">ئىزدەش قۇتىسى يوشۇرۇلدى</string>
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <string name="power_usage_summary_title">توكدان</string>
   <!-- Activity title summary for App Fuel Gauge summary -->
@@ -3147,6 +3186,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <string name="process_stats_summary_title">جەريان سىتاتىستىكىسى</string>
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
@@ -3213,6 +3253,7 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <string name="menu_proc_stats_type_cached">غەملەنگەن</string>
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <string name="voice_input_output_settings">تاۋۇش كىرگۈزۈش ۋە چىقىرىش</string>
   <!-- Main voice input/output settings screen title -->
@@ -3224,6 +3265,7 @@
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <string name="voice_category">تاۋۇش</string>
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -3240,6 +3282,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <string name="tts_settings">تېكىستتىن تاۋۇشقا تەڭشىكى</string>
   <!-- TTS option item name in the main settings screen -->
@@ -3410,6 +3453,7 @@
   <string name="credential_storage_type_software">يۇمشاق دېتاللا</string>
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <string name="credentials_unlock_hint">ئىسپاتلىق ساقلىغۇچ ئۈچۈن ئىم كىرگۈزۈڭ.</string>
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
@@ -3436,6 +3480,7 @@
   <!-- Sound settings screen, setting option summary text -->
   <string name="emergency_tone_summary">جىددىي چاقىرغاندىكى ھەرىكەت تەڭشىكى</string>
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <string name="privacy_settings">زاپاسلاش ۋە ئەسلىگە قايتۇرۇش</string>
   <!-- Privacy settings activity title -->
@@ -3469,11 +3514,13 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <string name="local_backup_password_toast_validation_failure">زاپاسلاش ئىم تەڭشىيەلمىدى</string>
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <string name="backup_erase_dialog_message">سىز Wi-Fi ئىم، خەتكۈچلەر، باشقا تەڭشەكلەر ۋە ئەپ سانلىق مەلۇماتلىرىڭىزنى زاپاسلاشنى توختىتىپ، Google مۇلازىمېتىردىكى بارلىق قوشۇمچە نۇسخىسىنى ئۆچۈرەمسىز؟</string>
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <string name="device_admin_settings_title">ئۈسكۈنە باشقۇرۇش تەڭشىكى</string>
   <!-- Label for screen showing the active device policy -->
@@ -3635,6 +3682,7 @@
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <string name="sync_automatically">ئەپ سانلىق مەلۇماتىنى ئۆزلۈكىدىن قەدەمداشلا</string>
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <string name="sync_enabled">قەدەمداش ئوچۇق</string>
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
@@ -4066,6 +4114,7 @@
   <string name="selinux_status_permissive">ئىجازەت</string>
   <string name="selinux_status_enforcing">ئىجرا قىلىنىۋاتىدۇ</string>
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">تور نازارەت قىلىنغان بولۇشى مۇمكىن</string>
@@ -4080,6 +4129,7 @@
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <string name="ssl_ca_cert_settings_button">ئىشەنچلىك گۇۋاھنامىلەرنى تەكشۈر</string>
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <string name="user_settings_title">ئىشلەتكۈچىلەر</string>
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
@@ -4184,6 +4234,7 @@
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <string name="global_font_change_title">خەت نۇسخا چوڭلۇقى ئۆزگەرت</string>
   <!-- NFC payment settings -->
+  <skip></skip>
   <string name="nfc_payment_settings_title">چېكىش ۋە چىقىم</string>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
@@ -4203,6 +4254,7 @@
          preferred payment application -->
   <string name="nfc_payment_set_default_label">مايىللىقىڭىزغا تەڭشەمدۇ؟</string>
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <string name="restriction_settings_title">چەكلىمەلەر</string>
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
@@ -4212,6 +4264,7 @@
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <string name="app_notifications_switch_label">ئۇقتۇرۇشنى كۆرسەت</string>
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -4306,6 +4359,7 @@
   <string name="user_image_choose_photo" msgid="3746334626214970837">رەسىم يىغقۇچتىن سۈرەت تاللاڭ</string>
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index a1c5ac7..fa85ff2 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -18,7 +18,7 @@
 <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> 個步驟，即可查詢裝置 ID。</item>
+    <item quantity="other">您僅需完成剩餘的 <xliff:g id="step_count">%1$d</xliff:g> 個步驟，即可查詢裝置 ID。</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>
@@ -102,7 +102,7 @@
   <string name="profile_remove_current_profile">無法刪除目前的設定檔</string>
   <string name="profile_app_group_category_title">覆蓋通知</string>
   <string name="profile_app_group_item_instructions">新增或移除群組</string>
-  <string name="profile_app_group_item_instructions_summary">添加或刪除覆蓋通知應用程式到此設定檔</string>
+  <string name="profile_app_group_item_instructions_summary">新增或刪除覆蓋通知應用程式到此設定檔</string>
   <!-- Profile mode options. -->
   <string name="profile_entries_on">開啟</string>
   <string name="profile_entries_off">關閉</string>
@@ -234,7 +234,7 @@
   <string name="navigation_bar_left_title">左撇子模式</string>
   <string name="navigation_bar_left_summary">橫向模式下將導航列置於螢幕左側</string>
   <string name="navigation_bar_title">按鍵與配置</string>
-  <string name="navigation_bar_help_text">要開始編輯，請輕觸編輯圖示來解鎖導航列的編輯功能。\n\n您可以輕觸一個圖示來變更它的捷徑，或長按一個圖示以變更它的外觀。\n\n輕觸「儲存」以確認您的變更，或「還原預設值」以重設外觀為預設設定。</string>
+  <string name="navigation_bar_help_text">要開始編輯，請輕觸編輯圖示來解鎖導航列的編輯功能。\n\n您可以輕觸一個圖示來更改它的捷徑，或長按一個圖示即可更改它的外觀。\n\n輕觸「儲存」即可確認您的更改，或「還原預設值」即可重設外觀為預設設定。</string>
   <string name="navigation_restore_button_text">還原\n預設</string>
   <string name="navigation_edit_button_text">編輯</string>
   <string name="navigation_save_button_text">儲存</string>
@@ -285,7 +285,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">指示燈設定</string>
   <string name="led_notification_text">已透過設定啟用 LED 指示燈</string>
-  <string name="notification_light_no_apps_summary">若要控制個別應用程式，在功能列中啟動 \'%1$s\' 和 \'\u002b\'</string>
+  <string name="notification_light_no_apps_summary">若要控制個別應用程式，請啟動「%1$s」然後按下選單列中的「\u002b」</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android 偵錯</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -359,15 +359,15 @@
   <string name="app_ops_summaries_assist_structure">協助結構</string>
   <string name="app_ops_summaries_assist_screenshot">協助螢幕截圖</string>
   <string name="app_ops_summaries_read_phone_state">讀取手機狀態</string>
-  <string name="app_ops_summaries_add_voicemail">新增語音郵件</string>
+  <string name="app_ops_summaries_add_voicemail">新增語音信箱</string>
   <string name="app_ops_summaries_use_sip">使用 SIP</string>
   <string name="app_ops_summaries_make_call">撥打電話</string>
   <string name="app_ops_summaries_use_fingerprint">使用指紋</string>
   <string name="app_ops_summaries_use_body_sensors">使用人體感應器</string>
   <string name="app_ops_summaries_read_cell_broadcasts">讀取區域廣播</string>
   <string name="app_ops_summaries_mock_location">模擬位置</string>
-  <string name="app_ops_summaries_read_external_storage">讀取外部存儲空間</string>
-  <string name="app_ops_summaries_write_external_storage">寫到外部存儲空間</string>
+  <string name="app_ops_summaries_read_external_storage">讀取外部儲存空間</string>
+  <string name="app_ops_summaries_write_external_storage">寫入外部儲存空間</string>
   <string name="app_ops_summaries_turn_screen_on">開啟螢幕</string>
   <string name="app_ops_summaries_get_accounts">取得帳戶</string>
   <string name="app_ops_summaries_toggle_wifi">切換至 Wi-Fi</string>
@@ -436,8 +436,8 @@
   <string name="app_ops_labels_use_body_sensors">使用人體感應器</string>
   <string name="app_ops_labels_read_cell_broadcasts">讀取區域廣播</string>
   <string name="app_ops_labels_mock_location">模擬位置</string>
-  <string name="app_ops_labels_read_external_storage">讀取外部存儲空間</string>
-  <string name="app_ops_labels_write_external_storage">寫到外部存儲空間</string>
+  <string name="app_ops_labels_read_external_storage">讀取外部儲存空間</string>
+  <string name="app_ops_labels_write_external_storage">寫入外部儲存空間</string>
   <string name="app_ops_labels_turn_screen_on">開啟螢幕</string>
   <string name="app_ops_labels_get_accounts">取得帳戶</string>
   <string name="app_ops_labels_toggle_wifi">切換至 Wi-Fi</string>
@@ -529,7 +529,7 @@
   <!-- Settings main menu entry -->
   <string name="gesture_settings_title">手勢</string>
   <!-- Power menu -->
-  <string name="power_menu_title">電源功能表</string>
+  <string name="power_menu_title">電源選單</string>
   <string name="power_menu_reboot_title">重新啟動選單</string>
   <string name="power_menu_screenshot_title">螢幕截圖</string>
   <string name="power_menu_airplane_title">飛航模式</string>
@@ -674,7 +674,7 @@
   <string name="increasing_ring_ramp_up_time_title">漸強時間</string>
   <!-- LTO download data over wi-fi only -->
   <string name="lto_download_data_wifi_only">GPS 輔助資料已下載</string>
-  <string name="lto_download_data_wifi_only_on">透過任何網絡</string>
+  <string name="lto_download_data_wifi_only_on">透過任何網路</string>
   <string name="lto_download_data_wifi_only_off">僅透過 Wi\u2011Fi 網路</string>
   <string name="volume_keys_control_ring_stream_title">控制鈴聲音量</string>
   <string name="volume_keys_control_ring_stream_summary_on">音量鍵控制鈴聲音量</string>
@@ -750,7 +750,7 @@
   <string name="privacy_guard_help_title">說明</string>
   <string name="privacy_guard_reset_title">重設</string>
   <string name="privacy_guard_reset_text">重設權限？</string>
-  <string name="privacy_guard_help_text">在此畫面您只要輕觸應用程式即可選擇是否對其啟用隱私守衛。被選取的應用程式將不能存取您的個人資料，例如聯絡人、訊息或通話記錄。長按應用程式可開啟其應用程式資訊畫面。\n\n內建應用程式預設不會顯示，但是可從選單中開啟顯示。</string>
+  <string name="privacy_guard_help_text">在此螢幕您只要輕觸應用程式即可選擇是否對其啟用隱私守衛。被選取的應用程式將不能存取您的個人資料，例如聯絡人、訊息或通話記錄。長按應用程式可開啟其應用程式資訊螢幕。\n\n內建應用程式預設不會顯示，但是可從選單中開啟顯示。</string>
   <string name="privacy_guard_manager_show_system_apps">顯示系統應用程式</string>
   <string name="privacy_guard_advanced_settings_title">進階</string>
   <string name="privacy_guard_notification_title">顯示通知</string>
@@ -785,7 +785,7 @@
   <string name="notification_ringtone_title_cm">通知鈴聲</string>
   <!-- Advanced reboot options -->
   <string name="advanced_reboot_title">進階重新啟動</string>
-  <string name="advanced_reboot_summary">當解鎖後，加入重啟進入 recovery 或 bootloader 或進行軟重啟的選項至電源選單</string>
+  <string name="advanced_reboot_summary">當解鎖後，加入重新啟動進入 Recovery、Bootloader 或進行軟體重新啟動的選項至電源選單</string>
   <string name="category_interface">介面</string>
   <!-- Expanded desktop -->
   <string name="power_menu_expanded_desktop">延伸桌面</string>
@@ -818,7 +818,7 @@
   <string name="blacklist_edit_dialog_title">更改已封鎖的電話號碼</string>
   <string name="blacklist_prefs">設定</string>
   <string name="blacklist_button_delete">刪除</string>
-  <string name="blacklist_empty_text">您沒有任何已封鎖的號碼，輕觸新增 (+) 按鍵加入號碼。</string>
+  <string name="blacklist_empty_text">您沒有任何已封鎖的號碼，輕觸新增 (+) 按鍵新增號碼。</string>
   <string name="blacklist_disabled_empty_text">為了防止某些電話號碼打電話或傳簡訊給您，請啟用已封鎖來電者名單功能。</string>
   <string name="blacklist_summary_disabled">已停用</string>
   <string name="blacklist_summary">您將不會收到任何在已封鎖來電者名單上的電話號碼的來電或簡訊</string>
@@ -970,12 +970,12 @@
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <string name="master_clear_desc_cm" product="tablet">該操作將從您的平板電腦<b>內部存儲裝置</b>清除所有資料，其中包括：\n\n <li>您的裝置帳戶</li>\n<li>系統和應用程式的資料及設定</li> \n <li>已下載的應用程式</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
-  <string name="master_clear_desc_cm" product="default">該操作將從您的手機<b>內部存儲裝置</b>清除所有資料，其中包括：\n\n <li>您的裝置帳戶</li>\n<li>系統和應用程式的資料及設定</li> \n <li>已下載的應用程式</li></string>
+  <string name="master_clear_desc_cm" product="default">該操作將從您的手機<b>內部儲存空間</b>清除所有資料，其中包括：\n\n <li>您的裝置帳戶</li>\n<li>系統和應用程式的資料及設定</li> \n <li>已下載的應用程式</li></string>
   <!-- Factory reset strings -->
   <string name="factory_reset_instructions_title">個人資料和應用程式</string>
   <string name="factory_reset_instructions_summary">這將移除在此裝置上您所有帳戶、應用程式、應用程式資料及系統設定</string>
   <string name="factory_reset_personal_content">個人內容</string>
-  <string name="factory_reset_erase_stored_content">移除存儲內容</string>
+  <string name="factory_reset_erase_stored_content">移除儲存空間</string>
   <string name="factory_reset_erase_stored_content_summary">移除音樂、照片、影片及其他儲存在此裝置上的使用者資料</string>
   <string name="factory_reset_erase_stored_content_summary_forced">移除音樂、照片、影片及其他儲存在此裝置上的使用者資料。\n\n<b>由於裝置加密，無法儲存內容。</b></string>
   <string name="factory_reset_erase_sd_card">格式化SD卡</string>
-- 
cgit v1.1


From 43d5629cf3f36ed4120a53f5d1ba0cdf00477c20 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Fri, 23 Dec 2016 20:45:27 +0800
Subject: Settings: statusbar: Enable notification icon count by default

This used to be enabled by default in previous releases.

Change-Id: I2eedf7d6a7864e8c27f74493af5227b61f7d8f31
---
 res/xml/status_bar_settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/xml/status_bar_settings.xml b/res/xml/status_bar_settings.xml
index 3db9fed..92a96ce 100644
--- a/res/xml/status_bar_settings.xml
+++ b/res/xml/status_bar_settings.xml
@@ -66,7 +66,7 @@
         android:key="status_bar_notif_count"
         android:title="@string/status_bar_notif_count_title"
         android:summary="@string/status_bar_notif_count_summary"
-        android:defaultValue="false" />
+        android:defaultValue="true" />
 
     <ListPreference
         android:key="qs_quick_pulldown"
-- 
cgit v1.1


From 0b62a0ce7359333bf06a95431d7d309971cfe3af Mon Sep 17 00:00:00 2001
From: "blinky@build01" <jenkins@cyanogenmod.com>
Date: Sat, 24 Dec 2016 17:27:52 -0800
Subject: Automatic translation import

Change-Id: I7a49ff0eee1862e7c400a2c507095a998b935290
Ticket: -
---
 res/values-sk/cm_strings.xml     | 14 ++++----
 res/values-zh-rTW/cm_strings.xml | 70 ++++++++++++++++++++--------------------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index cba1587..42b25db 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -42,7 +42,7 @@
   <string name="development_tools_title">Vývojárske nástroje</string>
   <!-- Development shortcut -->
   <string name="development_shortcut_title">Vývojárske odkazy</string>
-  <string name="development_shortcut_summary">Povoliť skratky v oznamovacej oblasti a zozname nedávnych aplikácií pre správu aplikácií</string>
+  <string name="development_shortcut_summary">Povolit ikony aplikácií v zozname nedávných aplikácií</string>
   <!-- Setting checkbox title for root access -->
   <string name="root_access">Root prístup</string>
   <string name="root_access_warning_title">Povoliť root prístup?</string>
@@ -463,8 +463,8 @@
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Zobraziť používateľské aplikácie</string>
   <string name="app_ops_show_system_apps">Zobraziť vstavané aplikácie</string>
-  <string name="app_ops_reset_counters">Obnoviť počítadlá povolení/zakázaní</string>
-  <string name="app_ops_reset_confirm_title">Potvrdiť obnovu počítadiel</string>
+  <string name="app_ops_reset_counters">Resetovať počítadlá povolení/zakázaní</string>
+  <string name="app_ops_reset_confirm_title">Potvrdiť reset počítadiel</string>
   <string name="app_ops_reset_confirm_mesg">Naozaj chcete vyresetovať počítadlá?</string>
   <string name="ok">OK</string>
   <!-- Hostname setting -->
@@ -628,7 +628,7 @@
   <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ikona výberu metódy vstupu</string>
-  <string name="ime_switcher_notify_summary">Zobraziť ikony výberu metódy vstupu</string>
+  <string name="ime_switcher_notify_summary">Zobraziť ikonu výberu metódy vstupu</string>
   <!-- Heads up -->
   <string name="heads_up_notifications">Plávajúce oznámenia</string>
   <string name="summary_heads_up_enabled">Plávajúce oznámenia sú povolené</string>
@@ -702,7 +702,7 @@
   <string name="status_bar_toggle_brightness">Ovládanie jasu</string>
   <string name="status_bar_toggle_brightness_summary">Nastaviť jas posúvaním po stavovom riadku</string>
   <string name="status_bar_notif_count_title">Zobraziť počítadlo oznámení</string>
-  <string name="status_bar_notif_count_summary">Zobraziť počet čakajúcich oznámení</string>
+  <string name="status_bar_notif_count_summary">Zobraziť počet čakajúcich oznámení na ikone v stavovom riadku</string>
   <string name="status_bar_quick_qs_pulldown_title">Rýchle vysunutie</string>
   <string name="status_bar_quick_qs_pulldown_summary">%1$s strana stavového riadku vysunie rýchle nastavenia</string>
   <string name="status_bar_quick_qs_pulldown_summary_left">Vľavo</string>
@@ -784,7 +784,7 @@
   <string name="autoperf_summary">Automaticky vybrať vhodný režim batérie pre rôzne aplikácie</string>
   <string name="perf_profile_title">Režim batérie</string>
   <!-- Memory -->
-  <string name="memory_startup_apps_title">Aplikácie spustené pri štarte</string>
+  <string name="memory_startup_apps_title">Aplikácie spúšťané pri štarte</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">Tón oznámenia</string>
   <!-- Advanced reboot options -->
@@ -1012,7 +1012,7 @@
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Obnoviť štatistiky</string>
   <!-- Reset stats confirmation dialog's message -->
-  <string name="reset_stats_msg">Štatistiky histórie batérie budú obnovené</string>
+  <string name="reset_stats_msg">Štatistiky histórie batérie budú vynulované</string>
   <!-- Dock battery not present message -->
   <string name="dock_battery_not_present">Batéria doku nie je prítomná</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index fa85ff2..f6651a9 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -41,7 +41,7 @@
   <string name="development_shortcut_summary">在最近的應用程式清單中啟用應用程式管理捷徑</string>
   <!-- Setting checkbox title for root access -->
   <string name="root_access">Root 權限</string>
-  <string name="root_access_warning_title">允許 root 權限？</string>
+  <string name="root_access_warning_title">是否允許 root 權限？</string>
   <string name="root_access_warning_message">允許應用程式請求 root 權限是很危險的，而且可能會影響您系統的安全！</string>
   <string name="root_access_none">已停用</string>
   <string name="root_access_apps">僅限應用程式</string>
@@ -69,8 +69,8 @@
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">更新 Cyanogen Recovery</string>
   <string name="update_recovery_summary">以系統更新來更新 Recovery</string>
-  <string name="update_recovery_on_warning">注意: 啟用此功能後，您已安裝的 Recovery 將會被現在所運行之系統所包含的取代。\n\n您的 Recovery 將會隨著系統一起更新以確保與未來版本的相容性。\n\n您確定要啟用這個功能?</string>
-  <string name="update_recovery_off_warning">警告:停用此功能後，您的 Recovery 將不會隨著系統一起更新。\n\n未來的系統更新可能無法使用過舊的或客製 Recovery 安裝。\n\n您確定要停用此功能?</string>
+  <string name="update_recovery_on_warning">注意: 啟用此功能後，您已安裝的 Recovery 將會被現在所執行之系統所包含的取代。\n\n您的 Recovery 將會隨著系統一起更新以確保與未來版本的相容性。\n\n您確定要啟用這個功能？</string>
+  <string name="update_recovery_off_warning">警告：停用此功能後，您的 Recovery 將不會隨著系統一起更新。\n\n未來的系統更新可能無法使用過舊的或客製 Recovery 安裝。\n\n您確定要停用此功能？</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
   <string name="themes_settings_title">主題</string>
@@ -96,8 +96,8 @@
   <string name="profile_unknown_nfc_tag">未知的設定檔</string>
   <string name="profile_add_nfc_text">此 NFC 標籤指向了一個未知的設定檔，連結此 NFC 標籤到現有的設定檔將允許您以後選取那個設定檔。</string>
   <string name="profile_select">選取設定檔</string>
-  <string name="profile_remove_dialog_message">移除設定檔「%1$s」？</string>
-  <string name="profile_populate_profile_from_state">使用目前的裝置設定配置設定檔嗎?</string>
+  <string name="profile_remove_dialog_message">是否移除設定檔「%1$s」？</string>
+  <string name="profile_populate_profile_from_state">是否使用目前的裝置設定配置設定檔？</string>
   <string name="profile_menu_fill_from_state">匯入目前裝置的設定</string>
   <string name="profile_remove_current_profile">無法刪除目前的設定檔</string>
   <string name="profile_app_group_category_title">覆蓋通知</string>
@@ -117,9 +117,9 @@
   <string name="rename_dialog_hint">輸入設定檔名稱</string>
   <!-- Reset Profiles -->
   <string name="profile_reset_title">重設</string>
-  <string name="profile_reset_message">刪除所有使用者建立的設定檔與應用程式群組並還原至預設值？</string>
+  <string name="profile_reset_message">是否刪除所有使用者建立的設定檔與應用程式群組並還原至預設值？</string>
   <!-- Delete confimation messages -->
-  <string name="profile_app_delete_confirm">移除此應用程式？</string>
+  <string name="profile_app_delete_confirm">是否移除此應用程式？</string>
   <!-- Profile network mode -->
   <string name="profile_networkmode_2g">2G</string>
   <string name="profile_networkmode_3g">3G</string>
@@ -127,10 +127,10 @@
   <string name="profile_networkmode_2g3g">2G/3G</string>
   <string name="profile_networkmode_2g3g4g">2G/3G/LTE</string>
   <!-- Profile Config screen PreferenceGroup titles -->
-  <string name="profile_volumeoverrides_title">音量覆寫</string>
+  <string name="profile_volumeoverrides_title">音量覆蓋</string>
   <string name="connection_state_enabled">啟用</string>
   <string name="volume_override_summary">設為 %1$s/%2$s</string>
-  <string name="profile_volume_override_checkbox_label">覆寫音量</string>
+  <string name="profile_volume_override_checkbox_label">覆蓋音量</string>
   <!-- Menu item for managing profiles -->
   <string name="profile_profiles_manage">設定檔</string>
   <string name="profile_profile_manage">管理設定檔</string>
@@ -154,7 +154,7 @@
   <string name="profile_appgroups_title">應用程式群組</string>
   <string name="profile_applist_title">應用程式</string>
   <string name="profile_new_appgroup">新應用程式群組</string>
-  <string name="profile_delete_appgroup">刪除此應用程式群組？</string>
+  <string name="profile_delete_appgroup">是否刪除此應用程式群組？</string>
   <string name="profile_appgroup_name_prompt">爲新應用程式群組輸入名稱</string>
   <string name="profile_appgroup_name_title">名稱</string>
   <!-- Add application dialog box title -->
@@ -163,7 +163,7 @@
   <string name="profile_system_settings_title">系統設定</string>
   <string name="profile_lockmode_title">鎖定螢幕模式</string>
   <string name="profile_lockmode_policy_disabled_summary">此設定檔被裝置管理員停用</string>
-  <string name="profile_lockmode_insecure_summary">不要詢問 PIN 或密碼</string>
+  <string name="profile_lockmode_insecure_summary">不要詢問 PIN 碼或密碼</string>
   <string name="profile_lockmode_disabled_summary">停用鎖定螢幕</string>
   <string name="profile_airplanemode_title">飛航模式</string>
   <string name="profile_brightness_title">螢幕亮度</string>
@@ -218,11 +218,11 @@
   <!-- Title for application group setting screen -->
   <string name="profile_appgroups_title">應用程式群組</string>
   <string name="profile_new_appgroup">新應用程式群組</string>
-  <string name="profile_delete_appgroup">刪除此應用程式群組？</string>
+  <string name="profile_delete_appgroup">是否刪除此應用程式群組？</string>
   <string name="profile_appgroup_name_prompt">爲新應用程式群組輸入名稱</string>
   <string name="profile_appgroup_name_title">名稱</string>
   <string name="duplicate_appgroup_name">重複的應用程式群組名稱！</string>
-  <string name="profile_app_delete_confirm">移除此應用程式？</string>
+  <string name="profile_app_delete_confirm">是否移除此應用程式？</string>
   <string name="no_bluetooth_triggers">沒有藍牙裝置配對。 \n在配置觸發器之前，輕觸配對藍牙裝置。</string>
   <string name="no_wifi_triggers">沒有已設定的 Wi\u2011Fi 連結。 \n設定前輕觸即可連線 Wi\u2011Fi</string>
   <string name="no_triggers_configured">觸發器未設定，輕觸即可建立。</string>
@@ -238,7 +238,7 @@
   <string name="navigation_restore_button_text">還原\n預設</string>
   <string name="navigation_edit_button_text">編輯</string>
   <string name="navigation_save_button_text">儲存</string>
-  <string name="navigation_bar_reset_message">刪除目前的設定並還原預設的佈局嗎？</string>
+  <string name="navigation_bar_reset_message">是否刪除目前的設定並還原預設的佈局？</string>
   <string name="navigation_bar_arrow_keys_title">輸入時顯示方向鍵</string>
   <string name="navigation_bar_arrow_keys_summary">輸入時顯示游標鍵。取代輸入法切換器。</string>
   <string name="navigation_bar_recents_title">多工鍵長按動作</string>
@@ -248,7 +248,7 @@
   <string name="default_time">正常</string>
   <string name="custom_time">自訂</string>
   <string name="dialog_delete_title">刪除</string>
-  <string name="dialog_delete_message">移除選取的項目？</string>
+  <string name="dialog_delete_message">是否移除選取的項目？</string>
   <!-- Values for the notification light pulse spinners -->
   <string name="pulse_length_always_on">一律開啟</string>
   <string name="pulse_length_very_short">非常短</string>
@@ -449,7 +449,7 @@
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">允許</string>
   <string name="app_ops_permissions_ignored">已忽略</string>
-  <string name="app_ops_permissions_always_ask">總是詢問</string>
+  <string name="app_ops_permissions_always_ask">一律詢問</string>
   <!-- App ops detail -->
   <string name="app_ops_entry_summary"><xliff:g id="op">%1$s</xliff:g> (已使用 <xliff:g id="count">%2$s</xliff:g>)</string>
   <string name="app_ops_allowed_count">已允許 <xliff:g id="count" example="2 times">%s</xliff:g></string>
@@ -461,12 +461,12 @@
   <string name="app_ops_show_system_apps">顯示內建應用程式</string>
   <string name="app_ops_reset_counters">重設允許與拒絕計數器</string>
   <string name="app_ops_reset_confirm_title">確認重設計數器</string>
-  <string name="app_ops_reset_confirm_mesg">您確定要重設計數器？</string>
+  <string name="app_ops_reset_confirm_mesg">您確定要重設計數器嗎？</string>
   <string name="ok">確定</string>
   <!-- Hostname setting -->
   <string name="device_hostname">裝置主機名稱</string>
   <string name="unlock_scramble_pin_layout_title">亂序布局</string>
-  <string name="unlock_scramble_pin_layout_summary">解鎖裝置時使用亂序 PIN 布局</string>
+  <string name="unlock_scramble_pin_layout_summary">解鎖裝置時使用亂序 PIN 碼布局</string>
   <string name="button_pref_title">按鍵</string>
   <string name="hardware_keys_power_key_title">電源鍵</string>
   <string name="hardware_keys_home_key_title">主螢幕鍵</string>
@@ -749,9 +749,9 @@
   <string name="privacy_guard_no_user_apps">未安裝任何應用程式</string>
   <string name="privacy_guard_help_title">說明</string>
   <string name="privacy_guard_reset_title">重設</string>
-  <string name="privacy_guard_reset_text">重設權限？</string>
+  <string name="privacy_guard_reset_text">是否重設權限？</string>
   <string name="privacy_guard_help_text">在此螢幕您只要輕觸應用程式即可選擇是否對其啟用隱私守衛。被選取的應用程式將不能存取您的個人資料，例如聯絡人、訊息或通話記錄。長按應用程式可開啟其應用程式資訊螢幕。\n\n內建應用程式預設不會顯示，但是可從選單中開啟顯示。</string>
-  <string name="privacy_guard_manager_show_system_apps">顯示系統應用程式</string>
+  <string name="privacy_guard_manager_show_system_apps">顯示內建應用程式</string>
   <string name="privacy_guard_advanced_settings_title">進階</string>
   <string name="privacy_guard_notification_title">顯示通知</string>
   <!-- Sizes for pattern lockscreen -->
@@ -802,17 +802,17 @@
   <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="recents_show_searchbar">在總覽選單中顯示搜尋列</string>
   <string name="keywords_recents_show_searchbar">最近 最近 停用 啟用 顯示 隱藏 搜尋列 搜尋列</string>
   <!-- Voice Wakeup -->
   <string name="voice_wakeup_settings_title">語音喚醒</string>
   <string name="voice_wakeup_retrain_title">重新訓練您的語音</string>
-  <string name="voice_wakeup_activity_title">行動啟動</string>
+  <string name="voice_wakeup_activity_title">活動啟動</string>
   <string name="voice_wakeup_default_activity">Google 即時資訊</string>
   <string name="voice_wakeup_needs_dial_permission_warning">語音喚醒需要擁有直接撥打聯絡人電話的權限。</string>
-  <string name="picker_activities">Activities</string>
+  <string name="picker_activities">活動</string>
   <string name="select_custom_app_title">選擇自訂應用程式</string>
-  <string name="select_custom_activity_title">選擇自訂 activity</string>
+  <string name="select_custom_activity_title">選擇自訂活動</string>
   <!-- Blacklist preferences -->
   <string name="blacklist_title">已封鎖來電者名單</string>
   <string name="blacklist_edit_dialog_title">更改已封鎖的電話號碼</string>
@@ -839,7 +839,7 @@
   <string name="blacklist_bad_number_add">無法將不正確的電話號碼加至已封鎖來電者名單</string>
   <!-- Blacklist management -->
   <string name="remove_blacklist_number_title">移除號碼</string>
-  <string name="remove_blacklist_entry">您確定您要將此已封鎖電話號碼移除？</string>
+  <string name="remove_blacklist_entry">您確定您要將此已封鎖電話號碼移除嗎？</string>
   <string name="select_contact">選取聯絡人</string>
   <!-- Sms security limit -->
   <string name="app_security_title">應用程式安全</string>
@@ -881,7 +881,7 @@
   <string name="menu_hidden_apps_reset_lock">重設圖形鎖</string>
   <string name="protected_apps">受保護的應用程式</string>
   <string name="protected_apps_summary">管理安全鎖下隱藏的應用程式</string>
-  <string name="saving_protected_components">儲存組件狀態\u2026</string>
+  <string name="saving_protected_components">正在儲存元件狀態\u2026</string>
   <string name="pa_login_password_hint">密碼</string>
   <string name="pa_login_submit_button">登入</string>
   <string name="pa_login_checking_password">正在檢查帳戶\u2026</string>
@@ -889,7 +889,7 @@
   <string name="pa_pattern_or_fingerprint_header">必須使用解鎖圖形或指紋解鎖</string>
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">貢獻者</string>
-  <string name="contributors_cloud_loading_message">貢獻者名單載入中\u2026</string>
+  <string name="contributors_cloud_loading_message">正在讀取貢獻者名單\u2026</string>
   <string name="contributors_cloud_failed_message">無法載入貢獻者資料</string>
   <string name="contributor_info_menu">貢獻者名單</string>
   <string name="contributor_info_msg"> <![CDATA[<b>名稱：</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
@@ -921,12 +921,12 @@
   <string name="sim_missing">遺失或毀損</string>
   <string name="sim_enabler_need_disable_sim">SIM 卡將被停用，確定要繼續嗎？</string>
   <string name="sim_enabler_will_disable_sim_title">注意</string>
-  <string name="sim_enabler_need_switch_data_service">此 SIM 卡將被停用，並且將使用 SIM 卡 <xliff:g id="slotid">%1$s</xliff:g> 於數據服務中，您確定要繼續？</string>
-  <string name="sim_enabler_airplane_on">飛行模式開啟时無法進行此操作。</string>
+  <string name="sim_enabler_need_switch_data_service">此 SIM 卡將被停用，並且將使用 SIM 卡 <xliff:g id="slotid">%1$s</xliff:g> 於數據服務中，您確定要繼續嗎？</string>
+  <string name="sim_enabler_airplane_on">飛航模式開啟時無法進行此操作。</string>
   <string name="sim_enabler_in_call">通話時無法進行此操作。</string>
   <string name="sim_enabler_both_inactive">無法停用所有 SIM 卡</string>
-  <string name="sim_enabler_enabling">啟用中\u2026</string>
-  <string name="sim_enabler_disabling">正在停用\u2026</string>
+  <string name="sim_enabler_enabling">正在啟用\u2026</string>
+  <string name="sim_enabler_disabling">正在關閉\u2026</string>
   <string name="sub_activate_success">SIM 卡已經啟用。</string>
   <string name="sub_activate_failed">啟用失敗。</string>
   <string name="sub_deactivate_success">SIM 卡已經停用。</string>
@@ -979,7 +979,7 @@
   <string name="factory_reset_erase_stored_content_summary">移除音樂、照片、影片及其他儲存在此裝置上的使用者資料</string>
   <string name="factory_reset_erase_stored_content_summary_forced">移除音樂、照片、影片及其他儲存在此裝置上的使用者資料。\n\n<b>由於裝置加密，無法儲存內容。</b></string>
   <string name="factory_reset_erase_sd_card">格式化SD卡</string>
-  <string name="factory_reset_erase_sd_card_summary">移除SD卡上所有資料，包括音樂和相片。</string>
+  <string name="factory_reset_erase_sd_card_summary">移除 SD 卡上所有資料，包括音樂和照片。</string>
   <string name="factory_reset_warning_text_reset_now">現在重置</string>
   <string name="factory_reset_warning_text_message">您所有帳戶、應用程式、應用程式資料及系統設定將從此裝置上移除，並不可逆轉。</string>
   <!-- Tethering & portable hotspot other category -->
@@ -1012,9 +1012,9 @@
   <!-- Dock battery not present message -->
   <string name="dock_battery_not_present">座架電池不存在</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
-  <string name="battery_info_status_charging_dock_ac">正在 AC 插口上充電</string>
+  <string name="battery_info_status_charging_dock_ac">正在透過座架 AC 變壓器充電</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
-  <string name="battery_info_status_charging_dock_usb">正在透過 USB 插口充電</string>
+  <string name="battery_info_status_charging_dock_usb">正在透過座架 USB 充電</string>
   <string name="restrict_app_wlan_title">停用應用程式使用 Wi\u2011Fi</string>
   <string name="restrict_app_wlan_summary">防止應用程式使用 Wi\u2011Fi 數據連線</string>
   <string name="restrict_app_cellular_title">停用應用程式使用行動網路</string>
@@ -1045,7 +1045,7 @@
   <string name="reset_stats_confirm">確認</string>
   <string name="restrict_cellular_access_title">限制行動數據存取</string>
   <string name="restrict_cellular_access_summary">停用行動數據資料存取權限</string>
-  <string name="restrict_cellular_access_dialog_title">限制行動數據存取？</string>
+  <string name="restrict_cellular_access_dialog_title">是否限制行動數據存取？</string>
   <string name="restrict_cellular_access_dialog_summary">此功能可能會導致依賴於網路存取的應用程式停止工作時，只有行動網路可用。\n\n您可以在應用程式中的可用設定中找到更合適的使用數據控制。</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">電信業者</string>
-- 
cgit v1.1


From b988d9f7920e33f5097157fdf753df66541318d6 Mon Sep 17 00:00:00 2001
From: Simon Shields <keepcalm444@gmail.com>
Date: Tue, 27 Dec 2016 22:51:35 +1100
Subject: Settings: Rebrand to LineageOS

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

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 2fb4a69..77ad722 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -54,20 +55,20 @@
   <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 -->
-  <string name="mod_version">CyanogenMod weergawe</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS weergawe</string>
   <string name="mod_version_default">Onbekend</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Toestel tipe</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Toestel naam</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API vlak</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API vlak</string>
   <string name="mod_api_level_default">Onbekend</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Bou datum</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod opgradering</string>
+  <string name="cmupdate_settings_title">LineageOS opgradering</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Opdateer Cyanogen recovery</string>
   <string name="update_recovery_summary">Opdateer recovery met stelsel opdaterings</string>
@@ -856,10 +857,10 @@
   <string name="no_filters_title">Geen filters opgestel</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod statistieke</string>
-  <string name="anonymous_statistics_summary">Help CyanogenMod verbeter deur anonieme statistiek verslagdoening te kies</string>
+  <string name="anonymous_statistics_title">LineageOS statistieke</string>
+  <string name="anonymous_statistics_summary">Help LineageOS verbeter deur anonieme statistiek verslagdoening te kies</string>
   <string name="anonymous_statistics_warning_title">Aangaande</string>
-  <string name="anonymous_statistics_warning">Deur CyanogenMod statistieke toe te laat sal nie-persoonlike data ingestuur word na die ontwikkelaars van CyanogenMod installasies. Die inligting sluit in \'n unieke identifikasienommer in wat nie privaatheid of persoonlike data in gevaar stel nie. Die data word ingestuur tydens elke \'boot\'.\n\nVir \'n voorbeeld van die data wat ingestuur word, raak Voorskou.</string>
+  <string name="anonymous_statistics_warning">Deur LineageOS statistieke toe te laat sal nie-persoonlike data ingestuur word na die ontwikkelaars van LineageOS installasies. Die inligting sluit in \'n unieke identifikasienommer in wat nie privaatheid of persoonlike data in gevaar stel nie. Die data word ingestuur tydens elke \'boot\'.\n\nVir \'n voorbeeld van die data wat ingestuur word, raak Voorskou.</string>
   <string name="enable_reporting_title">Aktiveer verslaggewing</string>
   <string name="preview_data_title">Voorskou</string>
   <string name="view_stats_title">Kyk na statistieke</string>
@@ -1001,7 +1002,7 @@
   <string name="interruptions_ignore_while_media_title">Verhoed oudio \'ducking\'</string>
   <string name="interruptions_ignore_while_media_summary">Moet nie media terugspeel volume verminder wanneer \'n kennisgewing arriveer</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod Regs</string>
+  <string name="cmlicense_title">LineageOS Regs</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Herstel stats</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-am/cm_strings.xml
+++ b/res/values-am/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index ed2d030..601868d 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -49,20 +50,20 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">الاتصال بالحقل القريب</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">إصدار CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">إصدار LineageOS</string>
   <string name="mod_version_default">مجهول</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">طراز الجهاز</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">اسم الجهاز</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">مستوى CyanogenMod API</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">مستوى LineageOS API</string>
   <string name="mod_api_level_default">مجهول</string>
   <!-- About phone screen, build date -->
   <string name="build_date">تاريخ إنشاء</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">تحديثات CyanogenMod</string>
+  <string name="cmupdate_settings_title">تحديثات LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">تحديث استعادة Cyanogen (Cyanogen recovery)</string>
   <string name="update_recovery_summary">تحديث الاستعادة بتحديثات النظام</string>
@@ -844,10 +845,10 @@
   <string name="no_filters_title">لم يتم تعيين عوامل التصفية</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">إحصائيات CyanogenMod</string>
-  <string name="anonymous_statistics_summary">ساهم في جعل CyanogenMod أفضل بموافقتك على إرسال تقارير بالإحصائيات مجهولة للمصدر</string>
+  <string name="anonymous_statistics_title">إحصائيات LineageOS</string>
+  <string name="anonymous_statistics_summary">ساهم في جعل LineageOS أفضل بموافقتك على إرسال تقارير بالإحصائيات مجهولة للمصدر</string>
   <string name="anonymous_statistics_warning_title">حول</string>
-  <string name="anonymous_statistics_warning">الموافقة على المشاركة في إحصائيات CyanogenMod سيسمح بإرسال البيانات غير الشخصية إلى مطوري CyanogenMod لتعقب الإصدارات المثبتة على مختلف الأجهزة كل على حدة. وتشمل المعلومات المقدمة معرفاً فريداً من نوعه، وبالتالي لا تتعرض خصوصيتك أو بياناتك الشخصية للخطر. تُرسل البيانات عند التشغيل في كل مرة. \n\n للاطلاع على مثال للبيانات التي يتم إرسالها، اضغط على معاينة البيانات.
+  <string name="anonymous_statistics_warning">الموافقة على المشاركة في إحصائيات LineageOS سيسمح بإرسال البيانات غير الشخصية إلى مطوري LineageOS لتعقب الإصدارات المثبتة على مختلف الأجهزة كل على حدة. وتشمل المعلومات المقدمة معرفاً فريداً من نوعه، وبالتالي لا تتعرض خصوصيتك أو بياناتك الشخصية للخطر. تُرسل البيانات عند التشغيل في كل مرة. \n\n للاطلاع على مثال للبيانات التي يتم إرسالها، اضغط على معاينة البيانات.
 </string>
   <string name="enable_reporting_title">تمكين إعداد التقارير</string>
   <string name="preview_data_title">معاينة البيانات</string>
@@ -991,7 +992,7 @@
   <string name="interruptions_ignore_while_media_title">منع تراكب الأصوات</string>
   <string name="interruptions_ignore_while_media_summary">لا يخفض صوت تشغيل الوسائط عند وصول إشعار</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">قانون CyanogenMod</string>
+  <string name="cmlicense_title">قانون LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">إعادة تعيين الإحصائيات</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index c9d1379..4adcf74 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -45,20 +46,20 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod সংস্কৰণ</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS সংস্কৰণ</string>
   <string name="mod_version_default">অজ্ঞাত</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">ডিভাইচৰ মডেল</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">ডিভাইচ নাম</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API স্তৰ</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API স্তৰ</string>
   <string name="mod_api_level_default">অজ্ঞাত</string>
   <!-- About phone screen, build date -->
   <string name="build_date">নিৰ্মাণৰ তাৰিখ</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod আপডেটসমূহ</string>
+  <string name="cmupdate_settings_title">LineageOS আপডেটসমূহ</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Cyanogen পুনৰুদ্ধাৰ আপডেট কৰক</string>
   <string name="update_recovery_summary">আপডেট পুনৰুদ্ধাৰ তথা ছিষ্টেম আপডেট</string>
@@ -837,10 +838,10 @@
   <string name="no_filters_title">কোনো ফিল্টাৰ ছেট কৰা নাই</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod পৰিসংখ্যা</string>
-  <string name="anonymous_statistics_summary">বেনামী পৰিসংখ্যা ৰিপোৰ্টিং চয়ন কৰাৰ দ্বাৰা CyanogenMod উন্নত কৰাত সহায় কৰক</string>
+  <string name="anonymous_statistics_title">LineageOS পৰিসংখ্যা</string>
+  <string name="anonymous_statistics_summary">বেনামী পৰিসংখ্যা ৰিপোৰ্টিং চয়ন কৰাৰ দ্বাৰা LineageOS উন্নত কৰাত সহায় কৰক</string>
   <string name="anonymous_statistics_warning_title">বিষয়ে</string>
-  <string name="anonymous_statistics_warning">CyanogenMod পৰিসংখ্যা চয়ন কৰিলে ডিভাইচবোৰৰ মাজত অনন্য স্থাপনকৰণ ট্ৰেক কৰিবলৈ অ-ব্যক্তিগত ডাটা CyanogenMod ডেভেলপাৰসকললৈ দাখিল কৰিবলৈ অনুমতি দিব। দাখিল কৰা তথ্যবোৰত এটা অনন্য চিনাক্তকাৰী অন্তৰ্ভুক্ত থাকে, যিটোৱে আপোনাৰ গোপনীয়তা বা ব্যক্তিগত ডাটাৰ সৈতে আপোচ নকৰে। প্ৰতিবাৰ বুট হোৱা সময়ত ডাটা দাখিল কৰা হয়।\n\nদাখিল কৰা ডাটাৰ উদাহৰণ হিচাপে, প্ৰিভিউ ডাটাত ডেপ কৰক।</string>
+  <string name="anonymous_statistics_warning">LineageOS পৰিসংখ্যা চয়ন কৰিলে ডিভাইচবোৰৰ মাজত অনন্য স্থাপনকৰণ ট্ৰেক কৰিবলৈ অ-ব্যক্তিগত ডাটা LineageOS ডেভেলপাৰসকললৈ দাখিল কৰিবলৈ অনুমতি দিব। দাখিল কৰা তথ্যবোৰত এটা অনন্য চিনাক্তকাৰী অন্তৰ্ভুক্ত থাকে, যিটোৱে আপোনাৰ গোপনীয়তা বা ব্যক্তিগত ডাটাৰ সৈতে আপোচ নকৰে। প্ৰতিবাৰ বুট হোৱা সময়ত ডাটা দাখিল কৰা হয়।\n\nদাখিল কৰা ডাটাৰ উদাহৰণ হিচাপে, প্ৰিভিউ ডাটাত ডেপ কৰক।</string>
   <string name="enable_reporting_title">ৰিপোৰ্টিং সক্ষম কৰক</string>
   <string name="preview_data_title">ডাটা প্ৰিভিউ কৰক</string>
   <string name="view_stats_title">পৰিসংখ্যা চাওক</string>
@@ -981,7 +982,7 @@
   <string name="interruptions_ignore_while_media_title">অডিঅ\' ডাকিং ৰোধ কৰক</string>
   <string name="interruptions_ignore_while_media_summary">অধিসূচনা আহিলে মিডিয়াৰ প্লেবেক ভলিউম হ্ৰাস নকৰিব</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod আইনী</string>
+  <string name="cmlicense_title">LineageOS আইনী</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">পৰিসংখ্যা ৰিছেট কৰক</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index e80c66a..3cffdb0 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -44,20 +45,20 @@
   <string name="root_access_all">Aplicaciones y ADB</string>
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Versión CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">Versión LineageOS</string>
   <string name="mod_version_default">Desconocida</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Modelu de preséu</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Nome del preséu</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Nivel d\'API CyanogenMod</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Nivel d\'API LineageOS</string>
   <string name="mod_api_level_default">Desconocida</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Data de compilación</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Anovamientos CyanogenMod</string>
+  <string name="cmupdate_settings_title">Anovamientos LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Anovar col recovery de Cyanogen</string>
   <string name="update_recovery_summary">Anovar recovery colos anovamientos del sistema</string>
@@ -933,7 +934,7 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="live_lock_screen_settings_disabled_prompt">Pa ver les pantalles de bloquéu animaes disponibles, activa la opción de pantalles de bloquéu.</string>
   <string name="interruptions_ignore_while_media_summary">Nun amenorga\'l volume de reproducción cuando aporten avisos</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Llicencia CyanogenMod</string>
+  <string name="cmlicense_title">Llicencia LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <!-- Reset stats confirmation dialog's message -->
   <!-- Dock battery not present message -->
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index 2d40e5e..cfd939b 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -43,19 +44,19 @@
   <string name="root_access_all">Tətbiqetmələr və ADB</string>
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod versiyası</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS versiyası</string>
   <string name="mod_version_default">Bilinməyən</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Cihaz modeli</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Cihaz adı</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <string name="mod_api_level_default">Bilinməyən</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Quruluş tarixi</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod yeniləmələri</string>
+  <string name="cmupdate_settings_title">LineageOS yeniləmələri</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Cyanogen bərpa rejimini yenilə</string>
   <string name="update_recovery_summary">Sistem yeniləməsi ilə bərpa rejimini yenilə</string>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index 05f6cac..be58ba9 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -46,15 +47,15 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Версія CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">Версія LineageOS</string>
   <string name="mod_version_default">Невядома</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Мадэль прылады</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Імя прылады</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Узровень CyanogenMod API</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Узровень LineageOS API</string>
   <string name="mod_api_level_default">Невядома</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Дата зборкі</string>
@@ -839,9 +840,9 @@
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
   <string name="anonymous_statistics_title">Адпраўка статыстыкі</string>
-  <string name="anonymous_statistics_summary">Дапамажыце зрабіць CyanogenMod лепш, дазволіўшы збор ананімнай статыстыкі</string>
+  <string name="anonymous_statistics_summary">Дапамажыце зрабіць LineageOS лепш, дазволіўшы збор ананімнай статыстыкі</string>
   <string name="anonymous_statistics_warning_title">Звесткі</string>
-  <string name="anonymous_statistics_warning">Ананімныя справаздачы дазваляюць распрацоўнікам CyanogenMod адсочваць усталёўкі на розныя прылады. Адсыланая інфармацыю складаецца з назву прылады, версію прашыўкі і ўнікальны ідэнтыфікатар, адпраўка якога ніякай чынам не шкодзіць Вашай прыватнасці. Справаздача адсылаецца пры кожнай загрузцы прылады.</string>
+  <string name="anonymous_statistics_warning">Ананімныя справаздачы дазваляюць распрацоўнікам LineageOS адсочваць усталёўкі на розныя прылады. Адсыланая інфармацыю складаецца з назву прылады, версію прашыўкі і ўнікальны ідэнтыфікатар, адпраўка якога ніякай чынам не шкодзіць Вашай прыватнасці. Справаздача адсылаецца пры кожнай загрузцы прылады.</string>
   <string name="enable_reporting_title">Дазволіць збор статыстыкі</string>
   <string name="preview_data_title">Прагляд дадзеных якія адпраўляюцца</string>
   <string name="view_stats_title">Прагляд статыстыкі ўсталёвак</string>
@@ -982,7 +983,7 @@
   <string name="interruptions_ignore_while_media_title">Не прыглушаць гук</string>
   <string name="interruptions_ignore_while_media_summary">Не змяншаць гучнасць прайгравання мультымедыя пры атрыманні паведамленняў</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Палітыка прыватнасці CyanogenMod</string>
+  <string name="cmlicense_title">Палітыка прыватнасці LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Скід статыстыкі</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 285087f..0aea1c4 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -54,15 +55,15 @@
   <string name="root_appops_summary">Преглед и управление на правилата за администраторски достъп</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod версия</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS версия</string>
   <string name="mod_version_default">Неизвестна</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Модел на устройството</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Име на устройството</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod приложно-програмен интерфейс ниво</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS приложно-програмен интерфейс ниво</string>
   <string name="mod_api_level_default">Неизвестна</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Дата на изграждане</string>
@@ -858,9 +859,9 @@
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
   <string name="anonymous_statistics_title">Статистики</string>
-  <string name="anonymous_statistics_summary">Помогнете да направим CyanogenMod по-добър, като разрешите да събира анонимни статистически данни</string>
+  <string name="anonymous_statistics_summary">Помогнете да направим LineageOS по-добър, като разрешите да събира анонимни статистически данни</string>
   <string name="anonymous_statistics_warning_title">Информация</string>
-  <string name="anonymous_statistics_warning">Ще позволи на CyanogenMod Statistics да изпраща не лична информация  на разработчиците от CyanogenMod, за проследяване на инсталациите в устройството. Предоставената информация включва уникален идентификатор, който не застрашава вашата поверителност или лични данни. Данните се подават по време на всяко зареждане.\n\nПример за данните, които са подадени.</string>
+  <string name="anonymous_statistics_warning">Ще позволи на LineageOS Statistics да изпраща не лична информация  на разработчиците от LineageOS, за проследяване на инсталациите в устройството. Предоставената информация включва уникален идентификатор, който не застрашава вашата поверителност или лични данни. Данните се подават по време на всяко зареждане.\n\nПример за данните, които са подадени.</string>
   <string name="enable_reporting_title">Разреши отчитане</string>
   <string name="preview_data_title">Визуализиране на данните</string>
   <string name="view_stats_title">Преглед на статистиките</string>
@@ -1006,7 +1007,7 @@
   <string name="interruptions_ignore_while_media_title">Не намалявай силата на звука</string>
   <string name="interruptions_ignore_while_media_summary">Не намалявай силата на звука, когато пристига известие</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod правна информация</string>
+  <string name="cmlicense_title">LineageOS правна информация</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Нулиране на статистиката</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index cab442a..24fba60 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -36,12 +37,12 @@
   <string name="root_access_all">অ্যাপস এবং এডিবি</string>
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <string name="mod_version">সায়ানোজেনমড সংস্করণ</string>
   <string name="mod_version_default">অজানা</string>
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <string name="mod_api_level_default">অজানা</string>
   <!-- About phone screen, build date -->
   <string name="build_date">তৈরী তারিখ</string>
diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-br-rFR/cm_strings.xml
+++ b/res/values-br-rFR/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-bs-rBA/cm_strings.xml b/res/values-bs-rBA/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-bs-rBA/cm_strings.xml
+++ b/res/values-bs-rBA/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 6ededb5..182529f 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -54,20 +55,20 @@
   <string name="root_appops_summary">Mostra i controla les regles de superusuari</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod versió</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS versió</string>
   <string name="mod_version_default">Desconegut</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Model del dispositiu</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Nom del dispositiu</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Nivell de l\'API de CyanogenMod</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Nivell de l\'API de LineageOS</string>
   <string name="mod_api_level_default">Desconegut</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Data d\'elaboració</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Actualitzacions CyanogenMod</string>
+  <string name="cmupdate_settings_title">Actualitzacions LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Actualitza la recuperació de Cyanogen</string>
   <string name="update_recovery_summary">Actualitza la recuperació amb les actualitzacions del sistema</string>
@@ -857,10 +858,10 @@
   <string name="no_filters_title">Sense filtres establerts</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Estadístiques de CyanogenMod</string>
-  <string name="anonymous_statistics_summary">Ajuda a fer millor CyanogenMod optant a transmetre estadístiques anònimes</string>
+  <string name="anonymous_statistics_title">Estadístiques de LineageOS</string>
+  <string name="anonymous_statistics_summary">Ajuda a fer millor LineageOS optant a transmetre estadístiques anònimes</string>
   <string name="anonymous_statistics_warning_title">Quant a</string>
-  <string name="anonymous_statistics_warning">Optant a les estadístiques de CyanogenMod permetràs que dades no-personals siguin transmeses als desenvolupadors de CyanogenMod per rastrejar les intal·lacions individuals a través dels dispositius. La informació transmesa inclou un identificador únic, que no compromet la privacitat o les dades personals. Les dades son transmeses durant cada arrancada.\n\nPer un exemple de les dades transmeses, pica a vista prèvia de Dades.</string>
+  <string name="anonymous_statistics_warning">Optant a les estadístiques de LineageOS permetràs que dades no-personals siguin transmeses als desenvolupadors de LineageOS per rastrejar les intal·lacions individuals a través dels dispositius. La informació transmesa inclou un identificador únic, que no compromet la privacitat o les dades personals. Les dades son transmeses durant cada arrancada.\n\nPer un exemple de les dades transmeses, pica a vista prèvia de Dades.</string>
   <string name="enable_reporting_title">Activa els informes</string>
   <string name="preview_data_title">Vista prèvia de Dades</string>
   <string name="view_stats_title">Veure estadístiques</string>
@@ -1006,7 +1007,7 @@
   <string name="interruptions_ignore_while_media_title">Evita la baixada del so</string>
   <string name="interruptions_ignore_while_media_summary">No redueixis el volum de reproducció multimèdia quan arribi una notificació</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Llicència CyanogenMod</string>
+  <string name="cmlicense_title">Llicència LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Reinicia estadístiques</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 3a3feca..7d6359a 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -56,20 +57,20 @@
   <string name="root_appops_summary">Zobrazit a zpravovat pravidla přístupů root</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod verze</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS verze</string>
   <string name="mod_version_default">Neznámá</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Model</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Název zařízení</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Verze CyanogenMod API</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Verze LineageOS API</string>
   <string name="mod_api_level_default">Neznámá</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Datum sestavení</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Aktualizace CyanogenMod</string>
+  <string name="cmupdate_settings_title">Aktualizace LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Aktualizovat Cyanogen recovery</string>
   <string name="update_recovery_summary">Aktualizovat recovery pomocí aktualizace systému</string>
@@ -859,8 +860,8 @@
   <string name="no_filters_title">Nenastaven žádný filtr</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod statistiky</string>
-  <string name="anonymous_statistics_summary">Zlepšete CyanogenMod pomocí posíláním anonymních statistik</string>
+  <string name="anonymous_statistics_title">LineageOS statistiky</string>
+  <string name="anonymous_statistics_summary">Zlepšete LineageOS pomocí posíláním anonymních statistik</string>
   <string name="anonymous_statistics_warning_title">O aplikaci</string>
   <string name="anonymous_statistics_warning">Pokud povolíte zasílání anonymních statistik z vašeho zařízení odesílat statistická data bez vašich osobních údajů k vývojářům, jež umožní zjišťovat unikátnost instalace napříč všemi zařízeními. Data jsou odesílána během startu zařízení.\n\nDotykem na „Náhled dat“ se můžete podívat na příklad odesílaných dat.</string>
   <string name="enable_reporting_title">Povolit odesílání</string>
@@ -1007,7 +1008,7 @@
   <string name="interruptions_ignore_while_media_title">Zabránit potlačení hudby</string>
   <string name="interruptions_ignore_while_media_summary">Nesnižovat hlasitost přehrávané hudby při oznámení</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Právní ujednání CyanogenMod</string>
+  <string name="cmlicense_title">Právní ujednání LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Resetovat statistiky</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-csb-rPL/cm_strings.xml b/res/values-csb-rPL/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-csb-rPL/cm_strings.xml
+++ b/res/values-csb-rPL/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index ac84597..3fcb935 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -47,20 +48,20 @@
   <string name="root_appops_title">Administrer root adgang</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod-version</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS-version</string>
   <string name="mod_version_default">Ukendt</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Enhedsmodel</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Enhedens navn</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API niveau</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API niveau</string>
   <string name="mod_api_level_default">Ukendt</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Kørselsdato</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod-opdateringer</string>
+  <string name="cmupdate_settings_title">LineageOS-opdateringer</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Opdatér Cyanogen recovery</string>
   <string name="update_recovery_summary">Opdatér recovery med systemopdateringer</string>
@@ -842,10 +843,10 @@
   <string name="no_filters_title">Der er ingen filtre</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod-statistikker</string>
-  <string name="anonymous_statistics_summary">Hjælp med at gøre CyanogenMod bedre ved at deltage i rapportering af anonyme statistikker</string>
+  <string name="anonymous_statistics_title">LineageOS-statistikker</string>
+  <string name="anonymous_statistics_summary">Hjælp med at gøre LineageOS bedre ved at deltage i rapportering af anonyme statistikker</string>
   <string name="anonymous_statistics_warning_title">Om</string>
-  <string name="anonymous_statistics_warning">Deltagelse af CyanogenMod-statistikker vil tillade ikke-personlige data, der skal forelægges for udviklerne af CyanogenMod, at spore unikke installationer på tværs af enheder. De indsendte oplysninger omfatter en entydig indikator, som ikke kompromitterer dit privatliv eller personlige data. Dataene indsendes under hver opstart.\n\nFor et eksempel på de data, der er indsendt, skal du trykke på Få vist data.</string>
+  <string name="anonymous_statistics_warning">Deltagelse af LineageOS-statistikker vil tillade ikke-personlige data, der skal forelægges for udviklerne af LineageOS, at spore unikke installationer på tværs af enheder. De indsendte oplysninger omfatter en entydig indikator, som ikke kompromitterer dit privatliv eller personlige data. Dataene indsendes under hver opstart.\n\nFor et eksempel på de data, der er indsendt, skal du trykke på Få vist data.</string>
   <string name="enable_reporting_title">Aktivér rapportering</string>
   <string name="preview_data_title">Få vist data</string>
   <string name="view_stats_title">Vis statistikker</string>
@@ -979,7 +980,7 @@
   <string name="interruptions_ignore_while_media_title">Undgå lyddæmpning</string>
   <string name="interruptions_ignore_while_media_summary">Reducér ikke lydstyrken, når en meddelelse modtages</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Juridisk information for CyanogenMod</string>
+  <string name="cmlicense_title">Juridisk information for LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Nulstil statistikker</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 46b4553..eabecd0 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -54,20 +55,20 @@
   <string name="root_appops_summary">Anzeigen und Kontrollieren der Root-Regeln</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod-Version</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS-Version</string>
   <string name="mod_version_default">Unbekannt</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Gerätemodell</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Gerätename</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API-Level</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API-Level</string>
   <string name="mod_api_level_default">Unbekannt</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Build-Datum</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod-Updates</string>
+  <string name="cmupdate_settings_title">LineageOS-Updates</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">CM-Recovery aktualisieren</string>
   <string name="update_recovery_summary">Recovery bei Systemupdates aktualisieren</string>
@@ -857,10 +858,10 @@
   <string name="no_filters_title">Keine Filter aktiv</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod-Statistiken</string>
-  <string name="anonymous_statistics_summary">Helfen Sie uns, CyanogenMod zu verbessern, indem Sie dem Sammeln anonymer Gerätestatistiken zustimmen.</string>
+  <string name="anonymous_statistics_title">LineageOS-Statistiken</string>
+  <string name="anonymous_statistics_summary">Helfen Sie uns, LineageOS zu verbessern, indem Sie dem Sammeln anonymer Gerätestatistiken zustimmen.</string>
   <string name="anonymous_statistics_warning_title">Über</string>
-  <string name="anonymous_statistics_warning">Die Aktivierung der Cyanogenmod-Statistiken ermöglicht die Übertragung von nicht-personenbezogenen Daten an die Entwickler von CyanogenMod. Die bei jedem Neustart des Geräts übermittelten Daten beeinträchtigen nicht die Privatsphäre, da sie keinerlei Rückschlüsse auf den Benutzer zulassen.\n\nFür ein Beispiel der gesendeten Daten bitte auf \"Vorschau\" klicken.</string>
+  <string name="anonymous_statistics_warning">Die Aktivierung der Cyanogenmod-Statistiken ermöglicht die Übertragung von nicht-personenbezogenen Daten an die Entwickler von LineageOS. Die bei jedem Neustart des Geräts übermittelten Daten beeinträchtigen nicht die Privatsphäre, da sie keinerlei Rückschlüsse auf den Benutzer zulassen.\n\nFür ein Beispiel der gesendeten Daten bitte auf \"Vorschau\" klicken.</string>
   <string name="enable_reporting_title">Berichte einschalten</string>
   <string name="preview_data_title">Vorschau</string>
   <string name="view_stats_title">Statistiken anzeigen</string>
@@ -1006,7 +1007,7 @@
   <string name="interruptions_ignore_while_media_title">Audio-Dämpfung verhindern</string>
   <string name="interruptions_ignore_while_media_summary">Medienlautstärke beim Eintreffen einer Benachrichtigung nicht reduzieren</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Rechtliche Hinweise zu CyanogenMod</string>
+  <string name="cmlicense_title">Rechtliche Hinweise zu LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Statistik zurücksetzen</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 408c887..3f90f22 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -54,20 +55,20 @@
   <string name="root_appops_summary">Προβολή και έλεγχος των κανόνων root</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Έκδοση CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">Έκδοση LineageOS</string>
   <string name="mod_version_default">Άγνωστη</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Μοντέλο συσκευής</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Όνομα συσκευής</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Επίπεδο CyanogenMod API</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Επίπεδο LineageOS API</string>
   <string name="mod_api_level_default">Άγνωστη</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Ημερομηνία έκδοσης</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Ενημερώσεις CyanogenMod</string>
+  <string name="cmupdate_settings_title">Ενημερώσεις LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Ενημέρωση Cyanogen recovery</string>
   <string name="update_recovery_summary">Ενημέρωση της recovery με τις ενημερώσεις συστήματος</string>
@@ -856,11 +857,11 @@
   <string name="no_filters_title">Δεν έχουν οριστεί φίλτρα</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Στατιστικά CyanogenMod</string>
-  <string name="anonymous_statistics_summary">Βοηθήστε το CyanogenMod να γίνει καλύτερο ενεργοποιώντας την αποστολή ανώνυμων στατιστικών στοιχείων</string>
+  <string name="anonymous_statistics_title">Στατιστικά LineageOS</string>
+  <string name="anonymous_statistics_summary">Βοηθήστε το LineageOS να γίνει καλύτερο ενεργοποιώντας την αποστολή ανώνυμων στατιστικών στοιχείων</string>
   <string name="anonymous_statistics_warning_title">Σχετικά</string>
-  <string name="anonymous_statistics_warning">Ενεργοποιώντας τα στατιστικά του CyanogenMod επιτρέπετε την αποστολή
-        μη προσωπικών δεδομένων στους προγραμματιστές του CyanogenMod για παρακολούθηση του αριθμού μοναδικών εγκαταστάσεων
+  <string name="anonymous_statistics_warning">Ενεργοποιώντας τα στατιστικά του LineageOS επιτρέπετε την αποστολή
+        μη προσωπικών δεδομένων στους προγραμματιστές του LineageOS για παρακολούθηση του αριθμού μοναδικών εγκαταστάσεων
         σε όλες τις συσκευές. Οι πληροφορίες που αποστέλλονται συμπεριλαμβάνουν ένα μοναδικό αναγνωριστικό, το οποίο δεν θέτει
         σε κίνδυνο την ασφάλεια σας ή τα προσωπικά δεδομένα. Τα δεδομένα αποστέλλονται σε κάθε εκκίνηση.\n\nΓια ένα παράδειγμα
         των δεδομένων που αποστέλλονται, πατήστε στην Προεπισκόπηση δεδομένων.</string>
@@ -1005,7 +1006,7 @@
   <string name="interruptions_ignore_while_media_title">Πρόληψη μείωσης έντασης πολυμέσων</string>
   <string name="interruptions_ignore_while_media_summary">Να μη μειώνεται η ένταση της αναπαραγωγής πολυμέσων όταν φτάνει μια ειδοποίηση</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Νομικές πληροφορίες CyanogenMod</string>
+  <string name="cmlicense_title">Νομικές πληροφορίες LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Επαναφορά στατιστικών</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index 6e9fbf5..dddae3f 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -44,17 +45,17 @@
   <string name="root_access_all">Apps and ADB</string>
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod version</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS version</string>
   <string name="mod_version_default">Unknown</string>
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <string name="mod_api_level_default">Unknown</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Build date</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod updates</string>
+  <string name="cmupdate_settings_title">LineageOS updates</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Update Cyanogen recovery</string>
   <string name="update_recovery_summary">Update recovery with system updates</string>
@@ -747,7 +748,7 @@
   <string name="interruptions_ignore_while_media_title">Prevent audio ducking</string>
   <string name="interruptions_ignore_while_media_summary">Do not reduce media playback volume when a notification arrives</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod legal</string>
+  <string name="cmlicense_title">LineageOS legal</string>
   <!-- Menu label for reset the battery stats -->
   <!-- Reset stats confirmation dialog's message -->
   <!-- Dock battery not present message -->
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index 038d40c..b76ef67 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index db16a60..34a574c 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -45,20 +46,20 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod version</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS version</string>
   <string name="mod_version_default">Unknown</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Device model</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Device name</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API level</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API level</string>
   <string name="mod_api_level_default">Unknown</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Build date</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod updates</string>
+  <string name="cmupdate_settings_title">LineageOS updates</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Update Cyanogen recovery</string>
   <string name="update_recovery_summary">Update recovery with system updates</string>
@@ -774,11 +775,11 @@
   <string name="no_filters_title">No filters set</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod statistics</string>
-  <string name="anonymous_statistics_summary">Help make CyanogenMod better by opting into anonymous statistics reporting</string>
+  <string name="anonymous_statistics_title">LineageOS statistics</string>
+  <string name="anonymous_statistics_summary">Help make LineageOS better by opting into anonymous statistics reporting</string>
   <string name="anonymous_statistics_warning_title">About</string>
-  <string name="anonymous_statistics_warning">Opting into CyanogenMod Statistics will allow non-personal data to be submitted to the
-        developers of CyanogenMod to track unique installations across devices. The information submitted includes an unique identifier,
+  <string name="anonymous_statistics_warning">Opting into LineageOS Statistics will allow non-personal data to be submitted to the
+        developers of LineageOS to track unique installations across devices. The information submitted includes an unique identifier,
         which does not compromise your privacy or personal data. The data is submitted during each boot.\n\nFor an example of the data that is submitted, tap on Preview Data.</string>
   <string name="enable_reporting_title">Enable reporting</string>
   <string name="preview_data_title">Preview data</string>
@@ -886,7 +887,7 @@
   <string name="interruptions_ignore_while_media_title">Prevent audio ducking</string>
   <string name="interruptions_ignore_while_media_summary">Do not reduce media playback volume when a notification arrives</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod legal</string>
+  <string name="cmlicense_title">LineageOS legal</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Reset stats</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-en-rPT/cm_strings.xml
+++ b/res/values-en-rPT/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index 1dbcd0e..ab373c4 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,11 +29,11 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <string name="mod_version_default">Nekonata</string>
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <string name="mod_api_level_default">Nekonata</string>
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
diff --git a/res/values-es-rCO/cm_strings.xml b/res/values-es-rCO/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-es-rCO/cm_strings.xml
+++ b/res/values-es-rCO/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
index f874b7c..8c97c67 100644
--- a/res/values-es-rMX/cm_strings.xml
+++ b/res/values-es-rMX/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,11 +29,11 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Nivel de API de CyanogenMod</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Nivel de API de LineageOS</string>
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 910f2e6..de7a9f0 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -45,22 +46,22 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Versión de CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">Versión de LineageOS</string>
   <string name="mod_version_default">Desconocido</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Modelo de dispositivo</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Nombre del dispositivo</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Nivel de API de CyanogenMod</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Nivel de API de LineageOS</string>
   <string name="mod_api_level_default">Desconocido</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Fecha de compilación</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Actualizaciones de CyanogenMod</string>
+  <string name="cmupdate_settings_title">Actualizaciones de LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
-  <string name="update_recovery_title">Actualizar recovery de CyanogenMod</string>
+  <string name="update_recovery_title">Actualizar recovery de LineageOS</string>
   <string name="update_recovery_summary">Actualizar recovery con las actualizaciones del sistema</string>
   <string name="update_recovery_on_warning">AVISO: Con esta característica activada, la recuperación instalada se reemplazará por la incluida en la versión actual del sistema.\n\nLa recuperación se actualizará junto con algunas mejoras en el sistema, lo que garantiza la compatibilidad con versiones futuras.\n\n¿Quieres activar esta característica?</string>
   <string name="update_recovery_off_warning">ADVERTENCIA: Con esta característica desactivada, la recuperación instalada no se actualizará con las actualizaciones del sistema.\n\nQuizás no sea posible instalar versiones futuras del sistema con una recuperación no actualizada o no compatible.\n\n¿Quieres desactivar esta característica?</string>
@@ -840,10 +841,10 @@
   <string name="no_filters_title">No hay filtros establecidos</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Estadísticas CyanogenMod</string>
-  <string name="anonymous_statistics_summary">Ayuda a mejorar CyanogenMod mediante el envío anónimo de estadísticas</string>
+  <string name="anonymous_statistics_title">Estadísticas LineageOS</string>
+  <string name="anonymous_statistics_summary">Ayuda a mejorar LineageOS mediante el envío anónimo de estadísticas</string>
   <string name="anonymous_statistics_warning_title">Acerca de</string>
-  <string name="anonymous_statistics_warning">Al permitir la recopilación y el envío de estadísticas de CyanogenMod, autorizas el envío de información de carácter no personal a los desarrolladores de CyanogenMod para hacer un seguimiento de las instalaciones que realices en los dispositivos. La información enviada incluye un identificador único que no compromete tu privacidad ni tu información personal. Esta información es enviada durante el arranque.\n\nPara ver un ejemplo de la información enviada, pulsa en \u00ABPrevisualizar datos\u00BB.</string>
+  <string name="anonymous_statistics_warning">Al permitir la recopilación y el envío de estadísticas de LineageOS, autorizas el envío de información de carácter no personal a los desarrolladores de LineageOS para hacer un seguimiento de las instalaciones que realices en los dispositivos. La información enviada incluye un identificador único que no compromete tu privacidad ni tu información personal. Esta información es enviada durante el arranque.\n\nPara ver un ejemplo de la información enviada, pulsa en \u00ABPrevisualizar datos\u00BB.</string>
   <string name="enable_reporting_title">Activar envío de estadísticas</string>
   <string name="preview_data_title">Previsualizar datos</string>
   <string name="view_stats_title">Ver estadísticas</string>
@@ -985,7 +986,7 @@
   <string name="interruptions_ignore_while_media_title">Prevenir reducción de audio</string>
   <string name="interruptions_ignore_while_media_summary">No reducir el volumen de reproducción cuando llegue una notificación</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Licencia de CyanogenMod</string>
+  <string name="cmlicense_title">Licencia de LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Restablecer estadísticas</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 8a3f980..6d2de53 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -45,20 +46,20 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Versión de CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">Versión de LineageOS</string>
   <string name="mod_version_default">Desconocida</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Modelo del dispositivo</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Nombre del dispositivo</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Nivel de la API de CyanogenMod</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Nivel de la API de LineageOS</string>
   <string name="mod_api_level_default">Desconocida</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Fecha de compilación</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Actualizaciones de CyanogenMod</string>
+  <string name="cmupdate_settings_title">Actualizaciones de LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Actualizar recovery de Cyanogen</string>
   <string name="update_recovery_summary">Actualizar recovery con las actualizaciones del sistema</string>
@@ -842,10 +843,10 @@
   <string name="no_filters_title">No hay filtros establecidos</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Estadísticas CyanogenMod</string>
-  <string name="anonymous_statistics_summary">Ayuda a mejorar CyanogenMod mediante el envío anónimo de estadísticas</string>
+  <string name="anonymous_statistics_title">Estadísticas LineageOS</string>
+  <string name="anonymous_statistics_summary">Ayuda a mejorar LineageOS mediante el envío anónimo de estadísticas</string>
   <string name="anonymous_statistics_warning_title">Acerca de</string>
-  <string name="anonymous_statistics_warning">Permitiendo la recopilación y envío de estadísticas de CyanogenMod, autorizas el envío de información de carácter no personal a los desarrolladores de CyanogenMod para hacer un seguimiento de las instalaciones que realices en los dispositivos. La información enviada incluye un identificador único que no compromete tu privacidad ni tu información personal. Esta información es enviada durante el arranque.\n\nPara ver un ejemplo de la información enviada, pulsa en Previsualizar datos.</string>
+  <string name="anonymous_statistics_warning">Permitiendo la recopilación y envío de estadísticas de LineageOS, autorizas el envío de información de carácter no personal a los desarrolladores de LineageOS para hacer un seguimiento de las instalaciones que realices en los dispositivos. La información enviada incluye un identificador único que no compromete tu privacidad ni tu información personal. Esta información es enviada durante el arranque.\n\nPara ver un ejemplo de la información enviada, pulsa en Previsualizar datos.</string>
   <string name="enable_reporting_title">Activar envío de estadísticas</string>
   <string name="preview_data_title">Previsualizar datos</string>
   <string name="view_stats_title">Ver estadísticas</string>
@@ -987,7 +988,7 @@
   <string name="interruptions_ignore_while_media_title">Prevenir reducción de audio</string>
   <string name="interruptions_ignore_while_media_summary">No reducir el volumen de reproducción cuando llegue una notificación</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Licencia de CyanogenMod</string>
+  <string name="cmlicense_title">Licencia de LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Restablecer estadísticas</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index 467b473..b71ec47 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -45,19 +46,19 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod versioon</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS versioon</string>
   <string name="mod_version_default">Teadmata</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Seadme mudel</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Seadme nimi</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <string name="mod_api_level_default">Teadmata</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Kooste kuupäev</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod uuendused</string>
+  <string name="cmupdate_settings_title">LineageOS uuendused</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Uuenda Cyanogeni taasterežiimi</string>
   <string name="update_recovery_summary">Uuenda recovery süsteemi uuendusega</string>
@@ -762,10 +763,10 @@
   <string name="no_filters_title">Filtreid pole seatud</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod statistika</string>
-  <string name="anonymous_statistics_summary">Aita muuta CyanogenMod paremaks, osaledes anonüümse statistika kogumises</string>
+  <string name="anonymous_statistics_title">LineageOS statistika</string>
+  <string name="anonymous_statistics_summary">Aita muuta LineageOS paremaks, osaledes anonüümse statistika kogumises</string>
   <string name="anonymous_statistics_warning_title">Üldist</string>
-  <string name="anonymous_statistics_warning">Osaledes CyanogenMod statiatika kogumises, võimaldad isikustamata teabe saatmist
+  <string name="anonymous_statistics_warning">Osaledes LineageOS statiatika kogumises, võimaldad isikustamata teabe saatmist
 arendajatele jälgimaks unikaalseid installatsioone üle seadmete. Infole lisatakae unikaalne tunnus,
 mis ei ohusta sinu privaatsust ega isiklikku infot. Teave saadetakse peale igat süateemi üleslaadimiat.\n\nEdastatava info näidise nägemiseks koputa Info eelvaatel.</string>
   <string name="enable_reporting_title">Luba raporteerimine</string>
@@ -870,7 +871,7 @@ mis ei ohusta sinu privaatsust ega isiklikku infot. Teave saadetakse peale igat
   <string name="interruptions_ignore_while_media_title">Enneta heli sumbumist</string>
   <string name="interruptions_ignore_while_media_summary">Ära alanda meedia helitugevust teavituse saabumisel</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod juriidiline info</string>
+  <string name="cmlicense_title">LineageOS juriidiline info</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Nulli statistika</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index eaa76f9..8f90708 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -54,20 +55,20 @@
   <string name="root_appops_summary">Ikusi eta kontrolatu root arauak</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod bertsioa</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS bertsioa</string>
   <string name="mod_version_default">Ezezaguna</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Gailuaren modeloa</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Gailuaren izena</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API maila</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API maila</string>
   <string name="mod_api_level_default">Ezezaguna</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Konpilatze data</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod eguneraketak</string>
+  <string name="cmupdate_settings_title">LineageOS eguneraketak</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Eguneratu Cyanogen berreskuratzea</string>
   <string name="update_recovery_summary">Eguneratu berreskuratzea sistema eguneraketekin</string>
@@ -857,10 +858,10 @@
   <string name="no_filters_title">Ez da iragazkirik ezarri</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod estatistikak</string>
-  <string name="anonymous_statistics_summary">CyanogenMod hobetzen lagundu estatistika anonimoak bidaliz</string>
+  <string name="anonymous_statistics_title">LineageOS estatistikak</string>
+  <string name="anonymous_statistics_summary">LineageOS hobetzen lagundu estatistika anonimoak bidaliz</string>
   <string name="anonymous_statistics_warning_title">Honi buruz</string>
-  <string name="anonymous_statistics_warning">CyanogenMod estatistikak baimenduz, CyanogenMod garatzaileei pertsonala ez den informazioa bidaltzea baimentzen duzu, gailu desberdinetako instalazioei segimendua egitea baimentzen diena. Igorritako datuen artean identifikatzaile esklusibo bat dago, honek ez du zure pribatutasuna edo datu pertsonalak arriskuan jartzen. Datuak abiarazte bakoitzean bidaltzen dira.\n\nIgorriko liratekeen datuen adibide bat ikusteko sakatu Aurreikusi Datuak.</string>
+  <string name="anonymous_statistics_warning">LineageOS estatistikak baimenduz, LineageOS garatzaileei pertsonala ez den informazioa bidaltzea baimentzen duzu, gailu desberdinetako instalazioei segimendua egitea baimentzen diena. Igorritako datuen artean identifikatzaile esklusibo bat dago, honek ez du zure pribatutasuna edo datu pertsonalak arriskuan jartzen. Datuak abiarazte bakoitzean bidaltzen dira.\n\nIgorriko liratekeen datuen adibide bat ikusteko sakatu Aurreikusi Datuak.</string>
   <string name="enable_reporting_title">Gaitu txosten bidalketa</string>
   <string name="preview_data_title">Aurreikusi datuak</string>
   <string name="view_stats_title">Ikusi estatistikak</string>
@@ -1006,7 +1007,7 @@
   <string name="interruptions_ignore_while_media_title">Ekidin beherakadak audioan</string>
   <string name="interruptions_ignore_while_media_summary">Ez gutxiagotu multimedia erreprodukzioaren bolumena jakinarazpen bat jasotzean</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod lizentzia</string>
+  <string name="cmlicense_title">LineageOS lizentzia</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Ezabatu estatistikak</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index 28ea72f..3a209a6 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -45,14 +46,14 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">ان‌اف‌سی</string>
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <string name="mod_version">نسخه سایانوژن‌مود</string>
   <string name="mod_version_default">ناشناخته</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">مدل دستگاه</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">نام دستگاه</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <string name="mod_api_level_default">ناشناخته</string>
   <!-- About phone screen, build date -->
   <string name="build_date">تاریخ ساخت</string>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index e25ed80..18d6b44 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -54,20 +55,20 @@
   <string name="root_appops_summary">Tarkastele ja hallinnoi root-sääntöjä</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod-versio</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS-versio</string>
   <string name="mod_version_default">Tuntematon</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Laitteen malli</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Laitteen nimi</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API-taso</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API-taso</string>
   <string name="mod_api_level_default">Tuntematon</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Luontipäivä</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod-päivitykset</string>
+  <string name="cmupdate_settings_title">LineageOS-päivitykset</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Päivitä Cyanogen Recovery</string>
   <string name="update_recovery_summary">Päivitä Recovery-tila järjestelmäpäivityksen aikana</string>
@@ -857,10 +858,10 @@
   <string name="no_filters_title">Suodattimia ei asetettu</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod-tilastot</string>
-  <string name="anonymous_statistics_summary">Auta tekemään CyanogenModista parempi tarjoamalla anonyymejä tilastoraportteja</string>
+  <string name="anonymous_statistics_title">LineageOS-tilastot</string>
+  <string name="anonymous_statistics_summary">Auta tekemään LineageOSista parempi tarjoamalla anonyymejä tilastoraportteja</string>
   <string name="anonymous_statistics_warning_title">Tietoja</string>
-  <string name="anonymous_statistics_warning">CyanogenMod-tilastojen käyttöönotto mahdollistaa anonyymien tietojen lähettämisen CyanogenModin kehittäjille, jotta laitteiden järjestelmäasennuksia voidaan seurata. Tiedot sisältävät yksilöllisen tunnisteen, joka ei vaaranna henkilökohtaisia tietojasi. Tietoja lähetetään jokaisella uudelleenkäynnistyskerralla.\n\nValitse Esikatsele tietoja nähdäksesi, millaisia tietoja laitteestasi lähetetään.</string>
+  <string name="anonymous_statistics_warning">LineageOS-tilastojen käyttöönotto mahdollistaa anonyymien tietojen lähettämisen LineageOSin kehittäjille, jotta laitteiden järjestelmäasennuksia voidaan seurata. Tiedot sisältävät yksilöllisen tunnisteen, joka ei vaaranna henkilökohtaisia tietojasi. Tietoja lähetetään jokaisella uudelleenkäynnistyskerralla.\n\nValitse Esikatsele tietoja nähdäksesi, millaisia tietoja laitteestasi lähetetään.</string>
   <string name="enable_reporting_title">Ota raportointi käyttöön</string>
   <string name="preview_data_title">Esikatsele tietoja</string>
   <string name="view_stats_title">Näytä tilastot</string>
@@ -1006,7 +1007,7 @@
   <string name="interruptions_ignore_while_media_title">Estä äänen vaimennus</string>
   <string name="interruptions_ignore_while_media_summary">Älä hiljennä median toiston äänenvoimakkuutta ilmoituksen saapuessa</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenModin lakiasiat</string>
+  <string name="cmlicense_title">LineageOSin lakiasiat</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Nollaa tilastot</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-fil-rPH/cm_strings.xml
+++ b/res/values-fil-rPH/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-fr-rCA/cm_strings.xml
+++ b/res/values-fr-rCA/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index df8c16c..d9bbf06 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -48,20 +49,20 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="root_appops_summary">Visualiser et contrôler les règles root</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Version CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">Version LineageOS</string>
   <string name="mod_version_default">Inconnue</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Modèle de l\'appareil</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Nom de l\'appareil</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Niveau de l\'API CyanogenMod</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Niveau de l\'API LineageOS</string>
   <string name="mod_api_level_default">Inconnue</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Date de compilation</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Mises à jour CyanogenMod</string>
+  <string name="cmupdate_settings_title">Mises à jour LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Mettre à jour la récupération Cyanogen</string>
   <string name="update_recovery_summary">Mettre à jour la récupération avec les mises à jour système</string>
@@ -843,10 +844,10 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="no_filters_title">Aucun filtre défini</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">Statistiques CyanogenMod</string>
-  <string name="anonymous_statistics_summary">Aider CyanogenMod en participant à l\'envoi de données anonymes</string>
+  <string name="anonymous_statistics_title">Statistiques LineageOS</string>
+  <string name="anonymous_statistics_summary">Aider LineageOS en participant à l\'envoi de données anonymes</string>
   <string name="anonymous_statistics_warning_title">À propos</string>
-  <string name="anonymous_statistics_warning">Autoriser l\'envoi de statistiques permet aux développeurs du système CyanogenMod de collecter des données anonymes afin de comptabiliser le nombre d\'installations par type d\'appareil. Les informations envoyées contiennent un identifiant unique de l\'appareil et ne compromettent en aucune manière la sécurité de vos données. Ce jeu d\'informations est envoyé à chaque redémarrage.\n\nVous pouvez visualiser ces données en sélectionnant Prévisualiser les données.</string>
+  <string name="anonymous_statistics_warning">Autoriser l\'envoi de statistiques permet aux développeurs du système LineageOS de collecter des données anonymes afin de comptabiliser le nombre d\'installations par type d\'appareil. Les informations envoyées contiennent un identifiant unique de l\'appareil et ne compromettent en aucune manière la sécurité de vos données. Ce jeu d\'informations est envoyé à chaque redémarrage.\n\nVous pouvez visualiser ces données en sélectionnant Prévisualiser les données.</string>
   <string name="enable_reporting_title">Activer l\'envoi</string>
   <string name="preview_data_title">Prévisualiser les données</string>
   <string name="view_stats_title">Afficher les statistiques</string>
@@ -992,7 +993,7 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="interruptions_ignore_while_media_title">Empêcher l\'atténuation audio</string>
   <string name="interruptions_ignore_while_media_summary">Ne pas réduire le volume de lecture de médias lors d\'une notification</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Infos légales CyanogenMod</string>
+  <string name="cmlicense_title">Infos légales LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Réinitialiser les statistiques</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-frp-rIT/cm_strings.xml b/res/values-frp-rIT/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-frp-rIT/cm_strings.xml
+++ b/res/values-frp-rIT/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
index 6ae8ac9..d71360b 100644
--- a/res/values-fy-rNL/cm_strings.xml
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-ga-rIE/cm_strings.xml b/res/values-ga-rIE/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-ga-rIE/cm_strings.xml
+++ b/res/values-ga-rIE/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-gd-rGB/cm_strings.xml
+++ b/res/values-gd-rGB/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index 430d9c9..f83c908 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -54,20 +55,20 @@
   <string name="root_appops_summary">Ver e xestionar as regras de root</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Versión de CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">Versión de LineageOS</string>
   <string name="mod_version_default">Descoñecido</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Modelo do dispositivo</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Nome do dispositivo</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Nivel API CyanogenMod</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Nivel API LineageOS</string>
   <string name="mod_api_level_default">Descoñecido</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Data de compilación</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Actualizacións de CyanogenMod</string>
+  <string name="cmupdate_settings_title">Actualizacións de LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Recuperación da actualización de Cyanogen</string>
   <string name="update_recovery_summary">Actualizar a recuperación coas actualizacións do sistema</string>
@@ -857,10 +858,10 @@
   <string name="no_filters_title">Non se estabeleceron filtros</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Estatísticas CyanogenMod</string>
+  <string name="anonymous_statistics_title">Estatísticas LineageOS</string>
   <string name="anonymous_statistics_summary">Axude a mellorar Cyanogen enviando informes de estatísiticas anónimas</string>
   <string name="anonymous_statistics_warning_title">Acerca de</string>
-  <string name="anonymous_statistics_warning">Optar polo envío de estatísticas CyanogenMod permitirá que se transmitan datos non personais aos desenvolvedores de CyanogenMod para rastrear intalacións únicas através dos dispositivos. Os datos transmitidos teñen un identificador único, que non compromete a súa privacidade ou datos persoais. Os datos serán enviados cada vez que se inicie.\n\nPara ver un exemplo dos datos van ser enviados, toque en Previsualizar datos.</string>
+  <string name="anonymous_statistics_warning">Optar polo envío de estatísticas LineageOS permitirá que se transmitan datos non personais aos desenvolvedores de LineageOS para rastrear intalacións únicas através dos dispositivos. Os datos transmitidos teñen un identificador único, que non compromete a súa privacidade ou datos persoais. Os datos serán enviados cada vez que se inicie.\n\nPara ver un exemplo dos datos van ser enviados, toque en Previsualizar datos.</string>
   <string name="enable_reporting_title">Activar envío de estatísticas</string>
   <string name="preview_data_title">Previsualizar datos</string>
   <string name="view_stats_title">Ver as estatísticas</string>
@@ -1006,7 +1007,7 @@
   <string name="interruptions_ignore_while_media_title">Previr a reducción de audio</string>
   <string name="interruptions_ignore_while_media_summary">Non reducir o volume de reprodución ao chegar unha notificación</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Licenza de CyanogenMod</string>
+  <string name="cmlicense_title">Licenza de LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Reiniciar estatísticas</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index 69f029e..df4e569 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -45,20 +46,20 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod સંસ્કરણ</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS સંસ્કરણ</string>
   <string name="mod_version_default">અજાણ્યો</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">ડિવાઇસ મૉડેલ</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">ઉપકરણનું નામ</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API સ્તર</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API સ્તર</string>
   <string name="mod_api_level_default">અજાણ્યો</string>
   <!-- About phone screen, build date -->
   <string name="build_date">બિલ્ડ તારીખ</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod અપડેટો</string>
+  <string name="cmupdate_settings_title">LineageOS અપડેટો</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Cyanogen રિકવરી અપડેટ કરો</string>
   <string name="update_recovery_summary">સિસ્ટમ અપડેટ્સથી રિકવરી અપડેટ કરો</string>
@@ -838,10 +839,10 @@
   <string name="no_filters_title">કોઇ ફિલ્ટર સેટ કરેલ નથી</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod આંકડા</string>
-  <string name="anonymous_statistics_summary">CyanogenModને વધુ સારું કરવામાં મદદ કરવા અનામી આંકડા અહેવાલીકરણ પસંદ કરો</string>
+  <string name="anonymous_statistics_title">LineageOS આંકડા</string>
+  <string name="anonymous_statistics_summary">LineageOSને વધુ સારું કરવામાં મદદ કરવા અનામી આંકડા અહેવાલીકરણ પસંદ કરો</string>
   <string name="anonymous_statistics_warning_title">વિશે</string>
-  <string name="anonymous_statistics_warning">CyanogenMod આંકડા પસંદ કરવાથી CyanogenModના ડેવેલપરોને બિન અંગત ડેટા સબમિટ કરવાની છૂટ મળશે જેથી તેઓ દરેક પ્રકારનાં ડિવાઇસેસના અનન્ય ઇન્સ્ટૉલેશનો ટ્રેક કરી શકે. સબમિટ કરેલ માહિતીમાં અનન્ય ઓળખકર્તાનો સમાવેશ છે જે તમારી ગોપનીયતા કે અંગત ડેટા સાથે તડજોડ કરતો નથી. પ્રત્યેક બૂટ દરમિયાનડેટા સબમિટ થાય છે.\n\nસબમિટ થયેલા ડેટાના ઉદાહરણ માટે પૂર્વાવલોકન ડેટા પર ટૅપ કરો.</string>
+  <string name="anonymous_statistics_warning">LineageOS આંકડા પસંદ કરવાથી LineageOSના ડેવેલપરોને બિન અંગત ડેટા સબમિટ કરવાની છૂટ મળશે જેથી તેઓ દરેક પ્રકારનાં ડિવાઇસેસના અનન્ય ઇન્સ્ટૉલેશનો ટ્રેક કરી શકે. સબમિટ કરેલ માહિતીમાં અનન્ય ઓળખકર્તાનો સમાવેશ છે જે તમારી ગોપનીયતા કે અંગત ડેટા સાથે તડજોડ કરતો નથી. પ્રત્યેક બૂટ દરમિયાનડેટા સબમિટ થાય છે.\n\nસબમિટ થયેલા ડેટાના ઉદાહરણ માટે પૂર્વાવલોકન ડેટા પર ટૅપ કરો.</string>
   <string name="enable_reporting_title">રિપોર્ટિંગ સક્ષમ કરો</string>
   <string name="preview_data_title">પૂર્વાવલોકન ડેટા</string>
   <string name="view_stats_title">આંકડા જુઓ</string>
@@ -982,7 +983,7 @@
   <string name="interruptions_ignore_while_media_title">ઑડિયો ડકિંગ રોકો</string>
   <string name="interruptions_ignore_while_media_summary">અધિસૂચનનું આગમન થાય ત્યારે મિડિયા પ્લેબૅક વોલ્યુમ ઘટાડો નહીં</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod lકાયદાકીય</string>
+  <string name="cmlicense_title">LineageOS lકાયદાકીય</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">આંકડા રિસેટ કરો</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index f4e9b56..0eb009f 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -44,14 +45,14 @@
   <string name="root_access_all">ऐप और एडीबी</string>
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <string name="mod_version">सियानोजेनमोड संस्करण</string>
   <string name="mod_version_default">अज्ञात</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">डिवाइस मॉडेल</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">डिवाइस का नाम</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <string name="mod_api_level_default">अज्ञात</string>
   <!-- About phone screen, build date -->
   <string name="build_date">बिल्ड तिथि</string>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 6d14a1a..d8f5a35 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -56,20 +57,20 @@
   <string name="root_appops_summary">Prikaz i kontrola root pravila</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod verzija</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS verzija</string>
   <string name="mod_version_default">Nepoznato</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Model uređaja</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Naziv uređaja</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API razina</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API razina</string>
   <string name="mod_api_level_default">Nepoznato</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Datum izdavanja</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod ažuriranja</string>
+  <string name="cmupdate_settings_title">LineageOS ažuriranja</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Ažuriraj Cyanogen recovery</string>
   <string name="update_recovery_summary">Ažuriraj recovery sa sistemom</string>
@@ -859,10 +860,10 @@
   <string name="no_filters_title">Nema postavljenih filtera</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod statistika</string>
-  <string name="anonymous_statistics_summary">Pomozite nam poboljšati CyanogenMod slanjem anonimnih statističkih izvješća</string>
+  <string name="anonymous_statistics_title">LineageOS statistika</string>
+  <string name="anonymous_statistics_summary">Pomozite nam poboljšati LineageOS slanjem anonimnih statističkih izvješća</string>
   <string name="anonymous_statistics_warning_title">O</string>
-  <string name="anonymous_statistics_warning">Omogućavanjem slanja CyanogenMod statistike dozvolit će se da se neosobni podaci dostave razvojnom timu CyanogenMod-a kako bi se pratio broj pojedinačnih instalacija na različite uređaje. Informacije koje se šalju sadrže jedinstvenu identifikaciju koja ne kompromitira privatnost ili osobne podatke. Podaci se šalju pri svakom pokretanju uređaja.\n\nZa primjer podataka koji se šalju, dodirnite pregled podataka.</string>
+  <string name="anonymous_statistics_warning">Omogućavanjem slanja LineageOS statistike dozvolit će se da se neosobni podaci dostave razvojnom timu LineageOS-a kako bi se pratio broj pojedinačnih instalacija na različite uređaje. Informacije koje se šalju sadrže jedinstvenu identifikaciju koja ne kompromitira privatnost ili osobne podatke. Podaci se šalju pri svakom pokretanju uređaja.\n\nZa primjer podataka koji se šalju, dodirnite pregled podataka.</string>
   <string name="enable_reporting_title">Omogući izvješća</string>
   <string name="preview_data_title">Pretpregled podataka</string>
   <string name="view_stats_title">Prikaz statistika</string>
@@ -1008,7 +1009,7 @@
   <string name="interruptions_ignore_while_media_title">Onemogući stišavanje audia</string>
   <string name="interruptions_ignore_while_media_summary">Nemoj utišati glasnoću reprodukcije medija kada pristigne obavijest</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod licenca</string>
+  <string name="cmlicense_title">LineageOS licenca</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Resetiraj statistiku</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 0b1c4f3..19d2c65 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -54,20 +55,20 @@
   <string name="root_appops_summary">Root szabályok megtekintése és kezelése</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod verzió</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS verzió</string>
   <string name="mod_version_default">Ismeretlen</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Eszköz modellje</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Eszköz neve</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API szint</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API szint</string>
   <string name="mod_api_level_default">Ismeretlen</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Build dátuma</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod frissítések</string>
+  <string name="cmupdate_settings_title">LineageOS frissítések</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">CM recovery frissítése</string>
   <string name="update_recovery_summary">Rendszerfrissítések telepítése közben frissítse a recovery-t</string>
@@ -856,10 +857,10 @@
   <string name="no_filters_title">Nincs szűrő beállítva</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod Statisztika</string>
-  <string name="anonymous_statistics_summary">Segítsen a CyanogenMod jobbá tételében, kapcsolja be a névtelen statisztikai adatok gyűjtését</string>
+  <string name="anonymous_statistics_title">LineageOS Statisztika</string>
+  <string name="anonymous_statistics_summary">Segítsen a LineageOS jobbá tételében, kapcsolja be a névtelen statisztikai adatok gyűjtését</string>
   <string name="anonymous_statistics_warning_title">Névjegy</string>
-  <string name="anonymous_statistics_warning">A CyanogenMod statisztika engedélyezése nem terjed ki személyes adatokra, csak egy egyedi azonosítóval azonosítjuk az eszközöket. A beküldött adatok beleértve az egyedi azonosítót, nem veszélyeztetik az adatvédelmi vagy személyes adatokat. A statisztika minden rendszerindításkor elküldésre kerül.\n\nAz elküldött adatok menüpont alatt tekintheti meg a statisztikai adatokat.</string>
+  <string name="anonymous_statistics_warning">A LineageOS statisztika engedélyezése nem terjed ki személyes adatokra, csak egy egyedi azonosítóval azonosítjuk az eszközöket. A beküldött adatok beleértve az egyedi azonosítót, nem veszélyeztetik az adatvédelmi vagy személyes adatokat. A statisztika minden rendszerindításkor elküldésre kerül.\n\nAz elküldött adatok menüpont alatt tekintheti meg a statisztikai adatokat.</string>
   <string name="enable_reporting_title">Statisztika engedélyezése</string>
   <string name="preview_data_title">Elküldött adatok</string>
   <string name="view_stats_title">Statisztika megtekintése</string>
@@ -1005,7 +1006,7 @@
   <string name="interruptions_ignore_while_media_title">Lehalkítás megelőzése</string>
   <string name="interruptions_ignore_while_media_summary">Ne csökkentse a lejátszott média hangerejét értesítés érkezésekor</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod jogi nyilatkozat</string>
+  <string name="cmlicense_title">LineageOS jogi nyilatkozat</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Statisztika törlése</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-hy-rAM/cm_strings.xml
+++ b/res/values-hy-rAM/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 18701a3..d56866d 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -52,20 +53,20 @@
   <string name="root_appops_summary">Lihat dan kontrol aturan akses root</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">Komunikasi jarak dekat</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Versi CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">Versi LineageOS</string>
   <string name="mod_version_default">Tidak diketahui</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Model perangkat</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Nama perangkat</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Tingkat API CyanogenMod</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Tingkat API LineageOS</string>
   <string name="mod_api_level_default">Tidak diketahui</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Tanggal pembuatan</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Pembaruan CyanogenMod</string>
+  <string name="cmupdate_settings_title">Pembaruan LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Perbarui Cyanogen recovery</string>
   <string name="update_recovery_summary">Perbarui recovery dengan pembaruan sistem</string>
@@ -855,10 +856,10 @@
   <string name="no_filters_title">Belum ada penyaring</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Statistik CyanogenMod</string>
-  <string name="anonymous_statistics_summary">Bantu CyanogenMod untuk menjadi lebih baik dengan memilih ikut dalam pelaporan statistik anonim</string>
+  <string name="anonymous_statistics_title">Statistik LineageOS</string>
+  <string name="anonymous_statistics_summary">Bantu LineageOS untuk menjadi lebih baik dengan memilih ikut dalam pelaporan statistik anonim</string>
   <string name="anonymous_statistics_warning_title">Mengenai</string>
-  <string name="anonymous_statistics_warning">Memilih ikut dalam Statistik CyanogenMod akan memungkinkan data nonpribadi dikirimkan kepada para pengembang CyanogenMod untuk melacak instalasi unik pada berbagai macam perangkat. Informasi yang dikirimkan berisi pengenal unik, dan tidak membahayakan privasi atau data pribadi Anda. Data dikirim setiap kali perangkat dibut.\n\nUntuk melihat contoh data yang akan dikirim, ketuk Pratinjau Data.</string>
+  <string name="anonymous_statistics_warning">Memilih ikut dalam Statistik LineageOS akan memungkinkan data nonpribadi dikirimkan kepada para pengembang LineageOS untuk melacak instalasi unik pada berbagai macam perangkat. Informasi yang dikirimkan berisi pengenal unik, dan tidak membahayakan privasi atau data pribadi Anda. Data dikirim setiap kali perangkat dibut.\n\nUntuk melihat contoh data yang akan dikirim, ketuk Pratinjau Data.</string>
   <string name="enable_reporting_title">Aktifkan pelaporan</string>
   <string name="preview_data_title">Pratinjau data</string>
   <string name="view_stats_title">Lihat statistik</string>
@@ -1004,7 +1005,7 @@
   <string name="interruptions_ignore_while_media_title">Cegah penurunan suara</string>
   <string name="interruptions_ignore_while_media_summary">Jangan kurangi volume pemutaran media ketika ada pemberitahuan baru</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Hukum CyanogenMod</string>
+  <string name="cmlicense_title">Hukum LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Atur ulang statistik</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-is-rIS/cm_strings.xml
+++ b/res/values-is-rIS/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 36dcfa6..2ab30b7 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -54,22 +55,22 @@
   <string name="root_appops_summary">Visualizza e controlla l\'utilizzo dei permessi root</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Versione CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">Versione LineageOS</string>
   <string name="mod_version_default">Sconosciuto</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Modello dispositivo</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Nome dispositivo</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Livello API CyanogenMod</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Livello API LineageOS</string>
   <string name="mod_api_level_default">Sconosciuto</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Data build</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Aggiornamento CyanogenMod</string>
+  <string name="cmupdate_settings_title">Aggiornamento LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
-  <string name="update_recovery_title">Aggiorna recovery CyanogenMod</string>
+  <string name="update_recovery_title">Aggiorna recovery LineageOS</string>
   <string name="update_recovery_summary">Aggiorna la recovery con gli aggiornamenti del sistema</string>
   <string name="update_recovery_on_warning">AVVISO: Quando questa funzionalità è attiva, la recovery installata sarà sostituita da una inclusa con la versione corrente del sistema.\n\nLa vostra recovery attuale verrà aggiornata con gli aggiornamenti di sistema, contribuendo a garantire la compatibilità con le future versioni.\n\nAttivare questa funzione?</string>
   <string name="update_recovery_off_warning">Attenzione: Quando questa funzionalità è disattivata, la recovery installata non verrà aggiornata con il sistema.\n\nFuturi aggiornamenti potrebbero non installarsi con recovery personalizzate o vecchie.\n\nDisattivare questa funzione?</string>
@@ -857,10 +858,10 @@
   <string name="no_filters_title">Nessun filtro impostato</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">Statistiche CyanogenMod</string>
+  <string name="anonymous_statistics_title">Statistiche LineageOS</string>
   <string name="anonymous_statistics_summary">Aiuta a migliorare Cyanogenmod consentendo l\'invio di statistiche anonime</string>
   <string name="anonymous_statistics_warning_title">Info</string>
-  <string name="anonymous_statistics_warning">Attivando le Statistiche CyanogenMod consentirai l\'invio di dati non personali
+  <string name="anonymous_statistics_warning">Attivando le Statistiche LineageOS consentirai l\'invio di dati non personali
         agli sviluppatori per contare il numero di installazioni sui dispositivi. Le informazioni inviate includono
         un\'identificatore unico che non compromette in alcun modo la tua privacy o dati personali.\n\nPer vedere un esempio di dati inviati, tocca Anteprima Dati.</string>
   <string name="enable_reporting_title">Attiva report</string>
@@ -1008,7 +1009,7 @@
   <string name="interruptions_ignore_while_media_title">Previeni abbassamento audio</string>
   <string name="interruptions_ignore_while_media_summary">Non ridurre il volume di riproduzione multimediale quando arriva una notifica</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Note legali CyanogenMod</string>
+  <string name="cmlicense_title">Note legali LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Reimposta statistiche</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index e1e0d56..0a892eb 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -58,20 +59,20 @@
   <string name="root_appops_summary">הצג ושלוט בחוקי גישת השורש</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">גרסת CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">גרסת LineageOS</string>
   <string name="mod_version_default">לא ידוע</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">דגם המכשיר</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">שם המכשיר</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">רמת ה-API של CyanogenMod</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">רמת ה-API של LineageOS</string>
   <string name="mod_api_level_default">לא ידוע</string>
   <!-- About phone screen, build date -->
   <string name="build_date">תאריך בנייה</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">עדכוני CyanogenMod</string>
+  <string name="cmupdate_settings_title">עדכוני LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">עדכן את השחזור של Cyanogen</string>
   <string name="update_recovery_summary">עדכן את השחזור יחד עם עדכוני מערכת</string>
@@ -860,10 +861,10 @@
   <string name="no_filters_title">לא הוגדרו מסננים</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">סטטיסטיקות CyanogenMod</string>
-  <string name="anonymous_statistics_summary">עזור לשפר את CyanogenMod על ידי דיווח סטטיסטיקות אנונימי</string>
+  <string name="anonymous_statistics_title">סטטיסטיקות LineageOS</string>
+  <string name="anonymous_statistics_summary">עזור לשפר את LineageOS על ידי דיווח סטטיסטיקות אנונימי</string>
   <string name="anonymous_statistics_warning_title">אודות</string>
-  <string name="anonymous_statistics_warning">הצטרפות לסטטיסטיקת CyanogenMod תאפשר שליחת מידע לא אישי למפתחי CyanogenMod על מנת לאתר התקנות שונות בין מכשירים. המידע הנשלח כולל מזהה ייחודי, אשר אינו פוגע בפרטיותך או במידע שלך. המידע נשלח עם כל אתחול.\n\nכדי לצפות בדוגמה של המידע, הקש על תצוגה מקדימה של נתונים.</string>
+  <string name="anonymous_statistics_warning">הצטרפות לסטטיסטיקת LineageOS תאפשר שליחת מידע לא אישי למפתחי LineageOS על מנת לאתר התקנות שונות בין מכשירים. המידע הנשלח כולל מזהה ייחודי, אשר אינו פוגע בפרטיותך או במידע שלך. המידע נשלח עם כל אתחול.\n\nכדי לצפות בדוגמה של המידע, הקש על תצוגה מקדימה של נתונים.</string>
   <string name="enable_reporting_title">הפעל דיווח</string>
   <string name="preview_data_title">תצוגה מקדימה של נתונים</string>
   <string name="view_stats_title">הצג סטטיסטיקות</string>
@@ -1009,7 +1010,7 @@
   <string name="interruptions_ignore_while_media_title">מנע שינוי עוצמת קול</string>
   <string name="interruptions_ignore_while_media_summary">אל תנמיך את עוצמת המוזיקה כאשר התראה מגיעה</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod משפטי</string>
+  <string name="cmlicense_title">LineageOS משפטי</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">איפוס סטטיסטיקות</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 1661f38..22f2a85 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -52,20 +53,20 @@
   <string name="root_appops_summary">ルートの規則を表示またはコントロールする</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenModバージョン</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOSバージョン</string>
   <string name="mod_version_default">不明</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">端末モデル</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">端末名</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod APIレベル</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS APIレベル</string>
   <string name="mod_api_level_default">不明</string>
   <!-- About phone screen, build date -->
   <string name="build_date">ビルド日時</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenModアップデート</string>
+  <string name="cmupdate_settings_title">LineageOSアップデート</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Cyanogenリカバリーをアップデート</string>
   <string name="update_recovery_summary">システムアップデートと同時にリカバリーをアップデートする</string>
@@ -855,10 +856,10 @@
   <string name="no_filters_title">フィルターが設定されていません</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenModの統計</string>
-  <string name="anonymous_statistics_summary">匿名の統計のレポートに同意してCyanogenModの改善に協力する</string>
+  <string name="anonymous_statistics_title">LineageOSの統計</string>
+  <string name="anonymous_statistics_summary">匿名の統計のレポートに同意してLineageOSの改善に協力する</string>
   <string name="anonymous_statistics_warning_title">情報</string>
-  <string name="anonymous_statistics_warning">CyanogenModの統計に同意すると、端末間のユニークインストール回数を調べるためにCyanogenModの開発者への非個人情報の送信を許可します。送信される情報にはユニークIDが含まれますが、プライバシーや個人データが危険にさらされることはありません。データはブート時に送信されます。\n\n送信されるデータの見本は[データをプレビュー]をタップして確認することができます。</string>
+  <string name="anonymous_statistics_warning">LineageOSの統計に同意すると、端末間のユニークインストール回数を調べるためにLineageOSの開発者への非個人情報の送信を許可します。送信される情報にはユニークIDが含まれますが、プライバシーや個人データが危険にさらされることはありません。データはブート時に送信されます。\n\n送信されるデータの見本は[データをプレビュー]をタップして確認することができます。</string>
   <string name="enable_reporting_title">レポートを有効化</string>
   <string name="preview_data_title">データをプレビュー</string>
   <string name="view_stats_title">統計を表示</string>
@@ -1004,7 +1005,7 @@
   <string name="interruptions_ignore_while_media_title">オーディオダッキングを無効化</string>
   <string name="interruptions_ignore_while_media_summary">通知が来たときにメディアの再生音量を下げないようにする</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod利用規約</string>
+  <string name="cmlicense_title">LineageOS利用規約</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">統計をリセット</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-ka-rGE/cm_strings.xml
+++ b/res/values-ka-rGE/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-kk-rKZ/cm_strings.xml
+++ b/res/values-kk-rKZ/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-km-rKH/cm_strings.xml
+++ b/res/values-km-rKH/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index ba364e9..696f76b 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -45,20 +46,20 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">ಎನ್ಎಫ್‍ಸಿ</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod ಆವೃತ್ತಿ</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS ಆವೃತ್ತಿ</string>
   <string name="mod_version_default">ಅಜ್ಞಾತ</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">ಸಾಧನ ಮಾದರಿ</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">ಸಾಧನ ಹೆಸರು</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <string name="mod_api_level">ಸೈನೋಜನ್ ಮೋಡ್ API ಮಟ್ಟ</string>
   <string name="mod_api_level_default">ಅಜ್ಞಾತ</string>
   <!-- About phone screen, build date -->
   <string name="build_date">ನಿರ್ಮಾಣ ದಿನಾಂಕ</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod ನವೀಕರಣೆಗಳು</string>
+  <string name="cmupdate_settings_title">LineageOS ನವೀಕರಣೆಗಳು</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Cyanogen ರಿಕವರಿ ನವೀಕರಿಸು</string>
   <string name="update_recovery_summary">ಸಿಸ್ಟಂ ನವೀಕರಣೆಗಳೊಂದಿಗೆ ರಿಕವರಿಯನ್ನು ನವೀಕರಿಸು</string>
@@ -837,11 +838,11 @@
   <string name="no_filters_title">ಯಾವುದೇ ಫಿಲ್ಟರ್‍ಗಳನ್ನು ಹೊಂದಿಸಿಲ್ಲ</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod ಅಂಕಿಅಂಶಗಳು</string>
-  <string name="anonymous_statistics_summary">ಅನಾಮಿಕ ಅಂಕಿಅಂಶಗಳ ವರದಿಸಲ್ಲಿಸುವಿಕೆಯನ್ನು ಆಯ್ದುಕೊಳ್ಳುವ ಮೂಲಕ CyanogenModನ್ನು ಉತ್ತಮವಾಗಿಸಲು ಸಹಕರಿಸಿ</string>
+  <string name="anonymous_statistics_title">LineageOS ಅಂಕಿಅಂಶಗಳು</string>
+  <string name="anonymous_statistics_summary">ಅನಾಮಿಕ ಅಂಕಿಅಂಶಗಳ ವರದಿಸಲ್ಲಿಸುವಿಕೆಯನ್ನು ಆಯ್ದುಕೊಳ್ಳುವ ಮೂಲಕ LineageOSನ್ನು ಉತ್ತಮವಾಗಿಸಲು ಸಹಕರಿಸಿ</string>
   <string name="anonymous_statistics_warning_title">ಕುರಿತು</string>
-  <string name="anonymous_statistics_warning">CyanogenMod ಅಂಕಿಅಂಶಗಳಿಗೆ ಆಯ್ದುಕೊಳ್ಳುವುದರಿಂದ ವಯಕ್ತಿಕವಲ್ಲದ ಡೇಟಾವನ್ನು ಸಲ್ಲಿಸುವುದರ ಮೂಲಕ
-        CyanogenMod ಡೆವಲಪರ್ಸ್‍ಗೆ ವಿಶಿಷ್ಟ ಸ್ಥಾಪನೆಗಳನ್ನು ಸಾಧನಗಳಾದ್ಯಂತ ಟ್ರ್ಯಾಕ್ ಮಾಡಲು ಅನುಮತಿಸುತ್ತದೆ. ಸಲ್ಲಿಸುವ ಮಾಹಿತಿಯು ಒಂದು ವಿಶಿಷ್ಟ ಗುರುತನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ,
+  <string name="anonymous_statistics_warning">LineageOS ಅಂಕಿಅಂಶಗಳಿಗೆ ಆಯ್ದುಕೊಳ್ಳುವುದರಿಂದ ವಯಕ್ತಿಕವಲ್ಲದ ಡೇಟಾವನ್ನು ಸಲ್ಲಿಸುವುದರ ಮೂಲಕ
+        LineageOS ಡೆವಲಪರ್ಸ್‍ಗೆ ವಿಶಿಷ್ಟ ಸ್ಥಾಪನೆಗಳನ್ನು ಸಾಧನಗಳಾದ್ಯಂತ ಟ್ರ್ಯಾಕ್ ಮಾಡಲು ಅನುಮತಿಸುತ್ತದೆ. ಸಲ್ಲಿಸುವ ಮಾಹಿತಿಯು ಒಂದು ವಿಶಿಷ್ಟ ಗುರುತನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ,
         ಅದು ನಿಮ್ಮ ಗೌಪ್ಯತೆ ಅಥವಾ ವಯಕ್ತಿಕ ಡೇಟಾವನ್ನು ರಾಜಿ ಮಾಡುವುದಿಲ್ಲ, ಡೇಟಾವನ್ನು ಪ್ರತೀ ಬೂಟ್‍ನ  ವೇಳೆ ಸಲ್ಲಿಸಲಾಗುತ್ತದೆ.\n\nಸಲ್ಲಿಸಲ್ಪಡುವ ಡೇಟಾದ ಒಂದು ಉದಾಹರಣೆಗಾಗಿ, ಡೇಟಾ ಮುನ್ನೋಟ ಸ್ಪರ್ಶಿಸಿ.</string>
   <string name="enable_reporting_title">ವರದಿ ಸಲ್ಲಿಸುವಿಕೆ ಸಕ್ರಿಯ</string>
   <string name="preview_data_title">ಡೇಟಾ ಮುನ್ನೋಟ</string>
@@ -983,7 +984,7 @@
   <string name="interruptions_ignore_while_media_title">ಆಡಿಯೋ ಮುಳುಗುವಿಕೆ ತಡೆಗಟ್ಟು</string>
   <string name="interruptions_ignore_while_media_summary">ಅಧಿಸೂಚನೆ ಆಗಮಿಸಿದಾಗ ಮಾಧ್ಯಮ ಪ್ಲೇ ಬ್ಯಾಕ್ ವಾಲ್ಯೂಂನ್ನು ಕಡಿಮೆ ಮಾಡಬೇಡ</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod ಕಾನೂನು</string>
+  <string name="cmlicense_title">LineageOS ಕಾನೂನು</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">ಅಂಕಿಅಂಶಗಳನ್ನು ಮರುಹೊಂದಿಸಿ</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index b43bedd..9798f02 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -44,20 +45,20 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod 버전</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS 버전</string>
   <string name="mod_version_default">알 수 없음</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">장치 모델</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">장치 이름</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API 레벨</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API 레벨</string>
   <string name="mod_api_level_default">알 수 없음</string>
   <!-- About phone screen, build date -->
   <string name="build_date">빌드 날짜</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod 업데이트</string>
+  <string name="cmupdate_settings_title">LineageOS 업데이트</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Cyanogen 리커버리 업데이트</string>
   <string name="update_recovery_summary">시스템을 업데이트할 때 리커버리 업데이트</string>
@@ -837,10 +838,10 @@
   <string name="no_filters_title">필터가 설정되지 않음</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod 통계</string>
-  <string name="anonymous_statistics_summary">익명의 통계 자료를 보내 CyanogenMod 개선에 도움 주기</string>
+  <string name="anonymous_statistics_title">LineageOS 통계</string>
+  <string name="anonymous_statistics_summary">익명의 통계 자료를 보내 LineageOS 개선에 도움 주기</string>
   <string name="anonymous_statistics_warning_title">정보</string>
-  <string name="anonymous_statistics_warning">CyanogenMod 통계를 사용하면 장치 고유의 설치 상태를 추적하기 위해 개인 정보를 포함하지 않은 정보가 CyanogenMod의 개발자로 전송됩니다. 정보는 매번 부팅할 때마다 전송됩니다.\n\n전송되는 정보를 보려면 데이터 미리 보기를 누르세요.</string>
+  <string name="anonymous_statistics_warning">LineageOS 통계를 사용하면 장치 고유의 설치 상태를 추적하기 위해 개인 정보를 포함하지 않은 정보가 LineageOS의 개발자로 전송됩니다. 정보는 매번 부팅할 때마다 전송됩니다.\n\n전송되는 정보를 보려면 데이터 미리 보기를 누르세요.</string>
   <string name="enable_reporting_title">보고 활성화</string>
   <string name="preview_data_title">데이터 미리 보기</string>
   <string name="view_stats_title">통계 보기</string>
@@ -982,7 +983,7 @@
   <string name="interruptions_ignore_while_media_title">재생 소리 줄이기 금지</string>
   <string name="interruptions_ignore_while_media_summary">알림시 미디어 재생 소리를 줄이지 않음</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod 법적 고지</string>
+  <string name="cmlicense_title">LineageOS 법적 고지</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">통계 재설정</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index ea43ac9..b978e89 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -40,14 +41,14 @@
   <string name="root_access_all">بەرنامەکان و ADB</string>
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <string name="mod_version">وەشانی کوردی</string>
   <string name="mod_version_default">نەناسراو</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">مۆدێلی ئامێر</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">ناوی ئامێر</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <string name="mod_api_level_default">نەناسراو</string>
   <!-- About phone screen, build date -->
   <string name="build_date">بنیاتنانی ڕۆژ</string>
diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-ky-rKG/cm_strings.xml
+++ b/res/values-ky-rKG/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 6eba308..f5ef31a 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -45,19 +46,19 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod-Versioun</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS-Versioun</string>
   <string name="mod_version_default">Onbekannt</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Apparatmodell</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Apparatnumm</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <string name="mod_api_level_default">Onbekannt</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Build-Datum</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod-Aktualiséierungen</string>
+  <string name="cmupdate_settings_title">LineageOS-Aktualiséierungen</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Cyanogen-Recovery aktualiséieren</string>
   <string name="update_recovery_summary">De Recovery-Programm zesumme mam System aktualiséieren</string>
@@ -806,10 +807,10 @@
   <string name="no_filters_title">Keng Filtere gesat</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod-Statistiken</string>
-  <string name="anonymous_statistics_summary">Duerch anonym Statistiken hëllefen, CyanogenMod ze verbesseren</string>
+  <string name="anonymous_statistics_title">LineageOS-Statistiken</string>
+  <string name="anonymous_statistics_summary">Duerch anonym Statistiken hëllefen, LineageOS ze verbesseren</string>
   <string name="anonymous_statistics_warning_title">Iwwer</string>
-  <string name="anonymous_statistics_warning">Duerch d\'Aktivéiere vun de CyanogenMod-Statistike ginn net-persounebezunnen Daten un d\'Entwéckler vu CyanogenMod iwwermëttelt, fir Unzuel un eenzelnen Installatiounen ze zielen. D\'Informatioun déi iwwerdroe gëtt enthält eng eendaiteg Identifikatiounsnummer, déi deng Privatsphär oder perséinlech Daten net beanträchtegt. D\'Datë gi bei all Systemstart iwwerdroen.\n\nFir e Beispill vun den iwwermëttelten Daten ze gesinn, dréck op \"Virschau vun den Donnéeën\".</string>
+  <string name="anonymous_statistics_warning">Duerch d\'Aktivéiere vun de LineageOS-Statistike ginn net-persounebezunnen Daten un d\'Entwéckler vu LineageOS iwwermëttelt, fir Unzuel un eenzelnen Installatiounen ze zielen. D\'Informatioun déi iwwerdroe gëtt enthält eng eendaiteg Identifikatiounsnummer, déi deng Privatsphär oder perséinlech Daten net beanträchtegt. D\'Datë gi bei all Systemstart iwwerdroen.\n\nFir e Beispill vun den iwwermëttelten Daten ze gesinn, dréck op \"Virschau vun den Donnéeën\".</string>
   <string name="enable_reporting_title">Berichter aschalten</string>
   <string name="preview_data_title">Virschau vun den Donnéeën</string>
   <string name="view_stats_title">Statistike kucken</string>
@@ -912,7 +913,7 @@
   <string name="interruptions_ignore_while_media_title">Ervirhiewe verhënneren</string>
   <string name="interruptions_ignore_while_media_summary">Medielautstäerkt net reduzéiere wann eng Notifikatioun empfaange gëtt</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Rechtlech Hiweiser iwwer CyanogenMod</string>
+  <string name="cmlicense_title">Rechtlech Hiweiser iwwer LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Statistiken zrécksetzen</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-lo-rLA/cm_strings.xml
+++ b/res/values-lo-rLA/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 9e3f59a..5e6b201 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -46,19 +47,19 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">„CyanogenMod“ versija</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">„LineageOS“ versija</string>
   <string name="mod_version_default">Nežinoma</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Įrenginio modelis</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Įrenginio pavadinimas</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <string name="mod_api_level_default">Nežinoma</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Surinkimo data</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">„CyanogenMod“ atnaujinimai</string>
+  <string name="cmupdate_settings_title">„LineageOS“ atnaujinimai</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Atnaujinti „Cyanogen“ atkūrimo programą</string>
   <string name="update_recovery_summary">Atnaujinti atkūrimo programą kartu su sistemos atnaujinimais</string>
@@ -763,10 +764,10 @@
   <string name="no_filters_title">Nenustatyti jokie filtrai</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">„CyanogenMod“ statistika</string>
-  <string name="anonymous_statistics_summary">Padėti tobulinti „CyanogenMod“ pasirenkant anoniminę statistikos ataskaitą</string>
+  <string name="anonymous_statistics_title">„LineageOS“ statistika</string>
+  <string name="anonymous_statistics_summary">Padėti tobulinti „LineageOS“ pasirenkant anoniminę statistikos ataskaitą</string>
   <string name="anonymous_statistics_warning_title">Apie</string>
-  <string name="anonymous_statistics_warning">Pasirenkant „CyanogenMod“ statistiką leis ne asmeniniams duomenims būti pateiktiems „CyanogenMod“ kūrėjams sekti unikalius diegimus visuose įrenginiuose. Pateikta informacija apima unikalų identifikatorių, kuris nedaro jokios žalos jūsų privatumui ar asmeniniams duomenims. Duomenys bus pateikti kiekvieno paleidimo metu.\n\nNorint peržiūrėti kokia informacija bus pateikta, bakstelėkite Peržiūrėti duomenis.</string>
+  <string name="anonymous_statistics_warning">Pasirenkant „LineageOS“ statistiką leis ne asmeniniams duomenims būti pateiktiems „LineageOS“ kūrėjams sekti unikalius diegimus visuose įrenginiuose. Pateikta informacija apima unikalų identifikatorių, kuris nedaro jokios žalos jūsų privatumui ar asmeniniams duomenims. Duomenys bus pateikti kiekvieno paleidimo metu.\n\nNorint peržiūrėti kokia informacija bus pateikta, bakstelėkite Peržiūrėti duomenis.</string>
   <string name="enable_reporting_title">Įgalinti ataskaitas</string>
   <string name="preview_data_title">Peržiūrėti duomenis</string>
   <string name="view_stats_title">Žiūrėti statistiką</string>
@@ -869,7 +870,7 @@
   <string name="interruptions_ignore_while_media_title">Neleisti garso sumažinimo</string>
   <string name="interruptions_ignore_while_media_summary">Nesumažinti medijos atkūrimo garsumo, kai gaunamas pranešimas</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Teisinė „CyanogenMod“ informacija</string>
+  <string name="cmlicense_title">Teisinė „LineageOS“ informacija</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Nustatyti iš naujo statistiką</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index dd4a947..a8f71d2 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -36,17 +37,17 @@
   <string name="root_access_all">Lietotnēm un ADB</string>
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod versija</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS versija</string>
   <string name="mod_version_default">Nezināms</string>
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <string name="mod_api_level_default">Nezināms</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Būvējuma datums</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod atjaunojumi</string>
+  <string name="cmupdate_settings_title">LineageOS atjaunojumi</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
@@ -533,7 +534,7 @@
   <string name="live_lock_screen_settings_button">Iestatījumi</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod atbildība</string>
+  <string name="cmlicense_title">LineageOS atbildība</string>
   <!-- Menu label for reset the battery stats -->
   <!-- Reset stats confirmation dialog's message -->
   <!-- Dock battery not present message -->
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-mk-rMK/cm_strings.xml
+++ b/res/values-mk-rMK/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index e75445e..cbca32c 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -45,20 +46,20 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod പതിപ്പ്</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS പതിപ്പ്</string>
   <string name="mod_version_default">അജ്ഞാതം</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">ഉപകരണ മോഡൽ</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">ഉപകരണത്തിന്റെ പേര്</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API ലെവൽ</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API ലെവൽ</string>
   <string name="mod_api_level_default">അജ്ഞാതം</string>
   <!-- About phone screen, build date -->
   <string name="build_date">ബിൽഡ് തീയതി</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod അപ്ഡേറ്റുകൾ</string>
+  <string name="cmupdate_settings_title">LineageOS അപ്ഡേറ്റുകൾ</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Cyanogen റിക്കവറി അപ്ഡേറ്റ് ചെയ്യുക</string>
   <string name="update_recovery_summary">സിസ്റ്റം അപ്ഡേറ്റുകളിലൂടെ റിക്കവറി അപ്ഡേറ്റ് ചെയ്യുക</string>
@@ -837,10 +838,10 @@
   <string name="no_filters_title">ഫിൽറ്ററുകള്‍ സജ്ജീകരിച്ചിട്ടില്ല</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod സ്ഥിതിവിവരക്കണക്കുകൾ</string>
-  <string name="anonymous_statistics_summary">അജ്ഞാത സ്ഥിതിവിവരക്കണക്കുകൾ റിപ്പോർട്ട് ചെയ്യുന്നത് തിരഞ്ഞെടുത്ത് CyanogenMod മികച്ചതാക്കാൻ സഹായിക്കുക</string>
+  <string name="anonymous_statistics_title">LineageOS സ്ഥിതിവിവരക്കണക്കുകൾ</string>
+  <string name="anonymous_statistics_summary">അജ്ഞാത സ്ഥിതിവിവരക്കണക്കുകൾ റിപ്പോർട്ട് ചെയ്യുന്നത് തിരഞ്ഞെടുത്ത് LineageOS മികച്ചതാക്കാൻ സഹായിക്കുക</string>
   <string name="anonymous_statistics_warning_title">ആമുഖം</string>
-  <string name="anonymous_statistics_warning">CyanogenMod സ്റ്റാറ്റിസ്റ്റിക്സ് തിരഞ്ഞെടുക്കുന്നതിലൂടെ ഉപകരണങ്ങളില്‍ വിശിഷ്ടമായ ഇൻസ്റ്റലേഷനുകൾ ട്രാക്കുചെയ്യുന്നതിന് സ്വകാര്യമല്ലാത്ത ഡാറ്റ CyanogenMod ഡെവലപ്പര്‍മാര്‍ക്ക് സമര്‍പ്പിക്കുന്നതാണ്. സമര്‍പ്പിക്കപ്പെടുന്ന വിവരങ്ങളില്‍ നിങ്ങളുടെ സ്വകാര്യതയെ അല്ലെങ്കിൽ സ്വകാര്യ ഡാറ്റയെ വിട്ടുവീഴ്ച ചെയ്യാത്ത ഒരു വിശിഷ്ട ഐഡന്റിഫയർ ഉൾപ്പെടുന്നു. ഓരോ ബൂട്ട് സമയത്തും ഡാറ്റ സമര്‍പ്പിക്കുന്നു.\n\nസമര്‍പ്പിച്ച ഡാറ്റയ്ക്ക് ഉദാഹരണത്തിനായി, പ്രിവ്യൂ ഡാറ്റ അമര്‍ത്തുക.</string>
+  <string name="anonymous_statistics_warning">LineageOS സ്റ്റാറ്റിസ്റ്റിക്സ് തിരഞ്ഞെടുക്കുന്നതിലൂടെ ഉപകരണങ്ങളില്‍ വിശിഷ്ടമായ ഇൻസ്റ്റലേഷനുകൾ ട്രാക്കുചെയ്യുന്നതിന് സ്വകാര്യമല്ലാത്ത ഡാറ്റ LineageOS ഡെവലപ്പര്‍മാര്‍ക്ക് സമര്‍പ്പിക്കുന്നതാണ്. സമര്‍പ്പിക്കപ്പെടുന്ന വിവരങ്ങളില്‍ നിങ്ങളുടെ സ്വകാര്യതയെ അല്ലെങ്കിൽ സ്വകാര്യ ഡാറ്റയെ വിട്ടുവീഴ്ച ചെയ്യാത്ത ഒരു വിശിഷ്ട ഐഡന്റിഫയർ ഉൾപ്പെടുന്നു. ഓരോ ബൂട്ട് സമയത്തും ഡാറ്റ സമര്‍പ്പിക്കുന്നു.\n\nസമര്‍പ്പിച്ച ഡാറ്റയ്ക്ക് ഉദാഹരണത്തിനായി, പ്രിവ്യൂ ഡാറ്റ അമര്‍ത്തുക.</string>
   <string name="enable_reporting_title">റിപ്പോർട്ടിംഗ് പ്രാപ്തമാക്കുക</string>
   <string name="preview_data_title">പ്രിവ്യൂ ഡാറ്റ</string>
   <string name="view_stats_title">സ്ഥിതിവിവരക്കണക്കുകൾ കാണുക</string>
@@ -981,7 +982,7 @@
   <string name="interruptions_ignore_while_media_title">ഓഡിയോ ഡക്കിംഗ് തടയുക</string>
   <string name="interruptions_ignore_while_media_summary">ഒരു അറിയിപ്പ് ലഭിക്കുമ്പോൾ മീഡിയ പ്ലേബാക്ക് വോളിയം കുറയ്ക്കരുത്</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod ലീഗല്‍</string>
+  <string name="cmlicense_title">LineageOS ലീഗല്‍</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">സ്ഥിതിവിവരക്കണക്കുകൾ പുനഃക്രമീകരിക്കാൻ</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-mn-rMN/cm_strings.xml
+++ b/res/values-mn-rMN/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index bb361d8..af2172b 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -45,20 +46,20 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod आवृत्ती</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS आवृत्ती</string>
   <string name="mod_version_default">अज्ञात</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">डिव्हाइस मॉडेल</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">डिव्हाइस नाव</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API लेव्हल</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API लेव्हल</string>
   <string name="mod_api_level_default">अज्ञात</string>
   <!-- About phone screen, build date -->
   <string name="build_date">बांधणी तारीख</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod अद्यतने</string>
+  <string name="cmupdate_settings_title">LineageOS अद्यतने</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Cyanogen पुनर्प्राप्ती अद्ययावत करा</string>
   <string name="update_recovery_summary">सिस्टिम अद्यतनांसह अद्यतने पुनर्प्राप्ती</string>
@@ -837,10 +838,10 @@
   <string name="no_filters_title">कोणतेही फिल्टर्स सेट नाहीत</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod आकडेवारी</string>
-  <string name="anonymous_statistics_summary">अनामिक आकडेवारी अहवाल देणे निवडून CyanogenMod अधिक चांगले करण्यास मदत करा</string>
+  <string name="anonymous_statistics_title">LineageOS आकडेवारी</string>
+  <string name="anonymous_statistics_summary">अनामिक आकडेवारी अहवाल देणे निवडून LineageOS अधिक चांगले करण्यास मदत करा</string>
   <string name="anonymous_statistics_warning_title">विषयी</string>
-  <string name="anonymous_statistics_warning">CyanogenMod आकडेवारी निवडल्यामुळे डिव्हाइसेवरील वैशिष्ट्यपूर्ण स्थापनेचा मागोवा घेण्यासाठी CyanogenMod च्या विकसकांकडे अ-वैयक्तिक डेटा सबमिट करण्यास परवानगी दिली जाईल. सबमिट केलेल्या माहितीमध्ये वैशिष्ट्यपूर्ण ओळखकर्त्याचा समावेश होतो, जो तुमच्या गुप्तता किंवा वैयक्तिक डेटाशी तडजोड करत नाही. डेटा प्रत्येक बूट दरम्यान सबमिट केला जातो.\n\nसबमिट केल्या जाणाऱ्या डेटाच्या उदाहरणासाठी, डेटा पूर्वावलोकन वर टॅप करा.</string>
+  <string name="anonymous_statistics_warning">LineageOS आकडेवारी निवडल्यामुळे डिव्हाइसेवरील वैशिष्ट्यपूर्ण स्थापनेचा मागोवा घेण्यासाठी LineageOS च्या विकसकांकडे अ-वैयक्तिक डेटा सबमिट करण्यास परवानगी दिली जाईल. सबमिट केलेल्या माहितीमध्ये वैशिष्ट्यपूर्ण ओळखकर्त्याचा समावेश होतो, जो तुमच्या गुप्तता किंवा वैयक्तिक डेटाशी तडजोड करत नाही. डेटा प्रत्येक बूट दरम्यान सबमिट केला जातो.\n\nसबमिट केल्या जाणाऱ्या डेटाच्या उदाहरणासाठी, डेटा पूर्वावलोकन वर टॅप करा.</string>
   <string name="enable_reporting_title">अहवाल देणे सक्षम करा</string>
   <string name="preview_data_title">डेटा पूर्वावलोकन</string>
   <string name="view_stats_title">आकडेवारी पाहा</string>
@@ -981,7 +982,7 @@
   <string name="interruptions_ignore_while_media_title">ऑडिओ डकिंगला प्रतिबंध करा</string>
   <string name="interruptions_ignore_while_media_summary">सूचना आल्यावर मिडिया प्लेबॅक ध्वनी कमी करू नका</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod लिगल</string>
+  <string name="cmlicense_title">LineageOS लिगल</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">आकडेवारी रीसेट करा</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-ms-rMY/cm_strings.xml
+++ b/res/values-ms-rMY/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-my-rMM/cm_strings.xml
+++ b/res/values-my-rMM/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 2f8d1a0..047952a 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -54,20 +55,20 @@
   <string name="root_appops_summary">Se over og endre root reglene</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod versjon</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS versjon</string>
   <string name="mod_version_default">Ukjent</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Enhetsmodell</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Enhetsnavn</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API nivå</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API nivå</string>
   <string name="mod_api_level_default">Ukjent</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Build-dato</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod oppdateringer</string>
+  <string name="cmupdate_settings_title">LineageOS oppdateringer</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Oppdater Cyanogen recovery</string>
   <string name="update_recovery_summary">Oppdater recovery med systemoppdateringer</string>
@@ -856,10 +857,10 @@
   <string name="no_filters_title">Ingen filtre valgt</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod statistikk</string>
-  <string name="anonymous_statistics_summary">Hjelp oss å gjøre CyanogenMod bedre ved å velge å sende inn anonym statistikkrapportering</string>
+  <string name="anonymous_statistics_title">LineageOS statistikk</string>
+  <string name="anonymous_statistics_summary">Hjelp oss å gjøre LineageOS bedre ved å velge å sende inn anonym statistikkrapportering</string>
   <string name="anonymous_statistics_warning_title">Om</string>
-  <string name="anonymous_statistics_warning">Ved å bli med i CyanogenMod statistikk vil ikke-personlige data bli sendt til utvilkerne av CyanogenMod for å spore antall unike installasjoner spredt over typer enheter. Informasjonen som sendes inkluderer en unik identitetskode, som ikke kompromitterer ditt personvern eller dine personlige data. Data blir sendt ved hver oppstart.\n\nFor ett eksempel over data som blir sendt, trykk på Forhåndsvis Data.</string>
+  <string name="anonymous_statistics_warning">Ved å bli med i LineageOS statistikk vil ikke-personlige data bli sendt til utvilkerne av LineageOS for å spore antall unike installasjoner spredt over typer enheter. Informasjonen som sendes inkluderer en unik identitetskode, som ikke kompromitterer ditt personvern eller dine personlige data. Data blir sendt ved hver oppstart.\n\nFor ett eksempel over data som blir sendt, trykk på Forhåndsvis Data.</string>
   <string name="enable_reporting_title">Aktiver rapportering</string>
   <string name="preview_data_title">Forhåndsvis data</string>
   <string name="view_stats_title">Vis statistikk</string>
@@ -1005,7 +1006,7 @@
   <string name="interruptions_ignore_while_media_title">Hindre lyd ducking</string>
   <string name="interruptions_ignore_while_media_summary">Ikke Reduser media avspillingsvolumet når en melding ankommer</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod juridisk</string>
+  <string name="cmlicense_title">LineageOS juridisk</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Tilbakestill statistikk</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-ne-rNP/cm_strings.xml
+++ b/res/values-ne-rNP/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 39045e1..b9f8bdd 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -54,20 +55,20 @@
   <string name="root_appops_summary">Root-instellingen bekijken en beheren</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod-versie</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS-versie</string>
   <string name="mod_version_default">Onbekend</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Model</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Apparaatnaam</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Niveau van CyanogenMod-API</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Niveau van LineageOS-API</string>
   <string name="mod_api_level_default">Onbekend</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Build-datum</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod-updates</string>
+  <string name="cmupdate_settings_title">LineageOS-updates</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Cyanogen-recovery bijwerken</string>
   <string name="update_recovery_summary">Recovery bijwerken met systeemupdates</string>
@@ -858,9 +859,9 @@
   <!-- 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">Statistieken</string>
-  <string name="anonymous_statistics_summary">Help CyanogenMod te verbeteren door anonieme statistieken te verzenden</string>
+  <string name="anonymous_statistics_summary">Help LineageOS te verbeteren door anonieme statistieken te verzenden</string>
   <string name="anonymous_statistics_warning_title">Over</string>
-  <string name="anonymous_statistics_warning">Door statistieken verzenden toe te staan worden tijdens het opstarten anonieme gegevens naar de ontwikkelaars van CyanogenMod verzonden om unieke installaties te kunnen volgen. In de gegevens zit een uniek id-nummer verwerkt, dat uw privacy niet schendt.\n\nOm een voorbeeld te zien, tikt u op \'Voorbeeld van gegevens\'.</string>
+  <string name="anonymous_statistics_warning">Door statistieken verzenden toe te staan worden tijdens het opstarten anonieme gegevens naar de ontwikkelaars van LineageOS verzonden om unieke installaties te kunnen volgen. In de gegevens zit een uniek id-nummer verwerkt, dat uw privacy niet schendt.\n\nOm een voorbeeld te zien, tikt u op \'Voorbeeld van gegevens\'.</string>
   <string name="enable_reporting_title">Statistieken verzenden</string>
   <string name="preview_data_title">Voorbeeld van gegevens</string>
   <string name="view_stats_title">Statistieken tonen</string>
@@ -1006,7 +1007,7 @@
   <string name="interruptions_ignore_while_media_title">Stabiel mediavolume</string>
   <string name="interruptions_ignore_while_media_summary">Mediavolume niet verminderen bij meldingen</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Juridische afdeling van CyanogenMod</string>
+  <string name="cmlicense_title">Juridische afdeling van LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Statistieken opnieuw instellen</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-oc-rFR/cm_strings.xml
+++ b/res/values-oc-rFR/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index e2fccf9..40b553e 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -45,14 +46,14 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <string name="mod_version">ସିଆନୋଜେନ୍‍ମୋଡ୍‍ ସଂସ୍କରଣ</string>
   <string name="mod_version_default">ଅଜ୍ଞାତ</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">ଡିଭାଇସ୍‍ ମଡେଲ୍‍</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">ଡିଭାଇସ୍ ନାମ</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <string name="mod_api_level">ସିଆନୋଜେନ୍‍ମୋଡ୍‍ API ସ୍ତର</string>
   <string name="mod_api_level_default">ଅଜ୍ଞାତ</string>
   <!-- About phone screen, build date -->
diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-pa-rIN/cm_strings.xml
+++ b/res/values-pa-rIN/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index fdd5655..553c11f 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -51,20 +52,20 @@
   <string name="root_appops_summary">Przeglądaj i kontroluj zasady roota</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Wersja CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">Wersja LineageOS</string>
   <string name="mod_version_default">Nieznana</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Model urządzenia</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Nazwa urządzenia</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Poziom API CyanogenMod</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Poziom API LineageOS</string>
   <string name="mod_api_level_default">Nieznana</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Data kompilacji</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Aktualizacje CyanogenMod</string>
+  <string name="cmupdate_settings_title">Aktualizacje LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Aktualizuj recovery Cyanogen</string>
   <string name="update_recovery_summary">Aktualizuj recovery wraz z aktualizacjami systemu</string>
@@ -847,11 +848,11 @@
   <string name="no_filters_title">Nie wybrano filtrów</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">Statystyki CyanogenMod</string>
-  <string name="anonymous_statistics_summary">Pomóż ulepszyć CyanogenMod, pozwalając na wysyłanie anonimowych statystyk</string>
+  <string name="anonymous_statistics_title">Statystyki LineageOS</string>
+  <string name="anonymous_statistics_summary">Pomóż ulepszyć LineageOS, pozwalając na wysyłanie anonimowych statystyk</string>
   <string name="anonymous_statistics_warning_title">O...</string>
-  <string name="anonymous_statistics_warning">Wyrażenie zgody na udział w Statystykach CyanogenMod zezwoli na przesył anonimowych danych do
-        developerów CyanogenMod, aby śledzić ilość unikalnych instalacji na urządzeniach . Informacje zawierają unikalny identyfikator,
+  <string name="anonymous_statistics_warning">Wyrażenie zgody na udział w Statystykach LineageOS zezwoli na przesył anonimowych danych do
+        developerów LineageOS, aby śledzić ilość unikalnych instalacji na urządzeniach . Informacje zawierają unikalny identyfikator,
        który nie narusza twojej prywatności lub prywatnych danych. Dane są wysyłane przy każdym uruchomieniu.\n\nAby zobaczyć przykład przesyłanych danych naciśnij Podgląd Danych.</string>
   <string name="enable_reporting_title">Włącz raportowanie</string>
   <string name="preview_data_title">Podgląd danych</string>
@@ -994,7 +995,7 @@
   <string name="interruptions_ignore_while_media_title">Zapobiegaj przerywaniu dźwięku</string>
   <string name="interruptions_ignore_while_media_summary">Nie zmniejszaj głośności odtwarzanych mediów, po odebraniu powiadomienia</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Informacje prawne CyanogenMod</string>
+  <string name="cmlicense_title">Informacje prawne LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Resetuj statystyki</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 05fdb64..a7028bd 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -54,20 +55,20 @@
   <string name="root_appops_summary">Visualizar e controlar as regras de superusuário</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Versão CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">Versão LineageOS</string>
   <string name="mod_version_default">Desconhecida</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Modelo do dispositivo</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Nome do dispositivo</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Nível de API CyanogenMod</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Nível de API LineageOS</string>
   <string name="mod_api_level_default">Desconhecida</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Data de compilação</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Atualizações CyanogenMod</string>
+  <string name="cmupdate_settings_title">Atualizações LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Atualizar a recuperação do Cyanogen</string>
   <string name="update_recovery_summary">Atualizar a recuperação com atualizações de sistema</string>
@@ -857,10 +858,10 @@
   <string name="no_filters_title">Nenhum filtro definido</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Estatísticas CyanogenMod</string>
-  <string name="anonymous_statistics_summary">Ajude a melhorar o CyanogenMod optando por enviar estatísticas anônimas</string>
+  <string name="anonymous_statistics_title">Estatísticas LineageOS</string>
+  <string name="anonymous_statistics_summary">Ajude a melhorar o LineageOS optando por enviar estatísticas anônimas</string>
   <string name="anonymous_statistics_warning_title">Sobre</string>
-  <string name="anonymous_statistics_warning">Optar por enviar estatísticas anônimas ao CyanogenMod permitirá que dados não-pessoais sejam enviados para os desenvolvedores do CyanogenMod para rastrear instalações únicas em dispositivos. As informações enviadas incluem um identificador único que não compromete sua privacidade ou dados pessoais. Os dados são enviados durante cada inicialização.\n\nPara ver um exemplo dos dados enviados, toque em \'Pré-visualizar dados\'.</string>
+  <string name="anonymous_statistics_warning">Optar por enviar estatísticas anônimas ao LineageOS permitirá que dados não-pessoais sejam enviados para os desenvolvedores do LineageOS para rastrear instalações únicas em dispositivos. As informações enviadas incluem um identificador único que não compromete sua privacidade ou dados pessoais. Os dados são enviados durante cada inicialização.\n\nPara ver um exemplo dos dados enviados, toque em \'Pré-visualizar dados\'.</string>
   <string name="enable_reporting_title">Ativar relatório</string>
   <string name="preview_data_title">Pré-visualizar dados</string>
   <string name="view_stats_title">Ver estatísticas</string>
@@ -1006,7 +1007,7 @@
   <string name="interruptions_ignore_while_media_title">Evitar a redução de áudio</string>
   <string name="interruptions_ignore_while_media_summary">Não reduz o volume de reprodução de mídia quando chega uma notificação</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Licença CyanogenMod</string>
+  <string name="cmlicense_title">Licença LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Redefinir estatísticas</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 05de7cd..ad7a74b 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -54,15 +55,15 @@
   <string name="root_appops_summary">Ver e controlar as regras de root</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Versão CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">Versão LineageOS</string>
   <string name="mod_version_default">Desconhecida</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Modelo do dispositivo</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Nome do dispositivo</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Nível de API CyanogenMod</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Nível de API LineageOS</string>
   <string name="mod_api_level_default">Desconhecida</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Data de compilação</string>
@@ -857,10 +858,10 @@
   <string name="no_filters_title">Sem filtros definidos</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Estatísticas CyanogenMod</string>
-  <string name="anonymous_statistics_summary">Ajude a melhorar a CyanogenMod optando por ativar o envio do relatório de estatísticas anónimas</string>
+  <string name="anonymous_statistics_title">Estatísticas LineageOS</string>
+  <string name="anonymous_statistics_summary">Ajude a melhorar a LineageOS optando por ativar o envio do relatório de estatísticas anónimas</string>
   <string name="anonymous_statistics_warning_title">Sobre</string>
-  <string name="anonymous_statistics_warning">Optar pelo envio de estatísticas CyanogenMod vai permitir que dados não pessoais sejam transmitidos aos desenvolvedores da CyanogenMod, para rastrearem instalações nos dispositivos. As informações submetidas incluem um identificador único, que não compromete a sua privacidade ou dados pessoais. Os dados são enviados durante cada inicialização.\n\nPara um exemplo dos dados que são enviados, toque em \'Pré-visualizar dados\'.</string>
+  <string name="anonymous_statistics_warning">Optar pelo envio de estatísticas LineageOS vai permitir que dados não pessoais sejam transmitidos aos desenvolvedores da LineageOS, para rastrearem instalações nos dispositivos. As informações submetidas incluem um identificador único, que não compromete a sua privacidade ou dados pessoais. Os dados são enviados durante cada inicialização.\n\nPara um exemplo dos dados que são enviados, toque em \'Pré-visualizar dados\'.</string>
   <string name="enable_reporting_title">Ativar relatório</string>
   <string name="preview_data_title">Pré-visualizar dados</string>
   <string name="view_stats_title">Ver estatísticas</string>
@@ -1006,7 +1007,7 @@
   <string name="interruptions_ignore_while_media_title">Prevenir a diminuição do áudio</string>
   <string name="interruptions_ignore_while_media_summary">Não diminuir o volume de reprodução de multimédia quando chega uma notificação</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Licença CyanogenMod</string>
+  <string name="cmlicense_title">Licença LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Repor estatísticas</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-rm/cm_strings.xml
+++ b/res/values-rm/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 2ca0aaf..05ef08a 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -45,19 +46,19 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">versiune CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">versiune LineageOS</string>
   <string name="mod_version_default">Necunoscut</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Modelul dispozitivului</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Numele dispozitivului</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <string name="mod_api_level_default">Necunoscut</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Dată compilare</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Actualizări CyanogenMod</string>
+  <string name="cmupdate_settings_title">Actualizări LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Actualizează Cyanogen recovery</string>
   <!-- Themes Settings -->
@@ -783,10 +784,10 @@
   <string name="no_filters_title">Niciun filtru setat</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">Statistici CyanogenMod</string>
-  <string name="anonymous_statistics_summary">Ajută-ne să facem CyanogenMod mai bun prin trimiterea de rapoarte anonime cu statistici</string>
+  <string name="anonymous_statistics_title">Statistici LineageOS</string>
+  <string name="anonymous_statistics_summary">Ajută-ne să facem LineageOS mai bun prin trimiterea de rapoarte anonime cu statistici</string>
   <string name="anonymous_statistics_warning_title">Despre</string>
-  <string name="anonymous_statistics_warning">Optând să trimiteți Statistici CyanogenMod, se permite dezvoltatorilor CyanogenMod să primească date ne-personale pentru a urmări instalările unice la o gama mare de dispozitive. Informația transmisă include un identificator unic, care nu vă compromite intimitatea sau datele personale. Datele sunt trimise la fiecare pornire a dispozitivului.\n\nPentru a vedea un exemplu de date ce se trimit, apăsați pe Previzualizare Date.</string>
+  <string name="anonymous_statistics_warning">Optând să trimiteți Statistici LineageOS, se permite dezvoltatorilor LineageOS să primească date ne-personale pentru a urmări instalările unice la o gama mare de dispozitive. Informația transmisă include un identificator unic, care nu vă compromite intimitatea sau datele personale. Datele sunt trimise la fiecare pornire a dispozitivului.\n\nPentru a vedea un exemplu de date ce se trimit, apăsați pe Previzualizare Date.</string>
   <string name="enable_reporting_title">Activare raportare</string>
   <string name="preview_data_title">Previzualizare date</string>
   <string name="view_stats_title">Vezi statistici</string>
@@ -904,7 +905,7 @@
   <string name="live_lock_screen_settings_button">Setări</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
-  <string name="cmlicense_title">Juridic CyanogenMod</string>
+  <string name="cmlicense_title">Juridic LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Resetare statistici</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 57834ea..712f758 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -56,15 +57,15 @@
   <string name="root_appops_summary">Просмотр и управление разрешениями для прав суперпользователя</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Версия CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">Версия LineageOS</string>
   <string name="mod_version_default">Неизвестно</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Модель устройства</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Имя устройства</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Версия API CyanogenMod</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Версия API LineageOS</string>
   <string name="mod_api_level_default">Неизвестно</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Дата сборки</string>
@@ -860,9 +861,9 @@
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
   <string name="anonymous_statistics_title">Отправка статистики</string>
-  <string name="anonymous_statistics_summary">Помогите сделать CyanogenMod лучше, разрешив сбор анонимной статистики</string>
+  <string name="anonymous_statistics_summary">Помогите сделать LineageOS лучше, разрешив сбор анонимной статистики</string>
   <string name="anonymous_statistics_warning_title">Сведения</string>
-  <string name="anonymous_statistics_warning">Анонимные отчёты позволяют разработчикам CyanogenMod отслеживать работу ОС на различных устройствах. Отправляемая информация включает название устройства, версию прошивки и уникальный идентификатор, что никаким образом не затрагивает Вашу конфиденциальность. Данные отправляются при каждой загрузке устройства.\n\nЧтобы просмотреть пример, нажмите «Просмотр данных».</string>
+  <string name="anonymous_statistics_warning">Анонимные отчёты позволяют разработчикам LineageOS отслеживать работу ОС на различных устройствах. Отправляемая информация включает название устройства, версию прошивки и уникальный идентификатор, что никаким образом не затрагивает Вашу конфиденциальность. Данные отправляются при каждой загрузке устройства.\n\nЧтобы просмотреть пример, нажмите «Просмотр данных».</string>
   <string name="enable_reporting_title">Разрешить сбор статистики</string>
   <string name="preview_data_title">Просмотр данных</string>
   <string name="view_stats_title">Просмотр статистики</string>
@@ -1008,7 +1009,7 @@
   <string name="interruptions_ignore_while_media_title">Не приглушать звук</string>
   <string name="interruptions_ignore_while_media_summary">Не снижать громкость воспроизведения мультимедиа при получении уведомлений</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Политика конфиденциальности CyanogenMod</string>
+  <string name="cmlicense_title">Политика конфиденциальности LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Сброс статистики</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index e0df1e7..fe94811 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -36,17 +37,17 @@
   <string name="root_access_all">යෙදුම් සහ ADB</string>
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod අනුවාදය</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS අනුවාදය</string>
   <string name="mod_version_default">නොදනී</string>
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <string name="mod_api_level_default">නොදනී</string>
   <!-- About phone screen, build date -->
   <string name="build_date">නිමැවූ දිනය</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod යාවත්කාලීනයන්</string>
+  <string name="cmupdate_settings_title">LineageOS යාවත්කාලීනයන්</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
@@ -541,7 +542,7 @@
   <string name="live_lock_screen_settings_button">සැකසීම්</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod නීතිමය තොරතුරු</string>
+  <string name="cmlicense_title">LineageOS නීතිමය තොරතුරු</string>
   <!-- Menu label for reset the battery stats -->
   <!-- Reset stats confirmation dialog's message -->
   <!-- Dock battery not present message -->
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 42b25db..d9fcbd8 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -56,20 +57,20 @@
   <string name="root_appops_summary">Zobraziť a spravovať pravidlá prístupu root</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Verzia CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">Verzia LineageOS</string>
   <string name="mod_version_default">Neznáme</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Model zariadenia</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Názov zariadenia</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API úroveň</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API úroveň</string>
   <string name="mod_api_level_default">Neznáme</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Dátum zostavy</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Aktualizácie CyanogenMod</string>
+  <string name="cmupdate_settings_title">Aktualizácie LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Aktualizovať Cyanogen recovery</string>
   <string name="update_recovery_summary">Aktualizovať recovery s aktualizáciami systému</string>
@@ -859,10 +860,10 @@
   <string name="no_filters_title">Nenastavené žiadne filtre</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">Štatistiky CyanogenMod</string>
-  <string name="anonymous_statistics_summary">Pomôžte zlepšiť CyanogenMod povolením anonymných štatistických hlásení</string>
+  <string name="anonymous_statistics_title">Štatistiky LineageOS</string>
+  <string name="anonymous_statistics_summary">Pomôžte zlepšiť LineageOS povolením anonymných štatistických hlásení</string>
   <string name="anonymous_statistics_warning_title">O aplikácii</string>
-  <string name="anonymous_statistics_warning">Povolením štatistík CyanogenMod súhlasíte s odosielaním neosobných údajov vývojárom CyanogenModu, na účel zaznamenávania inštalácií naprieč zariadeniami. Informácie obsahujú unikátny identifikátor, ktorý neohrozuje vaše súkromné alebo osobné údaje. Údaje sú odoslané pri každom spustení.\n\nNa ukážku odosielaných údajov kliknite na Prehľad údajov.</string>
+  <string name="anonymous_statistics_warning">Povolením štatistík LineageOS súhlasíte s odosielaním neosobných údajov vývojárom LineageOSu, na účel zaznamenávania inštalácií naprieč zariadeniami. Informácie obsahujú unikátny identifikátor, ktorý neohrozuje vaše súkromné alebo osobné údaje. Údaje sú odoslané pri každom spustení.\n\nNa ukážku odosielaných údajov kliknite na Prehľad údajov.</string>
   <string name="enable_reporting_title">Povoliť hlásenia</string>
   <string name="preview_data_title">Prehľad údajov</string>
   <string name="view_stats_title">Zobraziť štatistiky</string>
@@ -1008,7 +1009,7 @@
   <string name="interruptions_ignore_while_media_title">Zabrániť znižovaniu zvuku</string>
   <string name="interruptions_ignore_while_media_summary">Neznižovať hlasitosť pri prehrávaní médií po doručení upozornenia</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Právne informácie CyanogenMod</string>
+  <string name="cmlicense_title">Právne informácie LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Obnoviť štatistiky</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index daac0d6..c840954 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -58,20 +59,20 @@
   <string name="root_appops_summary">Ogled in nadzor skrbniških pravil</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Različica CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">Različica LineageOS</string>
   <string name="mod_version_default">Neznano</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Model naprave</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Ime naprave</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Raven API-ja CyanogenMod</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Raven API-ja LineageOS</string>
   <string name="mod_api_level_default">Neznano</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Datum izgradnje</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Posodobitve CyanogenMod</string>
+  <string name="cmupdate_settings_title">Posodobitve LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Posodobi obnovitev Cyanogen</string>
   <string name="update_recovery_summary">Posodobi obnovitev s sistemskimi posodobitvami</string>
@@ -861,11 +862,11 @@
   <string name="no_filters_title">Ni nastavljenih filtrov</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">Statistika CyanogenMod</string>
-  <string name="anonymous_statistics_summary">Pomagajte izboljšati CyanogenMod tako, da izberete pošiljanje anonimne statistike</string>
+  <string name="anonymous_statistics_title">Statistika LineageOS</string>
+  <string name="anonymous_statistics_summary">Pomagajte izboljšati LineageOS tako, da izberete pošiljanje anonimne statistike</string>
   <string name="anonymous_statistics_warning_title">O programu</string>
-  <string name="anonymous_statistics_warning">Izbira statistike CyanogenMod bo dovolila pošiljanje neosebnih podatkov
-        razvijalcem CyanogenModa, da lahko sledijo edinstvenim namestitvam v napravah. Poslani podatki vključujejo edinstven določilnik,
+  <string name="anonymous_statistics_warning">Izbira statistike LineageOS bo dovolila pošiljanje neosebnih podatkov
+        razvijalcem LineageOSa, da lahko sledijo edinstvenim namestitvam v napravah. Poslani podatki vključujejo edinstven določilnik,
         ki ne ogroža vaše zasebnosti in osebnih podatkov. Podatki so poslani ob vsakem zagonu.\n\nZa primer poslanih podatkov tapnite Predogled podatkov.</string>
   <string name="enable_reporting_title">Omogoči poročanje</string>
   <string name="preview_data_title">Predogled podatkov</string>
@@ -1017,7 +1018,7 @@
   <string name="interruptions_ignore_while_media_title">Prepreči zvočno izognitev</string>
   <string name="interruptions_ignore_while_media_summary">Ne zmanjšaj glasnosti predvajanja predstavnosti, ko prispe obvestilo</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Pravna obvestila CyanogenMod</string>
+  <string name="cmlicense_title">Pravna obvestila LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Ponastavi statistiko</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 897ad01..4aa4e32 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -56,15 +57,15 @@
   <string name="root_appops_summary">Види и контролиши правила рута</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod верзија</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS верзија</string>
   <string name="mod_version_default">Непознато</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Модел уређаја</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Име уређаја</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Ниво CyanogenMod API-а</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Ниво LineageOS API-а</string>
   <string name="mod_api_level_default">Непознато</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Датум израде</string>
@@ -858,10 +859,10 @@
   <string name="no_filters_title">Нема постављених филтера</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Статистике CyanogenMod-а</string>
-  <string name="anonymous_statistics_summary">Помози да CyanogenMod буде бољи слањем анонимних статистика</string>
+  <string name="anonymous_statistics_title">Статистике LineageOS-а</string>
+  <string name="anonymous_statistics_summary">Помози да LineageOS буде бољи слањем анонимних статистика</string>
   <string name="anonymous_statistics_warning_title">О</string>
-  <string name="anonymous_statistics_warning">Омогућавањем слања CyanogenMod статистикe дозволиће се да се нелични подаци доставе развојном тиму CyanogenMod-а како би се пратио број појединачних инсталација на различите уређаје. Информације које се шаљу садрже јединствену идентификацију која не компромитује приватност или личне податке. Подаци се шаљу при сваком покретању уређаја.\n\nЗа пример података који се шаљу, додирните преглед података.</string>
+  <string name="anonymous_statistics_warning">Омогућавањем слања LineageOS статистикe дозволиће се да се нелични подаци доставе развојном тиму LineageOS-а како би се пратио број појединачних инсталација на различите уређаје. Информације које се шаљу садрже јединствену идентификацију која не компромитује приватност или личне податке. Подаци се шаљу при сваком покретању уређаја.\n\nЗа пример података који се шаљу, додирните преглед података.</string>
   <string name="enable_reporting_title">Омогући извештавање</string>
   <string name="preview_data_title">Преглед података</string>
   <string name="view_stats_title">Погледај статистике</string>
@@ -1003,7 +1004,7 @@
   <string name="interruptions_ignore_while_media_title">Онемогући утишавање аудиа</string>
   <string name="interruptions_ignore_while_media_summary">Немој утишати јачину репродукције медија када обавештење пристигне</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod лиценца</string>
+  <string name="cmlicense_title">LineageOS лиценца</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Поништавање статистике</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 672a107..9b495e5 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -46,20 +47,20 @@
   <string name="root_appops_title">Hantera root-åtkomster</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod-version</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS-version</string>
   <string name="mod_version_default">Okänd</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Enhetsmodell</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Enhetsnamn</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API nivå</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API nivå</string>
   <string name="mod_api_level_default">Okänd</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Byggdatum</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod-uppdateringar</string>
+  <string name="cmupdate_settings_title">LineageOS-uppdateringar</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Uppdatera Cyanogen Recovery</string>
   <string name="update_recovery_summary">Uppdatera Recovery med systemuppdateringar</string>
@@ -840,11 +841,11 @@
   <string name="no_filters_title">Inga filter valda</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod-statistik</string>
-  <string name="anonymous_statistics_summary">Hjälp till att göra CyanogenMod bättre genom att skicka anonyma statistikrapporter</string>
+  <string name="anonymous_statistics_title">LineageOS-statistik</string>
+  <string name="anonymous_statistics_summary">Hjälp till att göra LineageOS bättre genom att skicka anonyma statistikrapporter</string>
   <string name="anonymous_statistics_warning_title">Om</string>
-  <string name="anonymous_statistics_warning">Att delta i CyanogenMod Statistics kommer tillåta att icke-personlig data kommer att skickas till
-        utvecklarna av CyanogenMod för att spåra unika installationer mellan enheter. Den delgivna informationen
+  <string name="anonymous_statistics_warning">Att delta i LineageOS Statistics kommer tillåta att icke-personlig data kommer att skickas till
+        utvecklarna av LineageOS för att spåra unika installationer mellan enheter. Den delgivna informationen
 inkluderar en unik identifikation,
         som inte riskerar din integritet eller personliga data. Data skickas vid varje uppstart av enheten.\n\nFör ett exempel på den data som skickas, tryck på Förhandsgranska data.</string>
   <string name="enable_reporting_title">Aktivera rapportering</string>
@@ -988,7 +989,7 @@ inkluderar en unik identifikation,
   <string name="interruptions_ignore_while_media_title">Undvik ljuddämpning</string>
   <string name="interruptions_ignore_while_media_summary">Minska inte ljudstyrkan för media när en avisering tas emot</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod Juridik</string>
+  <string name="cmlicense_title">LineageOS Juridik</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Återställ statistik</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-sw/cm_strings.xml
+++ b/res/values-sw/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index cd48448..ac4fdae 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -45,20 +46,20 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod பதிப்பு</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS பதிப்பு</string>
   <string name="mod_version_default">தெரியாதது</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">கருவி மாதிரி</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">சாதனத்தின் பெயர்</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API நிலை</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API நிலை</string>
   <string name="mod_api_level_default">தெரியாதது</string>
   <!-- About phone screen, build date -->
   <string name="build_date">கட்டிய தேதி</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod புதுப்பித்தல்கள்</string>
+  <string name="cmupdate_settings_title">LineageOS புதுப்பித்தல்கள்</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Cyanogen மீட்டலை புதுப்பி</string>
   <string name="update_recovery_summary">சிஸ்டம் புதுப்பித்தல்களுடன் மீட்டலை புதுப்பி</string>
@@ -837,10 +838,10 @@
   <string name="no_filters_title">வடிகட்டிகள் எதுவும் அமைக்கப்படவில்லை</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod புள்ளிவிவரங்கள்</string>
-  <string name="anonymous_statistics_summary">CyanogenMod மேம்பட்டு செயல்பட பெயரில்லா புள்ளிவிவர அறிவிப்பை தெரிந்துகொள்ளவும்</string>
+  <string name="anonymous_statistics_title">LineageOS புள்ளிவிவரங்கள்</string>
+  <string name="anonymous_statistics_summary">LineageOS மேம்பட்டு செயல்பட பெயரில்லா புள்ளிவிவர அறிவிப்பை தெரிந்துகொள்ளவும்</string>
   <string name="anonymous_statistics_warning_title">இதுபற்றி</string>
-  <string name="anonymous_statistics_warning">CyanogenMod புள்ளிவிவரங்களை தேர்ந்தெடுத்தல் தனிப்பட்டது அல்லாத தரவுகளை CyanogenMod உருவாக்கியவர்களுக்கு சமர்பிக்க அனுமதித்து கருவிகளுக்கு இடையே தனித்துவமான நிறுவல்களை கண்காணிக்க உதவும் சமர்பிக்கப்பட்ட தகவல்களில் ஒரு தனித்துவமான அடையாளம் காண்பான் உள்ளது, அது உங்கள் அந்தரங்கத்தை அல்லது தனிப்பட்ட தரவை சமரசம் செய்யாது. இந்த தரவு ஒவ்வொரு பூட்டிலும் சமர்பிக்கபப்டுகின்றது. \n\n சமர்பிக்கப்பட்ட தரவுகளுக்கான உதாரணத்திற்கு தரவுகள் முன்னோட்டத்தை தட்டவும்</string>
+  <string name="anonymous_statistics_warning">LineageOS புள்ளிவிவரங்களை தேர்ந்தெடுத்தல் தனிப்பட்டது அல்லாத தரவுகளை LineageOS உருவாக்கியவர்களுக்கு சமர்பிக்க அனுமதித்து கருவிகளுக்கு இடையே தனித்துவமான நிறுவல்களை கண்காணிக்க உதவும் சமர்பிக்கப்பட்ட தகவல்களில் ஒரு தனித்துவமான அடையாளம் காண்பான் உள்ளது, அது உங்கள் அந்தரங்கத்தை அல்லது தனிப்பட்ட தரவை சமரசம் செய்யாது. இந்த தரவு ஒவ்வொரு பூட்டிலும் சமர்பிக்கபப்டுகின்றது. \n\n சமர்பிக்கப்பட்ட தரவுகளுக்கான உதாரணத்திற்கு தரவுகள் முன்னோட்டத்தை தட்டவும்</string>
   <string name="enable_reporting_title">தெரிவித்தலை செயல்படுத்து</string>
   <string name="preview_data_title">தரவுகளை முன்னோட்டம்பார்</string>
   <string name="view_stats_title">புள்ளிவிவரங்களை காண்</string>
@@ -981,7 +982,7 @@
   <string name="interruptions_ignore_while_media_title">ஆடியோ டக்கிங்கை தடு</string>
   <string name="interruptions_ignore_while_media_summary">ஒரு அறிவுறுத்தல் வரும்போது ஊடக மறுஇயக்கம் வால்யூமை குறைக்காதே</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod சட்டம்</string>
+  <string name="cmlicense_title">LineageOS சட்டம்</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">புள்ளிவிவரங்களை மீட்டமை</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 17f4473..cbb2d72 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -45,14 +46,14 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <string name="mod_version">సయనోజెన్ మోడ్ సంస్కరణ</string>
   <string name="mod_version_default">తెలియదు</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">పరికరం మోడల్</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">పరికరం పేరు</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <string name="mod_api_level">సయనోజెన్ మోడ్ API స్థాయి</string>
   <string name="mod_api_level_default">తెలియదు</string>
   <!-- About phone screen, build date -->
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 552cb21..fa73875 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -44,20 +45,20 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">รุ่นของ CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">รุ่นของ LineageOS</string>
   <string name="mod_version_default">ไม่รู้จัก</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">รุ่นอุปกรณ์</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">ชื่ออุปกรณ์</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">ระดับ API ของ CyanogenMod</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">ระดับ API ของ LineageOS</string>
   <string name="mod_api_level_default">ไม่รู้จัก</string>
   <!-- About phone screen, build date -->
   <string name="build_date">วันที่สร้าง</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">การอัปเดตรุ่น CyanogenMod</string>
+  <string name="cmupdate_settings_title">การอัปเดตรุ่น LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">อัปเดตรุ่น Cyanogen recovery</string>
   <string name="update_recovery_summary">อัปเดตรุ่น recovery ด้วยการอัปเดตระบบ</string>
@@ -839,10 +840,10 @@
   <string name="no_filters_title">ไม่มีการตั้งค่าตัวกรอง</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">สถิติของ CyanogenMod</string>
-  <string name="anonymous_statistics_summary">ช่วยทำให้ CyanogenMod ดีขึ้นโดยการส่งรายงานสถิติแบบไม่ระบุตัวตน</string>
+  <string name="anonymous_statistics_title">สถิติของ LineageOS</string>
+  <string name="anonymous_statistics_summary">ช่วยทำให้ LineageOS ดีขึ้นโดยการส่งรายงานสถิติแบบไม่ระบุตัวตน</string>
   <string name="anonymous_statistics_warning_title">เกี่ยวกับ</string>
-  <string name="anonymous_statistics_warning">การส่งสถิติแบบไม่ระบุตัวตนไปยัง CyanogenMod จะอนุญาตให้ส่งข้อมูลที่ไม่ใช่ข้อมูลส่วนตัวไปยังนักพัฒนาของ CyanogenMod เพื่อติดตามการติดตั้งบนอุปกรณ์ทั้งหมด ข้อมูลที่ถูกส่งรวมไปถึงตัวระบุลักษณะเฉพาะ\n\nซึ่งไม่ส่งผลกระทบต่อความเป็นส่วนตัวและข้อมูลส่วนบุคคลของคุณ โดยจะส่งข้อมูลทุกครั้งที่เริ่มระบบ\n\n แตะ \"แสดงตัวอย่างข้อมูล\" เพื่อดูตัวอย่างข้อมูลที่ถูกส่ง</string>
+  <string name="anonymous_statistics_warning">การส่งสถิติแบบไม่ระบุตัวตนไปยัง LineageOS จะอนุญาตให้ส่งข้อมูลที่ไม่ใช่ข้อมูลส่วนตัวไปยังนักพัฒนาของ LineageOS เพื่อติดตามการติดตั้งบนอุปกรณ์ทั้งหมด ข้อมูลที่ถูกส่งรวมไปถึงตัวระบุลักษณะเฉพาะ\n\nซึ่งไม่ส่งผลกระทบต่อความเป็นส่วนตัวและข้อมูลส่วนบุคคลของคุณ โดยจะส่งข้อมูลทุกครั้งที่เริ่มระบบ\n\n แตะ \"แสดงตัวอย่างข้อมูล\" เพื่อดูตัวอย่างข้อมูลที่ถูกส่ง</string>
   <string name="enable_reporting_title">เปิดการรายงาน</string>
   <string name="preview_data_title">แสดงตัวอย่างข้อมูล</string>
   <string name="view_stats_title">ดูสถิติ</string>
@@ -984,7 +985,7 @@
   <string name="interruptions_ignore_while_media_title">ป้องกันการลดเสียง</string>
   <string name="interruptions_ignore_while_media_summary">ไม่ลดเสียงเพลงเมื่อมีการแจ้งเตือนเข้า</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">เกี่ยวกับกฎหมาย CyanogenMod</string>
+  <string name="cmlicense_title">เกี่ยวกับกฎหมาย LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">ตั้งค่าสถิติใหม่</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index aaa9af3..b545a40 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -45,20 +46,20 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod sürümü</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS sürümü</string>
   <string name="mod_version_default">Bilinmeyen</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Cihaz modeli</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Cihaz ismi</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API düzeyi</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API düzeyi</string>
   <string name="mod_api_level_default">Bilinmeyen</string>
   <!-- About phone screen, build date -->
   <string name="build_date">İnşa tarihi</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod güncellemeleri</string>
+  <string name="cmupdate_settings_title">LineageOS güncellemeleri</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Cyanogen kurtarma modunu güncelle</string>
   <string name="update_recovery_summary">Sistem güncellemesi ile kurtarma modunu güncelle</string>
@@ -840,10 +841,10 @@
   <string name="no_filters_title">Hiçbir filtre ayarlanmadı</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod istatistikleri</string>
-  <string name="anonymous_statistics_summary">Anonim istatistik raporları göndererek CyanogenMod\'un daha iyi olmasına yardım edin</string>
+  <string name="anonymous_statistics_title">LineageOS istatistikleri</string>
+  <string name="anonymous_statistics_summary">Anonim istatistik raporları göndererek LineageOS\'un daha iyi olmasına yardım edin</string>
   <string name="anonymous_statistics_warning_title">Hakkında</string>
-  <string name="anonymous_statistics_warning">CyanogenMod İstatistiklerine dahil olmak kişisel olmayan verilerin CyanogenMod geliştiricilerine cihazlar arasındaki benzersiz yüklemeleri takip etmeleri için gönderilmesine izin verir. Bu bilgi, kişisel bilgi içermeyen ve gizliliğinizi tehdit etmeyen bir benzersiz numara da içerir. Veri her başlangıçta gönderilir.\n\nGönderilecek verinin örneğini görmek için Veriyi Önizle butonunu kullanın.</string>
+  <string name="anonymous_statistics_warning">LineageOS İstatistiklerine dahil olmak kişisel olmayan verilerin LineageOS geliştiricilerine cihazlar arasındaki benzersiz yüklemeleri takip etmeleri için gönderilmesine izin verir. Bu bilgi, kişisel bilgi içermeyen ve gizliliğinizi tehdit etmeyen bir benzersiz numara da içerir. Veri her başlangıçta gönderilir.\n\nGönderilecek verinin örneğini görmek için Veriyi Önizle butonunu kullanın.</string>
   <string name="enable_reporting_title">Raporlamayı etkinleştir</string>
   <string name="preview_data_title">Veriyi önizle</string>
   <string name="view_stats_title">İstatistikleri görüntüle</string>
@@ -985,7 +986,7 @@
   <string name="interruptions_ignore_while_media_title">Ses yankılanmasını önle</string>
   <string name="interruptions_ignore_while_media_summary">Bir bildirim geldiğinde, medya oynatma ses seviyesini azaltma</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod yasal</string>
+  <string name="cmlicense_title">LineageOS yasal</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">İstatistikleri sıfırla</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index 45c6499..d391b7a 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -44,20 +45,20 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod نەشرى</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS نەشرى</string>
   <string name="mod_version_default">يوچۇن</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">ئۈسكىنە تىپى</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">ئۈسكۈنە ئاتى</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod نىڭ API دەرىجىسى</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS نىڭ API دەرىجىسى</string>
   <string name="mod_api_level_default">يوچۇن</string>
   <!-- About phone screen, build date -->
   <string name="build_date">ھاسىللىغان چېسلا</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod يېڭىلانمىلار</string>
+  <string name="cmupdate_settings_title">LineageOS يېڭىلانمىلار</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Cyanogen ئەسلىگە كەلتۈرۈش ھالىتىنى يېڭىلاش</string>
   <string name="update_recovery_summary">سىستېما يېڭىلانمىلىرى ئارقىلىق ئەسلىگە كەلتۈرۈشنى يېڭىلاش</string>
@@ -837,10 +838,10 @@
   <string name="no_filters_title">سۈزگۈچ تەڭشىكى يوق</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod سىتاتىستىكىسى</string>
-  <string name="anonymous_statistics_summary">ئاتسىز ئىشلىتىش سىتاتىستىكىڭىزنى يوللاپ CyanogenMod نىڭ تېخىمۇ ياخشىلىنىشىغا ياردەم قىلىڭ</string>
+  <string name="anonymous_statistics_title">LineageOS سىتاتىستىكىسى</string>
+  <string name="anonymous_statistics_summary">ئاتسىز ئىشلىتىش سىتاتىستىكىڭىزنى يوللاپ LineageOS نىڭ تېخىمۇ ياخشىلىنىشىغا ياردەم قىلىڭ</string>
   <string name="anonymous_statistics_warning_title">ھەققىدە</string>
-  <string name="anonymous_statistics_warning">بۇ CyanogenMod سىتاتىستىكىنى قوزغىتىپ شەخسىي ئۇچۇرلار بولمىغان سانلىق مەلۇماتنى CyanogenMod ئىجادكارلىرىغا يوللاپ، ھەر خىل ئۈسكۈنىلەردىكى ئورنىتىشلارنى خاتىرىلەشكە قولايلىق يارىتىدۇ. يوللانغان ئۇچۇردا ئالاھىدە بىر بەلگە بولۇپ شەخسىيەت ۋە شەخسىي سانلىق مەلۇماتلارغا چېتىلمايدۇ. بۇ سانلىق مەلۇماتلار ھەر قېتىم قوزغالغاندا يوللىنىدۇ.\n\nيوللانغان سانلىق مەلۇماتنىڭ ئۈلگىسى سۈپىتىدە سانلىق مەلۇماتنى ئالدىن كۆزەتنى چېكىڭ.</string>
+  <string name="anonymous_statistics_warning">بۇ LineageOS سىتاتىستىكىنى قوزغىتىپ شەخسىي ئۇچۇرلار بولمىغان سانلىق مەلۇماتنى LineageOS ئىجادكارلىرىغا يوللاپ، ھەر خىل ئۈسكۈنىلەردىكى ئورنىتىشلارنى خاتىرىلەشكە قولايلىق يارىتىدۇ. يوللانغان ئۇچۇردا ئالاھىدە بىر بەلگە بولۇپ شەخسىيەت ۋە شەخسىي سانلىق مەلۇماتلارغا چېتىلمايدۇ. بۇ سانلىق مەلۇماتلار ھەر قېتىم قوزغالغاندا يوللىنىدۇ.\n\nيوللانغان سانلىق مەلۇماتنىڭ ئۈلگىسى سۈپىتىدە سانلىق مەلۇماتنى ئالدىن كۆزەتنى چېكىڭ.</string>
   <string name="enable_reporting_title">دوكلاتنى قوزغىتىش</string>
   <string name="preview_data_title">سانلىق مەلۇماتنى ئالدىن كۆزىتىش</string>
   <string name="view_stats_title">سىتاتىستىكىنى كۆرسىتىش</string>
@@ -987,7 +988,7 @@
   <string name="interruptions_ignore_while_media_title">ئاۋاز چەتنەشنى  توس</string>
   <string name="interruptions_ignore_while_media_summary">ئۇقتۇرۇش كەلگەندە، ۋاسىتە ئاۋازىنى تۆۋەنلەتمەيدۇ</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod قانۇن ئۇچۇرى</string>
+  <string name="cmlicense_title">LineageOS قانۇن ئۇچۇرى</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">ستاتىستىكىلىق سانلىق مەلۇماتنى قايتا بېكىتىش</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index dea49d3..0605669 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -46,20 +47,20 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Версія CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">Версія LineageOS</string>
   <string name="mod_version_default">Невідомо</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Модель пристрою</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Назва пристрою</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Рівень CyanogenMod API</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Рівень LineageOS API</string>
   <string name="mod_api_level_default">Невідомо</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Дата збірки</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Оновлення CyanogenMod</string>
+  <string name="cmupdate_settings_title">Оновлення LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Оновити Cyanogen recovery</string>
   <string name="update_recovery_summary">Оновлювати розділ Recovery при застосуванні оновлень</string>
@@ -811,10 +812,10 @@
   <string name="no_filters_title">Немає фільтрів</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Статистика CyanogenMod</string>
-  <string name="anonymous_statistics_summary">Допоможіть зробити CyanogenMod кращим, надсилаючи анонімну статистику</string>
+  <string name="anonymous_statistics_title">Статистика LineageOS</string>
+  <string name="anonymous_statistics_summary">Допоможіть зробити LineageOS кращим, надсилаючи анонімну статистику</string>
   <string name="anonymous_statistics_warning_title">Про</string>
-  <string name="anonymous_statistics_warning">Анонімні звіти дозволяють розробникам CyanogenMod відстежувати шнформацію щодо установки на різні пристрої. Ця інформація містить у собі назву пристрою, версію ПЗ і унікальний ідентифікатор, надсилання якого ніяким чином не шкодить Вашій конфіденційності. Звіт надсилається при кожному завантаженні пристрою.\n\nНатисніть, аби переглянути приклад даних, які надсилаються.</string>
+  <string name="anonymous_statistics_warning">Анонімні звіти дозволяють розробникам LineageOS відстежувати шнформацію щодо установки на різні пристрої. Ця інформація містить у собі назву пристрою, версію ПЗ і унікальний ідентифікатор, надсилання якого ніяким чином не шкодить Вашій конфіденційності. Звіт надсилається при кожному завантаженні пристрою.\n\nНатисніть, аби переглянути приклад даних, які надсилаються.</string>
   <string name="enable_reporting_title">Увімкнути надсилання звітів</string>
   <string name="preview_data_title">Показати дані</string>
   <string name="view_stats_title">Перегляд статистики</string>
@@ -917,7 +918,7 @@
   <string name="interruptions_ignore_while_media_title">Не приглушувати звуки</string>
   <string name="interruptions_ignore_while_media_summary">Не приглушувати відтворення медіа при надходженні сповіщення</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Політика конфіденційності CyanogenMod</string>
+  <string name="cmlicense_title">Політика конфіденційності LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Скинути статистику</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-ur-rPK/cm_strings.xml
+++ b/res/values-ur-rPK/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-uz-rUZ/cm_strings.xml
+++ b/res/values-uz-rUZ/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 677ccee..89a2378 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -44,20 +45,20 @@
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Phiên bản CyanogenMod</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">Phiên bản LineageOS</string>
   <string name="mod_version_default">Không rõ</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Mẫu thiết bị</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Tên thiết bị</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">Cấp độ API CyanogenMod</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Cấp độ API LineageOS</string>
   <string name="mod_api_level_default">Không rõ</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Ngày dựng</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Các cập nhật CyanogenMod</string>
+  <string name="cmupdate_settings_title">Các cập nhật LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Khôi phục Cyanogen Recovery</string>
   <string name="update_recovery_summary">Cập nhập bản recovery cùng với cập nhật hệ thống</string>
@@ -839,10 +840,10 @@
   <string name="no_filters_title">Chưa thiết lập bộ lọc</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">Thống kê CyanogenMod</string>
-  <string name="anonymous_statistics_summary">Giúp làm cho CyanogenMod tốt hơn bằng cách chọn vào báo cáo thống kê ẩn danh</string>
+  <string name="anonymous_statistics_title">Thống kê LineageOS</string>
+  <string name="anonymous_statistics_summary">Giúp làm cho LineageOS tốt hơn bằng cách chọn vào báo cáo thống kê ẩn danh</string>
   <string name="anonymous_statistics_warning_title">Thông tin</string>
-  <string name="anonymous_statistics_warning">Chọn tham gia Thống kê CyanogenMod sẽ cho phép gửi dữ liệu không liên quan đến cá nhân đến những nhà phát triển của CyanogenMod để theo dõi số lượt cài đặt độc đáo trên các thiết bị. Thông tin đã gửi sẽ bao gồm một ký hiệu nhận dạng duy nhất, nó sẽ không ảnh hưởng đến sự riêng tư hoặc dữ liệu cá nhân của bạn. Dữ liệu được gửi vào mỗi lần khởi động.\n\nĐể xem mẫu dữ liệu được gửi, chạm vào Xem trước dữ liệu.</string>
+  <string name="anonymous_statistics_warning">Chọn tham gia Thống kê LineageOS sẽ cho phép gửi dữ liệu không liên quan đến cá nhân đến những nhà phát triển của LineageOS để theo dõi số lượt cài đặt độc đáo trên các thiết bị. Thông tin đã gửi sẽ bao gồm một ký hiệu nhận dạng duy nhất, nó sẽ không ảnh hưởng đến sự riêng tư hoặc dữ liệu cá nhân của bạn. Dữ liệu được gửi vào mỗi lần khởi động.\n\nĐể xem mẫu dữ liệu được gửi, chạm vào Xem trước dữ liệu.</string>
   <string name="enable_reporting_title">Cho phép báo cáo</string>
   <string name="preview_data_title">Xem trước dữ liệu</string>
   <string name="view_stats_title">Xem thống kê</string>
@@ -984,7 +985,7 @@
   <string name="interruptions_ignore_while_media_title">Ngăn chặn giảm âm thanh</string>
   <string name="interruptions_ignore_while_media_summary">Không làm giảm âm lượng phát lại media khi một thông báo đến</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Bộ phận pháp chế của CyanogenMod</string>
+  <string name="cmlicense_title">Bộ phận pháp chế của LineageOS</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Thiết lập lại thống kê</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index f333c35..4a81490 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -52,20 +53,20 @@
   <string name="root_appops_summary">查看和控制 Root 规则</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod 版本</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS 版本</string>
   <string name="mod_version_default">未知</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">设备型号</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">设备名称</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API 级别</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API 级别</string>
   <string name="mod_api_level_default">未知</string>
   <!-- About phone screen, build date -->
   <string name="build_date">编译日期</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod 更新</string>
+  <string name="cmupdate_settings_title">LineageOS 更新</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">更新 Cyanogen 恢复模式</string>
   <string name="update_recovery_summary">使用系统更新来更新恢复模式</string>
@@ -855,10 +856,10 @@
   <string name="no_filters_title">没有设置过滤</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod 统计</string>
-  <string name="anonymous_statistics_summary">开启匿名统计报告以便帮助 CyanogenMod 未来向更好的方向发展</string>
+  <string name="anonymous_statistics_title">LineageOS 统计</string>
+  <string name="anonymous_statistics_summary">开启匿名统计报告以便帮助 LineageOS 未来向更好的方向发展</string>
   <string name="anonymous_statistics_warning_title">关于</string>
-  <string name="anonymous_statistics_warning">开启 CyanogenMod 统计将允许非个人数据被提交到 CyanogenMod 的开发者以便记录各种设备上的唯一安装。提交的信息包含一个唯一的标识符，而不会涉及您的隐私与个人数据。该数据将在每次启动时被提交。\n\n如您想看一个作为被提交数据的实例，请点击预览数据。</string>
+  <string name="anonymous_statistics_warning">开启 LineageOS 统计将允许非个人数据被提交到 LineageOS 的开发者以便记录各种设备上的唯一安装。提交的信息包含一个唯一的标识符，而不会涉及您的隐私与个人数据。该数据将在每次启动时被提交。\n\n如您想看一个作为被提交数据的实例，请点击预览数据。</string>
   <string name="enable_reporting_title">开启报告</string>
   <string name="preview_data_title">预览数据</string>
   <string name="view_stats_title">查看统计</string>
@@ -1005,7 +1006,7 @@
   <string name="interruptions_ignore_while_media_title">阻止音频回避</string>
   <string name="interruptions_ignore_while_media_summary">当通知到达时，不要降低媒体播放音量</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod 法律信息</string>
+  <string name="cmlicense_title">LineageOS 法律信息</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">重置统计数据</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index f874de9..d845d5c 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -36,18 +37,18 @@
   <string name="root_access_all">應用程式和 ADB</string>
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod 版本</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS 版本</string>
   <string name="mod_version_default">不明</string>
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
   <string name="device_name">裝置名稱</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <string name="mod_api_level_default">不明</string>
   <!-- About phone screen, build date -->
   <string name="build_date">版本日期</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod 更新</string>
+  <string name="cmupdate_settings_title">LineageOS 更新</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">升級 Cyanogen 修復模式</string>
   <string name="update_recovery_summary">系統更新的同時更新修復模式</string>
@@ -715,8 +716,8 @@
   <string name="no_filters_title">沒有設定篩選器</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod 統計</string>
-  <string name="anonymous_statistics_summary">開啟匿名統計報告以便協助改進 CyanogenMod</string>
+  <string name="anonymous_statistics_title">LineageOS 統計</string>
+  <string name="anonymous_statistics_summary">開啟匿名統計報告以便協助改進 LineageOS</string>
   <string name="anonymous_statistics_warning_title">關於</string>
   <string name="enable_reporting_title">啟用報告</string>
   <string name="preview_data_title">預覽數據</string>
@@ -809,7 +810,7 @@
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <string name="interruptions_ignore_while_media_title">阻止音訊閃避</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod 法律條款</string>
+  <string name="cmlicense_title">LineageOS 法律條款</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">重設統計</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index f6651a9..f616ebf 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -52,20 +53,20 @@
   <string name="root_appops_summary">查看和控制 root 規則</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
-  <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">CyanogenMod 版本</string>
+  <!-- About phone screen, LineageOS version -->
+  <string name="mod_version">LineageOS 版本</string>
   <string name="mod_version_default">未知</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">裝置型號</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">裝置名稱</string>
-  <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level">CyanogenMod API 等級</string>
+  <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">LineageOS API 等級</string>
   <string name="mod_api_level_default">未知</string>
   <!-- About phone screen, build date -->
   <string name="build_date">版本日期</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">CyanogenMod 更新</string>
+  <string name="cmupdate_settings_title">LineageOS 更新</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">更新 Cyanogen Recovery</string>
   <string name="update_recovery_summary">以系統更新來更新 Recovery</string>
@@ -855,10 +856,10 @@
   <string name="no_filters_title">沒有過濾設定</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod 統計</string>
-  <string name="anonymous_statistics_summary">加入匿名統計報告以協助改進 CyanogenMod</string>
+  <string name="anonymous_statistics_title">LineageOS 統計</string>
+  <string name="anonymous_statistics_summary">加入匿名統計報告以協助改進 LineageOS</string>
   <string name="anonymous_statistics_warning_title">關於</string>
-  <string name="anonymous_statistics_warning">加入 CyanogenMod 統計將允許非個人資料被提交到 CyanogenMod 的開發人員，
+  <string name="anonymous_statistics_warning">加入 LineageOS 統計將允許非個人資料被提交到 LineageOS 的開發人員，
         以追蹤每個裝置上的獨特安裝。提交的資訊包含一個唯一識別碼，此識別碼並不會泄露您的隱私或個人資料。
         該資料在每次開機時被提交。\n\n輕觸預覽資料以預覽被提交資料的例子。</string>
   <string name="enable_reporting_title">啟用報告</string>
@@ -1004,7 +1005,7 @@
   <string name="interruptions_ignore_while_media_title">防止聲音回避</string>
   <string name="interruptions_ignore_while_media_summary">有通知時，不減少媒體播放的音量</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod 法律條款</string>
+  <string name="cmlicense_title">LineageOS 法律條款</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">重設統計</string>
   <!-- Reset stats confirmation dialog's message -->
diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml
index 8e47c83..3844719 100644
--- a/res/values-zu/cm_strings.xml
+++ b/res/values-zu/cm_strings.xml
@@ -2,6 +2,7 @@
 <!--Generated by crowdin.com-->
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -28,10 +29,10 @@
   <!-- Setting checkbox title for root access -->
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
-  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, LineageOS version -->
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
-  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, LineageOS Api Level -->
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 7fa4160..f717cee 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2012-2016 The CyanogenMod Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -60,8 +61,8 @@
     <!-- NFC PreferenceCategory title -->
     <string name="nfc_title_category">NFC</string>
 
-    <!-- About phone screen, CyanogenMod version -->
-    <string name="mod_version">CyanogenMod version</string>
+    <!-- About phone screen, LineageOS version -->
+    <string name="mod_version">LineageOS version</string>
     <string name="mod_version_default">Unknown</string>
 
     <!-- About phone screen, Device model -->
@@ -69,8 +70,8 @@
     <!-- About phone screen, Device name -->
     <string name="device_name">Device name</string>
 
-    <!-- About phone screen, CyanogenMod Api Level -->
-    <string name="mod_api_level">CyanogenMod API level</string>
+    <!-- About phone screen, LineageOS Api Level -->
+    <string name="mod_api_level">LineageOS API level</string>
     <string name="mod_api_level_default">Unknown</string>
 
     <!-- About phone screen, build date -->
@@ -78,7 +79,7 @@
     <string name="build_date_default" translatable="false">2015-01-01-0000</string>
 
     <!-- CM Updater -->
-    <string name="cmupdate_settings_title">CyanogenMod updates</string>
+    <string name="cmupdate_settings_title">LineageOS updates</string>
 
     <!-- Settings switch for updating Cyanogen recovery -->
     <string name="update_recovery_title">Update Cyanogen recovery</string>
@@ -856,7 +857,7 @@
 
     <!-- Privacy Settings Header item -->
     <string name="privacy_settings_cyanogenmod_title">Privacy</string>
-    <string name="privacy_settings_cyanogenmod_category" translatable="false">CyanogenMod</string>
+    <string name="privacy_settings_cyanogenmod_category" translatable="false">LineageOS</string>
 
     <!-- Privacy Guard -->
     <string name="privacy_guard_default_title">Enabled by default</string>
@@ -995,11 +996,11 @@
 
     <!-- Anonymous Statistics #CM -->
     <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-    <string name="anonymous_statistics_title">CyanogenMod statistics</string>
-    <string name="anonymous_statistics_summary">Help make CyanogenMod better by opting into anonymous statistics reporting</string>
+    <string name="anonymous_statistics_title">LineageOS statistics</string>
+    <string name="anonymous_statistics_summary">Help make LineageOS better by opting into anonymous statistics reporting</string>
     <string name="anonymous_statistics_warning_title">About</string>
-    <string name="anonymous_statistics_warning">Opting into CyanogenMod Statistics will allow non-personal data to be submitted to the
-        developers of CyanogenMod to track unique installations across devices. The information submitted includes an unique identifier,
+    <string name="anonymous_statistics_warning">Opting into LineageOS Statistics will allow non-personal data to be submitted to the
+        developers of LineageOS to track unique installations across devices. The information submitted includes an unique identifier,
         which does not compromise your privacy or personal data. The data is submitted during each boot.\n\nFor an example of the data that is submitted, tap on Preview Data.</string>
     <string name="enable_reporting_title">Enable reporting</string>
     <string name="preview_data_title">Preview data</string>
@@ -1171,7 +1172,7 @@
     <string name="interruptions_ignore_while_media_summary">Do not reduce media playback volume when a notification arrives</string>
 
     <!-- CM Legal -->
-    <string name="cmlicense_title">CyanogenMod legal</string>
+    <string name="cmlicense_title">LineageOS legal</string>
 
     <!-- Menu label for reset the battery stats -->
     <string name="menu_stats_reset">Reset stats</string>
-- 
cgit v1.1


From cd93a79b8c0f61c9d3be2587f903ec5861bd9e51 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Thu, 29 Dec 2016 18:33:27 +0800
Subject: DeviceInfoSettings: Launch normal PlatLogo for LA version

Since we've removed the Cid-esque PlatLogo as part of the
LineageOS rebrand, get rid of the extra code and simply
launch the AOSP PlatLogo when tapping on the LA version pref.

Change-Id: I2b70d4115d890771999b0b1b97c8a70495a75562
---
 src/com/android/settings/DeviceInfoSettings.java | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 39eaa5a..41e14ba 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -242,7 +242,8 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
 
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        if (preference.getKey().equals(KEY_FIRMWARE_VERSION)) {
+        if (preference.getKey().equals(KEY_FIRMWARE_VERSION)
+                || preference.getKey().equals(KEY_MOD_VERSION)) {
             System.arraycopy(mHits, 1, mHits, 0, mHits.length-1);
             mHits[mHits.length-1] = SystemClock.uptimeMillis();
             if (mHits[0] >= (SystemClock.uptimeMillis()-500)) {
@@ -367,20 +368,6 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
             if (b.getBoolean(CarrierConfigManager.KEY_CI_ACTION_ON_SYS_UPDATE_BOOL)) {
                 ciActionOnSysUpdate(b);
             }
-        } else if (preference.getKey().equals(KEY_MOD_VERSION)) {
-            System.arraycopy(mHits, 1, mHits, 0, mHits.length-1);
-            mHits[mHits.length-1] = SystemClock.uptimeMillis();
-            if (mHits[0] >= (SystemClock.uptimeMillis()-500)) {
-                Intent intent = new Intent(Intent.ACTION_MAIN);
-                intent.putExtra("is_cm", true);
-                intent.setClassName("android",
-                        com.android.internal.app.PlatLogoActivity.class.getName());
-                try {
-                    startActivity(intent);
-                } catch (Exception e) {
-                    Log.e(LOG_TAG, "Unable to start activity " + intent.toString());
-                }
-            }
         }
         return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
-- 
cgit v1.1


From 383b5d8e7076a801b60421bdd929d44de074a801 Mon Sep 17 00:00:00 2001
From: Marcos Marado <mindboosternoori@gmail.com>
Date: Tue, 29 Nov 2016 18:24:21 +0000
Subject: SimSettings: avoid NPE

Don't assume getPhoneAccount doesn't return null just because you're passing a
non-null argument.

Avoids:
java.lang.NullPointerException: Attempt to invoke virtual method 'java.lang.CharSequence android.telecom.PhoneAccount.getLabel()' on a null object reference
       at com.android.settings.sim.SimSettings.updateCallValues(SimSettings.java:299)
       at com.android.settings.sim.SimSettings.updateActivitesCategory(SimSettings.java:237)
       at com.android.settings.sim.SimSettings.updateAllOptions(SimSettings.java:222)
       at com.android.settings.sim.SimSettings.updateSubscriptions(SimSettings.java:217)
       at com.android.settings.sim.SimSettings.-wrap4(SimSettings.java)
       at com.android.settings.sim.SimSettings$1.onSubscriptionsChanged(SimSettings.java:175)
       at android.telephony.SubscriptionManager$OnSubscriptionsChangedListener$1.handleMessage(SubscriptionManager.java:397)
       at android.os.Handler.dispatchMessage(Handler.java:102)
       at android.os.Looper.loop(Looper.java:148)
       at android.app.ActivityThread.main(ActivityThread.java:5461)
       at java.lang.reflect.Method.invoke(Native Method)
       at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:726)
       at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:616)

Change-Id: Ibdb5a978744a8f3e5dd916d08297a07d98aca5be
---
 src/com/android/settings/sim/SimSettings.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index b97ee03..c5d3822 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -45,6 +45,7 @@ import android.telephony.SmsManager;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.text.TextUtils;
@@ -288,15 +289,19 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
     private void updateCallValues() {
         final Preference simPref = findPreference(KEY_CALLS);
         final TelecomManager telecomManager = TelecomManager.from(mContext);
-        final PhoneAccountHandle phoneAccount =
+        final PhoneAccountHandle phoneAccountHandle =
             telecomManager.getUserSelectedOutgoingPhoneAccount();
         final List<PhoneAccountHandle> allPhoneAccounts =
             telecomManager.getCallCapablePhoneAccounts();
 
         simPref.setTitle(R.string.calls_title);
+        PhoneAccount phoneAccount = null;
+        if (phoneAccountHandle != null) {
+            phoneAccount = telecomManager.getPhoneAccount(phoneAccountHandle);
+        }
         simPref.setSummary(phoneAccount == null
                 ? mContext.getResources().getString(R.string.sim_calls_ask_first_prefs_title)
-                : (String)telecomManager.getPhoneAccount(phoneAccount).getLabel());
+                : (String)phoneAccount.getLabel());
         simPref.setEnabled(allPhoneAccounts.size() > 1);
     }
 
-- 
cgit v1.1


From 3a22b88a268939c01b9d027308d551a5f7930690 Mon Sep 17 00:00:00 2001
From: Simon Shields <keepcalm444@gmail.com>
Date: Thu, 29 Dec 2016 10:31:03 +1100
Subject: Settings: CMStats: use sha256 for device IDs

Collions may occur with MD5.

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

diff --git a/src/com/android/settings/cmstats/Utilities.java b/src/com/android/settings/cmstats/Utilities.java
index 1e98888..f69e8ca 100644
--- a/src/com/android/settings/cmstats/Utilities.java
+++ b/src/com/android/settings/cmstats/Utilities.java
@@ -72,7 +72,7 @@ public class Utilities {
 
     public static String digest(String input) {
         try {
-            MessageDigest md = MessageDigest.getInstance("MD5");
+            MessageDigest md = MessageDigest.getInstance("SHA-256");
             return new BigInteger(1, md.digest(input.getBytes())).toString(16).toUpperCase();
         } catch (Exception e) {
             return null;
-- 
cgit v1.1


From 640c391b1521005d99f54165ff20fd47a2a13d2d Mon Sep 17 00:00:00 2001
From: Simon Shields <keepcalm444@gmail.com>
Date: Tue, 27 Dec 2016 21:36:39 +1100
Subject: Settings: cmstats: Stop sending stats to cyngn servers

Change-Id: I30fa515f924f368b6cd7016ba03f366affaa6e5e
---
 res/values/config.xml                              |   5 +-
 .../android/settings/cmstats/ReportingService.java |  36 +++-----
 .../settings/cmstats/StatsUploadJobService.java    | 100 +--------------------
 3 files changed, 15 insertions(+), 126 deletions(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index aa97d3c..c93d6f3 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (C) 2007 The Android Open Source Project
+               (C) 2017 The LineageOS Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -50,10 +51,8 @@
     <!-- Config to enable duplicate APN checking. When true, disallows adding new duplicate APNs -->
     <bool name="config_enable_duplicate_apn_checking">false</bool>
 
-    <!-- Metrics server endpoints -->
+    <!-- Metrics server endpoint -->
     <string name="stats_cm_url">https://stats.cyanogenmod.org/submit</string>
-    <string name="stats_cyanogen_url">https://shopvac.cyngn.com/community/heartbeat</string>
-    <string name="stats_cyanogen_token_url">https://account.cyngn.com/api/v1/community/heartbeat_token</string>
 
     <!-- Display ro.product.name above Device model -->
     <bool name="config_displayDeviceName">false</bool>
diff --git a/src/com/android/settings/cmstats/ReportingService.java b/src/com/android/settings/cmstats/ReportingService.java
index 8410143..5c876b9 100644
--- a/src/com/android/settings/cmstats/ReportingService.java
+++ b/src/com/android/settings/cmstats/ReportingService.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The CyanogenMod Project
+ *           (C) 2017 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,39 +52,24 @@ public class ReportingService extends IntentService {
         String deviceCarrierId = Utilities.getCarrierId(getApplicationContext());
         boolean optOut = intent.getBooleanExtra(EXTRA_OPTING_OUT, false);
 
-        final int cyanogenJobId = AnonymousStats.getNextJobId(getApplicationContext());
         final int cmOrgJobId = AnonymousStats.getNextJobId(getApplicationContext());
 
-        if (DEBUG) Log.d(TAG, "scheduling jobs id: " + cyanogenJobId + ", " + cmOrgJobId);
+        if (DEBUG) Log.d(TAG, "scheduling job id: " + cmOrgJobId);
 
-        PersistableBundle cyanogenBundle = new PersistableBundle();
-        cyanogenBundle.putBoolean(StatsUploadJobService.KEY_OPT_OUT, optOut);
-        cyanogenBundle.putString(StatsUploadJobService.KEY_DEVICE_NAME, deviceName);
-        cyanogenBundle.putString(StatsUploadJobService.KEY_UNIQUE_ID, deviceId);
-        cyanogenBundle.putString(StatsUploadJobService.KEY_VERSION, deviceVersion);
-        cyanogenBundle.putString(StatsUploadJobService.KEY_COUNTRY, deviceCountry);
-        cyanogenBundle.putString(StatsUploadJobService.KEY_CARRIER, deviceCarrier);
-        cyanogenBundle.putString(StatsUploadJobService.KEY_CARRIER_ID, deviceCarrierId);
-        cyanogenBundle.putLong(StatsUploadJobService.KEY_TIMESTAMP, System.currentTimeMillis());
-
-        // get snapshot and persist it
-        PersistableBundle cmBundle = new PersistableBundle(cyanogenBundle);
+        PersistableBundle cmBundle = new PersistableBundle();
+        cmBundle.putBoolean(StatsUploadJobService.KEY_OPT_OUT, optOut);
+        cmBundle.putString(StatsUploadJobService.KEY_DEVICE_NAME, deviceName);
+        cmBundle.putString(StatsUploadJobService.KEY_UNIQUE_ID, deviceId);
+        cmBundle.putString(StatsUploadJobService.KEY_VERSION, deviceVersion);
+        cmBundle.putString(StatsUploadJobService.KEY_COUNTRY, deviceCountry);
+        cmBundle.putString(StatsUploadJobService.KEY_CARRIER, deviceCarrier);
+        cmBundle.putString(StatsUploadJobService.KEY_CARRIER_ID, deviceCarrierId);
+        cmBundle.putLong(StatsUploadJobService.KEY_TIMESTAMP, System.currentTimeMillis());
 
         // set job types
-        cyanogenBundle.putInt(StatsUploadJobService.KEY_JOB_TYPE,
-                StatsUploadJobService.JOB_TYPE_CYANOGEN);
         cmBundle.putInt(StatsUploadJobService.KEY_JOB_TYPE,
                 StatsUploadJobService.JOB_TYPE_CMORG);
 
-        // schedule cyanogen stats upload
-        js.schedule(new JobInfo.Builder(cyanogenJobId, new ComponentName(getPackageName(),
-                StatsUploadJobService.class.getName()))
-                .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
-                .setMinimumLatency(1000)
-                .setExtras(cyanogenBundle)
-                .setPersisted(true)
-                .build());
-
         // schedule cmorg stats upload
         js.schedule(new JobInfo.Builder(cmOrgJobId, new ComponentName(getPackageName(),
                 StatsUploadJobService.class.getName()))
diff --git a/src/com/android/settings/cmstats/StatsUploadJobService.java b/src/com/android/settings/cmstats/StatsUploadJobService.java
index 580a20f..0171988 100644
--- a/src/com/android/settings/cmstats/StatsUploadJobService.java
+++ b/src/com/android/settings/cmstats/StatsUploadJobService.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The CyanogenMod Project
+ *           (C) 2017 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,8 +47,7 @@ public class StatsUploadJobService extends JobService {
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
     public static final String KEY_JOB_TYPE = "job_type";
-    public static final int JOB_TYPE_CYANOGEN = 1;
-    public static final int JOB_TYPE_CMORG = 2;
+    public static final int JOB_TYPE_CMORG = 1;
 
     public static final String KEY_UNIQUE_ID = "uniqueId";
     public static final String KEY_DEVICE_NAME = "deviceName";
@@ -114,25 +114,6 @@ public class StatsUploadJobService extends JobService {
             int jobType = extras.getInt(KEY_JOB_TYPE, -1);
             if (!isCancelled()) {
                 switch (jobType) {
-                    case JOB_TYPE_CYANOGEN:
-                        try {
-                            JSONObject json = new JSONObject();
-                            json.put("optOut", optOut);
-                            json.put("uniqueId", deviceId);
-                            json.put("deviceName", deviceName);
-                            json.put("version", deviceVersion);
-                            json.put("country", deviceCountry);
-                            json.put("carrier", deviceCarrier);
-                            json.put("carrierId", deviceCarrierId);
-                            json.put("timestamp", timeStamp);
-
-                            success = uploadToCyanogen(json);
-                        } catch (IOException | JSONException e) {
-                            Log.e(TAG, "Could not upload stats checkin to cyanogen server", e);
-                            success = false;
-                        }
-                        break;
-
                     case JOB_TYPE_CMORG:
                         try {
                             success = uploadToCM(deviceId, deviceName, deviceVersion, deviceCountry,
@@ -192,83 +173,6 @@ public class StatsUploadJobService extends JobService {
 
     }
 
-    private boolean uploadToCyanogen(JSONObject json)
-            throws IOException, JSONException {
-        String authToken = getAuthToken();
-
-        if (authToken.isEmpty()) {
-            Log.w(TAG, "no auth token!");
-        }
-
-        URL url = new URL(getString(R.string.stats_cyanogen_url));
-        HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
-        try {
-            urlConnection.setInstanceFollowRedirects(true);
-            urlConnection.setDoInput(true);
-            urlConnection.setDoOutput(true);
-
-            urlConnection.setRequestProperty("Accept-Encoding", "identity");
-            urlConnection.setRequestProperty("Authorization", authToken);
-            urlConnection.setRequestProperty("Content-Type", "application/json");
-
-            OutputStream os = urlConnection.getOutputStream();
-            BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(os, "UTF-8"));
-            writer.write(json.toString());
-            writer.flush();
-            writer.close();
-            os.close();
-
-            urlConnection.connect();
-
-            final int responseCode = urlConnection.getResponseCode();
-            final boolean success = responseCode == HttpURLConnection.HTTP_OK;
-
-            final String response = getResponse(urlConnection, !success);
-            if (DEBUG)
-                Log.d(TAG, "server responseCode: " + responseCode +", response=" + response);
-
-            if (!success) {
-                Log.w(TAG, "failed sending, server returned: " + response);
-            }
-            return success;
-        } finally {
-            urlConnection.disconnect();
-        }
-    }
-
-    private String getAuthToken() {
-        HttpURLConnection urlConnection = null;
-        try {
-            URL url = new URL(getString(R.string.stats_cyanogen_token_url));
-            urlConnection = (HttpURLConnection) url.openConnection();
-            urlConnection.setInstanceFollowRedirects(true);
-            urlConnection.setDoInput(true);
-
-            urlConnection.setRequestProperty("Accept-Encoding", "identity");
-            urlConnection.setRequestProperty("Content-Type", "text/plain");
-
-            urlConnection.connect();
-
-            final int responseCode = urlConnection.getResponseCode();
-            final boolean success = responseCode == HttpURLConnection.HTTP_OK;
-            if (DEBUG) Log.d(TAG, "server auth response code=" + responseCode);
-            final String response = getResponse(urlConnection, !success);
-            if (DEBUG)
-                Log.d(TAG, "server auth response=" + response);
-
-            if (success) {
-                return response;
-            }
-        } catch (IOException e) {
-            Log.e(TAG, "error getting auth token", e);
-        } finally {
-            if (urlConnection != null) {
-                urlConnection.disconnect();
-            }
-        }
-        return "";
-    }
-
     private String getResponse(HttpURLConnection httpUrlConnection, boolean errorStream)
             throws IOException {
         InputStream responseStream = new BufferedInputStream(errorStream
-- 
cgit v1.1


From 39de418560fc3d9ea9238aca19303d94c33cdeeb Mon Sep 17 00:00:00 2001
From: Simon Shields <keepcalm444@gmail.com>
Date: Wed, 28 Dec 2016 11:51:38 +1100
Subject: Settings: cmstats: Stop tracking opt-out events

Change-Id: Ia0e50b4af3979c374b4202cd6a187a9f0ded9e60
---
 .../android/settings/cmstats/AnonymousStats.java   | 28 +---------------------
 .../android/settings/cmstats/ReportingService.java | 10 --------
 .../settings/cmstats/ReportingServiceManager.java  | 16 +------------
 .../settings/cmstats/StatsUploadJobService.java    |  8 ++-----
 4 files changed, 4 insertions(+), 58 deletions(-)

diff --git a/src/com/android/settings/cmstats/AnonymousStats.java b/src/com/android/settings/cmstats/AnonymousStats.java
index 232a533..54e124d 100644
--- a/src/com/android/settings/cmstats/AnonymousStats.java
+++ b/src/com/android/settings/cmstats/AnonymousStats.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2015 The CyanogenMod Project
+ *           (C) 2017 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,15 +21,9 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 
-import android.os.UserHandle;
-import android.preference.Preference;
-import android.preference.PreferenceScreen;
-import android.preference.SwitchPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
-import cyanogenmod.providers.CMSettings;
-
 import org.cyanogenmod.internal.logging.CMMetricsLogger;
 
 public class AnonymousStats extends SettingsPreferenceFragment {
@@ -40,10 +35,6 @@ public class AnonymousStats extends SettingsPreferenceFragment {
     /* package */ static final String KEY_LAST_JOB_ID = "last_job_id";
     /* package */ static final int QUEUE_MAX_THRESHOLD = 1000;
 
-    public static final String KEY_STATS = "stats_collection";
-
-    SwitchPreference mStatsSwitch;
-
     public static SharedPreferences getPreferences(Context context) {
         return context.getSharedPreferences(PREF_FILE_NAME, 0);
     }
@@ -52,23 +43,6 @@ public class AnonymousStats extends SettingsPreferenceFragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.anonymous_stats);
-        mStatsSwitch = (SwitchPreference) findPreference(KEY_STATS);
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-        if (preference == mStatsSwitch) {
-            boolean checked = mStatsSwitch.isChecked();
-            if (checked) {
-                // clear opt out flags
-                CMSettings.Secure.putIntForUser(getContentResolver(),
-                        CMSettings.Secure.STATS_COLLECTION_REPORTED, 0, UserHandle.USER_OWNER);
-            }
-            // will initiate opt out sequence if necessary
-            ReportingServiceManager.setAlarm(getActivity());
-            return true;
-        }
-        return super.onPreferenceTreeClick(preferenceScreen, preference);
     }
 
     public static void updateLastSynced(Context context) {
diff --git a/src/com/android/settings/cmstats/ReportingService.java b/src/com/android/settings/cmstats/ReportingService.java
index 5c876b9..f04786d 100644
--- a/src/com/android/settings/cmstats/ReportingService.java
+++ b/src/com/android/settings/cmstats/ReportingService.java
@@ -34,8 +34,6 @@ public class ReportingService extends IntentService {
     /* package */ static final String TAG = "CMStats";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
-    public static final String EXTRA_OPTING_OUT = "cmstats::opt_out";
-
     public ReportingService() {
         super(ReportingService.class.getSimpleName());
     }
@@ -50,14 +48,12 @@ public class ReportingService extends IntentService {
         String deviceCountry = Utilities.getCountryCode(getApplicationContext());
         String deviceCarrier = Utilities.getCarrier(getApplicationContext());
         String deviceCarrierId = Utilities.getCarrierId(getApplicationContext());
-        boolean optOut = intent.getBooleanExtra(EXTRA_OPTING_OUT, false);
 
         final int cmOrgJobId = AnonymousStats.getNextJobId(getApplicationContext());
 
         if (DEBUG) Log.d(TAG, "scheduling job id: " + cmOrgJobId);
 
         PersistableBundle cmBundle = new PersistableBundle();
-        cmBundle.putBoolean(StatsUploadJobService.KEY_OPT_OUT, optOut);
         cmBundle.putString(StatsUploadJobService.KEY_DEVICE_NAME, deviceName);
         cmBundle.putString(StatsUploadJobService.KEY_UNIQUE_ID, deviceId);
         cmBundle.putString(StatsUploadJobService.KEY_VERSION, deviceVersion);
@@ -79,12 +75,6 @@ public class ReportingService extends IntentService {
                 .setPersisted(true)
                 .build());
 
-        if (optOut) {
-            // we've successfully scheduled the opt out.
-            CMSettings.Secure.putIntForUser(getContentResolver(),
-                    CMSettings.Secure.STATS_COLLECTION_REPORTED, 1, UserHandle.USER_OWNER);
-        }
-
         // reschedule
         AnonymousStats.updateLastSynced(this);
         ReportingServiceManager.setAlarm(this);
diff --git a/src/com/android/settings/cmstats/ReportingServiceManager.java b/src/com/android/settings/cmstats/ReportingServiceManager.java
index bce1372..286618c 100644
--- a/src/com/android/settings/cmstats/ReportingServiceManager.java
+++ b/src/com/android/settings/cmstats/ReportingServiceManager.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2012 The CyanogenMod Project
+ *           (C) 2017 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,27 +48,12 @@ public class ReportingServiceManager extends BroadcastReceiver {
         }
     }
 
-    /**
-     * opt out if we haven't yet
-     */
-    public static void initiateOptOut(Context context) {
-        final boolean optOutReported = CMSettings.Secure.getIntForUser(context.getContentResolver(),
-                CMSettings.Secure.STATS_COLLECTION_REPORTED, 0, UserHandle.USER_OWNER) == 1;
-        if (!optOutReported) {
-            Intent intent = new Intent();
-            intent.setClass(context, ReportingService.class);
-            intent.putExtra(ReportingService.EXTRA_OPTING_OUT, true);
-            context.startServiceAsUser(intent, UserHandle.OWNER);
-        }
-    }
-
     public static void setAlarm(Context context) {
         SharedPreferences prefs = AnonymousStats.getPreferences(context);
         if (prefs.contains(AnonymousStats.ANONYMOUS_OPT_IN)) {
             migrate(context, prefs);
         }
         if (!Utilities.isStatsCollectionEnabled(context)) {
-            initiateOptOut(context);
             return;
         }
         long lastSynced = prefs.getLong(AnonymousStats.ANONYMOUS_LAST_CHECKED, 0);
diff --git a/src/com/android/settings/cmstats/StatsUploadJobService.java b/src/com/android/settings/cmstats/StatsUploadJobService.java
index 0171988..c4b69ff 100644
--- a/src/com/android/settings/cmstats/StatsUploadJobService.java
+++ b/src/com/android/settings/cmstats/StatsUploadJobService.java
@@ -56,7 +56,6 @@ public class StatsUploadJobService extends JobService {
     public static final String KEY_CARRIER = "carrier";
     public static final String KEY_CARRIER_ID = "carrierId";
     public static final String KEY_TIMESTAMP = "timeStamp";
-    public static final String KEY_OPT_OUT = "optOut";
 
     private final Map<JobParameters, StatsUploadTask> mCurrentJobs
             = Collections.synchronizedMap(new ArrayMap<JobParameters, StatsUploadTask>());
@@ -108,7 +107,6 @@ public class StatsUploadJobService extends JobService {
             String deviceCarrier = extras.getString(KEY_CARRIER);
             String deviceCarrierId = extras.getString(KEY_CARRIER_ID);
             long timeStamp = extras.getLong(KEY_TIMESTAMP);
-            boolean optOut = extras.getBoolean(KEY_OPT_OUT);
 
             boolean success = false;
             int jobType = extras.getInt(KEY_JOB_TYPE, -1);
@@ -117,7 +115,7 @@ public class StatsUploadJobService extends JobService {
                     case JOB_TYPE_CMORG:
                         try {
                             success = uploadToCM(deviceId, deviceName, deviceVersion, deviceCountry,
-                                    deviceCarrier, deviceCarrierId, optOut);
+                                    deviceCarrier, deviceCarrierId);
                         } catch (IOException e) {
                             Log.e(TAG, "Could not upload stats checkin to commnity server", e);
                             success = false;
@@ -140,12 +138,10 @@ public class StatsUploadJobService extends JobService {
 
 
     private boolean uploadToCM(String deviceId, String deviceName, String deviceVersion,
-                               String deviceCountry, String deviceCarrier, String deviceCarrierId,
-                               boolean optOut)
+                               String deviceCountry, String deviceCarrier, String deviceCarrierId)
             throws IOException {
 
         final Uri uri = Uri.parse(getString(R.string.stats_cm_url)).buildUpon()
-                .appendQueryParameter("opt_out", optOut ? "1" : "0")
                 .appendQueryParameter("device_hash", deviceId)
                 .appendQueryParameter("device_name", deviceName)
                 .appendQueryParameter("device_version", deviceVersion)
-- 
cgit v1.1


From ed584932ca159e2e49add95f766cb743bf84a960 Mon Sep 17 00:00:00 2001
From: Simon Shields <keepcalm444@gmail.com>
Date: Thu, 29 Dec 2016 12:18:54 +1100
Subject: Settings: CMStats: Upload stats only if user has not opted out

Change-Id: If4cd7a2c1cee23e63d6191fbdff08c2219f8b8bc
---
 src/com/android/settings/cmstats/StatsUploadJobService.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/android/settings/cmstats/StatsUploadJobService.java b/src/com/android/settings/cmstats/StatsUploadJobService.java
index c4b69ff..4533e28 100644
--- a/src/com/android/settings/cmstats/StatsUploadJobService.java
+++ b/src/com/android/settings/cmstats/StatsUploadJobService.java
@@ -64,6 +64,11 @@ public class StatsUploadJobService extends JobService {
     public boolean onStartJob(JobParameters jobParameters) {
         if (DEBUG)
             Log.d(TAG, "onStartJob() called with " + "jobParameters = [" + jobParameters + "]");
+
+        if (!Utilities.isStatsCollectionEnabled(this)) {
+            return false;
+        }
+
         final StatsUploadTask uploadTask = new StatsUploadTask(jobParameters);
         mCurrentJobs.put(jobParameters, uploadTask);
         uploadTask.execute((Void) null);
-- 
cgit v1.1


From 8535ca7c5b3eb96be20ef16c33d805ebe5bfbbf0 Mon Sep 17 00:00:00 2001
From: Simon Shields <keepcalm444@gmail.com>
Date: Thu, 29 Dec 2016 11:00:19 +1100
Subject: Settings: CMStats: use new server-side API

* version the API
* instead of sending a POST request with parameters,
  POST a json blob.

Change-Id: I1e83f85ca833b823dfd23eacbc8309d9eeee72a9
---
 res/values/config.xml                              |  2 +-
 .../settings/cmstats/StatsUploadJobService.java    | 41 +++++++++++++---------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index c93d6f3..b7ccf9b 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -52,7 +52,7 @@
     <bool name="config_enable_duplicate_apn_checking">false</bool>
 
     <!-- Metrics server endpoint -->
-    <string name="stats_cm_url">https://stats.cyanogenmod.org/submit</string>
+    <string name="stats_cm_url">https://stats.lineageos.org/api/v1/stats</string>
 
     <!-- Display ro.product.name above Device model -->
     <bool name="config_displayDeviceName">false</bool>
diff --git a/src/com/android/settings/cmstats/StatsUploadJobService.java b/src/com/android/settings/cmstats/StatsUploadJobService.java
index 4533e28..c84e1a1 100644
--- a/src/com/android/settings/cmstats/StatsUploadJobService.java
+++ b/src/com/android/settings/cmstats/StatsUploadJobService.java
@@ -119,10 +119,11 @@ public class StatsUploadJobService extends JobService {
                 switch (jobType) {
                     case JOB_TYPE_CMORG:
                         try {
-                            success = uploadToCM(deviceId, deviceName, deviceVersion, deviceCountry,
-                                    deviceCarrier, deviceCarrierId);
-                        } catch (IOException e) {
-                            Log.e(TAG, "Could not upload stats checkin to commnity server", e);
+                            JSONObject json = buildStatsRequest(deviceId, deviceName,
+                                    deviceVersion, deviceCountry, deviceCarrier, deviceCarrierId);
+                            success = uploadToCM(json);
+                        } catch (IOException | JSONException e) {
+                            Log.e(TAG, "Could not upload stats checkin to community server", e);
                             success = false;
                         }
                         break;
@@ -141,24 +142,32 @@ public class StatsUploadJobService extends JobService {
         }
     }
 
+    private JSONObject buildStatsRequest(String deviceId, String deviceName, String deviceVersion,
+                                         String deviceCountry, String deviceCarrier,
+                                         String deviceCarrierId) throws JSONException {
+        JSONObject request = new JSONObject();
+        request.put("device_hash", deviceId);
+        request.put("device_name", deviceName);
+        request.put("device_version", deviceVersion);
+        request.put("device_country", deviceCountry);
+        request.put("device_carrier", deviceCarrier);
+        request.put("device_carrier_id", deviceCarrierId);
+        return request;
+    }
 
-    private boolean uploadToCM(String deviceId, String deviceName, String deviceVersion,
-                               String deviceCountry, String deviceCarrier, String deviceCarrierId)
-            throws IOException {
-
-        final Uri uri = Uri.parse(getString(R.string.stats_cm_url)).buildUpon()
-                .appendQueryParameter("device_hash", deviceId)
-                .appendQueryParameter("device_name", deviceName)
-                .appendQueryParameter("device_version", deviceVersion)
-                .appendQueryParameter("device_country", deviceCountry)
-                .appendQueryParameter("device_carrier", deviceCarrier)
-                .appendQueryParameter("device_carrier_id", deviceCarrierId).build();
+    private boolean uploadToCM(JSONObject json) throws IOException {
+        final Uri uri = Uri.parse(getString(R.string.stats_cm_url));
         URL url = new URL(uri.toString());
         HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
         try {
             urlConnection.setInstanceFollowRedirects(true);
             urlConnection.setDoOutput(true);
-            urlConnection.connect();
+            urlConnection.setDoInput(true);
+            urlConnection.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
+
+            OutputStream os = urlConnection.getOutputStream();
+            os.write(json.toString().getBytes("UTF-8"));
+            os.close();
 
             final int responseCode = urlConnection.getResponseCode();
             if (DEBUG) Log.d(TAG, "cm server response code=" + responseCode);
-- 
cgit v1.1


From 1bdefa08e856bbcac3475f42aa9bf194c9b83b27 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Sat, 14 Jan 2017 02:29:24 +0800
Subject: DeviceInfo: Set is_lineage intent when launching PlatLogo

We use this to decide whether to launch the LineageOS PlatLogo.

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

diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 41e14ba..3eb2f90 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -254,6 +254,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
                 }
 
                 Intent intent = new Intent(Intent.ACTION_MAIN);
+                intent.putExtra("is_lineage", preference.getKey().equals(KEY_MOD_VERSION));
                 intent.setClassName("android",
                         com.android.internal.app.PlatLogoActivity.class.getName());
                 try {
-- 
cgit v1.1


From 8586c215c77da79e8e2b08e813442a702a3aa747 Mon Sep 17 00:00:00 2001
From: nijel8 <nijel8@gmail.com>
Date: Sat, 7 Jan 2017 09:56:57 -0500
Subject: Settings: Update button backlight brightness in real time

When adjusting the button backlight brightness using the seekbar,
the brightness did not update in real time, but only when the
RESET button is tapped.

With this change, the brightness is updated instantly.

Change-Id: Ib4db8b4759f2b756495dc3f9319b35cdb548d9e5
---
 .../cyanogenmod/ButtonBacklightBrightness.java     | 24 +++++++++-------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java b/src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java
index 7c63f34..96f6020 100644
--- a/src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java
+++ b/src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java
@@ -49,8 +49,6 @@ public class ButtonBacklightBrightness extends DialogPreference implements
 
     public static final String KEY_BUTTON_BACKLIGHT = "pre_navbar_button_backlight";
 
-    private Window mWindow;
-
     private BrightnessControl mButtonBrightness;
     private BrightnessControl mKeyboardBrightness;
     private BrightnessControl mActiveControl;
@@ -150,10 +148,6 @@ public class ButtonBacklightBrightness extends DialogPreference implements
                 }
             }
         });
-
-        if (getDialog() != null) {
-            mWindow = getDialog().getWindow();
-        }
         updateBrightnessPreview();
     }
 
@@ -280,15 +274,17 @@ public class ButtonBacklightBrightness extends DialogPreference implements
     }
 
     private void updateBrightnessPreview() {
-        if (mWindow != null) {
-            LayoutParams params = mWindow.getAttributes();
-            if (mActiveControl != null) {
-                params.buttonBrightness = (float) mActiveControl.getBrightness(false) / 255.0f;
-            } else {
-                params.buttonBrightness = -1;
-            }
-            mWindow.setAttributes(params);
+        if (getDialog() == null || getDialog().getWindow() == null) {
+            return;
+        }
+        Window window = getDialog().getWindow();
+        LayoutParams params = window.getAttributes();
+        if (mActiveControl != null) {
+            params.buttonBrightness = (float) mActiveControl.getBrightness(false) / 255.0f;
+        } else {
+            params.buttonBrightness = -1;
         }
+        window.setAttributes(params);
     }
 
     private void updateTimeoutEnabledState() {
-- 
cgit v1.1


From 0cfb58bd75a916ac529b7df676b22af357bc1c03 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Mon, 16 Jan 2017 19:11:23 +0800
Subject: ButtonBacklight: Preview timeout once user stops dragging

Change-Id: I0abebe1041b6ad42b10e7d24f76ea17046e64666
---
 .../settings/cyanogenmod/ButtonBacklightBrightness.java        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java b/src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java
index 96f6020..ab3ee3f 100644
--- a/src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java
+++ b/src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2013 The CyanogenMod Project
+ *               2017 The LineageOS Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,6 +60,8 @@ public class ButtonBacklightBrightness extends DialogPreference implements
 
     private ContentResolver mResolver;
 
+    private int mOriginalTimeout;
+
     public ButtonBacklightBrightness(Context context, AttributeSet attrs) {
         super(context, attrs);
 
@@ -105,7 +108,8 @@ public class ButtonBacklightBrightness extends DialogPreference implements
         mTimeoutValue = (TextView) view.findViewById(R.id.timeout_value);
         mTimeoutBar.setMax(30);
         mTimeoutBar.setOnSeekBarChangeListener(this);
-        mTimeoutBar.setProgress(getTimeout());
+        mOriginalTimeout = getTimeout();
+        mTimeoutBar.setProgress(mOriginalTimeout);
         handleTimeoutUpdate(mTimeoutBar.getProgress());
 
         ViewGroup buttonContainer = (ViewGroup) view.findViewById(R.id.button_container);
@@ -140,6 +144,7 @@ public class ButtonBacklightBrightness extends DialogPreference implements
             @Override
             public void onClick(View v) {
                 mTimeoutBar.setProgress(DEFAULT_BUTTON_TIMEOUT);
+                applyTimeout(DEFAULT_BUTTON_TIMEOUT);
                 if (mButtonBrightness != null) {
                     mButtonBrightness.reset();
                 }
@@ -156,6 +161,7 @@ public class ButtonBacklightBrightness extends DialogPreference implements
         super.onDialogClosed(positiveResult);
 
         if (!positiveResult) {
+            applyTimeout(mOriginalTimeout);
             return;
         }
 
@@ -316,7 +322,7 @@ public class ButtonBacklightBrightness extends DialogPreference implements
 
     @Override
     public void onStopTrackingTouch(SeekBar seekBar) {
-        // Do nothing here
+        applyTimeout(seekBar.getProgress());
     }
 
     private static class SavedState extends BaseSavedState {
-- 
cgit v1.1


From a9a6d547827c28ec5cdc7272a2b3b00409395303 Mon Sep 17 00:00:00 2001
From: Jorge Ruesga <jorge@ruesga.com>
Date: Mon, 2 Jan 2017 13:21:14 +0100
Subject: Update contributors cloud db

Change-Id: Ia865e64901585eccfcfb7cc28fd42088e0c14774
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
---
 assets/contributors.db | Bin 304128 -> 337920 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

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


From 8a804f31f391a732cf6739f485a5c2a30dd28d73 Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@lineageos.org>
Date: Thu, 26 Jan 2017 15:03:51 -0800
Subject: Automatic translation import

Change-Id: Ib8d8f1f7fea13e14167ef08513b183a8fa19b87d
---
 res/values-af/cm_strings.xml     |   3 -
 res/values-ar/cm_strings.xml     |   4 -
 res/values-as-rIN/arrays.xml     |  11 --
 res/values-as-rIN/cm_strings.xml |   3 -
 res/values-as-rIN/strings.xml    |  54 --------
 res/values-ast-rES/arrays.xml    |  11 --
 res/values-ast-rES/strings.xml   |  54 --------
 res/values-be/cm_strings.xml     |   3 -
 res/values-bg/cm_strings.xml     |  29 ++---
 res/values-br-rFR/arrays.xml     |  11 --
 res/values-br-rFR/strings.xml    |  54 --------
 res/values-ca/cm_strings.xml     |   3 -
 res/values-cs/cm_strings.xml     |   7 +-
 res/values-csb-rPL/arrays.xml    |  11 --
 res/values-csb-rPL/strings.xml   |  54 --------
 res/values-cy/arrays.xml         |  11 --
 res/values-cy/strings.xml        |  54 --------
 res/values-da/cm_strings.xml     |   3 -
 res/values-de/cm_strings.xml     |   5 +-
 res/values-el/cm_strings.xml     |  21 ++--
 res/values-en-rIN/cm_strings.xml |   5 -
 res/values-en-rPT/arrays.xml     |  11 --
 res/values-en-rPT/strings.xml    |  54 --------
 res/values-eo/arrays.xml         |  11 --
 res/values-eo/strings.xml        |  54 --------
 res/values-es-rCO/arrays.xml     |  11 --
 res/values-es-rCO/strings.xml    |  54 --------
 res/values-es-rMX/arrays.xml     |  11 --
 res/values-es-rMX/strings.xml    |  54 --------
 res/values-es-rUS/cm_strings.xml |   5 +-
 res/values-es/cm_strings.xml     |   3 -
 res/values-et-rEE/cm_strings.xml |   5 -
 res/values-eu-rES/cm_strings.xml |   3 -
 res/values-fa/cm_strings.xml     |   5 -
 res/values-fi/cm_strings.xml     |   3 -
 res/values-fr/cm_strings.xml     |   3 -
 res/values-frp-rIT/arrays.xml    |  11 --
 res/values-frp-rIT/strings.xml   |  54 --------
 res/values-fy-rNL/arrays.xml     |  11 --
 res/values-fy-rNL/strings.xml    |  54 --------
 res/values-ga-rIE/arrays.xml     |  11 --
 res/values-ga-rIE/strings.xml    |  54 --------
 res/values-gd-rGB/arrays.xml     |  11 --
 res/values-gd-rGB/strings.xml    |  54 --------
 res/values-gl-rES/cm_strings.xml |   3 -
 res/values-gu-rIN/cm_strings.xml |   3 -
 res/values-hi/cm_strings.xml     |   3 -
 res/values-hr/cm_strings.xml     |   3 -
 res/values-hu/cm_strings.xml     |   3 -
 res/values-in/cm_strings.xml     |   3 -
 res/values-it/cm_strings.xml     |   7 +-
 res/values-iw/cm_strings.xml     |   3 -
 res/values-ja/cm_strings.xml     |   3 -
 res/values-kn-rIN/cm_strings.xml |   5 -
 res/values-ko/cm_strings.xml     |   3 -
 res/values-ku/arrays.xml         |  11 --
 res/values-ku/cm_strings.xml     |   2 -
 res/values-ku/strings.xml        |  54 --------
 res/values-lb/arrays.xml         |  11 --
 res/values-lb/cm_strings.xml     |   3 -
 res/values-lb/strings.xml        |  54 --------
 res/values-lt/cm_strings.xml     |   3 -
 res/values-ml-rIN/cm_strings.xml |   3 -
 res/values-mr-rIN/cm_strings.xml |   3 -
 res/values-nb/cm_strings.xml     |  30 +++--
 res/values-nl/cm_strings.xml     |   3 -
 res/values-oc-rFR/arrays.xml     |  11 --
 res/values-oc-rFR/strings.xml    |  54 --------
 res/values-or-rIN/arrays.xml     |  11 --
 res/values-or-rIN/cm_strings.xml |   3 -
 res/values-or-rIN/strings.xml    |  54 --------
 res/values-pl/cm_strings.xml     |   5 -
 res/values-pt-rBR/cm_strings.xml |   3 -
 res/values-pt-rPT/cm_strings.xml |   5 +-
 res/values-ro/cm_strings.xml     | 170 ++++++++++++++++++++++++-
 res/values-ru/cm_strings.xml     |   3 -
 res/values-sk/cm_strings.xml     |   5 +-
 res/values-sl/cm_strings.xml     |   5 -
 res/values-sr/cm_strings.xml     |  17 ++-
 res/values-sv/cm_strings.xml     |   6 -
 res/values-ta-rIN/cm_strings.xml |   3 -
 res/values-te-rIN/cm_strings.xml |   3 -
 res/values-th/cm_strings.xml     |   3 -
 res/values-tr/cm_strings.xml     |   3 -
 res/values-ug/arrays.xml         |  11 --
 res/values-ug/cm_strings.xml     |   3 -
 res/values-ug/strings.xml        |  54 --------
 res/values-uk/cm_strings.xml     |   3 -
 res/values-vi/cm_strings.xml     |   3 -
 res/values-zh-rCN/cm_strings.xml |  57 ++++-----
 res/values-zh-rHK/cm_strings.xml |   2 -
 res/values-zh-rTW/cm_strings.xml | 260 +++++++++++++++++++--------------------
 92 files changed, 383 insertions(+), 1548 deletions(-)

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 77ad722..0b05204 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -857,10 +857,7 @@
   <string name="no_filters_title">Geen filters opgestel</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">LineageOS statistieke</string>
-  <string name="anonymous_statistics_summary">Help LineageOS verbeter deur anonieme statistiek verslagdoening te kies</string>
   <string name="anonymous_statistics_warning_title">Aangaande</string>
-  <string name="anonymous_statistics_warning">Deur LineageOS statistieke toe te laat sal nie-persoonlike data ingestuur word na die ontwikkelaars van LineageOS installasies. Die inligting sluit in \'n unieke identifikasienommer in wat nie privaatheid of persoonlike data in gevaar stel nie. Die data word ingestuur tydens elke \'boot\'.\n\nVir \'n voorbeeld van die data wat ingestuur word, raak Voorskou.</string>
   <string name="enable_reporting_title">Aktiveer verslaggewing</string>
   <string name="preview_data_title">Voorskou</string>
   <string name="view_stats_title">Kyk na statistieke</string>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 601868d..fe33c10 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -845,11 +845,7 @@
   <string name="no_filters_title">لم يتم تعيين عوامل التصفية</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">إحصائيات LineageOS</string>
-  <string name="anonymous_statistics_summary">ساهم في جعل LineageOS أفضل بموافقتك على إرسال تقارير بالإحصائيات مجهولة للمصدر</string>
   <string name="anonymous_statistics_warning_title">حول</string>
-  <string name="anonymous_statistics_warning">الموافقة على المشاركة في إحصائيات LineageOS سيسمح بإرسال البيانات غير الشخصية إلى مطوري LineageOS لتعقب الإصدارات المثبتة على مختلف الأجهزة كل على حدة. وتشمل المعلومات المقدمة معرفاً فريداً من نوعه، وبالتالي لا تتعرض خصوصيتك أو بياناتك الشخصية للخطر. تُرسل البيانات عند التشغيل في كل مرة. \n\n للاطلاع على مثال للبيانات التي يتم إرسالها، اضغط على معاينة البيانات.
-</string>
   <string name="enable_reporting_title">تمكين إعداد التقارير</string>
   <string name="preview_data_title">معاينة البيانات</string>
   <string name="view_stats_title">عرض الإحصائيات</string>
diff --git a/res/values-as-rIN/arrays.xml b/res/values-as-rIN/arrays.xml
index c45c818..4acb887 100644
--- a/res/values-as-rIN/arrays.xml
+++ b/res/values-as-rIN/arrays.xml
@@ -22,7 +22,6 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
-  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -39,21 +38,16 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
-  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -65,13 +59,11 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
-  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -134,13 +126,10 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
-  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index 4adcf74..50076b6 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -838,10 +838,7 @@
   <string name="no_filters_title">কোনো ফিল্টাৰ ছেট কৰা নাই</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">LineageOS পৰিসংখ্যা</string>
-  <string name="anonymous_statistics_summary">বেনামী পৰিসংখ্যা ৰিপোৰ্টিং চয়ন কৰাৰ দ্বাৰা LineageOS উন্নত কৰাত সহায় কৰক</string>
   <string name="anonymous_statistics_warning_title">বিষয়ে</string>
-  <string name="anonymous_statistics_warning">LineageOS পৰিসংখ্যা চয়ন কৰিলে ডিভাইচবোৰৰ মাজত অনন্য স্থাপনকৰণ ট্ৰেক কৰিবলৈ অ-ব্যক্তিগত ডাটা LineageOS ডেভেলপাৰসকললৈ দাখিল কৰিবলৈ অনুমতি দিব। দাখিল কৰা তথ্যবোৰত এটা অনন্য চিনাক্তকাৰী অন্তৰ্ভুক্ত থাকে, যিটোৱে আপোনাৰ গোপনীয়তা বা ব্যক্তিগত ডাটাৰ সৈতে আপোচ নকৰে। প্ৰতিবাৰ বুট হোৱা সময়ত ডাটা দাখিল কৰা হয়।\n\nদাখিল কৰা ডাটাৰ উদাহৰণ হিচাপে, প্ৰিভিউ ডাটাত ডেপ কৰক।</string>
   <string name="enable_reporting_title">ৰিপোৰ্টিং সক্ষম কৰক</string>
   <string name="preview_data_title">ডাটা প্ৰিভিউ কৰক</string>
   <string name="view_stats_title">পৰিসংখ্যা চাওক</string>
diff --git a/res/values-as-rIN/strings.xml b/res/values-as-rIN/strings.xml
index d06c54e..2216f6c 100644
--- a/res/values-as-rIN/strings.xml
+++ b/res/values-as-rIN/strings.xml
@@ -23,13 +23,11 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
-  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
-  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -116,7 +114,6 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
-  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -281,7 +278,6 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -310,7 +306,6 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
-  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -333,7 +328,6 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
-  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -341,7 +335,6 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
-  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -416,20 +409,16 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
-  <skip></skip>
   <!-- Security Picker -->
-  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
-  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -517,7 +506,6 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
-  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -608,7 +596,6 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
-  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -663,7 +650,6 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
-  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -731,7 +717,6 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
-  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -841,7 +826,6 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -899,7 +883,6 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
-  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1039,9 +1022,7 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1055,9 +1036,7 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
-  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1180,7 +1159,6 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
-  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1301,7 +1279,6 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
-  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1310,23 +1287,18 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
-  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1387,7 +1359,6 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
-  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1470,7 +1441,6 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1503,7 +1473,6 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
-  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1515,7 +1484,6 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1571,7 +1539,6 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1599,16 +1566,13 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
-  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
-  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
-  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1734,7 +1698,6 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
-  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1823,7 +1786,6 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
-  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1853,7 +1815,6 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
-  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1963,7 +1924,6 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -2009,14 +1969,12 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
-  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -2033,7 +1991,6 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
-  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2129,7 +2086,6 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
-  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2144,7 +2100,6 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
-  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2164,12 +2119,10 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
-  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2278,7 +2231,6 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
-  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2531,7 +2483,6 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2540,7 +2491,6 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
-  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2610,7 +2560,6 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
-  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2627,13 +2576,11 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
-  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
-  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2711,7 +2658,6 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
-  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-ast-rES/arrays.xml b/res/values-ast-rES/arrays.xml
index 82f0dab..33b597c 100644
--- a/res/values-ast-rES/arrays.xml
+++ b/res/values-ast-rES/arrays.xml
@@ -22,7 +22,6 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
-  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <string-array name="timezone_filters">
     <!-- The next level of the time zoner picker should show time zones from the Americas. -->
@@ -120,7 +119,6 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <string-array name="wifi_status">
     <!-- Status message of Wi-Fi when it is idle. -->
@@ -149,7 +147,6 @@
     <item>Inhabilitando conexón inestable temporalmente...</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <string-array name="wifi_status_with_ssid">
     <!-- Status message of Wi-Fi when it is idle. -->
@@ -178,15 +175,12 @@
     <item>Inhabilitando conexón inestable temporalmente...</item>
   </string-array>
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
-  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <string-array name="wifi_eap_method">
     <!-- Do not translate. -->
@@ -252,7 +246,6 @@
     <item>Siempre visible</item>
   </string-array>
   <!-- Match this with drawable.wifi_signal. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <string-array name="wifi_signal">
     <item>Mala</item>
@@ -280,7 +273,6 @@
     <item>Enxamás</item>
   </string-array>
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
-  <skip></skip>
   <!-- Do not translate. -->
   <string-array name="wifi_sleep_policy_values">
     <!-- Do not translate. -->
@@ -711,10 +703,8 @@
   </string-array>
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <string-array name="vpn_types_long">
     <item>Rede privada virtual PPTP</item>
@@ -725,7 +715,6 @@
     <item>Rede privada virtual IPSec con certificaos y autenticación híbrida</item>
   </string-array>
   <!-- Match this with the constants in LegacyVpnInfo. -->
-  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <string-array name="vpn_states">
     <!-- Status message when VPN is disconnected. -->
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 5ad1e33..8bb657e 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -30,7 +30,6 @@
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <string name="dlg_switch">Camudar</string>
   <!-- Device Info -->
-  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <string name="device_info_default">Desconocíu</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
@@ -43,7 +42,6 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <string name="show_dev_already">Nun hai necesidá, yá yes un desendolcador.</string>
   <!-- Category headings in left-pane header menu -->
-  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <string name="header_category_wireless_networks">Conexones inalámbriques y redes</string>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
@@ -210,7 +208,6 @@
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <string name="bluetooth_disable_profile_message">Va inhabilitase&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;de&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;.</string>
   <!-- Bluetooth settings.  Message when the device state is unknown -->
-  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <string name="bluetooth_device">Preséu Bluetooth ensin nome</string>
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
@@ -532,7 +529,6 @@
   <!-- mobile network settings screen, setting option summary text -->
   <string name="sum_carrier_select">Esbillar un operador de rede</string>
   <!-- Date and time settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <string name="date_and_time_settings_title">Data y hora</string>
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
@@ -582,7 +578,6 @@
          [CHAR LIMIT=20] -->
   <string name="time_picker_title">Hora</string>
   <!-- Security Settings -->
-  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <string name="lock_after_timeout">Bloquiar automáticamente</string>
   <!-- Security settings screen, setting option summary to change screen timeout -->
@@ -626,7 +621,6 @@
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <string name="security_passwords_title">Contraseñes</string>
   <!-- Fingerprint enrollment and settings -->
-  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <string name="security_settings_fingerprint_preference_title">Buelga dixital</string>
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
@@ -643,7 +637,6 @@
     <item quantity="other">Configuráronsese <xliff:g id="count">%1$d</xliff:g> buelgues dixitales</item>
   </plurals>
   <!-- message shown in summary field when no fingerprints are registered -->
-  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <string name="security_settings_fingerprint_enroll_onboard_title">Configuración de buelga dixital</string>
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
@@ -809,15 +802,12 @@
   <!-- Image button description to switch input method -->
   <string name="crypt_keeper_switch_input_method">Camudar métodu d\'entrada</string>
   <!-- Unlock Picker Settings -->
-  <skip></skip>
   <!-- Security Picker -->
-  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <string name="lock_settings_picker_title">Escoyer bloquéu de pantalla</string>
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <string name="lock_settings_picker_fingerprint_message">Escoyer el métodu secundariu de bloquéu de pantalla</string>
   <!--  Main Security lock settings -->
-  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_launch_picker_title">Bloquéu de pantalla</string>
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
@@ -829,7 +819,6 @@
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_off_title">Ensin seguridá</string>
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_none_title">Eslizar</string>
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
@@ -1004,7 +993,6 @@
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <string name="bluetooth_pairing_shares_phonebook">Permitir que <xliff:g id="device_name">%1$s</xliff:g> acceda a los contautos y al historial de llamaes</string>
   <!-- Title for BT error dialogs. -->
-  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <string name="bluetooth_connecting_error_message">Nun pudo afitase conexón con <xliff:g id="device_name">%1$s</xliff:g>.</string>
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
@@ -1168,7 +1156,6 @@
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <string name="nsd_quick_toggle_summary">Permitir que les aplicaciones d\'otros preseos puedan ver les aplicaciones d\'esti preséu</string>
   <!-- Wi-Fi Settings -->
-  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <string name="wifi_quick_toggle_title">Wi-Fi</string>
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
@@ -1264,7 +1251,6 @@
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <string name="wifi_setup_wps">Configuración automática (WPS)</string>
   <!-- Dialog for Access Points -->
-  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <string name="wifi_show_advanced">Opciones avanzaes</string>
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
@@ -1390,7 +1376,6 @@
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <string name="wifi_connect_failed_message" product="default">El teléfonu nun pudo coneutase a esta rede Wi‑Fi.</string>
   <!-- Wi-Fi Advanced Settings -->
-  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <string name="wifi_saved_access_points_titlebar">Redes guardaes</string>
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
@@ -1558,7 +1543,6 @@
   </string-array>
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <string name="home_settings">Aniciu</string>
   <string name="display_settings_title">Pantalla</string>
@@ -1667,7 +1651,6 @@
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <string name="search_settings_summary">Alministrar historial y configuración de gueta</string>
   <!-- Display settings -->
-  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <string name="display_settings">Pantalla</string>
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
@@ -1939,9 +1922,7 @@
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <string name="sd_mount" product="default">Activar tarxeta SD</string>
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <string name="sd_format" product="nosdcard">Desaniciar almacenamientu USB</string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
@@ -1966,9 +1947,7 @@
   <!-- SD card eject confirmation dialog  -->
   <string name="dlg_confirm_unmount_text" product="default">Si desactives la tarxeta SD, van parase dalgunes aplicaciones que tas usando y nun van tar disponibles hasta que vuelvas activala.</string>
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
-  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <string name="dlg_error_unmount_text" product="nosdcard">Nun pudo desmontase l\'almacenamientu USB. Inténtalo dempués.</string>
   <!-- SD card eject error dialog text   -->
@@ -2188,7 +2167,6 @@
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <string name="menu_cancel">Descartar</string>
   <!-- APN error dialog title -->
-  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <string name="error_apn_empty">El APN nun pue quedar baleru.</string>
@@ -2416,7 +2394,6 @@
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <string name="location_sources_heading">Fontes de llocalización</string>
   <!-- About -->
-  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <string name="about_settings" product="tablet">Información de la tablet</string>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
@@ -2432,19 +2409,15 @@
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <string name="regulatory_information">Información regulatoria</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <string name="copyright_title">Derechos d\'autor</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <string name="license_title">Llicencia</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <string name="terms_title">Términos y condiciones</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <string name="wallpaper_attributions">Fondos de pantalla</string>
@@ -2455,7 +2428,6 @@
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <string name="settings_manual_activity_unavailable">Hebo un fallu al cargar el manual.</string>
   <!-- Title for actual Settings license activity. -->
-  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <string name="settings_license_activity_title">Llicencies de códigu abiertu</string>
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
@@ -2566,7 +2538,6 @@
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <string name="activity_not_found">L\'aplicación nun ta instalada nel teléfonu.</string>
   <!-- Applications Settings -->
-  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <string name="manageapplications_settings_title">Alministrar aplicaciones</string>
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
@@ -2723,7 +2694,6 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <string name="dlg_cancel">Encaboxar</string>
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <string name="app_not_found_dlg_text"> Nun s\'atopó l\'aplicación na llista d\'aplicaciones instalaes.</string>
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
@@ -2789,7 +2759,6 @@
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <string name="force_stop_dlg_text">Si se detién una aplicación, ye dable que nun funcione correcho.</string>
   <!-- Manage applications, text for dialog when moving an app -->
-  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <string name="move_app_failed_dlg_text">Nun pudo movese l\'aplicación. <xliff:g id="reason">%1$s</xliff:g></string>
   <!-- Manage applications, application installation location title -->
@@ -2810,7 +2779,6 @@
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <string name="app_disable_notifications_dlg_text">Si desactives les notificaciones d\'esta aplicación, ye dable que nun recibas anovamientos y alertes importantes.</string>
   <!-- App Ops Settings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <string name="app_ops_settings">Operaciones de l\'aplicación</string>
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
@@ -2910,7 +2878,6 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <string name="runningservicedetails_stop_dlg_text" product="default">Si detienes esti serviciu, ye dable que dalgunes funciones del teléfonu dexen de funcionar correcho hasta que reanicies el preséu.</string>
   <!-- Language Settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <string name="language_settings">Llingua y tecláu</string>
   <!-- Title of Language and keyboard settings screen -->
@@ -2961,7 +2928,6 @@
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <string name="vibrate_input_devices_summary">Redireicionar vibración al controlador de videoxuegu cuando tea coneutáu</string>
   <!-- Keyboard Layout Preference Dialog -->
-  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_dialog_title">Esbilla un tipu de tecláu</string>
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
@@ -2971,11 +2937,9 @@
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <string name="keyboard_layout_default_label">Predetermináu</string>
   <!-- Keyboard Layout Picker -->
-  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_picker_title">Diseños de tecláu</string>
   <!-- User dictionary settings -->
-  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <string name="user_dict_settings_title">Diccionariu personal</string>
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
@@ -3206,7 +3170,6 @@
   <!-- label for usage time -->
   <string name="usage_time_label">Tiempu d\'usu</string>
   <!-- Accessibility settings -->
-  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <string name="accessibility_settings">Accesibilidá</string>
   <!-- Settings title for accessibility settings screen -->
@@ -3375,7 +3338,6 @@
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <string name="settings_button">Axustes</string>
   <!-- Printing settings -->
-  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <string name="print_settings">Impresión</string>
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
@@ -3431,7 +3393,6 @@
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_hidden_utterance">Cuadru de gueta anubríu</string>
   <!-- App Fuel Gauge strings -->
-  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <string name="power_usage_summary_title">Batería</string>
   <!-- Activity title summary for App Fuel Gauge summary -->
@@ -3640,7 +3601,6 @@
   <string name="battery_saver_turn_on_automatically_never">Enxamás</string>
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <string name="process_stats_summary_title">Estadístiques de procesos</string>
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
@@ -3724,7 +3684,6 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <string name="menu_proc_stats_type_cached">En caché</string>
   <!-- Voice input/output settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <string name="voice_input_output_settings">Entrada y salida de voz</string>
   <!-- Main voice input/output settings screen title -->
@@ -3736,7 +3695,6 @@
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <string name="voice_category">Voz</string>
   <!-- Voice input settings -->
-  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <string name="voice_input_settings">Axustes d\'entrada de voz</string>
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
@@ -3762,7 +3720,6 @@
         entrada de voz en to nome. Remanez de l\'aplicación <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>.
         ¿Quies habilitar l\'usu d\'esti serviciu?</string>
   <!-- Text-To-Speech (TTS) settings -->
-  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <string name="tts_settings">Configuración síntesis voz</string>
   <!-- TTS option item name in the main settings screen -->
@@ -3937,7 +3894,6 @@
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <string name="credentials_settings_not_available">Les credenciales nun tán disponibles pa esti usuariu</string>
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
-  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <string name="credentials_unlock_hint">Escribi la contraseña del almacenamientu de credenciales.</string>
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
@@ -3965,7 +3921,6 @@
   <!-- Sound settings screen, setting option summary text -->
   <string name="emergency_tone_summary">Afitar comportamientu al facer una llamada d\'emerxencia</string>
   <!-- Backup and reset Settings screen -->
-  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <string name="privacy_settings">Copia de seguranza</string>
   <!-- Privacy settings activity title -->
@@ -4000,13 +3955,11 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <string name="local_backup_password_toast_validation_failure">Fallu al afitar contraseña de seguranza</string>
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <string name="backup_erase_dialog_message">¿Quies dexar de facer copies de seguranza de les contraseñes Wi-Fi, de los marcadores y d\'otros axustes y datos d\'aplicaciones, arriendes de desaniciar toles copies de los sirvidores de Google?</string>
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
-  <skip></skip>
   <!-- Device admin settings activity title -->
   <string name="device_admin_settings_title">Axustes d\'alministración de preseos</string>
   <!-- Label for screen showing the active device policy -->
@@ -4177,7 +4130,6 @@
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <string name="sync_automatically">Sincronizar datos aplicaciones autom.</string>
   <!-- Sync status messages on Accounts & Synchronization settings -->
-  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <string name="sync_enabled">Sincronización activa</string>
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
@@ -4665,7 +4617,6 @@
   <string name="selinux_status_permissive">Permisivu</string>
   <string name="selinux_status_enforcing">Obligatoriu</string>
   <!-- Notification of installed CA Certs -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">Pue que la rede tea supervisada</string>
@@ -4680,7 +4631,6 @@
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <string name="ssl_ca_cert_settings_button">Comprobar credenciales de confianza</string>
   <!-- User settings -->
-  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <string name="user_settings_title">Usuarios</string>
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
@@ -4817,7 +4767,6 @@
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <string name="global_font_change_title">Camudar tamañu de fonte</string>
   <!-- NFC payment settings -->
-  <skip></skip>
   <string name="nfc_payment_settings_title">Tocar y pagar</string>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <string name="nfc_payment_how_it_works">Cómo funciona</string>
@@ -4850,7 +4799,6 @@
   <string name="nfc_payment_set_default">¿Quies usar <xliff:g id="app">%1$s</xliff:g> siempre con Tocar y pagar?</string>
   <string name="nfc_payment_set_default_instead_of">¿Quies usar <xliff:g id="app">%1$s</xliff:g> siempre en cuenta de <xliff:g id="app">%2$s</xliff:g> con Tocar y pagar?</string>
   <!-- Restrictions settings -->
-  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <string name="restriction_settings_title">Restricciones</string>
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
@@ -4860,7 +4808,6 @@
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <string name="app_notifications_switch_label">Amosar notificaciones</string>
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
-  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <string name="help_label">Ayuda &amp; comentarios</string>
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
@@ -4981,7 +4928,6 @@
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <string name="user_image_photo_selector">Esbillar semeya</string>
   <!-- Text to display in regulatory info screen (from device overlay). -->
-  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <string name="sim_setup_wizard_title">Tarxetes SIM</string>
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index be58ba9..e771cd8 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -839,10 +839,7 @@
   <string name="no_filters_title">Фільтр не ўсталяваны</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Адпраўка статыстыкі</string>
-  <string name="anonymous_statistics_summary">Дапамажыце зрабіць LineageOS лепш, дазволіўшы збор ананімнай статыстыкі</string>
   <string name="anonymous_statistics_warning_title">Звесткі</string>
-  <string name="anonymous_statistics_warning">Ананімныя справаздачы дазваляюць распрацоўнікам LineageOS адсочваць усталёўкі на розныя прылады. Адсыланая інфармацыю складаецца з назву прылады, версію прашыўкі і ўнікальны ідэнтыфікатар, адпраўка якога ніякай чынам не шкодзіць Вашай прыватнасці. Справаздача адсылаецца пры кожнай загрузцы прылады.</string>
   <string name="enable_reporting_title">Дазволіць збор статыстыкі</string>
   <string name="preview_data_title">Прагляд дадзеных якія адпраўляюцца</string>
   <string name="view_stats_title">Прагляд статыстыкі ўсталёвак</string>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 0aea1c4..3b41123 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -377,7 +377,7 @@
   <string name="app_ops_summaries_toggle_bluetooth">превключване на Bluetooth</string>
   <string name="app_ops_summaries_start_at_boot">изпълнява се при стартиране</string>
   <string name="app_ops_summaries_toggle_nfc">активиране/деактивиране NFC</string>
-  <string name="app_ops_summaries_toggle_mobile_data">Превключване клетъчен данни</string>
+  <string name="app_ops_summaries_toggle_mobile_data">Включване / Изключване на мобилни данни</string>
   <string name="app_ops_summaries_superuser">Администраторски достъп</string>
   <!-- User display names for app ops codes - extension of AOSP -->
   <string name="app_ops_labels_coarse_location">Приблизително местоположение</string>
@@ -447,7 +447,7 @@
   <string name="app_ops_labels_toggle_bluetooth">Превключване на Bluetooth</string>
   <string name="app_ops_labels_start_at_boot">Изпълнява се при стартиране</string>
   <string name="app_ops_labels_toggle_nfc">активиране/деактивиране NFC</string>
-  <string name="app_ops_labels_toggle_mobile_data">Превключване клетъчен данни</string>
+  <string name="app_ops_labels_toggle_mobile_data">Включване / Изключване на мобилни данни</string>
   <string name="app_ops_labels_superuser">Администраторски достъп</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">Позволено</string>
@@ -626,8 +626,8 @@
   <string name="adj_intensity_title">Интензивност</string>
   <string name="adj_contrast_title">Контраст</string>
   <!-- Whether to display IME switcher notifcation -->
-  <string name="ime_switcher_notify">Селектор на икона</string>
-  <string name="ime_switcher_notify_summary">Покажи метода на въвеждане на селектирана икона</string>
+  <string name="ime_switcher_notify">Икона на селектор</string>
+  <string name="ime_switcher_notify_summary">Покажи метода за въвеждане на селекторна икона</string>
   <!-- Heads up -->
   <string name="heads_up_notifications">Изскачащи известия</string>
   <string name="summary_heads_up_enabled">Изскачащите известия са разрешени</string>
@@ -745,7 +745,7 @@
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_cyanogenmod_title">Поверителност</string>
   <!-- Privacy Guard -->
-  <string name="privacy_guard_default_title">Активирайте по подразбиране</string>
+  <string name="privacy_guard_default_title">Активиране по подразбиране</string>
   <string name="privacy_guard_default_summary">Активира защитен режим за нови приложения</string>
   <string name="privacy_guard_manager_title">Защитен режим</string>
   <string name="privacy_guard_manager_summary">Управлявайте, кои приложения да имат достъп до вашите лични данни</string>
@@ -858,10 +858,7 @@
   <string name="no_filters_title">Няма зададени филтри</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Статистики</string>
-  <string name="anonymous_statistics_summary">Помогнете да направим LineageOS по-добър, като разрешите да събира анонимни статистически данни</string>
   <string name="anonymous_statistics_warning_title">Информация</string>
-  <string name="anonymous_statistics_warning">Ще позволи на LineageOS Statistics да изпраща не лична информация  на разработчиците от LineageOS, за проследяване на инсталациите в устройството. Предоставената информация включва уникален идентификатор, който не застрашава вашата поверителност или лични данни. Данните се подават по време на всяко зареждане.\n\nПример за данните, които са подадени.</string>
   <string name="enable_reporting_title">Разреши отчитане</string>
   <string name="preview_data_title">Визуализиране на данните</string>
   <string name="view_stats_title">Преглед на статистиките</string>
@@ -890,18 +887,18 @@
   <string name="pa_login_incorrect_login">Влизането е неуспешно</string>
   <string name="pa_pattern_or_fingerprint_header">Начертай фигура или използвай пръстов отпечатък за да отключиш</string>
   <!-- Contributors cloud activity -->
-  <string name="contributors_cloud_fragment_title">Сътрудници</string>
-  <string name="contributors_cloud_loading_message">Зареждане на данните за сътрудници\u2026</string>
-  <string name="contributors_cloud_failed_message">Данните за сътрудници не могат да бъдат заредени</string>
+  <string name="contributors_cloud_fragment_title">Разработчици</string>
+  <string name="contributors_cloud_loading_message">Зареждане на данните за разработчици\u2026</string>
+  <string name="contributors_cloud_failed_message">Неуспех при изтеглянето на информация за разработчиците</string>
   <string name="contributor_info_menu">Потребителска информация</string>
   <string name="contributor_info_msg">
         <![CDATA[<b>Име:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
                  <b>Ник:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
                  <b>Ангажира:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
-  <string name="contributions_info_menu">Информация за потребители</string>
+  <string name="contributions_info_menu">Обща информация</string>
   <string name="contributions_info_msg">
-        <![CDATA[<b>Общо сътрудници:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
-                 <b>Общо ангажира:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
+        <![CDATA[<b>Брой разработчици:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
+                 <b>Брой промени:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
                  <b>Последна актуализация:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
   <string name="category_sounds">Звуци</string>
   <string name="notification_manager">Известия</string>
@@ -1024,7 +1021,7 @@
   <string name="restrict_app_cellular_summary">Забрани предаването на данните от приложенията през мобилни мрежи</string>
   <string name="privacy_guard_internet_category">Интернет</string>
   <!-- Weather -->
-  <string name="weather_settings_title">Прогноза за времето</string>
+  <string name="weather_settings_title">Прогноза на времето</string>
   <string name="weather_settings_no_services_prompt">Няма инсталиран доставчик на време</string>
   <string name="weather_settings_button">Настройки на доставчика</string>
   <string name="weather_settings_activity_not_found">Неуспешно стартиране на меню \"Настройки\" на този доставчик</string>
@@ -1034,7 +1031,7 @@
   <string name="weather_settings_temp_units_title">Температурни единици</string>
   <string name="weather_settings_temp_celsius">Целзий</string>
   <string name="weather_settings_temp_fahrenheit">Фаренхайт</string>
-  <string name="weather_settings_keyword">Прогноза за времето</string>
+  <string name="weather_settings_keyword">времето</string>
   <string name="background_data_access">Достъп до данни на заден план</string>
   <string name="allow_background_both">Надвишени мобилни данни &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">Само над Wi\u2011Fi</string>
diff --git a/res/values-br-rFR/arrays.xml b/res/values-br-rFR/arrays.xml
index c45c818..4acb887 100644
--- a/res/values-br-rFR/arrays.xml
+++ b/res/values-br-rFR/arrays.xml
@@ -22,7 +22,6 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
-  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -39,21 +38,16 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
-  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -65,13 +59,11 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
-  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -134,13 +126,10 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
-  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-br-rFR/strings.xml b/res/values-br-rFR/strings.xml
index d06c54e..2216f6c 100644
--- a/res/values-br-rFR/strings.xml
+++ b/res/values-br-rFR/strings.xml
@@ -23,13 +23,11 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
-  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
-  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -116,7 +114,6 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
-  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -281,7 +278,6 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -310,7 +306,6 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
-  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -333,7 +328,6 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
-  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -341,7 +335,6 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
-  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -416,20 +409,16 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
-  <skip></skip>
   <!-- Security Picker -->
-  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
-  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -517,7 +506,6 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
-  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -608,7 +596,6 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
-  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -663,7 +650,6 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
-  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -731,7 +717,6 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
-  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -841,7 +826,6 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -899,7 +883,6 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
-  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1039,9 +1022,7 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1055,9 +1036,7 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
-  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1180,7 +1159,6 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
-  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1301,7 +1279,6 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
-  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1310,23 +1287,18 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
-  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1387,7 +1359,6 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
-  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1470,7 +1441,6 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1503,7 +1473,6 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
-  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1515,7 +1484,6 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1571,7 +1539,6 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1599,16 +1566,13 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
-  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
-  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
-  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1734,7 +1698,6 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
-  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1823,7 +1786,6 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
-  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1853,7 +1815,6 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
-  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1963,7 +1924,6 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -2009,14 +1969,12 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
-  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -2033,7 +1991,6 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
-  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2129,7 +2086,6 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
-  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2144,7 +2100,6 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
-  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2164,12 +2119,10 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
-  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2278,7 +2231,6 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
-  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2531,7 +2483,6 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2540,7 +2491,6 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
-  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2610,7 +2560,6 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
-  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2627,13 +2576,11 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
-  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
-  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2711,7 +2658,6 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
-  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 182529f..eefb651 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -858,10 +858,7 @@
   <string name="no_filters_title">Sense filtres establerts</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Estadístiques de LineageOS</string>
-  <string name="anonymous_statistics_summary">Ajuda a fer millor LineageOS optant a transmetre estadístiques anònimes</string>
   <string name="anonymous_statistics_warning_title">Quant a</string>
-  <string name="anonymous_statistics_warning">Optant a les estadístiques de LineageOS permetràs que dades no-personals siguin transmeses als desenvolupadors de LineageOS per rastrejar les intal·lacions individuals a través dels dispositius. La informació transmesa inclou un identificador únic, que no compromet la privacitat o les dades personals. Les dades son transmeses durant cada arrancada.\n\nPer un exemple de les dades transmeses, pica a vista prèvia de Dades.</string>
   <string name="enable_reporting_title">Activa els informes</string>
   <string name="preview_data_title">Vista prèvia de Dades</string>
   <string name="view_stats_title">Veure estadístiques</string>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 7d6359a..d221526 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -860,10 +860,7 @@
   <string name="no_filters_title">Nenastaven žádný filtr</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">LineageOS statistiky</string>
-  <string name="anonymous_statistics_summary">Zlepšete LineageOS pomocí posíláním anonymních statistik</string>
   <string name="anonymous_statistics_warning_title">O aplikaci</string>
-  <string name="anonymous_statistics_warning">Pokud povolíte zasílání anonymních statistik z vašeho zařízení odesílat statistická data bez vašich osobních údajů k vývojářům, jež umožní zjišťovat unikátnost instalace napříč všemi zařízeními. Data jsou odesílána během startu zařízení.\n\nDotykem na „Náhled dat“ se můžete podívat na příklad odesílaných dat.</string>
   <string name="enable_reporting_title">Povolit odesílání</string>
   <string name="preview_data_title">Náhled dat</string>
   <string name="view_stats_title">Zobrazit statistiky</string>
@@ -901,9 +898,9 @@
 <b>Přezdívka:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
 <b>Potvrzení:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
   <string name="contributions_info_menu">Informace o přispěvatelích</string>
-  <string name="contributions_info_msg"><![CDATA[<b>Celkem přispěvatelů:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
+  <string name="contributions_info_msg"><b>Celkem přispěvatelů:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
 <b>Celkem příspěvků:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
-<b>Poslední aktualizace:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
+<b>Poslední aktualizace:</b> <xliff:g id="date">%3$s</xliff:g></string>
   <string name="category_sounds">Zvuky</string>
   <string name="notification_manager">Upozornění</string>
   <string name="lockscreen_settings">Zámek obrazovky</string>
diff --git a/res/values-csb-rPL/arrays.xml b/res/values-csb-rPL/arrays.xml
index c45c818..4acb887 100644
--- a/res/values-csb-rPL/arrays.xml
+++ b/res/values-csb-rPL/arrays.xml
@@ -22,7 +22,6 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
-  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -39,21 +38,16 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
-  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -65,13 +59,11 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
-  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -134,13 +126,10 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
-  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-csb-rPL/strings.xml b/res/values-csb-rPL/strings.xml
index d06c54e..2216f6c 100644
--- a/res/values-csb-rPL/strings.xml
+++ b/res/values-csb-rPL/strings.xml
@@ -23,13 +23,11 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
-  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
-  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -116,7 +114,6 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
-  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -281,7 +278,6 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -310,7 +306,6 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
-  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -333,7 +328,6 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
-  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -341,7 +335,6 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
-  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -416,20 +409,16 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
-  <skip></skip>
   <!-- Security Picker -->
-  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
-  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -517,7 +506,6 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
-  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -608,7 +596,6 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
-  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -663,7 +650,6 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
-  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -731,7 +717,6 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
-  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -841,7 +826,6 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -899,7 +883,6 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
-  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1039,9 +1022,7 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1055,9 +1036,7 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
-  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1180,7 +1159,6 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
-  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1301,7 +1279,6 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
-  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1310,23 +1287,18 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
-  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1387,7 +1359,6 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
-  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1470,7 +1441,6 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1503,7 +1473,6 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
-  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1515,7 +1484,6 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1571,7 +1539,6 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1599,16 +1566,13 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
-  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
-  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
-  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1734,7 +1698,6 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
-  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1823,7 +1786,6 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
-  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1853,7 +1815,6 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
-  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1963,7 +1924,6 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -2009,14 +1969,12 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
-  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -2033,7 +1991,6 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
-  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2129,7 +2086,6 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
-  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2144,7 +2100,6 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
-  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2164,12 +2119,10 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
-  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2278,7 +2231,6 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
-  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2531,7 +2483,6 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2540,7 +2491,6 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
-  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2610,7 +2560,6 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
-  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2627,13 +2576,11 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
-  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
-  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2711,7 +2658,6 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
-  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-cy/arrays.xml b/res/values-cy/arrays.xml
index c45c818..4acb887 100644
--- a/res/values-cy/arrays.xml
+++ b/res/values-cy/arrays.xml
@@ -22,7 +22,6 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
-  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -39,21 +38,16 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
-  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -65,13 +59,11 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
-  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -134,13 +126,10 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
-  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
index d06c54e..2216f6c 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -23,13 +23,11 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
-  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
-  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -116,7 +114,6 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
-  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -281,7 +278,6 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -310,7 +306,6 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
-  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -333,7 +328,6 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
-  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -341,7 +335,6 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
-  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -416,20 +409,16 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
-  <skip></skip>
   <!-- Security Picker -->
-  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
-  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -517,7 +506,6 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
-  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -608,7 +596,6 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
-  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -663,7 +650,6 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
-  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -731,7 +717,6 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
-  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -841,7 +826,6 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -899,7 +883,6 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
-  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1039,9 +1022,7 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1055,9 +1036,7 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
-  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1180,7 +1159,6 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
-  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1301,7 +1279,6 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
-  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1310,23 +1287,18 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
-  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1387,7 +1359,6 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
-  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1470,7 +1441,6 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1503,7 +1473,6 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
-  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1515,7 +1484,6 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1571,7 +1539,6 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1599,16 +1566,13 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
-  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
-  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
-  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1734,7 +1698,6 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
-  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1823,7 +1786,6 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
-  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1853,7 +1815,6 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
-  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1963,7 +1924,6 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -2009,14 +1969,12 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
-  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -2033,7 +1991,6 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
-  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2129,7 +2086,6 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
-  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2144,7 +2100,6 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
-  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2164,12 +2119,10 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
-  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2278,7 +2231,6 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
-  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2531,7 +2483,6 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2540,7 +2491,6 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
-  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2610,7 +2560,6 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
-  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2627,13 +2576,11 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
-  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
-  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2711,7 +2658,6 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
-  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 3fcb935..2181214 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -843,10 +843,7 @@
   <string name="no_filters_title">Der er ingen filtre</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">LineageOS-statistikker</string>
-  <string name="anonymous_statistics_summary">Hjælp med at gøre LineageOS bedre ved at deltage i rapportering af anonyme statistikker</string>
   <string name="anonymous_statistics_warning_title">Om</string>
-  <string name="anonymous_statistics_warning">Deltagelse af LineageOS-statistikker vil tillade ikke-personlige data, der skal forelægges for udviklerne af LineageOS, at spore unikke installationer på tværs af enheder. De indsendte oplysninger omfatter en entydig indikator, som ikke kompromitterer dit privatliv eller personlige data. Dataene indsendes under hver opstart.\n\nFor et eksempel på de data, der er indsendt, skal du trykke på Få vist data.</string>
   <string name="enable_reporting_title">Aktivér rapportering</string>
   <string name="preview_data_title">Få vist data</string>
   <string name="view_stats_title">Vis statistikker</string>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index eabecd0..c218cb8 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -858,10 +858,7 @@
   <string name="no_filters_title">Keine Filter aktiv</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">LineageOS-Statistiken</string>
-  <string name="anonymous_statistics_summary">Helfen Sie uns, LineageOS zu verbessern, indem Sie dem Sammeln anonymer Gerätestatistiken zustimmen.</string>
   <string name="anonymous_statistics_warning_title">Über</string>
-  <string name="anonymous_statistics_warning">Die Aktivierung der Cyanogenmod-Statistiken ermöglicht die Übertragung von nicht-personenbezogenen Daten an die Entwickler von LineageOS. Die bei jedem Neustart des Geräts übermittelten Daten beeinträchtigen nicht die Privatsphäre, da sie keinerlei Rückschlüsse auf den Benutzer zulassen.\n\nFür ein Beispiel der gesendeten Daten bitte auf \"Vorschau\" klicken.</string>
   <string name="enable_reporting_title">Berichte einschalten</string>
   <string name="preview_data_title">Vorschau</string>
   <string name="view_stats_title">Statistiken anzeigen</string>
@@ -1028,7 +1025,7 @@
   <string name="weather_settings_no_services_prompt">Keine Wetteranbieterdienste installiert</string>
   <string name="weather_settings_button">Anbieter-Einstellungen</string>
   <string name="weather_settings_activity_not_found">Das Einstellungsmenü dieses Anbieters konnte nicht gestartet werden</string>
-  <string name="weather_settings_add_weather_provider">Wetter-Anbieter hinzufügen</string>
+  <string name="weather_settings_add_weather_provider">Wetterdatenanbieter hinzufügen</string>
   <string name="weather_settings_general_settings_title">Allgemein</string>
   <string name="weather_settings_providers_title">Anbieter</string>
   <string name="weather_settings_temp_units_title">Temperatureinheit</string>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 3f90f22..aa38529 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -553,6 +553,7 @@
   <string name="double_tap_to_sleep_summary">Διπλό χτύπημα στη γραμμή κατάστασης για αναστολή της συσκευής</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Πρόληψη ακούσιας αφύπνισης</string>
+  <string name="proximity_wake_summary">Έλεγχος του αισθητήρα εγγύτητας πριν την αφύπνιση που προκλήθηκε από χειρονομίες</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Αφύπνιση κατά τη σύνδεση</string>
   <string name="wake_when_plugged_or_unplugged_summary">Ενεργοποίηση της οθόνης κατά την σύνδεση ή αποσύνδεση μιας πηγής ισχύος</string>
@@ -857,14 +858,7 @@
   <string name="no_filters_title">Δεν έχουν οριστεί φίλτρα</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Στατιστικά LineageOS</string>
-  <string name="anonymous_statistics_summary">Βοηθήστε το LineageOS να γίνει καλύτερο ενεργοποιώντας την αποστολή ανώνυμων στατιστικών στοιχείων</string>
   <string name="anonymous_statistics_warning_title">Σχετικά</string>
-  <string name="anonymous_statistics_warning">Ενεργοποιώντας τα στατιστικά του LineageOS επιτρέπετε την αποστολή
-        μη προσωπικών δεδομένων στους προγραμματιστές του LineageOS για παρακολούθηση του αριθμού μοναδικών εγκαταστάσεων
-        σε όλες τις συσκευές. Οι πληροφορίες που αποστέλλονται συμπεριλαμβάνουν ένα μοναδικό αναγνωριστικό, το οποίο δεν θέτει
-        σε κίνδυνο την ασφάλεια σας ή τα προσωπικά δεδομένα. Τα δεδομένα αποστέλλονται σε κάθε εκκίνηση.\n\nΓια ένα παράδειγμα
-        των δεδομένων που αποστέλλονται, πατήστε στην Προεπισκόπηση δεδομένων.</string>
   <string name="enable_reporting_title">Ενεργοποίηση αναφοράς</string>
   <string name="preview_data_title">Προεπισκόπηση δεδομένων</string>
   <string name="view_stats_title">Εμφάνιση στατιστικών</string>
@@ -955,6 +949,10 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">επιλεγμένα μηνύματα</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>
@@ -1061,6 +1059,15 @@
   <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">Προηγμένος έλεγχος modem</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index 34a574c..423eb3c 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -775,12 +775,7 @@
   <string name="no_filters_title">No filters set</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">LineageOS statistics</string>
-  <string name="anonymous_statistics_summary">Help make LineageOS better by opting into anonymous statistics reporting</string>
   <string name="anonymous_statistics_warning_title">About</string>
-  <string name="anonymous_statistics_warning">Opting into LineageOS Statistics will allow non-personal data to be submitted to the
-        developers of LineageOS to track unique installations across devices. The information submitted includes an unique identifier,
-        which does not compromise your privacy or personal data. The data is submitted during each boot.\n\nFor an example of the data that is submitted, tap on Preview Data.</string>
   <string name="enable_reporting_title">Enable reporting</string>
   <string name="preview_data_title">Preview data</string>
   <string name="view_stats_title">View stats</string>
diff --git a/res/values-en-rPT/arrays.xml b/res/values-en-rPT/arrays.xml
index c45c818..4acb887 100644
--- a/res/values-en-rPT/arrays.xml
+++ b/res/values-en-rPT/arrays.xml
@@ -22,7 +22,6 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
-  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -39,21 +38,16 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
-  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -65,13 +59,11 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
-  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -134,13 +126,10 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
-  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-en-rPT/strings.xml b/res/values-en-rPT/strings.xml
index d06c54e..2216f6c 100644
--- a/res/values-en-rPT/strings.xml
+++ b/res/values-en-rPT/strings.xml
@@ -23,13 +23,11 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
-  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
-  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -116,7 +114,6 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
-  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -281,7 +278,6 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -310,7 +306,6 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
-  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -333,7 +328,6 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
-  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -341,7 +335,6 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
-  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -416,20 +409,16 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
-  <skip></skip>
   <!-- Security Picker -->
-  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
-  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -517,7 +506,6 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
-  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -608,7 +596,6 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
-  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -663,7 +650,6 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
-  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -731,7 +717,6 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
-  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -841,7 +826,6 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -899,7 +883,6 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
-  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1039,9 +1022,7 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1055,9 +1036,7 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
-  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1180,7 +1159,6 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
-  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1301,7 +1279,6 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
-  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1310,23 +1287,18 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
-  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1387,7 +1359,6 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
-  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1470,7 +1441,6 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1503,7 +1473,6 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
-  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1515,7 +1484,6 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1571,7 +1539,6 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1599,16 +1566,13 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
-  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
-  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
-  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1734,7 +1698,6 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
-  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1823,7 +1786,6 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
-  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1853,7 +1815,6 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
-  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1963,7 +1924,6 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -2009,14 +1969,12 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
-  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -2033,7 +1991,6 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
-  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2129,7 +2086,6 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
-  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2144,7 +2100,6 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
-  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2164,12 +2119,10 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
-  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2278,7 +2231,6 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
-  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2531,7 +2483,6 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2540,7 +2491,6 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
-  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2610,7 +2560,6 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
-  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2627,13 +2576,11 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
-  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
-  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2711,7 +2658,6 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
-  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-eo/arrays.xml b/res/values-eo/arrays.xml
index f090536..2731296 100644
--- a/res/values-eo/arrays.xml
+++ b/res/values-eo/arrays.xml
@@ -22,7 +22,6 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
-  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <string-array name="timezone_filters">
     <!-- The next level of the time zoner picker should show time zones from the Americas. -->
@@ -103,21 +102,16 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
-  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -142,7 +136,6 @@
     <item>Never time out</item>
   </string-array>
   <!-- Match this with drawable.wifi_signal. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <string-array name="wifi_sleep_policy_entries">
@@ -164,7 +157,6 @@
     <item>Neniam</item>
   </string-array>
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
-  <skip></skip>
   <!-- Do not translate. -->
   <string-array name="wifi_sleep_policy_values">
     <!-- Do not translate. -->
@@ -354,13 +346,10 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
-  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index 6293304..6d2c217 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -25,14 +25,12 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
-  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <string name="device_info_default">Nekonata</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
-  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -124,7 +122,6 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
-  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -297,7 +294,6 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -327,7 +323,6 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
-  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -352,7 +347,6 @@
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <string name="security_passwords_title">Pasvortoj</string>
   <!-- Fingerprint enrollment and settings -->
-  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -360,7 +354,6 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
-  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -439,20 +432,16 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
-  <skip></skip>
   <!-- Security Picker -->
-  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
-  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -544,7 +533,6 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
-  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -641,7 +629,6 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
-  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -697,7 +684,6 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
-  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -770,7 +756,6 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
-  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -886,7 +871,6 @@
   </string-array>
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -947,7 +931,6 @@
   <string name="search_settings">Serĉi</string>
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
-  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1093,9 +1076,7 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1109,9 +1090,7 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
-  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1240,7 +1219,6 @@
   <string name="menu_save">Konservi</string>
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
-  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1361,7 +1339,6 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
-  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1370,23 +1347,18 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
-  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1447,7 +1419,6 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
-  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1536,7 +1507,6 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <string name="dlg_cancel">Nuligi</string>
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1570,7 +1540,6 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
-  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1582,7 +1551,6 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1643,7 +1611,6 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1674,16 +1641,13 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
-  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
-  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
-  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1816,7 +1780,6 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
-  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <string name="accessibility_settings">Alirebleco</string>
   <!-- Settings title for accessibility settings screen -->
@@ -1910,7 +1873,6 @@
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <string name="settings_button">Agordoj</string>
   <!-- Printing settings -->
-  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1946,7 +1908,6 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
-  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -2057,7 +2018,6 @@
   <string name="battery_saver_turn_on_automatically_never">Neniam</string>
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -2107,14 +2067,12 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
-  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -2131,7 +2089,6 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
-  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2229,7 +2186,6 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
-  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2244,7 +2200,6 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
-  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2264,12 +2219,10 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
-  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2384,7 +2337,6 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
-  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2653,7 +2605,6 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2662,7 +2613,6 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
-  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <string name="user_settings_title">Uzantoj</string>
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
@@ -2742,7 +2692,6 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
-  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2760,13 +2709,11 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
-  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
-  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2845,7 +2792,6 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
-  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-es-rCO/arrays.xml b/res/values-es-rCO/arrays.xml
index c45c818..4acb887 100644
--- a/res/values-es-rCO/arrays.xml
+++ b/res/values-es-rCO/arrays.xml
@@ -22,7 +22,6 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
-  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -39,21 +38,16 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
-  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -65,13 +59,11 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
-  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -134,13 +126,10 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
-  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-es-rCO/strings.xml b/res/values-es-rCO/strings.xml
index d06c54e..2216f6c 100644
--- a/res/values-es-rCO/strings.xml
+++ b/res/values-es-rCO/strings.xml
@@ -23,13 +23,11 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
-  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
-  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -116,7 +114,6 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
-  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -281,7 +278,6 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -310,7 +306,6 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
-  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -333,7 +328,6 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
-  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -341,7 +335,6 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
-  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -416,20 +409,16 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
-  <skip></skip>
   <!-- Security Picker -->
-  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
-  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -517,7 +506,6 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
-  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -608,7 +596,6 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
-  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -663,7 +650,6 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
-  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -731,7 +717,6 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
-  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -841,7 +826,6 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -899,7 +883,6 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
-  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1039,9 +1022,7 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1055,9 +1036,7 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
-  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1180,7 +1159,6 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
-  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1301,7 +1279,6 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
-  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1310,23 +1287,18 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
-  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1387,7 +1359,6 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
-  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1470,7 +1441,6 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1503,7 +1473,6 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
-  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1515,7 +1484,6 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1571,7 +1539,6 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1599,16 +1566,13 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
-  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
-  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
-  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1734,7 +1698,6 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
-  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1823,7 +1786,6 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
-  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1853,7 +1815,6 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
-  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1963,7 +1924,6 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -2009,14 +1969,12 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
-  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -2033,7 +1991,6 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
-  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2129,7 +2086,6 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
-  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2144,7 +2100,6 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
-  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2164,12 +2119,10 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
-  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2278,7 +2231,6 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
-  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2531,7 +2483,6 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2540,7 +2491,6 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
-  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2610,7 +2560,6 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
-  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2627,13 +2576,11 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
-  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
-  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2711,7 +2658,6 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
-  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-es-rMX/arrays.xml b/res/values-es-rMX/arrays.xml
index c45c818..4acb887 100644
--- a/res/values-es-rMX/arrays.xml
+++ b/res/values-es-rMX/arrays.xml
@@ -22,7 +22,6 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
-  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -39,21 +38,16 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
-  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -65,13 +59,11 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
-  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -134,13 +126,10 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
-  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-es-rMX/strings.xml b/res/values-es-rMX/strings.xml
index d06c54e..2216f6c 100644
--- a/res/values-es-rMX/strings.xml
+++ b/res/values-es-rMX/strings.xml
@@ -23,13 +23,11 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
-  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
-  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -116,7 +114,6 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
-  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -281,7 +278,6 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -310,7 +306,6 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
-  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -333,7 +328,6 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
-  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -341,7 +335,6 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
-  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -416,20 +409,16 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
-  <skip></skip>
   <!-- Security Picker -->
-  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
-  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -517,7 +506,6 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
-  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -608,7 +596,6 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
-  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -663,7 +650,6 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
-  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -731,7 +717,6 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
-  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -841,7 +826,6 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -899,7 +883,6 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
-  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1039,9 +1022,7 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1055,9 +1036,7 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
-  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1180,7 +1159,6 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
-  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1301,7 +1279,6 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
-  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1310,23 +1287,18 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
-  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1387,7 +1359,6 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
-  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1470,7 +1441,6 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1503,7 +1473,6 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
-  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1515,7 +1484,6 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1571,7 +1539,6 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1599,16 +1566,13 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
-  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
-  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
-  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1734,7 +1698,6 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
-  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1823,7 +1786,6 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
-  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1853,7 +1815,6 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
-  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1963,7 +1924,6 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -2009,14 +1969,12 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
-  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -2033,7 +1991,6 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
-  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2129,7 +2086,6 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
-  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2144,7 +2100,6 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
-  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2164,12 +2119,10 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
-  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2278,7 +2231,6 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
-  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2531,7 +2483,6 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2540,7 +2491,6 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
-  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2610,7 +2560,6 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
-  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2627,13 +2576,11 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
-  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
-  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2711,7 +2658,6 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
-  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index de7a9f0..3f88e77 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -61,7 +61,7 @@
   <!-- CM Updater -->
   <string name="cmupdate_settings_title">Actualizaciones de LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
-  <string name="update_recovery_title">Actualizar recovery de LineageOS</string>
+  <string name="update_recovery_title">Actualizar recovery de CyanogenMod</string>
   <string name="update_recovery_summary">Actualizar recovery con las actualizaciones del sistema</string>
   <string name="update_recovery_on_warning">AVISO: Con esta característica activada, la recuperación instalada se reemplazará por la incluida en la versión actual del sistema.\n\nLa recuperación se actualizará junto con algunas mejoras en el sistema, lo que garantiza la compatibilidad con versiones futuras.\n\n¿Quieres activar esta característica?</string>
   <string name="update_recovery_off_warning">ADVERTENCIA: Con esta característica desactivada, la recuperación instalada no se actualizará con las actualizaciones del sistema.\n\nQuizás no sea posible instalar versiones futuras del sistema con una recuperación no actualizada o no compatible.\n\n¿Quieres desactivar esta característica?</string>
@@ -841,10 +841,7 @@
   <string name="no_filters_title">No hay filtros establecidos</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Estadísticas LineageOS</string>
-  <string name="anonymous_statistics_summary">Ayuda a mejorar LineageOS mediante el envío anónimo de estadísticas</string>
   <string name="anonymous_statistics_warning_title">Acerca de</string>
-  <string name="anonymous_statistics_warning">Al permitir la recopilación y el envío de estadísticas de LineageOS, autorizas el envío de información de carácter no personal a los desarrolladores de LineageOS para hacer un seguimiento de las instalaciones que realices en los dispositivos. La información enviada incluye un identificador único que no compromete tu privacidad ni tu información personal. Esta información es enviada durante el arranque.\n\nPara ver un ejemplo de la información enviada, pulsa en \u00ABPrevisualizar datos\u00BB.</string>
   <string name="enable_reporting_title">Activar envío de estadísticas</string>
   <string name="preview_data_title">Previsualizar datos</string>
   <string name="view_stats_title">Ver estadísticas</string>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 6d2de53..4e7748c 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -843,10 +843,7 @@
   <string name="no_filters_title">No hay filtros establecidos</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Estadísticas LineageOS</string>
-  <string name="anonymous_statistics_summary">Ayuda a mejorar LineageOS mediante el envío anónimo de estadísticas</string>
   <string name="anonymous_statistics_warning_title">Acerca de</string>
-  <string name="anonymous_statistics_warning">Permitiendo la recopilación y envío de estadísticas de LineageOS, autorizas el envío de información de carácter no personal a los desarrolladores de LineageOS para hacer un seguimiento de las instalaciones que realices en los dispositivos. La información enviada incluye un identificador único que no compromete tu privacidad ni tu información personal. Esta información es enviada durante el arranque.\n\nPara ver un ejemplo de la información enviada, pulsa en Previsualizar datos.</string>
   <string name="enable_reporting_title">Activar envío de estadísticas</string>
   <string name="preview_data_title">Previsualizar datos</string>
   <string name="view_stats_title">Ver estadísticas</string>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index b71ec47..ae000bd 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -763,12 +763,7 @@
   <string name="no_filters_title">Filtreid pole seatud</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">LineageOS statistika</string>
-  <string name="anonymous_statistics_summary">Aita muuta LineageOS paremaks, osaledes anonüümse statistika kogumises</string>
   <string name="anonymous_statistics_warning_title">Üldist</string>
-  <string name="anonymous_statistics_warning">Osaledes LineageOS statiatika kogumises, võimaldad isikustamata teabe saatmist
-arendajatele jälgimaks unikaalseid installatsioone üle seadmete. Infole lisatakae unikaalne tunnus,
-mis ei ohusta sinu privaatsust ega isiklikku infot. Teave saadetakse peale igat süateemi üleslaadimiat.\n\nEdastatava info näidise nägemiseks koputa Info eelvaatel.</string>
   <string name="enable_reporting_title">Luba raporteerimine</string>
   <string name="preview_data_title">Andmete eelvaade</string>
   <string name="view_stats_title">Vaata statistikat</string>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 8f90708..7f06453 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -858,10 +858,7 @@
   <string name="no_filters_title">Ez da iragazkirik ezarri</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">LineageOS estatistikak</string>
-  <string name="anonymous_statistics_summary">LineageOS hobetzen lagundu estatistika anonimoak bidaliz</string>
   <string name="anonymous_statistics_warning_title">Honi buruz</string>
-  <string name="anonymous_statistics_warning">LineageOS estatistikak baimenduz, LineageOS garatzaileei pertsonala ez den informazioa bidaltzea baimentzen duzu, gailu desberdinetako instalazioei segimendua egitea baimentzen diena. Igorritako datuen artean identifikatzaile esklusibo bat dago, honek ez du zure pribatutasuna edo datu pertsonalak arriskuan jartzen. Datuak abiarazte bakoitzean bidaltzen dira.\n\nIgorriko liratekeen datuen adibide bat ikusteko sakatu Aurreikusi Datuak.</string>
   <string name="enable_reporting_title">Gaitu txosten bidalketa</string>
   <string name="preview_data_title">Aurreikusi datuak</string>
   <string name="view_stats_title">Ikusi estatistikak</string>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index 3a209a6..1ea59aa 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -763,12 +763,7 @@
   <string name="no_filters_title">هیچ فیلتری تنظیم نشده است</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">آمار استفاده از سایانوژن‌مود</string>
-  <string name="anonymous_statistics_summary">کمک به بهبود سایانوژن‌مود با مشارکت در ارسال گزارش آمار به صورت ناشناس</string>
   <string name="anonymous_statistics_warning_title">درباره</string>
-  <string name="anonymous_statistics_warning">مشارکت در آمار سایانوژن‌مود اجازه می‌دهد اطلاعات غیرشخصی به
-        توسعه‌دهنگان سایانوژن‌مود ارسال شده تا به موارد خاص نصب در دستگاه‌های مختلف دسترسی پیدا شود. اطلاعات ارسال‌ شده شامل یک شناسه یکتا است
-        که حریم خصوصی یا اطلاعات شخصی شما را در خطر افشا شدن قرار نمی‌دهد. این اطلاعات در هر بار راه‌اندازی دستگاه ارسال می‌شوند.\n\nبرای مشاهده یک نمونه از اطلاعاتی که ارسال می‌شود بر روی پیش‌نمایش داده‌ها ضربه بزنید.</string>
   <string name="enable_reporting_title">فعال کردن گزارش</string>
   <string name="preview_data_title">پیش‌نمایش داده‌ها</string>
   <string name="view_stats_title">مشاهده آمار</string>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 18d6b44..ae4bb7a 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -858,10 +858,7 @@
   <string name="no_filters_title">Suodattimia ei asetettu</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">LineageOS-tilastot</string>
-  <string name="anonymous_statistics_summary">Auta tekemään LineageOSista parempi tarjoamalla anonyymejä tilastoraportteja</string>
   <string name="anonymous_statistics_warning_title">Tietoja</string>
-  <string name="anonymous_statistics_warning">LineageOS-tilastojen käyttöönotto mahdollistaa anonyymien tietojen lähettämisen LineageOSin kehittäjille, jotta laitteiden järjestelmäasennuksia voidaan seurata. Tiedot sisältävät yksilöllisen tunnisteen, joka ei vaaranna henkilökohtaisia tietojasi. Tietoja lähetetään jokaisella uudelleenkäynnistyskerralla.\n\nValitse Esikatsele tietoja nähdäksesi, millaisia tietoja laitteestasi lähetetään.</string>
   <string name="enable_reporting_title">Ota raportointi käyttöön</string>
   <string name="preview_data_title">Esikatsele tietoja</string>
   <string name="view_stats_title">Näytä tilastot</string>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index d9bbf06..ea544bf 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -844,10 +844,7 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="no_filters_title">Aucun filtre défini</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">Statistiques LineageOS</string>
-  <string name="anonymous_statistics_summary">Aider LineageOS en participant à l\'envoi de données anonymes</string>
   <string name="anonymous_statistics_warning_title">À propos</string>
-  <string name="anonymous_statistics_warning">Autoriser l\'envoi de statistiques permet aux développeurs du système LineageOS de collecter des données anonymes afin de comptabiliser le nombre d\'installations par type d\'appareil. Les informations envoyées contiennent un identifiant unique de l\'appareil et ne compromettent en aucune manière la sécurité de vos données. Ce jeu d\'informations est envoyé à chaque redémarrage.\n\nVous pouvez visualiser ces données en sélectionnant Prévisualiser les données.</string>
   <string name="enable_reporting_title">Activer l\'envoi</string>
   <string name="preview_data_title">Prévisualiser les données</string>
   <string name="view_stats_title">Afficher les statistiques</string>
diff --git a/res/values-frp-rIT/arrays.xml b/res/values-frp-rIT/arrays.xml
index c45c818..4acb887 100644
--- a/res/values-frp-rIT/arrays.xml
+++ b/res/values-frp-rIT/arrays.xml
@@ -22,7 +22,6 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
-  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -39,21 +38,16 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
-  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -65,13 +59,11 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
-  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -134,13 +126,10 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
-  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-frp-rIT/strings.xml b/res/values-frp-rIT/strings.xml
index d06c54e..2216f6c 100644
--- a/res/values-frp-rIT/strings.xml
+++ b/res/values-frp-rIT/strings.xml
@@ -23,13 +23,11 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
-  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
-  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -116,7 +114,6 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
-  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -281,7 +278,6 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -310,7 +306,6 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
-  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -333,7 +328,6 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
-  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -341,7 +335,6 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
-  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -416,20 +409,16 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
-  <skip></skip>
   <!-- Security Picker -->
-  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
-  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -517,7 +506,6 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
-  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -608,7 +596,6 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
-  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -663,7 +650,6 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
-  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -731,7 +717,6 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
-  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -841,7 +826,6 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -899,7 +883,6 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
-  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1039,9 +1022,7 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1055,9 +1036,7 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
-  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1180,7 +1159,6 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
-  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1301,7 +1279,6 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
-  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1310,23 +1287,18 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
-  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1387,7 +1359,6 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
-  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1470,7 +1441,6 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1503,7 +1473,6 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
-  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1515,7 +1484,6 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1571,7 +1539,6 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1599,16 +1566,13 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
-  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
-  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
-  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1734,7 +1698,6 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
-  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1823,7 +1786,6 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
-  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1853,7 +1815,6 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
-  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1963,7 +1924,6 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -2009,14 +1969,12 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
-  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -2033,7 +1991,6 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
-  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2129,7 +2086,6 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
-  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2144,7 +2100,6 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
-  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2164,12 +2119,10 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
-  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2278,7 +2231,6 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
-  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2531,7 +2483,6 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2540,7 +2491,6 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
-  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2610,7 +2560,6 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
-  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2627,13 +2576,11 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
-  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
-  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2711,7 +2658,6 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
-  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-fy-rNL/arrays.xml b/res/values-fy-rNL/arrays.xml
index c45c818..4acb887 100644
--- a/res/values-fy-rNL/arrays.xml
+++ b/res/values-fy-rNL/arrays.xml
@@ -22,7 +22,6 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
-  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -39,21 +38,16 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
-  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -65,13 +59,11 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
-  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -134,13 +126,10 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
-  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-fy-rNL/strings.xml b/res/values-fy-rNL/strings.xml
index d06c54e..2216f6c 100644
--- a/res/values-fy-rNL/strings.xml
+++ b/res/values-fy-rNL/strings.xml
@@ -23,13 +23,11 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
-  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
-  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -116,7 +114,6 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
-  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -281,7 +278,6 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -310,7 +306,6 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
-  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -333,7 +328,6 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
-  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -341,7 +335,6 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
-  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -416,20 +409,16 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
-  <skip></skip>
   <!-- Security Picker -->
-  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
-  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -517,7 +506,6 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
-  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -608,7 +596,6 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
-  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -663,7 +650,6 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
-  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -731,7 +717,6 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
-  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -841,7 +826,6 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -899,7 +883,6 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
-  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1039,9 +1022,7 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1055,9 +1036,7 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
-  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1180,7 +1159,6 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
-  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1301,7 +1279,6 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
-  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1310,23 +1287,18 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
-  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1387,7 +1359,6 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
-  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1470,7 +1441,6 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1503,7 +1473,6 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
-  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1515,7 +1484,6 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1571,7 +1539,6 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1599,16 +1566,13 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
-  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
-  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
-  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1734,7 +1698,6 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
-  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1823,7 +1786,6 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
-  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1853,7 +1815,6 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
-  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1963,7 +1924,6 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -2009,14 +1969,12 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
-  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -2033,7 +1991,6 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
-  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2129,7 +2086,6 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
-  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2144,7 +2100,6 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
-  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2164,12 +2119,10 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
-  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2278,7 +2231,6 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
-  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2531,7 +2483,6 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2540,7 +2491,6 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
-  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2610,7 +2560,6 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
-  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2627,13 +2576,11 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
-  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
-  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2711,7 +2658,6 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
-  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-ga-rIE/arrays.xml b/res/values-ga-rIE/arrays.xml
index c45c818..4acb887 100644
--- a/res/values-ga-rIE/arrays.xml
+++ b/res/values-ga-rIE/arrays.xml
@@ -22,7 +22,6 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
-  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -39,21 +38,16 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
-  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -65,13 +59,11 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
-  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -134,13 +126,10 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
-  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-ga-rIE/strings.xml b/res/values-ga-rIE/strings.xml
index d06c54e..2216f6c 100644
--- a/res/values-ga-rIE/strings.xml
+++ b/res/values-ga-rIE/strings.xml
@@ -23,13 +23,11 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
-  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
-  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -116,7 +114,6 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
-  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -281,7 +278,6 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -310,7 +306,6 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
-  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -333,7 +328,6 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
-  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -341,7 +335,6 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
-  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -416,20 +409,16 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
-  <skip></skip>
   <!-- Security Picker -->
-  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
-  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -517,7 +506,6 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
-  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -608,7 +596,6 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
-  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -663,7 +650,6 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
-  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -731,7 +717,6 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
-  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -841,7 +826,6 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -899,7 +883,6 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
-  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1039,9 +1022,7 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1055,9 +1036,7 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
-  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1180,7 +1159,6 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
-  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1301,7 +1279,6 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
-  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1310,23 +1287,18 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
-  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1387,7 +1359,6 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
-  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1470,7 +1441,6 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1503,7 +1473,6 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
-  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1515,7 +1484,6 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1571,7 +1539,6 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1599,16 +1566,13 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
-  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
-  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
-  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1734,7 +1698,6 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
-  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1823,7 +1786,6 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
-  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1853,7 +1815,6 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
-  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1963,7 +1924,6 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -2009,14 +1969,12 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
-  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -2033,7 +1991,6 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
-  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2129,7 +2086,6 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
-  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2144,7 +2100,6 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
-  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2164,12 +2119,10 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
-  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2278,7 +2231,6 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
-  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2531,7 +2483,6 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2540,7 +2491,6 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
-  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2610,7 +2560,6 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
-  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2627,13 +2576,11 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
-  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
-  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2711,7 +2658,6 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
-  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-gd-rGB/arrays.xml b/res/values-gd-rGB/arrays.xml
index c45c818..4acb887 100644
--- a/res/values-gd-rGB/arrays.xml
+++ b/res/values-gd-rGB/arrays.xml
@@ -22,7 +22,6 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
-  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -39,21 +38,16 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
-  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -65,13 +59,11 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
-  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -134,13 +126,10 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
-  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-gd-rGB/strings.xml b/res/values-gd-rGB/strings.xml
index d06c54e..2216f6c 100644
--- a/res/values-gd-rGB/strings.xml
+++ b/res/values-gd-rGB/strings.xml
@@ -23,13 +23,11 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
-  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
-  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -116,7 +114,6 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
-  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -281,7 +278,6 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -310,7 +306,6 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
-  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -333,7 +328,6 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
-  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -341,7 +335,6 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
-  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -416,20 +409,16 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
-  <skip></skip>
   <!-- Security Picker -->
-  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
-  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -517,7 +506,6 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
-  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -608,7 +596,6 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
-  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -663,7 +650,6 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
-  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -731,7 +717,6 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
-  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -841,7 +826,6 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -899,7 +883,6 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
-  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1039,9 +1022,7 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1055,9 +1036,7 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
-  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1180,7 +1159,6 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
-  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1301,7 +1279,6 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
-  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1310,23 +1287,18 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
-  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1387,7 +1359,6 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
-  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1470,7 +1441,6 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1503,7 +1473,6 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
-  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1515,7 +1484,6 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1571,7 +1539,6 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1599,16 +1566,13 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
-  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
-  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
-  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1734,7 +1698,6 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
-  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1823,7 +1786,6 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
-  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1853,7 +1815,6 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
-  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1963,7 +1924,6 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -2009,14 +1969,12 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
-  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -2033,7 +1991,6 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
-  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2129,7 +2086,6 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
-  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2144,7 +2100,6 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
-  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2164,12 +2119,10 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
-  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2278,7 +2231,6 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
-  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2531,7 +2483,6 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2540,7 +2491,6 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
-  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2610,7 +2560,6 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
-  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2627,13 +2576,11 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
-  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
-  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2711,7 +2658,6 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
-  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index f83c908..c4b4649 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -858,10 +858,7 @@
   <string name="no_filters_title">Non se estabeleceron filtros</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Estatísticas LineageOS</string>
-  <string name="anonymous_statistics_summary">Axude a mellorar Cyanogen enviando informes de estatísiticas anónimas</string>
   <string name="anonymous_statistics_warning_title">Acerca de</string>
-  <string name="anonymous_statistics_warning">Optar polo envío de estatísticas LineageOS permitirá que se transmitan datos non personais aos desenvolvedores de LineageOS para rastrear intalacións únicas através dos dispositivos. Os datos transmitidos teñen un identificador único, que non compromete a súa privacidade ou datos persoais. Os datos serán enviados cada vez que se inicie.\n\nPara ver un exemplo dos datos van ser enviados, toque en Previsualizar datos.</string>
   <string name="enable_reporting_title">Activar envío de estatísticas</string>
   <string name="preview_data_title">Previsualizar datos</string>
   <string name="view_stats_title">Ver as estatísticas</string>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index df4e569..4129a8f 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -839,10 +839,7 @@
   <string name="no_filters_title">કોઇ ફિલ્ટર સેટ કરેલ નથી</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">LineageOS આંકડા</string>
-  <string name="anonymous_statistics_summary">LineageOSને વધુ સારું કરવામાં મદદ કરવા અનામી આંકડા અહેવાલીકરણ પસંદ કરો</string>
   <string name="anonymous_statistics_warning_title">વિશે</string>
-  <string name="anonymous_statistics_warning">LineageOS આંકડા પસંદ કરવાથી LineageOSના ડેવેલપરોને બિન અંગત ડેટા સબમિટ કરવાની છૂટ મળશે જેથી તેઓ દરેક પ્રકારનાં ડિવાઇસેસના અનન્ય ઇન્સ્ટૉલેશનો ટ્રેક કરી શકે. સબમિટ કરેલ માહિતીમાં અનન્ય ઓળખકર્તાનો સમાવેશ છે જે તમારી ગોપનીયતા કે અંગત ડેટા સાથે તડજોડ કરતો નથી. પ્રત્યેક બૂટ દરમિયાનડેટા સબમિટ થાય છે.\n\nસબમિટ થયેલા ડેટાના ઉદાહરણ માટે પૂર્વાવલોકન ડેટા પર ટૅપ કરો.</string>
   <string name="enable_reporting_title">રિપોર્ટિંગ સક્ષમ કરો</string>
   <string name="preview_data_title">પૂર્વાવલોકન ડેટા</string>
   <string name="view_stats_title">આંકડા જુઓ</string>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index 0eb009f..3d36f95 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -739,10 +739,7 @@
   <string name="no_filters_title">कोई फ़िल्टर सेट नहीं किए गए हैं</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">सियानोजेनमोड आँकड़े</string>
-  <string name="anonymous_statistics_summary">अनाम आँकड़ा रिपोर्टिंग के लिए सहमत होकर सियानोजेनमोड को बेहतर बनाने में मदद करें</string>
   <string name="anonymous_statistics_warning_title">संक्षिप्त परिचय</string>
-  <string name="anonymous_statistics_warning">सियानोजेनमोड आँकड़े के लिए सहमत होने से सियानोजेनमोड के डेवलपरों को ग़ैर-निजी डेटा भेजना संभव हो सकेगा ताकि वे विभिन्न डिवाइसों में किए गए अद्वितीय स्थापनों को ट्रैक कर सकें। भेजी गई जानकारी में अद्वितीय अभिनिर्धारक शामिल है, जो आपकी गोपनीयता या निजी डेटा के साथ कोई समझौता नहीं करता है। यह डेटा प्रत्येक बार बूट करने पर भेजा जाता है।\n\nभेजे जाने वाले डेटा के एक उदाहरण के लिए, डेटा पूर्वावलोकन को टैप करें।</string>
   <string name="enable_reporting_title">रिपोर्टिंग को सक्षम करें</string>
   <string name="preview_data_title">डेटा पूर्वावलोकन</string>
   <string name="view_stats_title">आँकड़े देखें</string>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index d8f5a35..0b2b429 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -860,10 +860,7 @@
   <string name="no_filters_title">Nema postavljenih filtera</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">LineageOS statistika</string>
-  <string name="anonymous_statistics_summary">Pomozite nam poboljšati LineageOS slanjem anonimnih statističkih izvješća</string>
   <string name="anonymous_statistics_warning_title">O</string>
-  <string name="anonymous_statistics_warning">Omogućavanjem slanja LineageOS statistike dozvolit će se da se neosobni podaci dostave razvojnom timu LineageOS-a kako bi se pratio broj pojedinačnih instalacija na različite uređaje. Informacije koje se šalju sadrže jedinstvenu identifikaciju koja ne kompromitira privatnost ili osobne podatke. Podaci se šalju pri svakom pokretanju uređaja.\n\nZa primjer podataka koji se šalju, dodirnite pregled podataka.</string>
   <string name="enable_reporting_title">Omogući izvješća</string>
   <string name="preview_data_title">Pretpregled podataka</string>
   <string name="view_stats_title">Prikaz statistika</string>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 19d2c65..382915e 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -857,10 +857,7 @@
   <string name="no_filters_title">Nincs szűrő beállítva</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">LineageOS Statisztika</string>
-  <string name="anonymous_statistics_summary">Segítsen a LineageOS jobbá tételében, kapcsolja be a névtelen statisztikai adatok gyűjtését</string>
   <string name="anonymous_statistics_warning_title">Névjegy</string>
-  <string name="anonymous_statistics_warning">A LineageOS statisztika engedélyezése nem terjed ki személyes adatokra, csak egy egyedi azonosítóval azonosítjuk az eszközöket. A beküldött adatok beleértve az egyedi azonosítót, nem veszélyeztetik az adatvédelmi vagy személyes adatokat. A statisztika minden rendszerindításkor elküldésre kerül.\n\nAz elküldött adatok menüpont alatt tekintheti meg a statisztikai adatokat.</string>
   <string name="enable_reporting_title">Statisztika engedélyezése</string>
   <string name="preview_data_title">Elküldött adatok</string>
   <string name="view_stats_title">Statisztika megtekintése</string>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index d56866d..46cdd7c 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -856,10 +856,7 @@
   <string name="no_filters_title">Belum ada penyaring</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Statistik LineageOS</string>
-  <string name="anonymous_statistics_summary">Bantu LineageOS untuk menjadi lebih baik dengan memilih ikut dalam pelaporan statistik anonim</string>
   <string name="anonymous_statistics_warning_title">Mengenai</string>
-  <string name="anonymous_statistics_warning">Memilih ikut dalam Statistik LineageOS akan memungkinkan data nonpribadi dikirimkan kepada para pengembang LineageOS untuk melacak instalasi unik pada berbagai macam perangkat. Informasi yang dikirimkan berisi pengenal unik, dan tidak membahayakan privasi atau data pribadi Anda. Data dikirim setiap kali perangkat dibut.\n\nUntuk melihat contoh data yang akan dikirim, ketuk Pratinjau Data.</string>
   <string name="enable_reporting_title">Aktifkan pelaporan</string>
   <string name="preview_data_title">Pratinjau data</string>
   <string name="view_stats_title">Lihat statistik</string>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 2ab30b7..133b20a 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -70,7 +70,7 @@
   <!-- CM Updater -->
   <string name="cmupdate_settings_title">Aggiornamento LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
-  <string name="update_recovery_title">Aggiorna recovery LineageOS</string>
+  <string name="update_recovery_title">Aggiorna recovery CyanogenMod</string>
   <string name="update_recovery_summary">Aggiorna la recovery con gli aggiornamenti del sistema</string>
   <string name="update_recovery_on_warning">AVVISO: Quando questa funzionalità è attiva, la recovery installata sarà sostituita da una inclusa con la versione corrente del sistema.\n\nLa vostra recovery attuale verrà aggiornata con gli aggiornamenti di sistema, contribuendo a garantire la compatibilità con le future versioni.\n\nAttivare questa funzione?</string>
   <string name="update_recovery_off_warning">Attenzione: Quando questa funzionalità è disattivata, la recovery installata non verrà aggiornata con il sistema.\n\nFuturi aggiornamenti potrebbero non installarsi con recovery personalizzate o vecchie.\n\nDisattivare questa funzione?</string>
@@ -858,12 +858,7 @@
   <string name="no_filters_title">Nessun filtro impostato</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">Statistiche LineageOS</string>
-  <string name="anonymous_statistics_summary">Aiuta a migliorare Cyanogenmod consentendo l\'invio di statistiche anonime</string>
   <string name="anonymous_statistics_warning_title">Info</string>
-  <string name="anonymous_statistics_warning">Attivando le Statistiche LineageOS consentirai l\'invio di dati non personali
-        agli sviluppatori per contare il numero di installazioni sui dispositivi. Le informazioni inviate includono
-        un\'identificatore unico che non compromette in alcun modo la tua privacy o dati personali.\n\nPer vedere un esempio di dati inviati, tocca Anteprima Dati.</string>
   <string name="enable_reporting_title">Attiva report</string>
   <string name="preview_data_title">Anteprima dati</string>
   <string name="view_stats_title">Vedi statistiche</string>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 0a892eb..ec34f20 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -861,10 +861,7 @@
   <string name="no_filters_title">לא הוגדרו מסננים</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">סטטיסטיקות LineageOS</string>
-  <string name="anonymous_statistics_summary">עזור לשפר את LineageOS על ידי דיווח סטטיסטיקות אנונימי</string>
   <string name="anonymous_statistics_warning_title">אודות</string>
-  <string name="anonymous_statistics_warning">הצטרפות לסטטיסטיקת LineageOS תאפשר שליחת מידע לא אישי למפתחי LineageOS על מנת לאתר התקנות שונות בין מכשירים. המידע הנשלח כולל מזהה ייחודי, אשר אינו פוגע בפרטיותך או במידע שלך. המידע נשלח עם כל אתחול.\n\nכדי לצפות בדוגמה של המידע, הקש על תצוגה מקדימה של נתונים.</string>
   <string name="enable_reporting_title">הפעל דיווח</string>
   <string name="preview_data_title">תצוגה מקדימה של נתונים</string>
   <string name="view_stats_title">הצג סטטיסטיקות</string>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 22f2a85..3cf1755 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -856,10 +856,7 @@
   <string name="no_filters_title">フィルターが設定されていません</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">LineageOSの統計</string>
-  <string name="anonymous_statistics_summary">匿名の統計のレポートに同意してLineageOSの改善に協力する</string>
   <string name="anonymous_statistics_warning_title">情報</string>
-  <string name="anonymous_statistics_warning">LineageOSの統計に同意すると、端末間のユニークインストール回数を調べるためにLineageOSの開発者への非個人情報の送信を許可します。送信される情報にはユニークIDが含まれますが、プライバシーや個人データが危険にさらされることはありません。データはブート時に送信されます。\n\n送信されるデータの見本は[データをプレビュー]をタップして確認することができます。</string>
   <string name="enable_reporting_title">レポートを有効化</string>
   <string name="preview_data_title">データをプレビュー</string>
   <string name="view_stats_title">統計を表示</string>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 696f76b..620799e 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -838,12 +838,7 @@
   <string name="no_filters_title">ಯಾವುದೇ ಫಿಲ್ಟರ್‍ಗಳನ್ನು ಹೊಂದಿಸಿಲ್ಲ</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">LineageOS ಅಂಕಿಅಂಶಗಳು</string>
-  <string name="anonymous_statistics_summary">ಅನಾಮಿಕ ಅಂಕಿಅಂಶಗಳ ವರದಿಸಲ್ಲಿಸುವಿಕೆಯನ್ನು ಆಯ್ದುಕೊಳ್ಳುವ ಮೂಲಕ LineageOSನ್ನು ಉತ್ತಮವಾಗಿಸಲು ಸಹಕರಿಸಿ</string>
   <string name="anonymous_statistics_warning_title">ಕುರಿತು</string>
-  <string name="anonymous_statistics_warning">LineageOS ಅಂಕಿಅಂಶಗಳಿಗೆ ಆಯ್ದುಕೊಳ್ಳುವುದರಿಂದ ವಯಕ್ತಿಕವಲ್ಲದ ಡೇಟಾವನ್ನು ಸಲ್ಲಿಸುವುದರ ಮೂಲಕ
-        LineageOS ಡೆವಲಪರ್ಸ್‍ಗೆ ವಿಶಿಷ್ಟ ಸ್ಥಾಪನೆಗಳನ್ನು ಸಾಧನಗಳಾದ್ಯಂತ ಟ್ರ್ಯಾಕ್ ಮಾಡಲು ಅನುಮತಿಸುತ್ತದೆ. ಸಲ್ಲಿಸುವ ಮಾಹಿತಿಯು ಒಂದು ವಿಶಿಷ್ಟ ಗುರುತನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ,
-        ಅದು ನಿಮ್ಮ ಗೌಪ್ಯತೆ ಅಥವಾ ವಯಕ್ತಿಕ ಡೇಟಾವನ್ನು ರಾಜಿ ಮಾಡುವುದಿಲ್ಲ, ಡೇಟಾವನ್ನು ಪ್ರತೀ ಬೂಟ್‍ನ  ವೇಳೆ ಸಲ್ಲಿಸಲಾಗುತ್ತದೆ.\n\nಸಲ್ಲಿಸಲ್ಪಡುವ ಡೇಟಾದ ಒಂದು ಉದಾಹರಣೆಗಾಗಿ, ಡೇಟಾ ಮುನ್ನೋಟ ಸ್ಪರ್ಶಿಸಿ.</string>
   <string name="enable_reporting_title">ವರದಿ ಸಲ್ಲಿಸುವಿಕೆ ಸಕ್ರಿಯ</string>
   <string name="preview_data_title">ಡೇಟಾ ಮುನ್ನೋಟ</string>
   <string name="view_stats_title">ಅಂಕಿಅಂಶಗಳನ್ನು ವೀಕ್ಷಿಸಿ</string>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 9798f02..6ee3f2a 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -838,10 +838,7 @@
   <string name="no_filters_title">필터가 설정되지 않음</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">LineageOS 통계</string>
-  <string name="anonymous_statistics_summary">익명의 통계 자료를 보내 LineageOS 개선에 도움 주기</string>
   <string name="anonymous_statistics_warning_title">정보</string>
-  <string name="anonymous_statistics_warning">LineageOS 통계를 사용하면 장치 고유의 설치 상태를 추적하기 위해 개인 정보를 포함하지 않은 정보가 LineageOS의 개발자로 전송됩니다. 정보는 매번 부팅할 때마다 전송됩니다.\n\n전송되는 정보를 보려면 데이터 미리 보기를 누르세요.</string>
   <string name="enable_reporting_title">보고 활성화</string>
   <string name="preview_data_title">데이터 미리 보기</string>
   <string name="view_stats_title">통계 보기</string>
diff --git a/res/values-ku/arrays.xml b/res/values-ku/arrays.xml
index aff892d..842ec6e 100644
--- a/res/values-ku/arrays.xml
+++ b/res/values-ku/arrays.xml
@@ -22,7 +22,6 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
-  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <string-array name="timezone_filters">
     <!-- The next level of the time zoner picker should show time zones from the Americas. -->
@@ -120,7 +119,6 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <string-array name="wifi_status">
     <!-- Status message of Wi-Fi when it is idle. -->
@@ -149,7 +147,6 @@
     <item>دورخستنه‌وه‌ی په‌یوه‌ندی کز</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <string-array name="wifi_status_with_ssid">
     <!-- Status message of Wi-Fi when it is idle. -->
@@ -178,15 +175,12 @@
     <item>دورخستنه‌وه‌ی تۆڕی کز</item>
   </string-array>
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
-  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <string-array name="wifi_eap_method">
     <!-- Do not translate. -->
@@ -245,7 +239,6 @@
     <item>هه‌رگیز کات ته‌واو نه‌بێت</item>
   </string-array>
   <!-- Match this with drawable.wifi_signal. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <string-array name="wifi_signal">
     <item>کز</item>
@@ -273,7 +266,6 @@
     <item>هه‌رگیز</item>
   </string-array>
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
-  <skip></skip>
   <!-- Do not translate. -->
   <string-array name="wifi_sleep_policy_values">
     <!-- Do not translate. -->
@@ -663,10 +655,8 @@
   </string-array>
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <string-array name="vpn_types_long">
     <item>PPTP VPN</item>
@@ -677,7 +667,6 @@
     <item>IPSec VPN with certificates and hybrid authentication</item>
   </string-array>
   <!-- Match this with the constants in LegacyVpnInfo. -->
-  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <string-array name="vpn_states">
     <!-- Status message when VPN is disconnected. -->
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index b978e89..1565c24 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -675,8 +675,6 @@
   <string name="no_filters_title">فلته‌ری نه‌بێت</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">ئاماری ساینۆجنمۆد</string>
-  <string name="anonymous_statistics_summary">یارمەتی ساینۆجنمۆد بدە بۆ باشکردنی سیستەمەکە بە ڕاپۆرتکردن بۆ دیلان کەلاری</string>
   <string name="anonymous_statistics_warning_title">دەربارە</string>
   <string name="enable_reporting_title">چالاکردنی ڕاپۆرتکردن</string>
   <string name="preview_data_title">پیشاندانی داتا</string>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index a6f99d9..a58ac91 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -28,7 +28,6 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
-  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <string name="device_info_default">نەناسراو</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
@@ -37,7 +36,6 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <string name="show_dev_already">پێویست ناکا، پێشتر گه‌شه‌ پێده‌ری.</string>
   <!-- Category headings in left-pane header menu -->
-  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -191,7 +189,6 @@
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <string name="bluetooth_disable_profile_message">ئه‌مه‌ وlt;brوgt;وlt;bوgt;<xliff:g id="profile_name">%1$s</xliff:g>وlt;/bوgt;وlt;brوgt;وlt;brوgt;From:وlt;brوgt;وlt;bوgt;<xliff:g id="device_name">%2$s</xliff:g>وlt;/bوgt; له‌کارده‌خات.</string>
   <!-- Bluetooth settings.  Message when the device state is unknown -->
-  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <string name="bluetooth_device">بلوتوسه‌ بێناوه‌کان</string>
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
@@ -489,7 +486,6 @@
   <!-- mobile network settings screen, setting option summary text -->
   <string name="sum_carrier_select">هه‌ڵسوڕێنه‌ری هێڵه‌که‌ت هه‌ڵبژێره‌</string>
   <!-- Date and time settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <string name="date_and_time_settings_title">ڕۆژ وamp; کات</string>
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
@@ -535,7 +531,6 @@
          [CHAR LIMIT=20] -->
   <string name="time_picker_title">کات</string>
   <!-- Security Settings -->
-  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <string name="lock_after_timeout">قفڵکردنی خۆکاری</string>
   <!-- Security settings screen, setting option summary to change screen timeout -->
@@ -572,7 +567,6 @@
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <string name="security_passwords_title">وشه‌ نهێنییه‌کان</string>
   <!-- Fingerprint enrollment and settings -->
-  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -580,7 +574,6 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
-  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -679,14 +672,11 @@
   <!-- Image button description to switch input method -->
   <string name="crypt_keeper_switch_input_method">گۆڕینی ته‌خته‌کلیل</string>
   <!-- Unlock Picker Settings -->
-  <skip></skip>
   <!-- Security Picker -->
-  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <string name="lock_settings_picker_title">ده‌ستنیشانکردنی قوفڵی ڕوونما</string>
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
-  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_launch_picker_title">قوفڵی ڕوونما</string>
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
@@ -698,7 +688,6 @@
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_off_title">هیچ</string>
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <string name="unlock_set_unlock_none_summary">پاراستنی نیه‌</string>
@@ -857,7 +846,6 @@
   <string name="bluetooth_display_passkey_pin_msg">جووت لەگەڵ :<xliff:g id="bold1">وlt;brوgt;وlt;bوgt;</xliff:g><xliff:g id="device_name">%1$s</xliff:g><xliff:g id="end_bold1">وlt;/bوgt;وlt;brوgt;وlt;brوgt;</xliff:g>بنوسە لەسەری:<xliff:g id="bold2">وlt;brوgt;وlt;bوgt;</xliff:g><xliff:g id="passkey">%2$s</xliff:g><xliff:g id="end_bold2">وlt;/bوgt;</xliff:g>,وە لێبدە بۆ ئەوەی بگەڕێتەوە.</string>
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
-  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <string name="bluetooth_preference_scan_title">پشکنین بۆ ئامێرەکان</string>
@@ -1001,7 +989,6 @@
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <string name="nsd_quick_toggle_summary">ڕێگە بە بەرنامەکانی ناو ئامێرێکی دیکە بدە کە بەرنامەکانی ناو ئامێری من ببینێت</string>
   <!-- Wi-Fi Settings -->
-  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <string name="wifi_quick_toggle_title">Wi\u2011Fi</string>
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
@@ -1088,7 +1075,6 @@
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <string name="wifi_setup_wps">دامه‌زراندنی خۆکارانه‌(WPS)</string>
   <!-- Dialog for Access Points -->
-  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <string name="wifi_wps_setup_title">دامه‌زراندنی Wi\u2011Fi پارێزراو</string>
@@ -1199,7 +1185,6 @@
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <string name="wifi_connect_failed_message" product="default">مۆبایل نەیتوانی گرێبدات بە تۆڕی وای\u2011فای.</string>
   <!-- Wi-Fi Advanced Settings -->
-  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <string name="wifi_advanced_titlebar">ڕێکبەندەکانی پەرەسەندوی وای\u2011فای</string>
@@ -1349,7 +1334,6 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <string name="home_settings">ماڵەوە</string>
   <string name="display_settings_title">شاشە</string>
@@ -1453,7 +1437,6 @@
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <string name="search_settings_summary">به‌ڕێوه‌بردنی گه‌ڕان و مێژوو</string>
   <!-- Display settings -->
-  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <string name="display_settings">پیشاندان</string>
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
@@ -1704,9 +1687,7 @@
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <string name="sd_mount" product="default">به‌ستنه‌وه‌ی بیرگه‌ی SD</string>
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <string name="sd_format" product="nosdcard">سڕینەوەی بیرگەی USB</string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
@@ -1731,9 +1712,7 @@
   <!-- SD card eject confirmation dialog  -->
   <string name="dlg_confirm_unmount_text" product="default">ئەگەر کارتی بیرگە دەربکەی لەوانەیە هەندێ لە بەرنامەکانت بوەستن وە نەکەونە کار تاکو دوبارە دایدەنێی.</string>
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
-  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1909,7 +1888,6 @@
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <string name="menu_cancel">ڕەتکردنەوە</string>
   <!-- APN error dialog title -->
-  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -2096,7 +2074,6 @@
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <string name="location_sources_heading">سەرچاوەی دۆزینەوەی شوێنەکەت</string>
   <!-- About -->
-  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <string name="about_settings" product="tablet">ده‌رباره‌ی بیرگه‌</string>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
@@ -2111,26 +2088,21 @@
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <string name="regulatory_information">زانیاری ڕێک</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <string name="copyright_title">مافی له‌به‌رگرتنه‌وه‌</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <string name="license_title">مۆڵه‌ت</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <string name="terms_title">زاراوه‌ و مه‌رجه‌کان</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
-  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <string name="settings_license_activity_title">کردنەوەی مۆڵەتی سەرچاوە</string>
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
@@ -2230,7 +2202,6 @@
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <string name="activity_not_found">بەرنامەکە دانەمەزراوە لەسەر تەلەفۆنەکەت.</string>
   <!-- Applications Settings -->
-  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <string name="manageapplications_settings_title">ڕێکخستنی بەرنامەکان</string>
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
@@ -2385,7 +2356,6 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <string name="dlg_cancel">هەڵوەشاندنەوە</string>
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -2449,7 +2419,6 @@
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <string name="force_stop_dlg_text">ئەگەر هێز بکەی بۆ وەستاندن. لەوە دەچێت تێکبچێت.</string>
   <!-- Manage applications, text for dialog when moving an app -->
-  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <string name="app_install_location_title">شوێنی دابەزاندنی خوازراو</string>
@@ -2467,7 +2436,6 @@
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <string name="app_disable_notifications_dlg_text">ئەگەر ئاگەداریەکەنی ئەم بەرنامەیە لەکار بخەی.لەوانەیە ئاگەدارکردنەوەی گرنگت لەدەست بچێ سەبارەت بە بەرنامەکە</string>
   <!-- App Ops Settings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <string name="app_ops_settings">کارەکانی بەرنامەکە</string>
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
@@ -2570,7 +2538,6 @@
 شێوازی تەلەفۆنەکە لەوە دەچێت لە کاربکەوێت تاوەکو ئەکوژێتەوە
 وە دوبارە هەوڵبدەرەوە.</string>
   <!-- Language Settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <string name="language_settings">زمانەکان</string>
   <!-- Title of Language and keyboard settings screen -->
@@ -2626,7 +2593,6 @@
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <string name="vibrate_input_devices_summary">لەرەلەر بگوازەوە بۆ دەسکەکە .کاتێ بەسترایەوە</string>
   <!-- Keyboard Layout Preference Dialog -->
-  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_dialog_title">شێوازی کیبۆرد هەڵبژێرە</string>
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
@@ -2636,11 +2602,9 @@
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <string name="keyboard_layout_default_label">بنێڕه‌ت</string>
   <!-- Keyboard Layout Picker -->
-  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_picker_title">گه‌ڵاڵه‌به‌ندی تەختەکلیل</string>
   <!-- User dictionary settings -->
-  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <string name="user_dict_settings_title">فەرهەنگی کەسی</string>
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
@@ -2852,7 +2816,6 @@
   <!-- label for usage time -->
   <string name="usage_time_label">کاتی به‌کارهێنان</string>
   <!-- Accessibility settings -->
-  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <string name="accessibility_settings">توانای ده‌ستپێگه‌شتن</string>
   <!-- Settings title for accessibility settings screen -->
@@ -3000,7 +2963,6 @@
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <string name="settings_button">ڕێکخستنه‌کان</string>
   <!-- Printing settings -->
-  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <string name="print_settings">چاپکردن</string>
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
@@ -3058,7 +3020,6 @@
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_hidden_utterance">گەڕان بۆ سندوقی شاراوە</string>
   <!-- App Fuel Gauge strings -->
-  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <string name="power_usage_summary_title">باتری</string>
   <!-- Activity title summary for App Fuel Gauge summary -->
@@ -3233,7 +3194,6 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <string name="process_stats_summary_title">ئاماری پرۆسە</string>
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
@@ -3300,7 +3260,6 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <string name="menu_proc_stats_type_cached">حەشار درا</string>
   <!-- Voice input/output settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <string name="voice_input_output_settings">دەنگ لەناو وamp; دەرەوە</string>
   <!-- Main voice input/output settings screen title -->
@@ -3312,7 +3271,6 @@
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <string name="voice_category">قسە</string>
   <!-- Voice input settings -->
-  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -3329,7 +3287,6 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
-  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <string name="tts_settings">دەق-بۆ-ڕێکخستنی قسە</string>
   <!-- TTS option item name in the main settings screen -->
@@ -3505,7 +3462,6 @@
   <string name="credential_storage_type_software">تەنها نەرمەکاڵا</string>
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
-  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <string name="credentials_unlock_hint">ئەبێت تێپەڕەوشە بنوسیت بۆ بیرگە.</string>
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
@@ -3532,7 +3488,6 @@
   <!-- Sound settings screen, setting option summary text -->
   <string name="emergency_tone_summary">دانانی کرداری كۆمەڵە كاتێك تەلەفۆن كردنێكى بارى ناكاو دا دەنێرێت</string>
   <!-- Backup and reset Settings screen -->
-  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <string name="privacy_settings">پاڵپشت و ڕێکخستنەوە</string>
   <!-- Privacy settings activity title -->
@@ -3566,14 +3521,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <string name="local_backup_password_toast_validation_failure">هەڵوەشانەوەی تێپەڕەوشەی پاشەکەوتی پاشەکەوت</string>
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <string name="backup_erase_dialog_message">گەڕانەوەى Wi\u2011Fi  وشەى نهێنيت ڕا بگرە، پەڕتووك نيشانەكەر، دانانەوەى ديكە، و زانياريى بەرنامە، كۆ هەموو وێنە
  لەسەر سێرڤەرى گووگل لەناودەبات دات?</string>
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
-  <skip></skip>
   <!-- Device admin settings activity title -->
   <string name="device_admin_settings_title">ڕێکخستنی بەڕێوەبەرایەتی ئامیر</string>
   <!-- Label for screen showing the active device policy -->
@@ -3737,7 +3690,6 @@
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <string name="sync_automatically">خۆکارانە-ناردنی داتای بەرنامە</string>
   <!-- Sync status messages on Accounts & Synchronization settings -->
-  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <string name="sync_enabled">ناردن لەکارە</string>
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
@@ -4176,7 +4128,6 @@
   <string name="selinux_status_permissive">شل</string>
   <string name="selinux_status_enforcing">سەپاندن</string>
   <!-- Notification of installed CA Certs -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">لەوانەیە تۆڕ چاودێری کرابێت</string>
@@ -4191,7 +4142,6 @@
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <string name="ssl_ca_cert_settings_button">پشکنینی بەڵگەی باوەڕپێکراو.</string>
   <!-- User settings -->
-  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <string name="user_settings_title">بەکارهێنەر</string>
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
@@ -4296,7 +4246,6 @@
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <string name="global_font_change_title">گوڕینی جۆره‌پیت قەبارە</string>
   <!-- NFC payment settings -->
-  <skip></skip>
   <string name="nfc_payment_settings_title">لێدان وamp; پێدان</string>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
@@ -4316,7 +4265,6 @@
          preferred payment application -->
   <string name="nfc_payment_set_default_label">كۆمەڵە وەك بژاردەت?</string>
   <!-- Restrictions settings -->
-  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <string name="restriction_settings_title">سنووردارەکان</string>
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
@@ -4326,7 +4274,6 @@
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <string name="app_notifications_switch_label">نیشاندانی تێبینیەکان</string>
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
-  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -4422,7 +4369,6 @@
   <string name="user_image_choose_photo" msgid="3746334626214970837">هه‌ڵبژاردنی وینه‌یه‌ک له‌ پێشەنگا</string>
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
-  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-lb/arrays.xml b/res/values-lb/arrays.xml
index 6cd02a6..8e1c9ae 100644
--- a/res/values-lb/arrays.xml
+++ b/res/values-lb/arrays.xml
@@ -22,7 +22,6 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
-  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <string-array name="timezone_filters">
     <!-- The next level of the time zoner picker should show time zones from the Americas. -->
@@ -120,7 +119,6 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <string-array name="wifi_status">
     <!-- Status message of Wi-Fi when it is idle. -->
@@ -149,7 +147,6 @@
     <item>Schlecht Internetconnectioun gëtt temporär ignoréiert</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <string-array name="wifi_status_with_ssid">
     <!-- Status message of Wi-Fi when it is idle. -->
@@ -178,15 +175,12 @@
     <item>Schlecht Internetconnectioun gëtt temporär ignoréiert</item>
   </string-array>
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
-  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <string-array name="wifi_eap_method">
     <!-- Do not translate. -->
@@ -245,7 +239,6 @@
     <item>Keen Timeout</item>
   </string-array>
   <!-- Match this with drawable.wifi_signal. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <string-array name="wifi_signal">
     <item>Schwaach</item>
@@ -273,7 +266,6 @@
     <item>Ni</item>
   </string-array>
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
-  <skip></skip>
   <!-- Do not translate. -->
   <string-array name="wifi_sleep_policy_values">
     <!-- Do not translate. -->
@@ -704,10 +696,8 @@
   </string-array>
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <string-array name="vpn_types_long">
     <item>PPTP VPN</item>
@@ -718,7 +708,6 @@
     <item>IPSec-VPN mat Zertifikaten an Hybrid-Authentifizéierung</item>
   </string-array>
   <!-- Match this with the constants in LegacyVpnInfo. -->
-  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <string-array name="vpn_states">
     <!-- Status message when VPN is disconnected. -->
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index f5ef31a..a863184 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -807,10 +807,7 @@
   <string name="no_filters_title">Keng Filtere gesat</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">LineageOS-Statistiken</string>
-  <string name="anonymous_statistics_summary">Duerch anonym Statistiken hëllefen, LineageOS ze verbesseren</string>
   <string name="anonymous_statistics_warning_title">Iwwer</string>
-  <string name="anonymous_statistics_warning">Duerch d\'Aktivéiere vun de LineageOS-Statistike ginn net-persounebezunnen Daten un d\'Entwéckler vu LineageOS iwwermëttelt, fir Unzuel un eenzelnen Installatiounen ze zielen. D\'Informatioun déi iwwerdroe gëtt enthält eng eendaiteg Identifikatiounsnummer, déi deng Privatsphär oder perséinlech Daten net beanträchtegt. D\'Datë gi bei all Systemstart iwwerdroen.\n\nFir e Beispill vun den iwwermëttelten Daten ze gesinn, dréck op \"Virschau vun den Donnéeën\".</string>
   <string name="enable_reporting_title">Berichter aschalten</string>
   <string name="preview_data_title">Virschau vun den Donnéeën</string>
   <string name="view_stats_title">Statistike kucken</string>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 8321f63..a75eacf 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -30,7 +30,6 @@
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <string name="dlg_switch">Wiesselen</string>
   <!-- Device Info -->
-  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <string name="device_info_default">Onbekannt</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
@@ -43,7 +42,6 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <string name="show_dev_already">Net néideg, du bass schonn en Entwéckler.</string>
   <!-- Category headings in left-pane header menu -->
-  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <string name="header_category_wireless_networks">Kabellos an Netzwierker</string>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
@@ -213,7 +211,6 @@
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <string name="bluetooth_disable_profile_message">Dëse Profil gëtt desaktivéiert:&lt;br&gt;&lt;b&gt;<xliff:g id="profile_name">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vu(n):&lt;br&gt;&lt;b&gt;<xliff:g id="device_name">%2$s</xliff:g>&lt;/b&gt;</string>
   <!-- Bluetooth settings.  Message when the device state is unknown -->
-  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <string name="bluetooth_device">Onbenannte Bluetooth-Apparat</string>
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
@@ -523,7 +520,6 @@
   <!-- mobile network settings screen, setting option summary text -->
   <string name="sum_carrier_select">Netzwierkprovider auswielen</string>
   <!-- Date and time settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <string name="date_and_time_settings_title">Datum an Zäit</string>
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
@@ -573,7 +569,6 @@
          [CHAR LIMIT=20] -->
   <string name="time_picker_title">Zäit</string>
   <!-- Security Settings -->
-  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <string name="lock_after_timeout">Automatesch spären</string>
   <!-- Security settings screen, setting option summary to change screen timeout -->
@@ -613,7 +608,6 @@
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <string name="security_passwords_title">Passwierder</string>
   <!-- Fingerprint enrollment and settings -->
-  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -621,7 +615,6 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
-  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -727,14 +720,11 @@
   <!-- Image button description to switch input method -->
   <string name="crypt_keeper_switch_input_method">Method fir anzeginn wiesselen</string>
   <!-- Unlock Picker Settings -->
-  <skip></skip>
   <!-- Security Picker -->
-  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <string name="lock_settings_picker_title">Schiermspär auswielen</string>
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
-  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_launch_picker_title">Schiermspär</string>
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
@@ -746,7 +736,6 @@
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_off_title">Ouni</string>
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_none_title">Wëschen</string>
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
@@ -912,7 +901,6 @@
   <string name="bluetooth_display_passkey_pin_msg">Gëff fir eng Koppelung mat <xliff:g id="bold1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="device_name">%1$s</xliff:g><xliff:g id="end_bold1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> <xliff:g id="bold2">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="passkey">%2$s</xliff:g><xliff:g id="end_bold2">&lt;/b&gt;</xliff:g> an, an dréck duerno d\'Bestätegungstast.</string>
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
-  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <string name="bluetooth_preference_scan_title">Apparater sichen</string>
@@ -1069,7 +1057,6 @@
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <string name="nsd_quick_toggle_summary">Erlaabt Appen op aneren Apparater fir Appen op dësem Apparat z\'entdecken</string>
   <!-- Wi-Fi Settings -->
-  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <string name="wifi_quick_toggle_title">WLAN</string>
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
@@ -1169,7 +1156,6 @@
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <string name="wifi_setup_wps">Automatesch Astellungen (WPS)</string>
   <!-- Dialog for Access Points -->
-  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <string name="wifi_show_advanced">Erweidert Optiounen</string>
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
@@ -1289,7 +1275,6 @@
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <string name="wifi_connect_failed_message" product="default">Den Telefon konnt net mam WLAN-Netzwierk connectéieren.</string>
   <!-- Wi-Fi Advanced Settings -->
-  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <string name="wifi_saved_access_points_titlebar">Gespäichert Netzwierker</string>
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
@@ -1444,7 +1429,6 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <string name="home_settings">Heem</string>
   <string name="display_settings_title">Usiicht</string>
@@ -1550,7 +1534,6 @@
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <string name="search_settings_summary">Geréier d\'Sich-Astellungen an den Historique</string>
   <!-- Display settings -->
-  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <string name="display_settings">Usiicht</string>
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
@@ -1812,9 +1795,7 @@
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <string name="sd_mount" product="default">SD-Kaart abannen</string>
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <string name="sd_format" product="nosdcard">USB-Späicher läschen</string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
@@ -1839,9 +1820,7 @@
   <!-- SD card eject confirmation dialog  -->
   <string name="dlg_confirm_unmount_text" product="default">Wann s du d\'SD-Kaart trenns, gi verschidden Appen déi s du benotz gestoppt a kéinten ophale mat funktionéiere bis du d\'SD-Kaart nees verbënns.</string>
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
-  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -2017,7 +1996,6 @@
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <string name="menu_cancel">Verwerfen</string>
   <!-- APN error dialog title -->
-  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -2217,7 +2195,6 @@
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <string name="location_sources_heading">Standuertquellen</string>
   <!-- About -->
-  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <string name="about_settings" product="tablet">Iwwer den Tablet</string>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
@@ -2232,19 +2209,15 @@
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <string name="regulatory_information">Reguléierungsinformatiounen</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <string name="copyright_title">Auteursrecht</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <string name="license_title">Lizenz</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <string name="terms_title">Geschäftsbedéngungen</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <string name="webview_license_title">System-WebView-Lizenz</string>
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
@@ -2254,7 +2227,6 @@
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
-  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <string name="settings_license_activity_title">Open-Source-Lizenzen</string>
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
@@ -2356,7 +2328,6 @@
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <string name="activity_not_found">D\'App ass net op dengem Telefon installéiert.</string>
   <!-- Applications Settings -->
-  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <string name="manageapplications_settings_title">Appe geréieren</string>
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
@@ -2514,7 +2485,6 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <string name="dlg_cancel">Ofbriechen</string>
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -2574,7 +2544,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <string name="force_stop_dlg_text">Wann s du eng App stopps kéint se sech onerwënscht verhalen.</string>
   <!-- Manage applications, text for dialog when moving an app -->
-  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <string name="app_install_location_title">Preferréiert Installatiounsplaz</string>
@@ -2592,7 +2561,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <string name="app_disable_notifications_dlg_text">Wann s du d\'Notifikatioune fir dës App ausschalts kéints du wichteg Warnungen an Aktualiséierunge verpassen.</string>
   <!-- App Ops Settings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <string name="app_ops_settings">App-Virgäng</string>
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
@@ -2696,7 +2664,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <string name="runningservicedetails_stop_dlg_text" product="default">Wann s du dëse Service stopps kéinte verschidde Funktiounen um Telefon ophale mat funktionéiere bis de den Telefon ausschalts an nei uschalts.</string>
   <!-- Language Settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <string name="language_settings">Sprooch an Agab</string>
   <!-- Title of Language and keyboard settings screen -->
@@ -2747,7 +2714,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <string name="vibrate_input_devices_summary">Vibratioun op de Spillcontroller ëmleede wann ugeschloss.</string>
   <!-- Keyboard Layout Preference Dialog -->
-  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_dialog_title">Tastatur-Layout auswielen</string>
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
@@ -2757,11 +2723,9 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <string name="keyboard_layout_default_label">Standard</string>
   <!-- Keyboard Layout Picker -->
-  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_picker_title">Tastaturlayouten</string>
   <!-- User dictionary settings -->
-  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <string name="user_dict_settings_title">Perséinlechen Dictionnaire</string>
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
@@ -2992,7 +2956,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- label for usage time -->
   <string name="usage_time_label">Benotzungszäit</string>
   <!-- Accessibility settings -->
-  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <string name="accessibility_settings">Accessibilitéit</string>
   <!-- Settings title for accessibility settings screen -->
@@ -3158,7 +3121,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <string name="settings_button">Astellungen</string>
   <!-- Printing settings -->
-  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <string name="print_settings">Drécken</string>
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
@@ -3214,7 +3176,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_hidden_utterance">Sichkëscht verstoppt</string>
   <!-- App Fuel Gauge strings -->
-  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <string name="power_usage_summary_title">Akku</string>
   <!-- Activity title summary for App Fuel Gauge summary -->
@@ -3424,7 +3385,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <string name="battery_saver_turn_on_automatically_pct">bei %1$s Akku</string>
   <!-- Process Stats strings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <string name="process_stats_summary_title">Prozess-Statistiken</string>
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
@@ -3502,7 +3462,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <string name="menu_proc_stats_type_cached">Am Tëschespäicher</string>
   <!-- Voice input/output settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <string name="voice_input_output_settings">Stëmm-Agab an -Ausgab</string>
   <!-- Main voice input/output settings screen title -->
@@ -3514,7 +3473,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <string name="voice_category">Sprooch</string>
   <!-- Voice input settings -->
-  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <string name="voice_input_settings">Astellunge fir d\'Sproochagab</string>
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
@@ -3537,7 +3495,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
          message when the user selects to enable a service. -->
   <string name="voice_interaction_security_warning">Dëse Sproochagabservice ka Sproochagaben all Moment iwwerwaachen an Appen, déi Sproochbefehler ënnerstëtzen, fir dech steieren. E gëtt vun der App <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> bereetgestallt. Wëlls du dëse Service aktivéieren?</string>
   <!-- Text-To-Speech (TTS) settings -->
-  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <string name="tts_settings">Astellunge vun der Sproochausgab</string>
   <!-- TTS option item name in the main settings screen -->
@@ -3711,7 +3668,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <string name="credentials_settings_not_available">Zouganksdate fir dëse Benotzer sinn net disponibel</string>
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
-  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <string name="credentials_unlock_hint">Gëff d\'Passuwert fir den Umeldungsinformatiounsspäicher an.</string>
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
@@ -3739,7 +3695,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Sound settings screen, setting option summary text -->
   <string name="emergency_tone_summary">Definéier d\'Behuele wann en Noutruff ofgesat gëtt</string>
   <!-- Backup and reset Settings screen -->
-  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <string name="privacy_settings">Sécheren an zrécksetzen</string>
   <!-- Privacy settings activity title -->
@@ -3775,13 +3730,11 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <string name="local_backup_password_toast_validation_failure">Feeler beim setze vum Sécherungspasswuert</string>
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <string name="backup_erase_dialog_message">D\'Sécherung vun App-Daten, WLAN-Passwierder an aner Astellunge stoppen an all d\'Kopien op de Google-Servere läschen?</string>
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
-  <skip></skip>
   <!-- Device admin settings activity title -->
   <string name="device_admin_settings_title">Apparatverwaltungsastellungen</string>
   <!-- Label for screen showing the active device policy -->
@@ -3951,7 +3904,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <string name="sync_automatically">App-Daten automatesch synchroniséieren</string>
   <!-- Sync status messages on Accounts & Synchronization settings -->
-  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <string name="sync_enabled">Sync ass UN</string>
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
@@ -4422,7 +4374,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <string name="selinux_status_permissive">Moderat</string>
   <string name="selinux_status_enforcing">Strikt</string>
   <!-- Notification of installed CA Certs -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">D\'Netzwierk kéint iwwerwaacht sinn</string>
@@ -4437,7 +4388,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <string name="ssl_ca_cert_settings_button">Vertrauenswierdeg Zouganksdaten iwwerpréiwen</string>
   <!-- User settings -->
-  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <string name="user_settings_title">Benotzer</string>
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
@@ -4562,7 +4512,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <string name="global_font_change_title">Schrëftgréisst änneren</string>
   <!-- NFC payment settings -->
-  <skip></skip>
   <string name="nfc_payment_settings_title">Drécken a bezuelen</string>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
@@ -4583,7 +4532,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
          preferred payment application -->
   <string name="nfc_payment_set_default_label">Als deng Preferenz setzen?</string>
   <!-- Restrictions settings -->
-  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <string name="restriction_settings_title">Aschränkungen</string>
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
@@ -4593,7 +4541,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <string name="app_notifications_switch_label">Notifikatiounen uweisen</string>
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
-  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <string name="help_label">Hëllef a Feedback</string>
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
@@ -4712,7 +4659,6 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <string name="user_image_photo_selector">Foto auswielen</string>
   <!-- Text to display in regulatory info screen (from device overlay). -->
-  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <string name="sim_setup_wizard_title">SIM-Kaarten</string>
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 5e6b201..fecf0bc 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -764,10 +764,7 @@
   <string name="no_filters_title">Nenustatyti jokie filtrai</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">„LineageOS“ statistika</string>
-  <string name="anonymous_statistics_summary">Padėti tobulinti „LineageOS“ pasirenkant anoniminę statistikos ataskaitą</string>
   <string name="anonymous_statistics_warning_title">Apie</string>
-  <string name="anonymous_statistics_warning">Pasirenkant „LineageOS“ statistiką leis ne asmeniniams duomenims būti pateiktiems „LineageOS“ kūrėjams sekti unikalius diegimus visuose įrenginiuose. Pateikta informacija apima unikalų identifikatorių, kuris nedaro jokios žalos jūsų privatumui ar asmeniniams duomenims. Duomenys bus pateikti kiekvieno paleidimo metu.\n\nNorint peržiūrėti kokia informacija bus pateikta, bakstelėkite Peržiūrėti duomenis.</string>
   <string name="enable_reporting_title">Įgalinti ataskaitas</string>
   <string name="preview_data_title">Peržiūrėti duomenis</string>
   <string name="view_stats_title">Žiūrėti statistiką</string>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index cbca32c..f7b7635 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -838,10 +838,7 @@
   <string name="no_filters_title">ഫിൽറ്ററുകള്‍ സജ്ജീകരിച്ചിട്ടില്ല</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">LineageOS സ്ഥിതിവിവരക്കണക്കുകൾ</string>
-  <string name="anonymous_statistics_summary">അജ്ഞാത സ്ഥിതിവിവരക്കണക്കുകൾ റിപ്പോർട്ട് ചെയ്യുന്നത് തിരഞ്ഞെടുത്ത് LineageOS മികച്ചതാക്കാൻ സഹായിക്കുക</string>
   <string name="anonymous_statistics_warning_title">ആമുഖം</string>
-  <string name="anonymous_statistics_warning">LineageOS സ്റ്റാറ്റിസ്റ്റിക്സ് തിരഞ്ഞെടുക്കുന്നതിലൂടെ ഉപകരണങ്ങളില്‍ വിശിഷ്ടമായ ഇൻസ്റ്റലേഷനുകൾ ട്രാക്കുചെയ്യുന്നതിന് സ്വകാര്യമല്ലാത്ത ഡാറ്റ LineageOS ഡെവലപ്പര്‍മാര്‍ക്ക് സമര്‍പ്പിക്കുന്നതാണ്. സമര്‍പ്പിക്കപ്പെടുന്ന വിവരങ്ങളില്‍ നിങ്ങളുടെ സ്വകാര്യതയെ അല്ലെങ്കിൽ സ്വകാര്യ ഡാറ്റയെ വിട്ടുവീഴ്ച ചെയ്യാത്ത ഒരു വിശിഷ്ട ഐഡന്റിഫയർ ഉൾപ്പെടുന്നു. ഓരോ ബൂട്ട് സമയത്തും ഡാറ്റ സമര്‍പ്പിക്കുന്നു.\n\nസമര്‍പ്പിച്ച ഡാറ്റയ്ക്ക് ഉദാഹരണത്തിനായി, പ്രിവ്യൂ ഡാറ്റ അമര്‍ത്തുക.</string>
   <string name="enable_reporting_title">റിപ്പോർട്ടിംഗ് പ്രാപ്തമാക്കുക</string>
   <string name="preview_data_title">പ്രിവ്യൂ ഡാറ്റ</string>
   <string name="view_stats_title">സ്ഥിതിവിവരക്കണക്കുകൾ കാണുക</string>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index af2172b..0aeffcb 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -838,10 +838,7 @@
   <string name="no_filters_title">कोणतेही फिल्टर्स सेट नाहीत</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">LineageOS आकडेवारी</string>
-  <string name="anonymous_statistics_summary">अनामिक आकडेवारी अहवाल देणे निवडून LineageOS अधिक चांगले करण्यास मदत करा</string>
   <string name="anonymous_statistics_warning_title">विषयी</string>
-  <string name="anonymous_statistics_warning">LineageOS आकडेवारी निवडल्यामुळे डिव्हाइसेवरील वैशिष्ट्यपूर्ण स्थापनेचा मागोवा घेण्यासाठी LineageOS च्या विकसकांकडे अ-वैयक्तिक डेटा सबमिट करण्यास परवानगी दिली जाईल. सबमिट केलेल्या माहितीमध्ये वैशिष्ट्यपूर्ण ओळखकर्त्याचा समावेश होतो, जो तुमच्या गुप्तता किंवा वैयक्तिक डेटाशी तडजोड करत नाही. डेटा प्रत्येक बूट दरम्यान सबमिट केला जातो.\n\nसबमिट केल्या जाणाऱ्या डेटाच्या उदाहरणासाठी, डेटा पूर्वावलोकन वर टॅप करा.</string>
   <string name="enable_reporting_title">अहवाल देणे सक्षम करा</string>
   <string name="preview_data_title">डेटा पूर्वावलोकन</string>
   <string name="view_stats_title">आकडेवारी पाहा</string>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 047952a..5e00893 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -88,7 +88,7 @@
   <string name="profiles_add">Legg til</string>
   <string name="profile_menu_delete">Slett</string>
   <string name="profile_settings_title">Profil</string>
-  <string name="profile_empty_list_profiles_off">For å konfigurere å bruke system profiler, aktiverer profiler.</string>
+  <string name="profile_empty_list_profiles_off">For å konfigurere og bruke system profiler, må du aktivere profiler.</string>
   <string name="profile_trigger_configure">Konfigurer utløseren</string>
   <string name="profile_write_nfc_tag">Skriv til NFC tag</string>
   <string name="profile_write_touch_tag">Touch Tag for å skrive</string>
@@ -103,9 +103,9 @@
   <string name="profile_populate_profile_from_state">Konfigurere profilen ved hjelp av gjeldende innstillinger?</string>
   <string name="profile_menu_fill_from_state">Importer gjeldende innstillinger</string>
   <string name="profile_remove_current_profile">Kan ikke slette gjeldende profil!</string>
-  <string name="profile_app_group_category_title">Overstyring av notifikasjoner</string>
+  <string name="profile_app_group_category_title">Overstyring av varsler</string>
   <string name="profile_app_group_item_instructions">Legg til eller fjern grupper</string>
-  <string name="profile_app_group_item_instructions_summary">Legg til eller fjern apper som overstyrer notifikasjonsvarsler på denne profilen</string>
+  <string name="profile_app_group_item_instructions_summary">Legg til eller fjern apper som overstyrer varsler på denne profilen</string>
   <!-- Profile mode options. -->
   <string name="profile_entries_on">På</string>
   <string name="profile_entries_off">Av</string>
@@ -145,14 +145,14 @@
   <string name="profile_trigger_disconnect">Ved frakobling</string>
   <string name="profile_trigger_notrigger">Ingen utløser</string>
   <!-- Profile Settings sound modes labels -->
-  <string name="sound_mode">Notifikasjonsmodus</string>
+  <string name="sound_mode">Varslingsmodus</string>
   <string name="ringer_mode">Ringemodus</string>
   <string name="lights_mode">Lys-modus</string>
   <string name="vibrate_mode">Vibrasjonsmodus</string>
-  <string name="choose_soundtone">Velg notifikasjonstone</string>
+  <string name="choose_soundtone">Velg varslingstone</string>
   <string name="choose_ringtone">Velg ringetone</string>
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <string name="soundtone_title">Notifikasjonstone</string>
+  <string name="soundtone_title">Varslingstone</string>
   <!-- Title for application group setting screen -->
   <string name="profile_appgroups_title">App grupper</string>
   <string name="profile_applist_title">Apper</string>
@@ -272,7 +272,7 @@
   <string name="battery_light_medium_color_title">Lading</string>
   <string name="battery_light_full_color_title">Fulladet</string>
   <!-- Lights settings screen, notification light settings -->
-  <string name="notification_light_title">Notifikasjonslys</string>
+  <string name="notification_light_title">Varslingslys</string>
   <string name="notification_light_general_title">Generelt</string>
   <string name="notification_light_applist_title">Apper</string>
   <string name="notification_light_phonelist_title">Telefon</string>
@@ -300,7 +300,7 @@
   <string name="adb_over_network_warning">Advarsel: Når ADB over nettverk er aktivert, er telefonen åpen for angrep på alle tilkoblede nettverk! \n\nKun bruk denne funksjonen når du er koblet på klarerte nettverk.\n\nVil du aktivere denne funksjonen?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
   <string name="adb_notify">Feilsøkingsvarsel</string>
-  <string name="adb_notify_summary">Vis en melding når USB eller nettverksfeilsøking er aktivert</string>
+  <string name="adb_notify_summary">Vis et varsel når USB eller nettverksfeilsøking er aktivert</string>
   <!-- Names of categories of app ops tabs - extension of AOSP -->
   <string name="app_ops_categories_location">Posisjon</string>
   <string name="app_ops_categories_personal">Personlig</string>
@@ -335,7 +335,7 @@
   <string name="app_ops_summaries_write_icc_sms">skriv ICC SMS</string>
   <string name="app_ops_summaries_modify_settings">endre innstillinger</string>
   <string name="app_ops_summaries_draw_on_top">tegne på topp</string>
-  <string name="app_ops_summaries_access_notifications">adgang til varsler</string>
+  <string name="app_ops_summaries_access_notifications">tilgang til varsler</string>
   <string name="app_ops_summaries_camera">kamera</string>
   <string name="app_ops_summaries_record_audio">spille inn lyd</string>
   <string name="app_ops_summaries_play_audio">spille av lyd</string>
@@ -405,7 +405,7 @@
   <string name="app_ops_labels_write_icc_sms">Skriv ICC SMS</string>
   <string name="app_ops_labels_modify_settings">Endre innstillinger</string>
   <string name="app_ops_labels_draw_on_top">Trekk fra toppen</string>
-  <string name="app_ops_labels_access_notifications">Tilgangsvarsler</string>
+  <string name="app_ops_labels_access_notifications">Tilgang til varsler</string>
   <string name="app_ops_labels_camera">Kamera</string>
   <string name="app_ops_labels_record_audio">spille inn lyd</string>
   <string name="app_ops_labels_play_audio">Spill av lyd</string>
@@ -553,6 +553,7 @@
   <string name="double_tap_to_sleep_summary">Dobbelttapp på statuslinjen for å slå av skjermen</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Hindre utilsiktet vekking</string>
+  <string name="proximity_wake_summary">Sjekk nærhetssensor før oppvekkinger utløst av bevegelser</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Våkne ved tilkobling av strøm</string>
   <string name="wake_when_plugged_or_unplugged_summary">Slå skjermen på når du kobler til eller kobler fra en strømkilde</string>
@@ -628,7 +629,7 @@
   <string name="ime_switcher_notify">Valgikon</string>
   <string name="ime_switcher_notify_summary">Viser inndatametode snarvei</string>
   <!-- Heads up -->
-  <string name="heads_up_notifications">Flytende notifikasjoner</string>
+  <string name="heads_up_notifications">Flytende varsler</string>
   <string name="summary_heads_up_enabled">Popup varsler er aktivert</string>
   <string name="summary_heads_up_disabled">popupvarsler er deaktivert</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
@@ -692,7 +693,7 @@
   <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
   <string name="power_notifications_vibrate_title">Vibrer</string>
   <!-- Sound settings, Charging sounds ringtone selection, preference label -->
-  <string name="power_notifications_ringtone_title">Notifikasjonslyd</string>
+  <string name="power_notifications_ringtone_title">Varslingslyd</string>
   <!-- Sound settings, charging sounds label for ringtone == none -->
   <string name="power_notifications_ringtone_silent">Stille</string>
   <!-- Status bar -->
@@ -700,7 +701,7 @@
   <string name="status_bar_toggle_brightness">Lysstyrkekontroll</string>
   <string name="status_bar_toggle_brightness_summary">Juster lysstyrken ved å sveipe over statuslinjen</string>
   <string name="status_bar_notif_count_title">Vis antall varsler</string>
-  <string name="status_bar_notif_count_summary">Vise antall ventende notifikasjoner</string>
+  <string name="status_bar_notif_count_summary">Vis antall ventende varsler</string>
   <string name="status_bar_quick_qs_pulldown_title">Rask rullegardinmeny</string>
   <string name="status_bar_quick_qs_pulldown_summary">%1$s kanten av statusbaren drar ned hurtiginnstillinger</string>
   <string name="status_bar_quick_qs_pulldown_summary_left">Venstre</string>
@@ -857,10 +858,7 @@
   <string name="no_filters_title">Ingen filtre valgt</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">LineageOS statistikk</string>
-  <string name="anonymous_statistics_summary">Hjelp oss å gjøre LineageOS bedre ved å velge å sende inn anonym statistikkrapportering</string>
   <string name="anonymous_statistics_warning_title">Om</string>
-  <string name="anonymous_statistics_warning">Ved å bli med i LineageOS statistikk vil ikke-personlige data bli sendt til utvilkerne av LineageOS for å spore antall unike installasjoner spredt over typer enheter. Informasjonen som sendes inkluderer en unik identitetskode, som ikke kompromitterer ditt personvern eller dine personlige data. Data blir sendt ved hver oppstart.\n\nFor ett eksempel over data som blir sendt, trykk på Forhåndsvis Data.</string>
   <string name="enable_reporting_title">Aktiver rapportering</string>
   <string name="preview_data_title">Forhåndsvis data</string>
   <string name="view_stats_title">Vis statistikk</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index b9f8bdd..2f7a40f 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -858,10 +858,7 @@
   <string name="no_filters_title">Geen filters ingesteld</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">Statistieken</string>
-  <string name="anonymous_statistics_summary">Help LineageOS te verbeteren door anonieme statistieken te verzenden</string>
   <string name="anonymous_statistics_warning_title">Over</string>
-  <string name="anonymous_statistics_warning">Door statistieken verzenden toe te staan worden tijdens het opstarten anonieme gegevens naar de ontwikkelaars van LineageOS verzonden om unieke installaties te kunnen volgen. In de gegevens zit een uniek id-nummer verwerkt, dat uw privacy niet schendt.\n\nOm een voorbeeld te zien, tikt u op \'Voorbeeld van gegevens\'.</string>
   <string name="enable_reporting_title">Statistieken verzenden</string>
   <string name="preview_data_title">Voorbeeld van gegevens</string>
   <string name="view_stats_title">Statistieken tonen</string>
diff --git a/res/values-oc-rFR/arrays.xml b/res/values-oc-rFR/arrays.xml
index c45c818..4acb887 100644
--- a/res/values-oc-rFR/arrays.xml
+++ b/res/values-oc-rFR/arrays.xml
@@ -22,7 +22,6 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
-  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -39,21 +38,16 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
-  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -65,13 +59,11 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
-  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -134,13 +126,10 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
-  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-oc-rFR/strings.xml b/res/values-oc-rFR/strings.xml
index d06c54e..2216f6c 100644
--- a/res/values-oc-rFR/strings.xml
+++ b/res/values-oc-rFR/strings.xml
@@ -23,13 +23,11 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
-  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
-  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -116,7 +114,6 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
-  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -281,7 +278,6 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -310,7 +306,6 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
-  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -333,7 +328,6 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
-  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -341,7 +335,6 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
-  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -416,20 +409,16 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
-  <skip></skip>
   <!-- Security Picker -->
-  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
-  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -517,7 +506,6 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
-  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -608,7 +596,6 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
-  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -663,7 +650,6 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
-  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -731,7 +717,6 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
-  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -841,7 +826,6 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -899,7 +883,6 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
-  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1039,9 +1022,7 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1055,9 +1036,7 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
-  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1180,7 +1159,6 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
-  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1301,7 +1279,6 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
-  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1310,23 +1287,18 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
-  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1387,7 +1359,6 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
-  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1470,7 +1441,6 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1503,7 +1473,6 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
-  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1515,7 +1484,6 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1571,7 +1539,6 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1599,16 +1566,13 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
-  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
-  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
-  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1734,7 +1698,6 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
-  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1823,7 +1786,6 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
-  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1853,7 +1815,6 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
-  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1963,7 +1924,6 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -2009,14 +1969,12 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
-  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -2033,7 +1991,6 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
-  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2129,7 +2086,6 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
-  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2144,7 +2100,6 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
-  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2164,12 +2119,10 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
-  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2278,7 +2231,6 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
-  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2531,7 +2483,6 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2540,7 +2491,6 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
-  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2610,7 +2560,6 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
-  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2627,13 +2576,11 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
-  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
-  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2711,7 +2658,6 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
-  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-or-rIN/arrays.xml b/res/values-or-rIN/arrays.xml
index c45c818..4acb887 100644
--- a/res/values-or-rIN/arrays.xml
+++ b/res/values-or-rIN/arrays.xml
@@ -22,7 +22,6 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
-  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -39,21 +38,16 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
-  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -65,13 +59,11 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
-  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -134,13 +126,10 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
-  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index 40b553e..43dc936 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -838,10 +838,7 @@
   <string name="no_filters_title">କୌଣସି ଫିଲ୍‍ଟର୍‍ ସେଟ୍‍ ହୋଇନାହିଁ</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">ସିଆନୋଜେନ୍ମୋଡ‍ ପରିସଂଖ୍ୟାନ</string>
-  <string name="anonymous_statistics_summary">ଅଜ୍ଞାତ ପ୍ରିସଂଖ୍ୟାନ ରିପୋର୍ଟିଂ ପାଇଁ ବିକଳ୍ପ ଦେଇ ସିଆନୋଜେନ୍ମୋଡ‍ ଉନ୍ନତ କରିବାରେ ସାହାଯ୍ୟ କରନ୍ତୁ</string>
   <string name="anonymous_statistics_warning_title">ବିଷୟରେ</string>
-  <string name="anonymous_statistics_warning">ଡିଭାଇସ୍‍ ମଧ୍ୟରେ ନିର୍ଦିଷ୍ଟ ସଂ‍ସ୍ଥାପନ ଟ୍ରାକ୍‍ କରିବା ନିମନ୍ତେ ସିଆନୋଜେନ୍ମୋଡ‍ ପରିସଂଖ୍ୟାନ ପାଇଁ ବିକଳ୍ପ ଦେଇ ସିଆନୋଜେନ୍ମୋଡର ଡେଭେଲୋପରମାନଙ୍କୁ ଅଣ-ବ୍ୟକ୍ତିଗତ ତଥ୍ୟ ସବ୍‍ମିଟ୍‍ କରିବା ପାଇଁ ଅନୁମତି ଦେବ ସବ୍‍ମିଟ୍‍ ହୋଇଥିବା ସୂଚନା ଅଜ୍ଞାତ ପରିଚାୟକଙ୍କୁ ଅନ୍ତଭୁକ୍ତ କରିବ, ଯାହା ଆପଣଙ୍କ ଗୋପନୀୟ ବା ବ୍ୟକ୍ତିଗତ ତଥ୍ୟରେ ବାଧା ସୃଷ୍ଟି କରିବ ନାହିଁ। ଡାଟା୍ରତି ରିବୁଟ୍‍ ସମୟରେ ସବ୍‍ମିଟ୍‍ ହୁଏ।\n\nଯେଉଁ ଡାଟା ସବ୍‍ମିଟ୍‍ ହୁଏ  ତାହାର ଉଦାହରଣ ସ୍ୱରୂପ, ପ୍ରିଭ୍ୟୁ ଡାଟା ଉପରେ ଟ୍ୟାପ୍‍ କରନ୍ତୁ।</string>
   <string name="enable_reporting_title">ରିପୋର୍ଟିଂ ସ‍କ୍ଷମ କରନ୍ତୁ</string>
   <string name="preview_data_title">ଡାଟା ପ୍ରିଭ୍ୟୁ କରନ୍ତୁ</string>
   <string name="view_stats_title">ପରିସଂଖ୍ୟାନ ଦେଖନ୍ତୁ</string>
diff --git a/res/values-or-rIN/strings.xml b/res/values-or-rIN/strings.xml
index d06c54e..2216f6c 100644
--- a/res/values-or-rIN/strings.xml
+++ b/res/values-or-rIN/strings.xml
@@ -23,13 +23,11 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
-  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
-  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -116,7 +114,6 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
-  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -281,7 +278,6 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -310,7 +306,6 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
-  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -333,7 +328,6 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
-  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -341,7 +335,6 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
-  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -416,20 +409,16 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
-  <skip></skip>
   <!-- Security Picker -->
-  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
-  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -517,7 +506,6 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
-  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -608,7 +596,6 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
-  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -663,7 +650,6 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
-  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -731,7 +717,6 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
-  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -841,7 +826,6 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -899,7 +883,6 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
-  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1039,9 +1022,7 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1055,9 +1036,7 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
-  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1180,7 +1159,6 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
-  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1301,7 +1279,6 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
-  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1310,23 +1287,18 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
-  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1387,7 +1359,6 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
-  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1470,7 +1441,6 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1503,7 +1473,6 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
-  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1515,7 +1484,6 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1571,7 +1539,6 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1599,16 +1566,13 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
-  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
-  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
-  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1734,7 +1698,6 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
-  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1823,7 +1786,6 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
-  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1853,7 +1815,6 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
-  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1963,7 +1924,6 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -2009,14 +1969,12 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
-  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -2033,7 +1991,6 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
-  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2129,7 +2086,6 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
-  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2144,7 +2100,6 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
-  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2164,12 +2119,10 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
-  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2278,7 +2231,6 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
-  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2531,7 +2483,6 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2540,7 +2491,6 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
-  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2610,7 +2560,6 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
-  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2627,13 +2576,11 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
-  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
-  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2711,7 +2658,6 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
-  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 553c11f..0214bd4 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -848,12 +848,7 @@
   <string name="no_filters_title">Nie wybrano filtrów</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">Statystyki LineageOS</string>
-  <string name="anonymous_statistics_summary">Pomóż ulepszyć LineageOS, pozwalając na wysyłanie anonimowych statystyk</string>
   <string name="anonymous_statistics_warning_title">O...</string>
-  <string name="anonymous_statistics_warning">Wyrażenie zgody na udział w Statystykach LineageOS zezwoli na przesył anonimowych danych do
-        developerów LineageOS, aby śledzić ilość unikalnych instalacji na urządzeniach . Informacje zawierają unikalny identyfikator,
-       który nie narusza twojej prywatności lub prywatnych danych. Dane są wysyłane przy każdym uruchomieniu.\n\nAby zobaczyć przykład przesyłanych danych naciśnij Podgląd Danych.</string>
   <string name="enable_reporting_title">Włącz raportowanie</string>
   <string name="preview_data_title">Podgląd danych</string>
   <string name="view_stats_title">Zobacz statystyki</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index a7028bd..1ff832d 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -858,10 +858,7 @@
   <string name="no_filters_title">Nenhum filtro definido</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Estatísticas LineageOS</string>
-  <string name="anonymous_statistics_summary">Ajude a melhorar o LineageOS optando por enviar estatísticas anônimas</string>
   <string name="anonymous_statistics_warning_title">Sobre</string>
-  <string name="anonymous_statistics_warning">Optar por enviar estatísticas anônimas ao LineageOS permitirá que dados não-pessoais sejam enviados para os desenvolvedores do LineageOS para rastrear instalações únicas em dispositivos. As informações enviadas incluem um identificador único que não compromete sua privacidade ou dados pessoais. Os dados são enviados durante cada inicialização.\n\nPara ver um exemplo dos dados enviados, toque em \'Pré-visualizar dados\'.</string>
   <string name="enable_reporting_title">Ativar relatório</string>
   <string name="preview_data_title">Pré-visualizar dados</string>
   <string name="view_stats_title">Ver estatísticas</string>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index ad7a74b..5f4fba0 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -70,7 +70,7 @@
   <!-- CM Updater -->
   <string name="cmupdate_settings_title">Atualizações</string>
   <!-- Settings switch for updating Cyanogen recovery -->
-  <string name="update_recovery_title">Atualizar a recuperação Cyanogen</string>
+  <string name="update_recovery_title">Atualizar a recuperação LineageOS</string>
   <string name="update_recovery_summary">Atualizar a recuperação juntamente com as atualizações do sistema</string>
   <string name="update_recovery_on_warning">Aviso: Quando este recurso estiver ativado, a sua recuperação instalada será substituída por uma incluída na versão atual do SO.\n\nA sua recuperação será atualizada juntamente com as atualizações do seu sistema, ajudando a garantir a compatibilidade com futuras versões.\n\nQuer ativar este recurso?</string>
   <string name="update_recovery_off_warning">Aviso: Quando este recurso está desativado, a sua recuperação instalada não será atualizada com o SO.\n\nFuturas atualizações do SO poderão não se instalar com uma versão da recuperação desatualizada ou personalizada.\n\nQuer desativar este recurso?</string>
@@ -858,10 +858,7 @@
   <string name="no_filters_title">Sem filtros definidos</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Estatísticas LineageOS</string>
-  <string name="anonymous_statistics_summary">Ajude a melhorar a LineageOS optando por ativar o envio do relatório de estatísticas anónimas</string>
   <string name="anonymous_statistics_warning_title">Sobre</string>
-  <string name="anonymous_statistics_warning">Optar pelo envio de estatísticas LineageOS vai permitir que dados não pessoais sejam transmitidos aos desenvolvedores da LineageOS, para rastrearem instalações nos dispositivos. As informações submetidas incluem um identificador único, que não compromete a sua privacidade ou dados pessoais. Os dados são enviados durante cada inicialização.\n\nPara um exemplo dos dados que são enviados, toque em \'Pré-visualizar dados\'.</string>
   <string name="enable_reporting_title">Ativar relatório</string>
   <string name="preview_data_title">Pré-visualizar dados</string>
   <string name="view_stats_title">Ver estatísticas</string>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 05ef08a..1fd829e 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -18,9 +18,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">Sunteți la <xliff:g id="step_count">%1$d</xliff:g> pas distanță de la a întreba despre ID-ul Dispozitivului.</item>
+    <item quantity="few">Sunteți la <xliff:g id="step_count">%1$d</xliff:g> pași distanță de la a întreba despre ID-ul Dispozitivului.</item>
+    <item quantity="other">Sunteți la <xliff:g id="step_count">%1$d</xliff:g> pași distanță de la a întreba despre ID-ul Dispozitivului.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">ID dispozitiv:[<xliff:g id="device_id">%1$s</xliff:g>] copiat în clipboard</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">ID-ul dispozitivului nu este disponibil în acest build</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">ID dispozitiv</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Ești la <xliff:g id="step_count">%1$d</xliff:g> pas distanță de a activa opțiunile de dezvoltator.</item>
@@ -35,6 +43,7 @@
   <string name="development_tools_title">Unelte de dezvoltare</string>
   <!-- Development shortcut -->
   <string name="development_shortcut_title">Comandă rapidă dezvoltare</string>
+  <string name="development_shortcut_summary">Activați comenzi rapide pentru gestionarea aplicaţiilor în lista de aplicaţii recente</string>
   <!-- Setting checkbox title for root access -->
   <string name="root_access">Acces root</string>
   <string name="root_access_warning_title">Permite acces la root?</string>
@@ -44,6 +53,8 @@
   <string name="root_access_adb">Doar ADB</string>
   <string name="root_access_all">Aplicații și ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Gestionați accesul root</string>
+  <string name="root_appops_summary">Vizualizați și controlați regulile root-ului</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, LineageOS version -->
@@ -54,6 +65,7 @@
   <!-- About phone screen, Device name -->
   <string name="device_name">Numele dispozitivului</string>
   <!-- About phone screen, LineageOS Api Level -->
+  <string name="mod_api_level">Nivel API LineageOS</string>
   <string name="mod_api_level_default">Necunoscut</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Dată compilare</string>
@@ -61,6 +73,9 @@
   <string name="cmupdate_settings_title">Actualizări LineageOS</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Actualizează Cyanogen recovery</string>
+  <string name="update_recovery_summary">Actualizează recovery la instalarea actualizărilor de sistem</string>
+  <string name="update_recovery_on_warning">ANUNŢ: Atunci când această caracteristică este activată, meniul de recuperare instalat va fi înlocuit cu unul inclus în versiunea curentă a Sistemului de Operare.\n\nMeniul dvs. de recuperare va fi actualizat împreună cu upgrade-urile sistemului dvs., ajutând la asigurarea compatibilității cu viitoarele versiuni.\n\nAți vrea să activați această caracteristică?</string>
+  <string name="update_recovery_off_warning">ATENŢIE: Atunci când această caracteristică este dezactivată, meniul de recuperare instalat nu va fi actualizat odată cu upgrade-urile Sistemului de Operare.\n\nActualizările viitoare ale Sistemului de Operare s-ar putea să nu se instaleze cu versiuni expirate sau personalizate ale meniului de recuperare.\n\nDoriţi într-adevăr să dezactivaţi această caracteristică?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
   <string name="themes_settings_title">Teme</string>
@@ -133,6 +148,9 @@
   <string name="profile_trigger_notrigger">Fără declanșator</string>
   <!-- Profile Settings sound modes labels -->
   <string name="sound_mode">Mod notificare</string>
+  <string name="ringer_mode">Modul tonului de apel</string>
+  <string name="lights_mode">Modul lumini</string>
+  <string name="vibrate_mode">Modul vibrare</string>
   <string name="choose_soundtone">Alegeți tonul de notificare</string>
   <string name="choose_ringtone">Alegeți tonul de apel</string>
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
@@ -221,11 +239,13 @@
   <string name="navigation_bar_left_title">Mod stângaci</string>
   <string name="navigation_bar_left_summary">În modul peisaj bara de navigare se pune în partea stângă a ecranului</string>
   <string name="navigation_bar_title">Butoane și aspect</string>
-  <string name="navigation_restore_button_text">Restaurează\nsetările implicite</string>
+  <string name="navigation_bar_help_text">Pentru a începe, atingeți iconița editorului pentru a debloca editarea bării de navigare.\n\nPuteți atinge o iconiță pentru a-i schimba scurtătura sau puteți să o atingeți lung pentru a-i rearanja aspectul.\n\nAtingeți \'Salvați\' pentru a salva schimbările sau \'Restabilire implicite\' pentru a reseta aspectul la setările implicite.</string>
+  <string name="navigation_restore_button_text">Restabilire\nimplicite</string>
   <string name="navigation_edit_button_text">Editare</string>
   <string name="navigation_save_button_text">Salvare</string>
   <string name="navigation_bar_reset_message">Șterge setările curente și restaurează aspectul implicit?</string>
   <string name="navigation_bar_arrow_keys_title">Arată butoanele de direcție în timp ce tastați</string>
+  <string name="navigation_bar_arrow_keys_summary">Arată butoanele de cursor stânga şi dreapta în timp ce tastaţi. Înlocuieşte comutatorul IME.</string>
   <string name="navigation_bar_recents_title">Acțiunea apăsării lungi a butonului Aplicații Recente</string>
   <!-- Notification light dialogs -->
   <string name="edit_light_settings">Editare setări lumină</string>
@@ -262,8 +282,15 @@
   <string name="notification_light_default_value">Implicit</string>
   <string name="notification_light_missed_call_title">Apel pierdut</string>
   <string name="notification_light_voicemail_title">Mesagerie vocală</string>
+  <string name="notification_light_screen_on">Lumini cu ecranul aprins</string>
+  <string name="notification_light_zen_mode">Lumini în modul Nu Deranjați</string>
   <string name="notification_light_use_multiple_leds">LED-uri multiple</string>
+  <string name="keywords_lights_brightness_level">diminuați luminozitatea led-urilor</string>
+  <string name="notification_light_automagic">Alege culorile automat</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Setări lumină</string>
+  <string name="led_notification_text">Lumină LED activată de setări</string>
+  <string name="notification_light_no_apps_summary">Pentru a adăuga control per aplicație, activați \'%1$s\' și apăsați \'\u002b\' în bara meniului</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Depanare Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -272,6 +299,7 @@
   <string name="adb_over_network">ADB prin rețea</string>
   <string name="adb_over_network_summary">Activează depanarea TCP/IP prin interfețele de rețea (Wi\u2011Fi, rețele USB). Această setare este restaurată la repornire</string>
   <!-- Warning for Adb over Network -->
+  <string name="adb_over_network_warning">AVERTISMENT: Când ADB prin reţea este activat, telefonul dvs. este deschis pentru intruziuni pe toate reţelele conectate! \n\nUtilizaţi această caracteristică doar atunci când sunteţi conectat la rețele de încredere.\n\nDoriţi cu adevărat să activaţi această funcţie?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
   <string name="adb_notify">Notificare depanare</string>
   <string name="adb_notify_summary">Afișează o notificare atunci când depanarea prin USB sau rețea este activată</string>
@@ -295,6 +323,7 @@
   <string name="app_ops_summaries_read_calendar">citește calendarul</string>
   <string name="app_ops_summaries_modify_calendar">modifică calendarul</string>
   <string name="app_ops_summaries_wifi_scan">Scanare Wi-Fi</string>
+  <string name="app_ops_summaries_notification">notificare/toast</string>
   <string name="app_ops_summaries_cell_scan">scanare celulă</string>
   <string name="app_ops_summaries_call_phone">apelare telefon</string>
   <string name="app_ops_summaries_read_sms">citește SMS</string>
@@ -322,6 +351,7 @@
   <string name="app_ops_summaries_media_volume">volum media</string>
   <string name="app_ops_summaries_alarm_volume">volum alarma</string>
   <string name="app_ops_summaries_notification_volume">volum notificare</string>
+  <string name="app_ops_summaries_bluetooth_volume">volum bluetooth</string>
   <string name="app_ops_summaries_keep_awake">ține treaz</string>
   <string name="app_ops_summaries_monitor_location">monitorizează locația</string>
   <string name="app_ops_summaries_monitor_high_power_location">monitorizează locația de putere mare</string>
@@ -331,7 +361,10 @@
   <string name="app_ops_summaries_project_media">proiect media</string>
   <string name="app_ops_summaries_activate_vpn">activează VPN</string>
   <string name="app_ops_summaries_write_wallpaper">scrie tapet</string>
+  <string name="app_ops_summaries_assist_structure">structura de asistență</string>
+  <string name="app_ops_summaries_assist_screenshot">asistă captura de ecran</string>
   <string name="app_ops_summaries_read_phone_state">citește starea telefonului</string>
+  <string name="app_ops_summaries_add_voicemail">adaugă mesagerie vocală</string>
   <string name="app_ops_summaries_use_sip">utilizează SIP</string>
   <string name="app_ops_summaries_make_call">apelează</string>
   <string name="app_ops_summaries_use_fingerprint">utilizează amprentă digitală</string>
@@ -349,6 +382,7 @@
   <string name="app_ops_summaries_toggle_mobile_data">comutare date mobile</string>
   <string name="app_ops_summaries_superuser">acces root</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">Locație aspră</string>
   <string name="app_ops_labels_fine_location">Locație fină</string>
   <string name="app_ops_labels_gps">GPS</string>
   <string name="app_ops_labels_vibrate">Vibrează</string>
@@ -397,6 +431,8 @@
   <string name="app_ops_labels_project_media">Proiectare media</string>
   <string name="app_ops_labels_activate_vpn">Activează VPN</string>
   <string name="app_ops_labels_write_wallpaper">Scrie tapet</string>
+  <string name="app_ops_labels_assist_structure">Structura de asistență</string>
+  <string name="app_ops_labels_assist_screenshot">Asistă captura de ecran</string>
   <string name="app_ops_labels_read_phone_state">Citește starea telefonului</string>
   <string name="app_ops_labels_add_voicemail">Adaugă mesaj vocal</string>
   <string name="app_ops_labels_use_sip">Utilizează SIP</string>
@@ -404,6 +440,7 @@
   <string name="app_ops_labels_use_fingerprint">Utilizează amprentă digitală</string>
   <string name="app_ops_labels_use_body_sensors">Utilizează senzorii corporali</string>
   <string name="app_ops_labels_read_cell_broadcasts">Citește trasmisiunile din rețea</string>
+  <string name="app_ops_labels_mock_location">Locație falsă</string>
   <string name="app_ops_labels_read_external_storage">Citește stocare externă</string>
   <string name="app_ops_labels_write_external_storage">Scrie stocare externă</string>
   <string name="app_ops_labels_turn_screen_on">Pornește ecranul</string>
@@ -423,6 +460,7 @@
   <string name="app_ops_allowed_count">Permis <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Respins <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Permis <xliff:g id="count">%1$s</xliff:g>, respins <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Dezactivat de optimizarea bateriei</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Arată aplicațiile utilizatorului</string>
   <string name="app_ops_show_system_apps">Arată aplicații preinstalate</string>
@@ -458,6 +496,7 @@
   <string name="camera_sleep_on_release_title">Aruncare privire la ecran</string>
   <string name="camera_sleep_on_release_summary">O jumătate de apăsare va ține ecranul pornit doar atât timp cât butonul este apăsat</string>
   <string name="camera_launch_title">Lansare Cameră foto</string>
+  <string name="camera_launch_summary">O atingere lungă și o eliberare vor lansa camera foto</string>
   <string name="volbtn_music_controls_title">Control redare</string>
   <string name="volbtn_music_controls_summary">Când ecranul este stins, prin apăsarea lungă pe tastele de volum se va porni căutarea de melodii</string>
   <string name="volbtn_cursor_control_title">Control cursor tastatură</string>
@@ -468,6 +507,7 @@
   <string name="power_end_call_summary">Apăsarea butonului de pornire va termina apelul curent</string>
   <string name="swap_volume_buttons_title">Reorientare</string>
   <string name="swap_volume_buttons_summary">Schimbă butoanele de volum atunci când ecranul este rotit</string>
+  <string name="button_wake_title">Trezește dispozitivul</string>
   <string name="home_answer_call_title">Răspundere apel</string>
   <string name="home_answer_call_summary">Apăsarea butonului „acasă” va răspunde la apelul primit</string>
   <!-- Backlight brightness settings screen -->
@@ -499,9 +539,11 @@
   <string name="power_menu_screenshot_title">Captură</string>
   <string name="power_menu_airplane_title">Mod Avion</string>
   <string name="power_menu_users_title">Comutator utilizator</string>
+  <string name="power_menu_settings_title">Comandă rapidă pentru Setări</string>
   <string name="power_menu_lockdown_title">Blocare dispozitiv</string>
   <string name="power_menu_bug_report_title">Raport de eroare</string>
   <string name="power_menu_sound_title">Panou sunet</string>
+  <string name="power_menu_bug_report_disabled">Raportarea erorilor este dezactivată în setările pentru dezvoltatori</string>
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Activare bară navig pe ecran</string>
   <string name="disable_navkeys_summary">Activare bara navigare pe ecran și dezactivează butoanele hardware</string>
@@ -513,6 +555,7 @@
   <string name="double_tap_to_sleep_summary">Atingeți de două ori bara de stare pentru a dezactiva afișarea</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Previne trezirea accidentală</string>
+  <string name="proximity_wake_summary">Verifică senzorul de proximitate înainte de wake-up-uri declanșate de gesturi</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Trezire la alimentare</string>
   <string name="wake_when_plugged_or_unplugged_summary">Aprinde ecranul când se conectează sau deconectează sursa de alimentare</string>
@@ -523,6 +566,7 @@
   <string name="volume_adjust_sounds_title">Sunet ajustare volum</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intensitate vibrare</string>
+  <string name="vibrator_warning">Valorile mai mari decât %1$d%% nu sunt recomandate</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Calibrare culoare</string>
   <string name="color_calibration_summary">Calibrare culori pe ecran</string>
@@ -546,27 +590,42 @@
   <string name="display_rotation_180_title">180 de grade</string>
   <string name="display_rotation_270_title">270 de grade</string>
   <!-- LiveDisplay -->
+  <string name="live_display_summary">Optimizați ecranul bazat pe timpul zilei şi condiţiile mediului ambient pentru a îmbunătăţi lizibilitatea şi a reduce oboseala ochilor</string>
   <string name="live_display_mode">Mod de afișare</string>
   <string name="live_display_color_temperature_title">Temperatura culorii</string>
+  <string name="live_display_color_temperature_summary">Zi: <xliff:g id="day_temperature">%1$d</xliff:g>K Noapte: <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">Zi</string>
   <string name="live_display_night">Noapte</string>
+  <string name="live_display_outdoor_mode_title">Mod automat aer liber</string>
   <string name="live_display_outdoor_mode_summary">Crește luminozitatea și saturația automat în lumina strălucitoare a soarelui</string>
+  <string name="live_display_low_power_title">Redu consumul de energie</string>
+  <string name="live_display_low_power_summary">Reglează afişajul pentru cel mai mic consum de energie fără degradare</string>
   <string name="live_display_enhance_color_title">Sporește culorile</string>
   <string name="live_display_enhance_color_summary">Îmbunătățește dinamica culorilor pentru tonuri, peisaje și alte imagini</string>
   <string name="live_display_color_profile_title">Profilul culorii</string>
   <string name="live_display_color_profile_standard_title">Standard</string>
   <string name="live_display_color_profile_standard_summary">Culori precise și alb luminos</string>
   <string name="live_display_color_profile_natural_title">Natural</string>
+  <string name="live_display_color_profile_natural_summary">Tonuri și culori realiste</string>
   <string name="live_display_color_profile_dynamic_title">Dinamic</string>
   <string name="live_display_color_profile_dynamic_summary">Culori îmbunătățite și alb luminos</string>
   <string name="live_display_color_profile_cinema_title">Cinema</string>
   <string name="live_display_color_profile_cinema_summary">Reproducere culoare perfectă pentru video</string>
   <string name="live_display_color_profile_astronomy_title">Astronomie</string>
+  <string name="live_display_color_profile_astronomy_summary">Roșu închis pentru păstrarea viziunii nocturne</string>
   <string name="live_display_color_profile_photography_title">Fotografie</string>
+  <string name="live_display_color_profile_photography_summary">Reproducere perfectă a culorii pentru fotografii</string>
+  <string name="live_display_color_profile_basic_title">De bază</string>
   <string name="live_display_color_profile_basic_summary">Utilizează ecranul necalibrat</string>
+  <string name="live_display_color_profile_adaptive_title">Adaptiv</string>
+  <string name="live_display_color_profile_adaptive_summary">Culorile se adaptează la condiţiile ambientale</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Ajustare fotografie</string>
+  <string name="picture_adjustment_summary">Ajustaţi nuanţa, saturaţia, intensitatea şi contrastul</string>
+  <string name="adj_hue_title">Nuanţă</string>
   <string name="adj_saturation_title">Saturație</string>
+  <string name="adj_intensity_title">Intensitate</string>
   <string name="adj_contrast_title">Contrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Selectorul pictogramă</string>
@@ -617,10 +676,14 @@
   <!-- Increasing ring tone volume -->
   <string name="increasing_ring_volume_option_title">Volum crescător</string>
   <string name="increasing_ring_min_volume_title">Volum inițial</string>
+  <string name="increasing_ring_ramp_up_time_title">Timp de creştere a volumului</string>
   <!-- LTO download data over wi-fi only -->
   <string name="lto_download_data_wifi_only">Descărcare date asistență GPS</string>
   <string name="lto_download_data_wifi_only_on">Folosind orice rețea</string>
   <string name="lto_download_data_wifi_only_off">Folosind doar rețele Wi\u2011Fi</string>
+  <string name="volume_keys_control_ring_stream_title">Controlează volumul soneriei</string>
+  <string name="volume_keys_control_ring_stream_summary_on">Butoanele de volum controlează volumul tonului de apel</string>
+  <string name="volume_keys_control_ring_stream_summary_off">Butoanele de volum controlează volumul media</string>
   <string name="category_calibration">Calibrare</string>
   <string name="display_and_lights">Afișare &amp; lumini</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
@@ -702,20 +765,27 @@
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
   <string name="lockpattern_settings_enable_dots_title">Afișare puncte model</string>
   <!-- Whether the keyguard will directly pass to password entry -->
+  <string name="lock_directly_show_password">Arată direct introducere parolă</string>
   <!-- Whether the keyguard will directly pass to pattern view -->
+  <string name="lock_directly_show_pattern">Arată direct vizualizarea modelului</string>
   <!-- Whether the keyguard will directly pass to PIN entry -->
+  <string name="lock_directly_show_pin">Arată direct introducere PIN</string>
   <!-- lock screen visualizer -->
+  <string name="lockscreen_visualizer_title">Afișează vizualizatorul muzicii</string>
   <!-- lock screen disabled by QS tile warning -->
   <string name="lockscreen_disabled_by_qs_tile_title">Dezactivat de chenarul de setări rapide</string>
   <string name="lockscreen_disabled_by_qs_tile_summary">Apăsați pentru a activa blocarea ecran</string>
   <string name="lockscreen_disabled_by_qs_tile_summary_enabled">Blocare ecran activată!</string>
   <!-- Battery saver -->
+  <string name="battery_saver_threshold">Prag economizor baterie</string>
   <string name="battery_saver_summary">Reduce performanța și limitează traficul de date în fundal</string>
   <string name="battery_saver_summary_unavailable">Nu este disponibil în timpul încărcării</string>
   <!-- Battery : Automatic performance profiles -->
   <string name="autoperf_title">Activează profiluri per-aplicație</string>
+  <string name="autoperf_summary">Alege automat un mod de baterie corespunzător pentru diferite aplicații</string>
   <string name="perf_profile_title">Mod baterie</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">Aplicații pornite la boot</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">Tonul de notificare</string>
   <!-- Advanced reboot options -->
@@ -724,9 +794,11 @@
   <string name="category_interface">Interfață</string>
   <!-- Expanded desktop -->
   <string name="power_menu_expanded_desktop">Desktop extins</string>
+  <string name="expanded_hide_nothing">Nu ascunde nimic</string>
   <string name="expanded_hide_status">Ascundere bară de stare</string>
   <string name="expanded_hide_navigation">Ascunde bara de navigare</string>
   <string name="expanded_hide_both">Ascunde ambele</string>
+  <string name="expanded_nothing_to_show">Pentru a adăuga o configuraţie particularizată per aplicație pentru stare extinsă, setaţi \"Activat pentru toate\" în poziţia închis</string>
   <string name="expanded_enabled_for_all">Activat pentru toate</string>
   <string name="expanded_desktop_style">Stil desktop extins</string>
   <string name="expanded_desktop_style_description">Alegeți un stil desktop extins implicit</string>
@@ -742,6 +814,7 @@
   <string name="voice_wakeup_retrain_title">Re-antrenați vocea</string>
   <string name="voice_wakeup_activity_title">Activitate pentru lansare</string>
   <string name="voice_wakeup_default_activity">Google Now</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">Voice Wakeup are nevoie de permisiunile pentru apeluri telefonice pentru a selecta un contact Apelare Directă.</string>
   <string name="picker_activities">Activități</string>
   <string name="select_custom_app_title">Selectați aplicație personalizată</string>
   <string name="select_custom_activity_title">Selectați activitate personalizată</string>
@@ -750,6 +823,8 @@
   <string name="blacklist_edit_dialog_title">Editați numărul de telefon blocat</string>
   <string name="blacklist_prefs">Setări</string>
   <string name="blacklist_button_delete">Șterge</string>
+  <string name="blacklist_empty_text">Nu aveți niciun număr blocat. Adăugați unul apăsând butonul Adăugare (+).</string>
+  <string name="blacklist_disabled_empty_text">Pentru a preveni numerele de telefon de la a vă suna sau trimite mesaje, activați lista de apelanți blocați.</string>
   <string name="blacklist_summary_disabled">Dezactivat</string>
   <string name="blacklist_summary">Nu veți primi apeluri sau mesaje de la numere de telefon pe lista apelanților blocați</string>
   <string name="blacklist_notify">Afișare notificare</string>
@@ -779,15 +854,13 @@
   <string name="sms_security_check_limit_none">Fără</string>
   <!-- Notification spamfilter -->
   <string name="spam_added_title">Adăugat %1$s</string>
+  <string name="spam_last_blocked_title">Ultimul %1$s blocat</string>
   <string name="block_notifications_title">Filtru notificări</string>
   <string name="block_notifications_summary">Gestionați notificările ignorate și filtrele</string>
   <string name="no_filters_title">Niciun filtru setat</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">Statistici LineageOS</string>
-  <string name="anonymous_statistics_summary">Ajută-ne să facem LineageOS mai bun prin trimiterea de rapoarte anonime cu statistici</string>
   <string name="anonymous_statistics_warning_title">Despre</string>
-  <string name="anonymous_statistics_warning">Optând să trimiteți Statistici LineageOS, se permite dezvoltatorilor LineageOS să primească date ne-personale pentru a urmări instalările unice la o gama mare de dispozitive. Informația transmisă include un identificator unic, care nu vă compromite intimitatea sau datele personale. Datele sunt trimise la fiecare pornire a dispozitivului.\n\nPentru a vedea un exemplu de date ce se trimit, apăsați pe Previzualizare Date.</string>
   <string name="enable_reporting_title">Activare raportare</string>
   <string name="preview_data_title">Previzualizare date</string>
   <string name="view_stats_title">Vezi statistici</string>
@@ -799,6 +872,7 @@
   <string name="preview_country_title">Țara</string>
   <string name="preview_carrier_title">Operator</string>
   <string name="stats_collection_title">Colectarea de statistici</string>
+  <string name="stats_collection_summary">Când este activată, permite colectarea de măsurători</string>
   <!-- Protected apps lockpattern reset button -->
   <string name="lockpattern_reset_button">Model de resetare</string>
   <string name="lockpattern_settings_reset_summary">Introduceți contul de email primar și parola asociată pentru a reseta modelul de blocare</string>
@@ -806,6 +880,7 @@
   <string name="menu_hidden_apps_delete">Resetați</string>
   <string name="menu_hidden_apps_reset_lock">Resetați șablonul de blocare</string>
   <string name="protected_apps">Aplicații protejate</string>
+  <string name="protected_apps_summary">Gestionați care aplicații sunt ascunse după o blocare sigură</string>
   <string name="saving_protected_components">Se salvează starea componentei\u2026</string>
   <string name="pa_login_username_hint">Nume de utilizator (email)</string>
   <string name="pa_login_password_hint">Parola</string>
@@ -815,6 +890,9 @@
   <string name="pa_pattern_or_fingerprint_header">Pentru deblocare trebuie să desenați modelul sau să utilizați amprenta</string>
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">Contribuitori</string>
+  <string name="contributors_cloud_loading_message">Încărcare date contribuitori\u2026</string>
+  <string name="contributors_cloud_failed_message">Nu s-au putut încărca datele contribuitorilor</string>
+  <string name="contributor_info_menu">Informații contribuitori</string>
   <string name="contributor_info_msg">
         <![CDATA[<b>Nume:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
                  <b>Pseudonim:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
@@ -833,6 +911,8 @@
   <string name="category_misc">Diverse</string>
   <string name="title_general">General</string>
   <string name="advanced">Avansat</string>
+  <string name="link_volume_option_title">Leagă volumele de apel &amp; notificare</string>
+  <string name="lcd_density_prompt_message">Unele aplicații s-ar putea să nu funcționeze la un DPI non-standard.\n\nAceasta va reporni dispozitivul dvs.</string>
   <!-- Edit access point labels: PPP number -->
   <string name="apn_ppp_number">Număr telefon APN PPP</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
@@ -871,6 +951,10 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">mesajele selectate</string>
   <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Vibrare</string>
+  <string name="zen_mode_vibration_never">Fără vibrare</string>
+  <string name="zen_mode_vibration_calls_only">Vibrează numai pentru apeluri</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Vibrează pentru apeluri şi notificări</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>
@@ -882,12 +966,22 @@
   <!-- label for application name -->
   <string name="app_name_label_cm">Aplicație:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">Ultima utilizare:</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">Timp de utilizare:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="tablet">Aceasta va șterge toate datele din <b>stocarea internă</b> a tabletei dvs., incluzând:\n\n<li>Conturile de pe dispozitiv</li>\n<li>Datele și setările sistemului și ale aplicațiilor</li>\n<li>Aplicațiile descărcate</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">Aceasta va șterge toate datele din <b>stocarea internă</b> a telefonului dvs., incluzând:\n\n<li>Conturile de pe dispozitiv</li>\n<li>Datele și setările sistemului și ale aplicațiilor</li>\n<li>Aplicațiile descărcate</li></string>
   <!-- Factory reset strings -->
   <string name="factory_reset_instructions_title">Date personale &amp; aplicații</string>
+  <string name="factory_reset_instructions_summary">Aceasta va şterge toate conturile dvs., aplicațiile, datele aplicațiilor şi setările de sistem de pe acest dispozitiv</string>
+  <string name="factory_reset_personal_content">Conținut personal</string>
+  <string name="factory_reset_erase_stored_content">Şterge conţinutul stocat</string>
+  <string name="factory_reset_erase_stored_content_summary">Şterge muzica, fotografiile, videoclipurile şi alte date ale utilizatorului stocate pe acest dispozitiv</string>
+  <string name="factory_reset_erase_stored_content_summary_forced">Şterge muzica, fotografiile, videoclipurile şi alte date ale utilizatorului stocate pe acest dispozitiv. \n\n<b>Conținutul nu poate fi salvat din cauza criptării dispozitivului.</b></string>
   <string name="factory_reset_erase_sd_card">Formatare card SD</string>
+  <string name="factory_reset_erase_sd_card_summary">Şterge toate datele de pe cardul SD, incluzând muzica și fotografiile</string>
   <string name="factory_reset_warning_text_reset_now">RESETAȚI ACUM</string>
   <string name="factory_reset_warning_text_message">Toate conturile, aplicațiile, datele lor, și setările de sistem vor fi eliminate din acest dispozitiv. Acest lucru nu este reversibil.</string>
   <!-- Tethering & portable hotspot other category -->
@@ -898,12 +992,19 @@
   <string name="hotstpot_inactivity_timeout_1_minute">1 minut</string>
   <string name="hotstpot_inactivity_timeout_5_minutes">5 minute</string>
   <string name="hotstpot_inactivity_timeout_10_minutes">10 minute</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">Hotspotul portabil Wi\u2011Fi nu va expira niciodată</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">Hotspotul portabil Wi\u2011Fi va expira după <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">Live lockscreen</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">Activați și configurați ecranele de blocare Live</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">Setări</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">Pentru a vizualiza ecranele de blocare Live disponibile, activaţi ecranele de blocare Live.</string>
+  <string name="interruptions_ignore_while_media_title">Prevenire înfundare audio</string>
+  <string name="interruptions_ignore_while_media_summary">Nu redu volumul redării media la sosirea unei notificări</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Juridic LineageOS</string>
   <!-- Menu label for reset the battery stats -->
@@ -911,16 +1012,47 @@
   <!-- Reset stats confirmation dialog's message -->
   <string name="reset_stats_msg">Istoricul bateriei va fi resetat</string>
   <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Bateria dock nu este prezentă</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <string name="battery_info_status_charging_dock_ac">Încărcare în stativ AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Încărcare prin stativ USB</string>
+  <string name="restrict_app_wlan_title">Dezactivați utilizarea Wi\u2011Fi a aplicației</string>
+  <string name="restrict_app_wlan_summary">Preveniți aplicația de la a utiliza conexiunea de date Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">Dezactivați utilizarea celulară a aplicației</string>
+  <string name="restrict_app_cellular_summary">Preveniți aplicația de la a utiliza conexiunea de date celulară</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
   <string name="weather_settings_title">Vremea</string>
+  <string name="weather_settings_no_services_prompt">Niciun serviciu furnizor de vreme instalat</string>
+  <string name="weather_settings_button">Setări furnizor</string>
+  <string name="weather_settings_activity_not_found">Imposibil de a lansa meniul de setări pentru acest furnizor</string>
+  <string name="weather_settings_add_weather_provider">Adăugați un furnizor de vreme</string>
   <string name="weather_settings_general_settings_title">General</string>
+  <string name="weather_settings_providers_title">Furnizori</string>
+  <string name="weather_settings_temp_units_title">Unitate de temperatură</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">vreme</string>
+  <string name="background_data_access">Acces la datele din fundal</string>
+  <string name="allow_background_both">Prin date celulare &amp; Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Numai prin Wi\u2011Fi</string>
+  <string name="allow_background_none">Fără acces</string>
+  <string name="mobile_data_alert">Alertă date celulare</string>
+  <string name="mobile_data_alert_summary">Notifică atunci când aplicaţia utilizează o cantitate semnificativă de date</string>
+  <string name="data_usage_menu_enable_data_alerts">Activați alerte de utilizare date</string>
+  <string name="data_usage_menu_disable_data_alerts">Dezactivați alertele de utilizare date</string>
+  <string name="data_usage_menu_reset_stats">Resetați statisticile datelor</string>
+  <string name="reset_data_stats_msg">Aceasta va şterge toate informaţiile urmăririi datelor trecute şi prezente</string>
+  <string name="reset_stats_confirm">Confirmați</string>
+  <string name="restrict_cellular_access_title">Restricţionați accesul la datele celulare</string>
+  <string name="restrict_cellular_access_summary">Dezactivați accesul la date în reţelele celulare</string>
+  <string name="restrict_cellular_access_dialog_title">Restricţionați accesul la datele celulare?</string>
+  <string name="restrict_cellular_access_dialog_summary">Această caracteristică poate face ca o aplicație care depinde de accesul la rețea să nu mai funcționeze când sunt disponibile numai rețelele celulare.\n\nPuteți găsi controale pentru utilizarea datelor mai adecvate în setările disponibile în aplicație.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Operatori de rețea</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Blurare fundal</string>
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">Arată vremea</string>
   <!-- Per app controls for LP keyguard notifications -->
@@ -929,10 +1061,40 @@
   <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 -->
+  <string name="app_notification_sound_timeout_title">Timp minim între sunetele notificărilor</string>
+  <string name="app_notification_sound_timeout_summary_template">Nu permiteți sunete sau vibrații mai mult de o singură dată la mai puțin de fiecare <xliff:g id="duration">%1$s</xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Fără restricţie</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 secunde</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 de secunde</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 minut</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 minute</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 minute</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 de minute</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Control radio îmbunătățit</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Opriți auto-încărcarea MBN</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Porniți auto-încărcarea MBN</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Opriți depanarea VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Porniți depanarea VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Opriți depanarea VT</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Porniți depanarea VT</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Opriți depanarea WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Porniți depanarea WFC</string>
+  <string name="cm_radio_info_adb_log_on_label">Opriți jurnalizarea radio ADB</string>
+  <string name="cm_radio_info_adb_log_off_label">Porniți jurnalizarea radio ADB</string>
+  <string name="cm_radio_info_diag_log_on_label">Opriți jurnalizarea Diag</string>
+  <string name="cm_radio_info_diag_log_off_label">Porniți jurnalizarea Diag</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Imagine de fundal</string>
+  <string name="not_available_with_app">Indisponibil cu %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Localizați senzorul de amprentă pe <xliff:g id="sensor_location">%1$s</xliff:g> telefonului dvs.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">înapoia</string>
+  <string name="security_settings_fingerprint_sensor_location_front">fața</string>
+  <string name="security_settings_fingerprint_sensor_location_left">partea stângă a</string>
+  <string name="security_settings_fingerprint_sensor_location_right">partea dreaptă a</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Voce: <xliff:g id="voice_status">%1$s</xliff:g> / Date: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 712f758..51714bc 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -860,10 +860,7 @@
   <string name="no_filters_title">Фильтр не установлен</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Отправка статистики</string>
-  <string name="anonymous_statistics_summary">Помогите сделать LineageOS лучше, разрешив сбор анонимной статистики</string>
   <string name="anonymous_statistics_warning_title">Сведения</string>
-  <string name="anonymous_statistics_warning">Анонимные отчёты позволяют разработчикам LineageOS отслеживать работу ОС на различных устройствах. Отправляемая информация включает название устройства, версию прошивки и уникальный идентификатор, что никаким образом не затрагивает Вашу конфиденциальность. Данные отправляются при каждой загрузке устройства.\n\nЧтобы просмотреть пример, нажмите «Просмотр данных».</string>
   <string name="enable_reporting_title">Разрешить сбор статистики</string>
   <string name="preview_data_title">Просмотр данных</string>
   <string name="view_stats_title">Просмотр статистики</string>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index d9fcbd8..66c8099 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -65,7 +65,7 @@
   <!-- About phone screen, Device name -->
   <string name="device_name">Názov zariadenia</string>
   <!-- About phone screen, LineageOS Api Level -->
-  <string name="mod_api_level">LineageOS API úroveň</string>
+  <string name="mod_api_level">Verzia LineageOS API</string>
   <string name="mod_api_level_default">Neznáme</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Dátum zostavy</string>
@@ -860,10 +860,7 @@
   <string name="no_filters_title">Nenastavené žiadne filtre</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">Štatistiky LineageOS</string>
-  <string name="anonymous_statistics_summary">Pomôžte zlepšiť LineageOS povolením anonymných štatistických hlásení</string>
   <string name="anonymous_statistics_warning_title">O aplikácii</string>
-  <string name="anonymous_statistics_warning">Povolením štatistík LineageOS súhlasíte s odosielaním neosobných údajov vývojárom LineageOSu, na účel zaznamenávania inštalácií naprieč zariadeniami. Informácie obsahujú unikátny identifikátor, ktorý neohrozuje vaše súkromné alebo osobné údaje. Údaje sú odoslané pri každom spustení.\n\nNa ukážku odosielaných údajov kliknite na Prehľad údajov.</string>
   <string name="enable_reporting_title">Povoliť hlásenia</string>
   <string name="preview_data_title">Prehľad údajov</string>
   <string name="view_stats_title">Zobraziť štatistiky</string>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index c840954..cda1e1d 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -862,12 +862,7 @@
   <string name="no_filters_title">Ni nastavljenih filtrov</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">Statistika LineageOS</string>
-  <string name="anonymous_statistics_summary">Pomagajte izboljšati LineageOS tako, da izberete pošiljanje anonimne statistike</string>
   <string name="anonymous_statistics_warning_title">O programu</string>
-  <string name="anonymous_statistics_warning">Izbira statistike LineageOS bo dovolila pošiljanje neosebnih podatkov
-        razvijalcem LineageOSa, da lahko sledijo edinstvenim namestitvam v napravah. Poslani podatki vključujejo edinstven določilnik,
-        ki ne ogroža vaše zasebnosti in osebnih podatkov. Podatki so poslani ob vsakem zagonu.\n\nZa primer poslanih podatkov tapnite Predogled podatkov.</string>
   <string name="enable_reporting_title">Omogoči poročanje</string>
   <string name="preview_data_title">Predogled podatkov</string>
   <string name="view_stats_title">Pokaži statistiko</string>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 4aa4e32..a96daaf 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -555,6 +555,7 @@
   <string name="double_tap_to_sleep_summary">Двапут додирни статусну траку да искључиш дисплеј</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Спречи случајно буђење</string>
+  <string name="proximity_wake_summary">Провери сензор близине пре примене геста буђења</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Пробуди на утикачу</string>
   <string name="wake_when_plugged_or_unplugged_summary">Укључи екран код повезивања или искључивања са извора напајања</string>
@@ -859,10 +860,7 @@
   <string name="no_filters_title">Нема постављених филтера</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Статистике LineageOS-а</string>
-  <string name="anonymous_statistics_summary">Помози да LineageOS буде бољи слањем анонимних статистика</string>
   <string name="anonymous_statistics_warning_title">О</string>
-  <string name="anonymous_statistics_warning">Омогућавањем слања LineageOS статистикe дозволиће се да се нелични подаци доставе развојном тиму LineageOS-а како би се пратио број појединачних инсталација на различите уређаје. Информације које се шаљу садрже јединствену идентификацију која не компромитује приватност или личне податке. Подаци се шаљу при сваком покретању уређаја.\n\nЗа пример података који се шаљу, додирните преглед података.</string>
   <string name="enable_reporting_title">Омогући извештавање</string>
   <string name="preview_data_title">Преглед података</string>
   <string name="view_stats_title">Погледај статистике</string>
@@ -953,6 +951,10 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">одабране поруке</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>
@@ -1059,6 +1061,15 @@
   <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">Без ograničenja</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-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 9b495e5..1d9c014 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -841,13 +841,7 @@
   <string name="no_filters_title">Inga filter valda</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">LineageOS-statistik</string>
-  <string name="anonymous_statistics_summary">Hjälp till att göra LineageOS bättre genom att skicka anonyma statistikrapporter</string>
   <string name="anonymous_statistics_warning_title">Om</string>
-  <string name="anonymous_statistics_warning">Att delta i LineageOS Statistics kommer tillåta att icke-personlig data kommer att skickas till
-        utvecklarna av LineageOS för att spåra unika installationer mellan enheter. Den delgivna informationen
-inkluderar en unik identifikation,
-        som inte riskerar din integritet eller personliga data. Data skickas vid varje uppstart av enheten.\n\nFör ett exempel på den data som skickas, tryck på Förhandsgranska data.</string>
   <string name="enable_reporting_title">Aktivera rapportering</string>
   <string name="preview_data_title">Förhandsgranska data</string>
   <string name="view_stats_title">Visa statistik</string>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index ac4fdae..840c3ef 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -838,10 +838,7 @@
   <string name="no_filters_title">வடிகட்டிகள் எதுவும் அமைக்கப்படவில்லை</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">LineageOS புள்ளிவிவரங்கள்</string>
-  <string name="anonymous_statistics_summary">LineageOS மேம்பட்டு செயல்பட பெயரில்லா புள்ளிவிவர அறிவிப்பை தெரிந்துகொள்ளவும்</string>
   <string name="anonymous_statistics_warning_title">இதுபற்றி</string>
-  <string name="anonymous_statistics_warning">LineageOS புள்ளிவிவரங்களை தேர்ந்தெடுத்தல் தனிப்பட்டது அல்லாத தரவுகளை LineageOS உருவாக்கியவர்களுக்கு சமர்பிக்க அனுமதித்து கருவிகளுக்கு இடையே தனித்துவமான நிறுவல்களை கண்காணிக்க உதவும் சமர்பிக்கப்பட்ட தகவல்களில் ஒரு தனித்துவமான அடையாளம் காண்பான் உள்ளது, அது உங்கள் அந்தரங்கத்தை அல்லது தனிப்பட்ட தரவை சமரசம் செய்யாது. இந்த தரவு ஒவ்வொரு பூட்டிலும் சமர்பிக்கபப்டுகின்றது. \n\n சமர்பிக்கப்பட்ட தரவுகளுக்கான உதாரணத்திற்கு தரவுகள் முன்னோட்டத்தை தட்டவும்</string>
   <string name="enable_reporting_title">தெரிவித்தலை செயல்படுத்து</string>
   <string name="preview_data_title">தரவுகளை முன்னோட்டம்பார்</string>
   <string name="view_stats_title">புள்ளிவிவரங்களை காண்</string>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index cbb2d72..62ea403 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -838,10 +838,7 @@
   <string name="no_filters_title">ఎటువంటి ఫిల్టర్లు సెట్ చేయబడలేదు</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">సయనోజెన్ మోడ్ గణాంకాలు</string>
-  <string name="anonymous_statistics_summary">అజ్ఞాతంగా గణాంకాల నివేదిక పంపడాన్ని ఎంచుకోవడం ద్వారా సయనోజెన్ మోడ్ ను మెరుగుపరిచేందుకు సహాయపడండి</string>
   <string name="anonymous_statistics_warning_title">గురించి</string>
-  <string name="anonymous_statistics_warning">సయనోజెన్ మోడ్ గణాంకాలను ఎంచుకోవడం ద్వారా సయనోజెన్ మోడ్ డెవలపర్‌లు పరికరాలలో అసాధారణ వ్యవస్థాపనలను ట్రాక్ చేసేందుకు వారికి వ్యక్తిగతం కాని డేటాను సమర్పించే అవకాశాన్ని కల్పిస్తుంది. సమర్పించబడిన సమాచారం ఒక ఏకైక నిర్ధారిణిను కలిగి ఉంటుంది, ఇది మీ యొక్క గోప్యత లేదా వ్యక్తిగత డేటాలను కలిగి ఉండదు ప్రతి ఒక్క బూట్ సందర్భంలో డేటా సమర్పించబడుతుంది. \n\nసమర్పించబడిన డేటాకు ఉదాహరణ కొరకు, పూర్వవీక్షణ డేటా పైన ట్యాప్ చేయండి.</string>
   <string name="enable_reporting_title">నివేదిక పంపడాన్ని ప్రారంభించుము</string>
   <string name="preview_data_title">పూర్వవీక్షణ డేటా</string>
   <string name="view_stats_title">వీక్షణ గణాంకాలు</string>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index fa73875..b751249 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -840,10 +840,7 @@
   <string name="no_filters_title">ไม่มีการตั้งค่าตัวกรอง</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">สถิติของ LineageOS</string>
-  <string name="anonymous_statistics_summary">ช่วยทำให้ LineageOS ดีขึ้นโดยการส่งรายงานสถิติแบบไม่ระบุตัวตน</string>
   <string name="anonymous_statistics_warning_title">เกี่ยวกับ</string>
-  <string name="anonymous_statistics_warning">การส่งสถิติแบบไม่ระบุตัวตนไปยัง LineageOS จะอนุญาตให้ส่งข้อมูลที่ไม่ใช่ข้อมูลส่วนตัวไปยังนักพัฒนาของ LineageOS เพื่อติดตามการติดตั้งบนอุปกรณ์ทั้งหมด ข้อมูลที่ถูกส่งรวมไปถึงตัวระบุลักษณะเฉพาะ\n\nซึ่งไม่ส่งผลกระทบต่อความเป็นส่วนตัวและข้อมูลส่วนบุคคลของคุณ โดยจะส่งข้อมูลทุกครั้งที่เริ่มระบบ\n\n แตะ \"แสดงตัวอย่างข้อมูล\" เพื่อดูตัวอย่างข้อมูลที่ถูกส่ง</string>
   <string name="enable_reporting_title">เปิดการรายงาน</string>
   <string name="preview_data_title">แสดงตัวอย่างข้อมูล</string>
   <string name="view_stats_title">ดูสถิติ</string>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index b545a40..6b0ed07 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -841,10 +841,7 @@
   <string name="no_filters_title">Hiçbir filtre ayarlanmadı</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">LineageOS istatistikleri</string>
-  <string name="anonymous_statistics_summary">Anonim istatistik raporları göndererek LineageOS\'un daha iyi olmasına yardım edin</string>
   <string name="anonymous_statistics_warning_title">Hakkında</string>
-  <string name="anonymous_statistics_warning">LineageOS İstatistiklerine dahil olmak kişisel olmayan verilerin LineageOS geliştiricilerine cihazlar arasındaki benzersiz yüklemeleri takip etmeleri için gönderilmesine izin verir. Bu bilgi, kişisel bilgi içermeyen ve gizliliğinizi tehdit etmeyen bir benzersiz numara da içerir. Veri her başlangıçta gönderilir.\n\nGönderilecek verinin örneğini görmek için Veriyi Önizle butonunu kullanın.</string>
   <string name="enable_reporting_title">Raporlamayı etkinleştir</string>
   <string name="preview_data_title">Veriyi önizle</string>
   <string name="view_stats_title">İstatistikleri görüntüle</string>
diff --git a/res/values-ug/arrays.xml b/res/values-ug/arrays.xml
index da28810..109e65f 100644
--- a/res/values-ug/arrays.xml
+++ b/res/values-ug/arrays.xml
@@ -22,7 +22,6 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
-  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <string-array name="timezone_filters">
     <!-- The next level of the time zoner picker should show time zones from the Americas. -->
@@ -120,7 +119,6 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <string-array name="wifi_status">
     <!-- Status message of Wi-Fi when it is idle. -->
@@ -149,7 +147,6 @@
     <item>سىگنال ناچار باغلىنىشنى ۋاقىتلىق تاقايدۇ</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <string-array name="wifi_status_with_ssid">
     <!-- Status message of Wi-Fi when it is idle. -->
@@ -178,15 +175,12 @@
     <item>سىگنال ناچار باغلىنىشنى ۋاقىتلىق تاقايدۇ</item>
   </string-array>
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
-  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
-  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <string-array name="wifi_eap_method">
     <!-- Do not translate. -->
@@ -245,7 +239,6 @@
     <item>ھەرگىز ۋاقىت ھالقىمايدۇ</item>
   </string-array>
   <!-- Match this with drawable.wifi_signal. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <string-array name="wifi_signal">
     <item>ناچار</item>
@@ -273,7 +266,6 @@
     <item>ھەرگىز</item>
   </string-array>
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
-  <skip></skip>
   <!-- Do not translate. -->
   <string-array name="wifi_sleep_policy_values">
     <!-- Do not translate. -->
@@ -657,10 +649,8 @@
   </string-array>
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
-  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <string-array name="vpn_types_long">
     <item>PPTP VPN</item>
@@ -671,7 +661,6 @@
     <item>گۇۋاھنامەلىك ھەمدە ئارىلاش سالاھىيەت دەلىللەيدىغان IPSec VPN</item>
   </string-array>
   <!-- Match this with the constants in LegacyVpnInfo. -->
-  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <string-array name="vpn_states">
     <!-- Status message when VPN is disconnected. -->
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index d391b7a..a21b24d 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -838,10 +838,7 @@
   <string name="no_filters_title">سۈزگۈچ تەڭشىكى يوق</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">LineageOS سىتاتىستىكىسى</string>
-  <string name="anonymous_statistics_summary">ئاتسىز ئىشلىتىش سىتاتىستىكىڭىزنى يوللاپ LineageOS نىڭ تېخىمۇ ياخشىلىنىشىغا ياردەم قىلىڭ</string>
   <string name="anonymous_statistics_warning_title">ھەققىدە</string>
-  <string name="anonymous_statistics_warning">بۇ LineageOS سىتاتىستىكىنى قوزغىتىپ شەخسىي ئۇچۇرلار بولمىغان سانلىق مەلۇماتنى LineageOS ئىجادكارلىرىغا يوللاپ، ھەر خىل ئۈسكۈنىلەردىكى ئورنىتىشلارنى خاتىرىلەشكە قولايلىق يارىتىدۇ. يوللانغان ئۇچۇردا ئالاھىدە بىر بەلگە بولۇپ شەخسىيەت ۋە شەخسىي سانلىق مەلۇماتلارغا چېتىلمايدۇ. بۇ سانلىق مەلۇماتلار ھەر قېتىم قوزغالغاندا يوللىنىدۇ.\n\nيوللانغان سانلىق مەلۇماتنىڭ ئۈلگىسى سۈپىتىدە سانلىق مەلۇماتنى ئالدىن كۆزەتنى چېكىڭ.</string>
   <string name="enable_reporting_title">دوكلاتنى قوزغىتىش</string>
   <string name="preview_data_title">سانلىق مەلۇماتنى ئالدىن كۆزىتىش</string>
   <string name="view_stats_title">سىتاتىستىكىنى كۆرسىتىش</string>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index 07c9843..b20fdea 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -29,7 +29,6 @@
   <string name="dlg_close">تاقاش</string>
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
-  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <string name="device_info_default">يوچۇن</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
@@ -41,7 +40,6 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <string name="show_dev_already">ھاجەتسىز، سىز ئاللىبۇرۇن ئىجادكار ھالىتىدە.</string>
   <!-- Category headings in left-pane header menu -->
-  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -195,7 +193,6 @@
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <string name="bluetooth_disable_profile_message">بۇ مەشغۇلات چەكلەيدۇ: &lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ئورنى:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;</string>
   <!-- Bluetooth settings.  Message when the device state is unknown -->
-  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <string name="bluetooth_device">ئاتسىز كۆكچىش ئۈسكۈنە</string>
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
@@ -493,7 +490,6 @@
   <!-- mobile network settings screen, setting option summary text -->
   <string name="sum_carrier_select">تور مۇلازىمەت تەمىنلىگۈچىنى تاللاڭ</string>
   <!-- Date and time settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <string name="date_and_time_settings_title">چىسلا ۋە ۋاقىت</string>
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
@@ -539,7 +535,6 @@
          [CHAR LIMIT=20] -->
   <string name="time_picker_title">ۋاقىت</string>
   <!-- Security Settings -->
-  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <string name="lock_after_timeout">ئۆزلۈكىدىن قۇلۇپلا</string>
   <!-- Security settings screen, setting option summary to change screen timeout -->
@@ -576,7 +571,6 @@
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <string name="security_passwords_title">ئىم</string>
   <!-- Fingerprint enrollment and settings -->
-  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -584,7 +578,6 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
-  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -683,14 +676,11 @@
   <!-- Image button description to switch input method -->
   <string name="crypt_keeper_switch_input_method">كىرگۈزگۈچ ئالماشتۇر</string>
   <!-- Unlock Picker Settings -->
-  <skip></skip>
   <!-- Security Picker -->
-  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <string name="lock_settings_picker_title">ئېكران قۇلۇپىنى تاللاڭ</string>
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
-  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_launch_picker_title">ئېكران قۇلۇپلا</string>
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
@@ -702,7 +692,6 @@
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_off_title">يوق</string>
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <string name="unlock_set_unlock_none_summary">بىخەتەرلىك تەدبىرى يوق</string>
@@ -854,7 +843,6 @@
   <string name="bluetooth_display_passkey_pin_msg"><xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> بىلەن جۈپلەشتە <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> نى كىرگۈزۈڭ، ئاندىن Return ياكى Enter نى بېسىڭ.</string>
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
-  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <string name="bluetooth_preference_scan_title">ئۈسكۈنە تەكشۈرۈۋاتىدۇ</string>
@@ -998,7 +986,6 @@
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <string name="nsd_quick_toggle_summary">باشقا ئۈسكۈنىدىكى ئەپنىڭ بۇ ئۈسكۈنىدىكى ئەپنى بايقىشىغا يول قويىدۇ</string>
   <!-- Wi-Fi Settings -->
-  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <string name="wifi_quick_toggle_title">Wi‑Fi</string>
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
@@ -1085,7 +1072,6 @@
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <string name="wifi_setup_wps">ئاپتوماتىك تەڭشەك (WPS)</string>
   <!-- Dialog for Access Points -->
-  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <string name="wifi_wps_setup_title">Wi-Fi قوغداش تەڭشىكى</string>
@@ -1196,7 +1182,6 @@
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <string name="wifi_connect_failed_message" product="default">تېلېفون بۇ Wi-Fi تورىغا باغلىنالمايدۇ.</string>
   <!-- Wi-Fi Advanced Settings -->
-  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <string name="wifi_advanced_titlebar">ئالىي WiFi</string>
@@ -1346,7 +1331,6 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
-  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <string name="home_settings">باش بەت</string>
   <string name="display_settings_title">ئېكران</string>
@@ -1450,7 +1434,6 @@
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <string name="search_settings_summary">ئىزدەش تەڭشىكى ۋە تارىخ خاتىرىنى باشقۇرۇش</string>
   <!-- Display settings -->
-  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <string name="display_settings">ئېكران</string>
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
@@ -1696,9 +1679,7 @@
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <string name="sd_mount" product="default">SD كارتىنى ئېگەرلە</string>
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
-  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <string name="sd_format" product="nosdcard">بۇ USB ساقلىغۇچنى ئۆچۈرىدۇ</string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
@@ -1723,9 +1704,7 @@
   <!-- SD card eject confirmation dialog  -->
   <string name="dlg_confirm_unmount_text" product="default">ئەگەر SD كارتىنى ئېگەرسىزلىسىڭىز، ئىشلىتىلىۋاتقان بەزى ئەپلەر ئىشتىن توختايدۇ ھەم SD كارتىنى قايتا ئىگەرلىمىگۈچە ئىشلەتكىلى بولماسلىقى مۇمكىن.</string>
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
-  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
-  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1901,7 +1880,6 @@
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <string name="menu_cancel">تاشلىۋەت</string>
   <!-- APN error dialog title -->
-  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -2087,7 +2065,6 @@
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <string name="location_sources_heading">ئورۇن مەنبەلىرى</string>
   <!-- About -->
-  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <string name="about_settings" product="tablet">تاختا كومپيۇتېر ھەققىدە</string>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
@@ -2102,26 +2079,21 @@
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <string name="regulatory_information">باشقۇرۇش ئۇچۇرى</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <string name="copyright_title">نەشر ھوقوقى</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <string name="license_title">ئىجازەت</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <string name="terms_title">ماددا ۋە شەرتلەر</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
-  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
-  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <string name="settings_license_activity_title">ئوچۇق كودلۇق ئىجازەتنامە</string>
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
@@ -2221,7 +2193,6 @@
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <string name="activity_not_found">ئەپ تېلېفونىڭىزغا  ئورنىتىلمىغان.</string>
   <!-- Applications Settings -->
-  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <string name="manageapplications_settings_title">ئەپ باشقۇرۇش</string>
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
@@ -2370,7 +2341,6 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <string name="dlg_cancel">ۋاز كەچ</string>
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
-  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -2428,7 +2398,6 @@
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <string name="force_stop_dlg_text">ئەپ مەجبۇرىي توختىتىلسا نورمالسىزلىق كەلتۈرۈپ چىقىرىشى مۇمكىن.</string>
   <!-- Manage applications, text for dialog when moving an app -->
-  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <string name="app_install_location_title">ئالدىن بەلگىلەنگەن ئورنىتىدىغان ئورۇن</string>
@@ -2446,7 +2415,6 @@
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <string name="app_disable_notifications_dlg_text">ئەگەر بۇ ئەپنىڭ ئۇقتۇرۇشىنى تاقىسىڭىز، مۇھىم ئاگاھلاندۇرۇش ۋە يېڭىلاشلاردىن بىخەۋەر قېلىشىڭىز مۇمكىن.</string>
   <!-- App Ops Settings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <string name="app_ops_settings">ئەپ مەشغۇلاتى</string>
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
@@ -2538,7 +2506,6 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <string name="runningservicedetails_stop_dlg_text" product="default">ئەگەر بۇ مۇلازىمەتنى توختاتسىڭىز، تاختا كومپيۇتېرىڭىزدىكى بەزى ئىقتىدارلار ئۇنى تاقاپ قايتا ئاچقۇچە خىزمەتتىن توختىشى مۇمكىن.</string>
   <!-- Language Settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <string name="language_settings">تىل ۋە كىرگۈزۈش </string>
   <!-- Title of Language and keyboard settings screen -->
@@ -2589,7 +2556,6 @@
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <string name="vibrate_input_devices_summary">باغلانغاندىن كېيىن تىترەتكۈچ ئويۇن تىزگىنەككە قايتا نىشانلايدۇ.</string>
   <!-- Keyboard Layout Preference Dialog -->
-  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_dialog_title">ھەرپتاختا ئورۇنلاشتۇرۇلۇشىنى تاللاڭ</string>
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
@@ -2599,11 +2565,9 @@
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <string name="keyboard_layout_default_label">كۆڭۈلدىكى</string>
   <!-- Keyboard Layout Picker -->
-  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_picker_title">ھەرپتاختا ئورۇنلاشتۇرۇلۇشى</string>
   <!-- User dictionary settings -->
-  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <string name="user_dict_settings_title">شەخسىي لۇغەت</string>
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
@@ -2813,7 +2777,6 @@
   <!-- label for usage time -->
   <string name="usage_time_label">ئىشلىتىش ۋاقتى</string>
   <!-- Accessibility settings -->
-  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <string name="accessibility_settings">قوشۇمچە ئىقتىدار</string>
   <!-- Settings title for accessibility settings screen -->
@@ -2956,7 +2919,6 @@
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <string name="settings_button">تەڭشەكلەر</string>
   <!-- Printing settings -->
-  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <string name="print_settings">بېسىش</string>
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
@@ -3011,7 +2973,6 @@
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_hidden_utterance">ئىزدەش قۇتىسى يوشۇرۇلدى</string>
   <!-- App Fuel Gauge strings -->
-  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <string name="power_usage_summary_title">توكدان</string>
   <!-- Activity title summary for App Fuel Gauge summary -->
@@ -3186,7 +3147,6 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
-  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <string name="process_stats_summary_title">جەريان سىتاتىستىكىسى</string>
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
@@ -3253,7 +3213,6 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <string name="menu_proc_stats_type_cached">غەملەنگەن</string>
   <!-- Voice input/output settings -->
-  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <string name="voice_input_output_settings">تاۋۇش كىرگۈزۈش ۋە چىقىرىش</string>
   <!-- Main voice input/output settings screen title -->
@@ -3265,7 +3224,6 @@
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <string name="voice_category">تاۋۇش</string>
   <!-- Voice input settings -->
-  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -3282,7 +3240,6 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
-  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <string name="tts_settings">تېكىستتىن تاۋۇشقا تەڭشىكى</string>
   <!-- TTS option item name in the main settings screen -->
@@ -3453,7 +3410,6 @@
   <string name="credential_storage_type_software">يۇمشاق دېتاللا</string>
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
-  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <string name="credentials_unlock_hint">ئىسپاتلىق ساقلىغۇچ ئۈچۈن ئىم كىرگۈزۈڭ.</string>
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
@@ -3480,7 +3436,6 @@
   <!-- Sound settings screen, setting option summary text -->
   <string name="emergency_tone_summary">جىددىي چاقىرغاندىكى ھەرىكەت تەڭشىكى</string>
   <!-- Backup and reset Settings screen -->
-  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <string name="privacy_settings">زاپاسلاش ۋە ئەسلىگە قايتۇرۇش</string>
   <!-- Privacy settings activity title -->
@@ -3514,13 +3469,11 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <string name="local_backup_password_toast_validation_failure">زاپاسلاش ئىم تەڭشىيەلمىدى</string>
   <!-- Dialog title for confirmation to erase backup data from server -->
-  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <string name="backup_erase_dialog_message">سىز Wi-Fi ئىم، خەتكۈچلەر، باشقا تەڭشەكلەر ۋە ئەپ سانلىق مەلۇماتلىرىڭىزنى زاپاسلاشنى توختىتىپ، Google مۇلازىمېتىردىكى بارلىق قوشۇمچە نۇسخىسىنى ئۆچۈرەمسىز؟</string>
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
-  <skip></skip>
   <!-- Device admin settings activity title -->
   <string name="device_admin_settings_title">ئۈسكۈنە باشقۇرۇش تەڭشىكى</string>
   <!-- Label for screen showing the active device policy -->
@@ -3682,7 +3635,6 @@
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <string name="sync_automatically">ئەپ سانلىق مەلۇماتىنى ئۆزلۈكىدىن قەدەمداشلا</string>
   <!-- Sync status messages on Accounts & Synchronization settings -->
-  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <string name="sync_enabled">قەدەمداش ئوچۇق</string>
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
@@ -4114,7 +4066,6 @@
   <string name="selinux_status_permissive">ئىجازەت</string>
   <string name="selinux_status_enforcing">ئىجرا قىلىنىۋاتىدۇ</string>
   <!-- Notification of installed CA Certs -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">تور نازارەت قىلىنغان بولۇشى مۇمكىن</string>
@@ -4129,7 +4080,6 @@
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <string name="ssl_ca_cert_settings_button">ئىشەنچلىك گۇۋاھنامىلەرنى تەكشۈر</string>
   <!-- User settings -->
-  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <string name="user_settings_title">ئىشلەتكۈچىلەر</string>
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
@@ -4234,7 +4184,6 @@
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <string name="global_font_change_title">خەت نۇسخا چوڭلۇقى ئۆزگەرت</string>
   <!-- NFC payment settings -->
-  <skip></skip>
   <string name="nfc_payment_settings_title">چېكىش ۋە چىقىم</string>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
@@ -4254,7 +4203,6 @@
          preferred payment application -->
   <string name="nfc_payment_set_default_label">مايىللىقىڭىزغا تەڭشەمدۇ؟</string>
   <!-- Restrictions settings -->
-  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <string name="restriction_settings_title">چەكلىمەلەر</string>
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
@@ -4264,7 +4212,6 @@
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <string name="app_notifications_switch_label">ئۇقتۇرۇشنى كۆرسەت</string>
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
-  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -4359,7 +4306,6 @@
   <string name="user_image_choose_photo" msgid="3746334626214970837">رەسىم يىغقۇچتىن سۈرەت تاللاڭ</string>
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
-  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 0605669..1425c69 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -812,10 +812,7 @@
   <string name="no_filters_title">Немає фільтрів</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Статистика LineageOS</string>
-  <string name="anonymous_statistics_summary">Допоможіть зробити LineageOS кращим, надсилаючи анонімну статистику</string>
   <string name="anonymous_statistics_warning_title">Про</string>
-  <string name="anonymous_statistics_warning">Анонімні звіти дозволяють розробникам LineageOS відстежувати шнформацію щодо установки на різні пристрої. Ця інформація містить у собі назву пристрою, версію ПЗ і унікальний ідентифікатор, надсилання якого ніяким чином не шкодить Вашій конфіденційності. Звіт надсилається при кожному завантаженні пристрою.\n\nНатисніть, аби переглянути приклад даних, які надсилаються.</string>
   <string name="enable_reporting_title">Увімкнути надсилання звітів</string>
   <string name="preview_data_title">Показати дані</string>
   <string name="view_stats_title">Перегляд статистики</string>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 89a2378..3054682 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -840,10 +840,7 @@
   <string name="no_filters_title">Chưa thiết lập bộ lọc</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">Thống kê LineageOS</string>
-  <string name="anonymous_statistics_summary">Giúp làm cho LineageOS tốt hơn bằng cách chọn vào báo cáo thống kê ẩn danh</string>
   <string name="anonymous_statistics_warning_title">Thông tin</string>
-  <string name="anonymous_statistics_warning">Chọn tham gia Thống kê LineageOS sẽ cho phép gửi dữ liệu không liên quan đến cá nhân đến những nhà phát triển của LineageOS để theo dõi số lượt cài đặt độc đáo trên các thiết bị. Thông tin đã gửi sẽ bao gồm một ký hiệu nhận dạng duy nhất, nó sẽ không ảnh hưởng đến sự riêng tư hoặc dữ liệu cá nhân của bạn. Dữ liệu được gửi vào mỗi lần khởi động.\n\nĐể xem mẫu dữ liệu được gửi, chạm vào Xem trước dữ liệu.</string>
   <string name="enable_reporting_title">Cho phép báo cáo</string>
   <string name="preview_data_title">Xem trước dữ liệu</string>
   <string name="view_stats_title">Xem thống kê</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 4a81490..00d2ac5 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -22,7 +22,7 @@
     <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>
+  <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 -->
@@ -71,7 +71,7 @@
   <string name="update_recovery_title">更新 Cyanogen 恢复模式</string>
   <string name="update_recovery_summary">使用系统更新来更新恢复模式</string>
   <string name="update_recovery_on_warning">注意：启用此功能后，您已安装的恢复模式会被正在运行的系统所包含的恢复模式所替换。\n\n您的恢复模式会随着系统一起更新，以确保对未来版本的兼容性。\n\n您确定启用此功能？</string>
-  <string name="update_recovery_off_warning">警告：此功能被禁用后，你安装的恢复模式将不会随着系统一起更新。\n\n未来的系统更新可能不支持用过旧的或自制的恢复模式安装。\n\n您确定要禁用此功能？</string>
+  <string name="update_recovery_off_warning">警告：此功能被禁用后，您已安装的恢复模式将不会随着系统一起更新。\n\n未来的系统更新可能不支持用过旧或自制的恢复模式安装。\n\n您确定要禁用此功能？</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
   <string name="themes_settings_title">主题</string>
@@ -290,10 +290,10 @@
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android 调试</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
-  <string name="enable_adb_summary_cm">开启 Android Debug Bridge (adb) 界面</string>
+  <string name="enable_adb_summary_cm">启用 Android Debug Bridge (adb) 接口</string>
   <!-- Android debugging over WiFi -->
   <string name="adb_over_network">网络 ADB 调试</string>
-  <string name="adb_over_network_summary">通过网络接口 (Wi\u2011Fi，USB 网络) 启用 TCP/IP 调试。该设置重启后失效</string>
+  <string name="adb_over_network_summary">启用通过网络接口（Wi\u2011Fi、USB 网络）的 TCP/IP 调试。该设置重启后失效</string>
   <!-- Warning for Adb over Network -->
   <string name="adb_over_network_warning">警告：当网络 ADB 调试启用时，您的设备将在所有已连接的网络上接收指令！\n\n请只在您信任的网络中启用此功能。\n\n您真的要开启这个功能吗？</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
@@ -368,7 +368,7 @@
   <string name="app_ops_summaries_read_cell_broadcasts">读取小区广播</string>
   <string name="app_ops_summaries_mock_location">模拟位置</string>
   <string name="app_ops_summaries_read_external_storage">读取外部存储</string>
-  <string name="app_ops_summaries_write_external_storage">写入外部存储器</string>
+  <string name="app_ops_summaries_write_external_storage">写入外部存储</string>
   <string name="app_ops_summaries_turn_screen_on">点亮屏幕</string>
   <string name="app_ops_summaries_get_accounts">获得帐户</string>
   <string name="app_ops_summaries_toggle_wifi">切换 Wi-Fi</string>
@@ -438,7 +438,7 @@
   <string name="app_ops_labels_read_cell_broadcasts">读取小区广播</string>
   <string name="app_ops_labels_mock_location">模拟位置</string>
   <string name="app_ops_labels_read_external_storage">读取外部存储</string>
-  <string name="app_ops_labels_write_external_storage">写入外部存储器</string>
+  <string name="app_ops_labels_write_external_storage">写入外部存储</string>
   <string name="app_ops_labels_turn_screen_on">点亮屏幕</string>
   <string name="app_ops_labels_get_accounts">获得帐户</string>
   <string name="app_ops_labels_toggle_wifi">切换 Wi-Fi</string>
@@ -586,7 +586,7 @@
   <string name="display_rotation_180_title">180 度</string>
   <string name="display_rotation_270_title">270 度</string>
   <!-- LiveDisplay -->
-  <string name="live_display_summary">基于时间和环境条件来优化您的屏幕以改善可读性和减少眼睛疲劳</string>
+  <string name="live_display_summary">基于当前时间和环境条件来优化您的屏幕以改善可读性和减少视疲劳</string>
   <string name="live_display_mode">显示模式</string>
   <string name="live_display_color_temperature_title">色温</string>
   <string name="live_display_color_temperature_summary">白天：<xliff:g id="day_temperature">%1$d</xliff:g>K 夜晚：<xliff:g id="night_temperature">%2$d</xliff:g>K</string>
@@ -649,7 +649,7 @@
   <string name="category_spen_title">触控笔手势</string>
   <string name="enable_subcat_title">触控笔</string>
   <string name="enable_spen_title_head">启用手势</string>
-  <string name="enable_spen_summary_head">持续压住触控笔按钮启用滑动手势</string>
+  <string name="enable_spen_summary_head">按住触控笔按钮时使用滑动手势</string>
   <string name="gestures_subcat_title">手势</string>
   <string name="gestures_left_spen_title_head">左划</string>
   <string name="gestures_right_spen_title_head">右划</string>
@@ -665,10 +665,10 @@
   <string name="gestures_action_search">搜索</string>
   <string name="gestures_action_recent">最近应用</string>
   <!-- Stylus gestures -->
-  <string name="stylus_app_not_installed">%s 尚未被安装</string>
+  <string name="stylus_app_not_installed">%s 尚未安装</string>
   <!-- Touchscreen hovering -->
   <string name="touchscreen_hovering_title">悬空操作</string>
-  <string name="touchscreen_hovering_summary">允许您把手指悬停在屏幕上作为浏览器、远程桌面等的鼠标指针</string>
+  <string name="touchscreen_hovering_summary">允许您将手指悬停在屏幕上作为浏览器、远程桌面等处的鼠标指针</string>
   <!-- Increasing ring tone volume -->
   <string name="increasing_ring_volume_option_title">铃声音量渐强</string>
   <string name="increasing_ring_min_volume_title">初始音量</string>
@@ -681,7 +681,7 @@
   <string name="volume_keys_control_ring_stream_summary_on">音量键控制铃声音量</string>
   <string name="volume_keys_control_ring_stream_summary_off">音量键控制媒体音量</string>
   <string name="category_calibration">校准</string>
-  <string name="display_and_lights">显示 &amp; 指示灯</string>
+  <string name="display_and_lights">显示和指示灯</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
          [CHAR LIMIT=40] -->
   <string name="power_notifications_category_title">充电提示音</string>
@@ -734,8 +734,8 @@
   <string name="status_bar_icons_title">状态栏图标</string>
   <string name="status_bar_icons_summary">控制显示哪些状态栏图标</string>
   <!-- EdgeGesture service -->
-  <string name="edge_gesture_service_title">拦截手势触摸事件</string>
-  <string name="edge_gesture_service_summary">不向应用发送导航栏和状态栏的触摸事件</string>
+  <string name="edge_gesture_service_title">屏蔽手势的触摸事件</string>
+  <string name="edge_gesture_service_summary">不为导航栏和状态栏的手势向应用发送触摸事件</string>
   <!-- Keep screen on strings -->
   <string name="keep_screen_on_never">永不</string>
   <string name="keep_screen_on_debugging">当 USB 调试时</string>
@@ -744,14 +744,14 @@
   <string name="privacy_settings_cyanogenmod_title">隐私</string>
   <!-- Privacy Guard -->
   <string name="privacy_guard_default_title">默认启用隐私防护</string>
-  <string name="privacy_guard_default_summary">默认对新安装的应用启用隐私防护</string>
+  <string name="privacy_guard_default_summary">为新安装的应用默认启用隐私防护</string>
   <string name="privacy_guard_manager_title">隐私防护</string>
-  <string name="privacy_guard_manager_summary">管理哪些应用可以访问您的个人资料</string>
-  <string name="privacy_guard_no_user_apps">未安装应用</string>
+  <string name="privacy_guard_manager_summary">管理哪些应用可以访问您的个人数据</string>
+  <string name="privacy_guard_no_user_apps">尚未安装任何应用</string>
   <string name="privacy_guard_help_title">帮助</string>
   <string name="privacy_guard_reset_title">重置</string>
   <string name="privacy_guard_reset_text">重置权限？</string>
-  <string name="privacy_guard_help_text">在这个页面上，您可以简单地通过点击来选择在哪些应用上启用隐私防护。选中的应用将无法访问个人数据，例如：联系人、短信或通话记录。长按一个应用的条目打开应用详细页面。\n\n默认不显示内置应用，在菜单中选择相应选项可以显示它们。</string>
+  <string name="privacy_guard_help_text">在这个画面上，您可以简单地点击来选择为哪些应用启用隐私防护。选中的应用将无法访问您的联系人、短信和通话记录等个人数据。长按一个应用项将打开应用详情画面。\n\n内置应用默认不显示，在菜单中切换相应选项可以显示它们。</string>
   <string name="privacy_guard_manager_show_system_apps">显示内置应用</string>
   <string name="privacy_guard_advanced_settings_title">高级</string>
   <string name="privacy_guard_notification_title">显示通知</string>
@@ -850,16 +850,13 @@
   <string name="sms_security_check_limit_none">无</string>
   <!-- Notification spamfilter -->
   <string name="spam_added_title">已添加 %1$s</string>
-  <string name="spam_last_blocked_title">最后一次被阻止： %1$s</string>
+  <string name="spam_last_blocked_title">上次拦截 %1$s</string>
   <string name="block_notifications_title">通知过滤</string>
   <string name="block_notifications_summary">管理已忽略的通知和过滤器</string>
   <string name="no_filters_title">没有设置过滤</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">LineageOS 统计</string>
-  <string name="anonymous_statistics_summary">开启匿名统计报告以便帮助 LineageOS 未来向更好的方向发展</string>
   <string name="anonymous_statistics_warning_title">关于</string>
-  <string name="anonymous_statistics_warning">开启 LineageOS 统计将允许非个人数据被提交到 LineageOS 的开发者以便记录各种设备上的唯一安装。提交的信息包含一个唯一的标识符，而不会涉及您的隐私与个人数据。该数据将在每次启动时被提交。\n\n如您想看一个作为被提交数据的实例，请点击预览数据。</string>
   <string name="enable_reporting_title">开启报告</string>
   <string name="preview_data_title">预览数据</string>
   <string name="view_stats_title">查看统计</string>
@@ -895,7 +892,7 @@
   <string name="contributor_info_msg">
         <![CDATA[<b>姓名：</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
                  <b>昵称：</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
-                 <b>提交：</b> <xliff:g id="commits">%3$s</xliff:g></string>
+                 <b>提交数：</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
   <string name="contributions_info_menu">贡献信息</string>
   <string name="contributions_info_msg">
         <![CDATA[<b>贡献者总数：</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
@@ -922,7 +919,7 @@
   <string name="sim_missing">丢失或缺损</string>
   <string name="sim_enabler_need_disable_sim">SIM 卡将被禁用。确定继续吗？</string>
   <string name="sim_enabler_will_disable_sim_title">注意</string>
-  <string name="sim_enabler_need_switch_data_service">此 SIM 卡将会被禁用，并且 SIM 卡 <xliff:g id="slotid">%1$s</xliff:g> 将会被用于数据服务。您确定想要继续吗？</string>
+  <string name="sim_enabler_need_switch_data_service">此 SIM 卡将被禁用，并且 SIM 卡 <xliff:g id="slotid">%1$s</xliff:g> 将被用作数据服务。您确定要继续吗？</string>
   <string name="sim_enabler_airplane_on">飞行模式开启时无法完成该操作。</string>
   <string name="sim_enabler_in_call">在通话状态下无法完成该操作。</string>
   <string name="sim_enabler_both_inactive">无法禁用全部 SIM 卡</string>
@@ -969,17 +966,17 @@
   <!-- label for usage time -->
   <string name="usage_time_label_cm">使用时间：</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
-  <string name="master_clear_desc_cm" product="tablet">这将会从您平板的<b>内部存储</b>中擦出所有数据，包括：\n\n<li>您的设备账号</li>\n<li>系统和应用数据设置</li>\n<li>已下载的应用</li></string>
+  <string name="master_clear_desc_cm" product="tablet">这将擦除您的平板电脑<b>内部存储</b>上的所有数据，包括：\n\n<li>您的设备账号</li>\n<li>系统和应用的数据和设置</li>\n<li>已下载的所有应用</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
-  <string name="master_clear_desc_cm" product="default">这将会从您手机的<b>内部存储</b>中擦出所有数据，包括：\n\n<li>您的设备账号</li>\n<li>系统和应用数据设置</li>\n<li>已下载的应用</li></string>
+  <string name="master_clear_desc_cm" product="default">这将擦除您的手机<b>内部存储</b>上的所有数据，包括：\n\n<li>您的设备账号</li>\n<li>系统和应用的数据和设置</li>\n<li>已下载的所有应用</li></string>
   <!-- Factory reset strings -->
-  <string name="factory_reset_instructions_title">个人数据 &amp; 应用</string>
-  <string name="factory_reset_instructions_summary">这将删除此设备上所有的帐户、 应用、 应用数据和系统设置</string>
+  <string name="factory_reset_instructions_title">个人数据和应用</string>
+  <string name="factory_reset_instructions_summary">这将删除此设备上所有的帐户、应用、应用数据和系统设置</string>
   <string name="factory_reset_personal_content">个人内容</string>
   <string name="factory_reset_erase_stored_content">擦除已存储的内容</string>
   <string name="factory_reset_erase_stored_content_summary">擦除此设备上的音乐、照片、视频和其他用户数据。</string>
-  <string name="factory_reset_erase_stored_content_summary_forced">擦除音乐、照片、视频，并且存储在此设备上的其他用户数据。
-\n\n<b>由于设备加密，将无法保存内容。</b></string>
+  <string name="factory_reset_erase_stored_content_summary_forced">擦除音乐、照片、视频以及此设备上存储的其他用户数据。
+\n\n<b>由于设备加密，无法保存内容。</b></string>
   <string name="factory_reset_erase_sd_card">格式化 SD 卡</string>
   <string name="factory_reset_erase_sd_card_summary">擦除 SD 卡上的所有数据，包括音乐和照片</string>
   <string name="factory_reset_warning_text_reset_now">立即重置</string>
@@ -1035,7 +1032,7 @@
   <string name="weather_settings_temp_fahrenheit">华氏</string>
   <string name="weather_settings_keyword">天气</string>
   <string name="background_data_access">后台数据访问</string>
-  <string name="allow_background_both">仅通过移动数据 &amp; Wi\u2011Fi</string>
+  <string name="allow_background_both">通过移动数据 和 Wi\u2011Fi</string>
   <string name="allow_background_wlan">仅通过 Wi\u2011Fi</string>
   <string name="allow_background_none">没有访问权限</string>
   <string name="mobile_data_alert">移动数据警报</string>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index d845d5c..ed0a8dd 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -716,8 +716,6 @@
   <string name="no_filters_title">沒有設定篩選器</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">LineageOS 統計</string>
-  <string name="anonymous_statistics_summary">開啟匿名統計報告以便協助改進 LineageOS</string>
   <string name="anonymous_statistics_warning_title">關於</string>
   <string name="enable_reporting_title">啟用報告</string>
   <string name="preview_data_title">預覽數據</string>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index f616ebf..0876be0 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -29,7 +29,7 @@
   <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>
+    <item quantity="other">您僅需完成剩餘的 <xliff:g id="step_count">%1$d</xliff:g> 個步驟啟用開發人員選項。</item>
   </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <string name="show_dev_on_cm">您已啟用開發人員選項。</string>
@@ -42,7 +42,7 @@
   <string name="development_shortcut_summary">在最近的應用程式清單中啟用應用程式管理捷徑</string>
   <!-- Setting checkbox title for root access -->
   <string name="root_access">Root 權限</string>
-  <string name="root_access_warning_title">是否允許 root 權限？</string>
+  <string name="root_access_warning_title">允許 root 權限？</string>
   <string name="root_access_warning_message">允許應用程式請求 root 權限是很危險的，而且可能會影響您系統的安全！</string>
   <string name="root_access_none">已停用</string>
   <string name="root_access_apps">僅限應用程式</string>
@@ -88,17 +88,17 @@
   <string name="profile_settings_title">設定檔</string>
   <string name="profile_empty_list_profiles_off">開啟設定檔功能即可設定與使用設定檔。</string>
   <string name="profile_trigger_configure">設定觸發器</string>
-  <string name="profile_write_nfc_tag">寫到 NFC 標籤</string>
+  <string name="profile_write_nfc_tag">寫入至 NFC 標籤</string>
   <string name="profile_write_touch_tag">觸碰標籤即可寫入</string>
   <string name="profile_write_success">標籤寫入成功</string>
   <string name="profile_write_failed">標籤寫入失敗！</string>
-  <string name="profile_selected">選取的設定檔：%1$s</string>
+  <string name="profile_selected">已選取的設定檔：%1$s</string>
   <string name="profile_nfc_text">將設定檔寫入至 NFC 標籤允許透過輕觸標籤來選取此設定檔。再次輕觸將會回到之前選取的設定檔。</string>
   <string name="profile_unknown_nfc_tag">未知的設定檔</string>
   <string name="profile_add_nfc_text">此 NFC 標籤指向了一個未知的設定檔，連結此 NFC 標籤到現有的設定檔將允許您以後選取那個設定檔。</string>
-  <string name="profile_select">選取設定檔</string>
-  <string name="profile_remove_dialog_message">是否移除設定檔「%1$s」？</string>
-  <string name="profile_populate_profile_from_state">是否使用目前的裝置設定配置設定檔？</string>
+  <string name="profile_select">選擇設定檔</string>
+  <string name="profile_remove_dialog_message">移除設定檔「%1$s」？</string>
+  <string name="profile_populate_profile_from_state">使用目前的裝置設定配置設定檔？</string>
   <string name="profile_menu_fill_from_state">匯入目前裝置的設定</string>
   <string name="profile_remove_current_profile">無法刪除目前的設定檔</string>
   <string name="profile_app_group_category_title">覆蓋通知</string>
@@ -120,7 +120,7 @@
   <string name="profile_reset_title">重設</string>
   <string name="profile_reset_message">是否刪除所有使用者建立的設定檔與應用程式群組並還原至預設值？</string>
   <!-- Delete confimation messages -->
-  <string name="profile_app_delete_confirm">是否移除此應用程式？</string>
+  <string name="profile_app_delete_confirm">移除此應用程式？</string>
   <!-- Profile network mode -->
   <string name="profile_networkmode_2g">2G</string>
   <string name="profile_networkmode_3g">3G</string>
@@ -130,7 +130,7 @@
   <!-- Profile Config screen PreferenceGroup titles -->
   <string name="profile_volumeoverrides_title">音量覆蓋</string>
   <string name="connection_state_enabled">啟用</string>
-  <string name="volume_override_summary">設為 %1$s/%2$s</string>
+  <string name="volume_override_summary">設為「%1$s/%2$s」</string>
   <string name="profile_volume_override_checkbox_label">覆蓋音量</string>
   <!-- Menu item for managing profiles -->
   <string name="profile_profiles_manage">設定檔</string>
@@ -147,28 +147,28 @@
   <string name="ringer_mode">鈴響模式</string>
   <string name="lights_mode">指示燈模式</string>
   <string name="vibrate_mode">震動模式</string>
-  <string name="choose_soundtone">選取通知音效</string>
-  <string name="choose_ringtone">選取鈴聲</string>
+  <string name="choose_soundtone">選擇通知音效</string>
+  <string name="choose_ringtone">選擇鈴聲</string>
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
   <string name="soundtone_title">通知音效</string>
   <!-- Title for application group setting screen -->
   <string name="profile_appgroups_title">應用程式群組</string>
   <string name="profile_applist_title">應用程式</string>
   <string name="profile_new_appgroup">新應用程式群組</string>
-  <string name="profile_delete_appgroup">是否刪除此應用程式群組？</string>
+  <string name="profile_delete_appgroup">刪除此應用程式群組？</string>
   <string name="profile_appgroup_name_prompt">爲新應用程式群組輸入名稱</string>
   <string name="profile_appgroup_name_title">名稱</string>
   <!-- Add application dialog box title -->
   <string name="profile_choose_app">選擇應用程式</string>
   <!-- Profiles - system settings -->
   <string name="profile_system_settings_title">系統設定</string>
-  <string name="profile_lockmode_title">鎖定螢幕模式</string>
+  <string name="profile_lockmode_title">鎖定畫面模式</string>
   <string name="profile_lockmode_policy_disabled_summary">此設定檔被裝置管理員停用</string>
   <string name="profile_lockmode_insecure_summary">不要詢問 PIN 碼或密碼</string>
-  <string name="profile_lockmode_disabled_summary">停用鎖定螢幕</string>
+  <string name="profile_lockmode_disabled_summary">停用鎖定畫面</string>
   <string name="profile_airplanemode_title">飛航模式</string>
   <string name="profile_brightness_title">螢幕亮度</string>
-  <string name="profile_brightness_override_summary">設為 %1$d%%</string>
+  <string name="profile_brightness_override_summary">設為「%1$d%%」</string>
   <string name="profile_brightness_override_checkbox_label">強制亮度設定</string>
   <!-- Connection override toggles (not all are used at this time ) -->
   <string name="toggleWifi">Wi\u2011Fi</string>
@@ -176,14 +176,14 @@
   <string name="toggleBluetooth">藍牙</string>
   <string name="toggleGPS">GPS</string>
   <string name="toggleData">數據連線</string>
-  <string name="toggleSync">自動同步資料</string>
-  <string name="toggle2g3g4g">首選網路類型</string>
+  <string name="toggleSync">自動同步處理資料</string>
+  <string name="toggle2g3g4g">偏好網路類型</string>
   <string name="toggle2g3g4g_msim">網路類型偏好 (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
-  <string name="wifi_setting_countrycode_title">Wi\u2011Fi區碼</string>
+  <string name="wifi_setting_countrycode_title">Wi\u2011Fi 區碼</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
-  <string name="wifi_setting_countrycode_summary">指定Wi\u2011Fi區碼</string>
+  <string name="wifi_setting_countrycode_summary">指定 Wi\u2011Fi 區碼</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">設定區碼時遇到問題。</string>
   <string name="wifi_countrycode_us">美國</string>
@@ -193,7 +193,7 @@
   <string name="wifi_countrycode_jp">日本，俄羅斯</string>
   <string name="wifi_countrycode_au">澳洲</string>
   <string name="wifi_countrycode_cn">中國</string>
-  <string name="wifi_countrycode_kr">南韓</string>
+  <string name="wifi_countrycode_kr">韓國</string>
   <string name="wifi_countrycode_tr">南非，土耳其</string>
   <string name="wifi_countrycode_sg">以色列，新加坡</string>
   <string name="wifi_countrycode_br">巴西</string>
@@ -205,25 +205,25 @@
   <string name="profile_action_disable">關閉</string>
   <string name="profile_action_enable">開啟</string>
   <string name="profile_trigger_a2dp_connect">A2DP 已連線</string>
-  <string name="profile_trigger_a2dp_disconnect">A2DP 已斷開連線</string>
+  <string name="profile_trigger_a2dp_disconnect">A2DP 已中斷連線</string>
   <string name="profile_tabs_wifi">Wi\u2011Fi</string>
   <string name="profile_tabs_bluetooth">藍牙</string>
   <string name="profile_tabs_nfc">NFC</string>
-  <string name="profile_triggers_header">將激活此配置文件的觸發器</string>
+  <string name="profile_triggers_header">將啟動此設定檔的觸發器</string>
   <string name="profile_setup_setup_triggers_title">步驟 1：新增觸發器</string>
   <string name="profile_setup_setup_triggers_title_config">修改觸發器：<xliff:g id="profile_name">%1$s</xliff:g></string>
   <string name="profile_setup_actions_title">步驟 2：指定動作</string>
-  <string name="profile_setup_actions_title_config">重新配置操作</string>
+  <string name="profile_setup_actions_title_config">重新配置動作</string>
   <string name="profile_appgroups_manage">應用程式群組</string>
   <string name="profile_appgroup_manage">管理應用程式群組</string>
   <!-- Title for application group setting screen -->
   <string name="profile_appgroups_title">應用程式群組</string>
   <string name="profile_new_appgroup">新應用程式群組</string>
-  <string name="profile_delete_appgroup">是否刪除此應用程式群組？</string>
+  <string name="profile_delete_appgroup">刪除此應用程式群組？</string>
   <string name="profile_appgroup_name_prompt">爲新應用程式群組輸入名稱</string>
   <string name="profile_appgroup_name_title">名稱</string>
   <string name="duplicate_appgroup_name">重複的應用程式群組名稱！</string>
-  <string name="profile_app_delete_confirm">是否移除此應用程式？</string>
+  <string name="profile_app_delete_confirm">移除此應用程式？</string>
   <string name="no_bluetooth_triggers">沒有藍牙裝置配對。 \n在配置觸發器之前，輕觸配對藍牙裝置。</string>
   <string name="no_wifi_triggers">沒有已設定的 Wi\u2011Fi 連結。 \n設定前輕觸即可連線 Wi\u2011Fi</string>
   <string name="no_triggers_configured">觸發器未設定，輕觸即可建立。</string>
@@ -231,15 +231,15 @@
   <string name="profile_setup_setup_triggers_description">請選擇啟動此設定檔的觸發器</string>
   <string name="profile_setup_actions_description">現在配置設定檔啟動時將發生的操作</string>
   <!-- Navigation Bar -->
-  <string name="navigation_bar_category">導航列</string>
+  <string name="navigation_bar_category">導覽列</string>
   <string name="navigation_bar_left_title">左撇子模式</string>
-  <string name="navigation_bar_left_summary">橫向模式下將導航列置於螢幕左側</string>
+  <string name="navigation_bar_left_summary">橫向模式下將導覽列置於螢幕左側</string>
   <string name="navigation_bar_title">按鍵與配置</string>
-  <string name="navigation_bar_help_text">要開始編輯，請輕觸編輯圖示來解鎖導航列的編輯功能。\n\n您可以輕觸一個圖示來更改它的捷徑，或長按一個圖示即可更改它的外觀。\n\n輕觸「儲存」即可確認您的更改，或「還原預設值」即可重設外觀為預設設定。</string>
+  <string name="navigation_bar_help_text">要開始編輯，請輕觸編輯圖示來解鎖導覽列的編輯功能。\n\n您可以輕觸一個圖示來變更它的捷徑，或長按一個圖示即可更改它的外觀。\n\n輕觸 [儲存] 即可確認您的變更，或 [還原預設值] 即可重設外觀為預設設定。</string>
   <string name="navigation_restore_button_text">還原\n預設</string>
   <string name="navigation_edit_button_text">編輯</string>
   <string name="navigation_save_button_text">儲存</string>
-  <string name="navigation_bar_reset_message">是否刪除目前的設定並還原預設的佈局？</string>
+  <string name="navigation_bar_reset_message">刪除目前的設定並還原預設的佈局？</string>
   <string name="navigation_bar_arrow_keys_title">輸入時顯示方向鍵</string>
   <string name="navigation_bar_arrow_keys_summary">輸入時顯示游標鍵。取代輸入法切換器。</string>
   <string name="navigation_bar_recents_title">多工鍵長按動作</string>
@@ -249,7 +249,7 @@
   <string name="default_time">正常</string>
   <string name="custom_time">自訂</string>
   <string name="dialog_delete_title">刪除</string>
-  <string name="dialog_delete_message">是否移除選取的項目？</string>
+  <string name="dialog_delete_message">移除已選取的項目？</string>
   <!-- Values for the notification light pulse spinners -->
   <string name="pulse_length_always_on">一律開啟</string>
   <string name="pulse_length_very_short">非常短</string>
@@ -266,7 +266,7 @@
   <string name="battery_light_title">電量指示燈</string>
   <string name="battery_low_pulse_title">電量低時開啟呼吸燈</string>
   <string name="battery_light_list_title">顏色</string>
-  <string name="battery_light_low_color_title">電量低</string>
+  <string name="battery_light_low_color_title">電量不足</string>
   <string name="battery_light_medium_color_title">充電中</string>
   <string name="battery_light_full_color_title">電力充足</string>
   <!-- Lights settings screen, notification light settings -->
@@ -279,7 +279,7 @@
   <string name="notification_light_missed_call_title">未接來電</string>
   <string name="notification_light_voicemail_title">語音信箱</string>
   <string name="notification_light_screen_on">螢幕開啟時依然啟用指示燈</string>
-  <string name="notification_light_zen_mode">在勿干擾模式下啟用指示燈</string>
+  <string name="notification_light_zen_mode">在零打擾模式下啟用指示燈</string>
   <string name="notification_light_use_multiple_leds">多重 LED</string>
   <string name="keywords_lights_brightness_level">降低 LED 亮度</string>
   <string name="notification_light_automagic">自動選擇顏色</string>
@@ -302,7 +302,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>
@@ -327,12 +327,12 @@
   <string name="app_ops_summaries_receive_sms">接收簡訊</string>
   <string name="app_ops_summaries_receive_emergency_sms">接收緊急簡訊</string>
   <string name="app_ops_summaries_receive_mms">接收多媒體簡訊</string>
-  <string name="app_ops_summaries_receive_wap_push">接收 WAP PUSH 簡訊</string>
+  <string name="app_ops_summaries_receive_wap_push">接收 WAP 推送</string>
   <string name="app_ops_summaries_send_sms">傳送簡訊</string>
   <string name="app_ops_summaries_read_icc_sms">讀取 ICC 簡訊</string>
   <string name="app_ops_summaries_write_icc_sms">撰寫 ICC 簡訊</string>
   <string name="app_ops_summaries_modify_settings">修改設定</string>
-  <string name="app_ops_summaries_draw_on_top">在最上層繪圖</string>
+  <string name="app_ops_summaries_draw_on_top">在最上層繪製</string>
   <string name="app_ops_summaries_access_notifications">存取通知</string>
   <string name="app_ops_summaries_camera">相機</string>
   <string name="app_ops_summaries_record_audio">錄音</string>
@@ -348,18 +348,18 @@
   <string name="app_ops_summaries_alarm_volume">鬧鐘音量</string>
   <string name="app_ops_summaries_notification_volume">通知音量</string>
   <string name="app_ops_summaries_bluetooth_volume">藍牙音量</string>
-  <string name="app_ops_summaries_keep_awake">停用休眠</string>
+  <string name="app_ops_summaries_keep_awake">保持清醒</string>
   <string name="app_ops_summaries_monitor_location">監控位置</string>
   <string name="app_ops_summaries_monitor_high_power_location">監控高耗電定位功能</string>
   <string name="app_ops_summaries_get_usage_stats">取得使用統計</string>
   <string name="app_ops_summaries_mute_unmute_microphone">將麥克風靜音/解除靜音</string>
-  <string name="app_ops_summaries_toast_window">顯示浮動通知</string>
-  <string name="app_ops_summaries_project_media">媒體投放</string>
+  <string name="app_ops_summaries_toast_window">顯示提示通知</string>
+  <string name="app_ops_summaries_project_media">放映媒體</string>
   <string name="app_ops_summaries_activate_vpn">啟用 VPN</string>
   <string name="app_ops_summaries_write_wallpaper">設定桌布</string>
   <string name="app_ops_summaries_assist_structure">協助結構</string>
-  <string name="app_ops_summaries_assist_screenshot">協助螢幕截圖</string>
-  <string name="app_ops_summaries_read_phone_state">讀取手機狀態</string>
+  <string name="app_ops_summaries_assist_screenshot">協助螢幕擷取</string>
+  <string name="app_ops_summaries_read_phone_state">讀取電話狀態</string>
   <string name="app_ops_summaries_add_voicemail">新增語音信箱</string>
   <string name="app_ops_summaries_use_sip">使用 SIP</string>
   <string name="app_ops_summaries_make_call">撥打電話</string>
@@ -389,8 +389,8 @@
   <string name="app_ops_labels_read_calendar">讀取日曆</string>
   <string name="app_ops_labels_modify_calendar">修改日曆</string>
   <string name="app_ops_labels_wifi_scan">Wi-Fi 掃瞄</string>
-  <string name="app_ops_labels_notification">通知/Toast</string>
-  <string name="app_ops_labels_cell_scan">基站掃瞄</string>
+  <string name="app_ops_labels_notification">通知/提示</string>
+  <string name="app_ops_labels_cell_scan">基地台掃瞄</string>
   <string name="app_ops_labels_call_phone">撥打電話</string>
   <string name="app_ops_labels_read_sms">讀取簡訊</string>
   <string name="app_ops_labels_write_sms">撰寫簡訊</string>
@@ -400,16 +400,16 @@
   <string name="app_ops_labels_receive_wap_push">接收 WAP 推送</string>
   <string name="app_ops_labels_send_sms">傳送簡訊</string>
   <string name="app_ops_labels_read_icc_sms">讀取 ICC 簡訊</string>
-  <string name="app_ops_labels_write_icc_sms">撰寫 ICC 短訊</string>
+  <string name="app_ops_labels_write_icc_sms">撰寫 ICC 簡訊</string>
   <string name="app_ops_labels_modify_settings">修改設定</string>
-  <string name="app_ops_labels_draw_on_top">在最上層繪圖</string>
+  <string name="app_ops_labels_draw_on_top">在最上層繪製</string>
   <string name="app_ops_labels_access_notifications">存取通知</string>
   <string name="app_ops_labels_camera">相機</string>
   <string name="app_ops_labels_record_audio">錄音</string>
   <string name="app_ops_labels_play_audio">播放音訊</string>
   <string name="app_ops_labels_read_clipboard">讀取剪貼簿</string>
   <string name="app_ops_labels_modify_clipboard">修改剪貼簿</string>
-  <string name="app_ops_labels_media_buttons">媒體按鈕</string>
+  <string name="app_ops_labels_media_buttons">媒體鍵</string>
   <string name="app_ops_labels_audio_focus">音訊焦點</string>
   <string name="app_ops_labels_master_volume">主音量</string>
   <string name="app_ops_labels_voice_volume">語音音量</string>
@@ -418,17 +418,17 @@
   <string name="app_ops_labels_alarm_volume">鬧鐘音量</string>
   <string name="app_ops_labels_notification_volume">通知音量</string>
   <string name="app_ops_labels_bluetooth_volume">藍牙音量</string>
-  <string name="app_ops_labels_keep_awake">停用休眠</string>
+  <string name="app_ops_labels_keep_awake">保持清醒</string>
   <string name="app_ops_labels_monitor_location">監控位置</string>
   <string name="app_ops_labels_monitor_high_power_location">監控高耗電定位功能</string>
   <string name="app_ops_labels_get_usage_stats">取得使用統計</string>
   <string name="app_ops_labels_mute_unmute_microphone">將麥克風靜音/解除靜音</string>
-  <string name="app_ops_labels_toast_window">顯示 toasts 通知</string>
-  <string name="app_ops_labels_project_media">媒體投放</string>
+  <string name="app_ops_labels_toast_window">顯示提示通知</string>
+  <string name="app_ops_labels_project_media">放映媒體</string>
   <string name="app_ops_labels_activate_vpn">啟用 VPN</string>
   <string name="app_ops_labels_write_wallpaper">設定桌布</string>
   <string name="app_ops_labels_assist_structure">協助結構</string>
-  <string name="app_ops_labels_assist_screenshot">協助螢幕截圖</string>
+  <string name="app_ops_labels_assist_screenshot">協助螢幕擷取</string>
   <string name="app_ops_labels_read_phone_state">讀取電話狀態</string>
   <string name="app_ops_labels_add_voicemail">新增語音郵件</string>
   <string name="app_ops_labels_use_sip">使用 SIP</string>
@@ -456,7 +456,7 @@
   <string name="app_ops_allowed_count">已允許 <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">已拒絕 <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">已允許  <xliff:g id="count">%1$s</xliff:g>，已拒絕 <xliff:g id="count">%2$s</xliff:g></string>
-  <string name="app_ops_disabled_by_optimization">透過電池最佳化停用</string>
+  <string name="app_ops_disabled_by_optimization">已被電池最佳化停用</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">顯示使用者應用程式</string>
   <string name="app_ops_show_system_apps">顯示內建應用程式</string>
@@ -466,11 +466,11 @@
   <string name="ok">確定</string>
   <!-- Hostname setting -->
   <string name="device_hostname">裝置主機名稱</string>
-  <string name="unlock_scramble_pin_layout_title">亂序布局</string>
-  <string name="unlock_scramble_pin_layout_summary">解鎖裝置時使用亂序 PIN 碼布局</string>
+  <string name="unlock_scramble_pin_layout_title">亂序佈局</string>
+  <string name="unlock_scramble_pin_layout_summary">解鎖裝置時使用亂序 PIN 碼佈局</string>
   <string name="button_pref_title">按鍵</string>
   <string name="hardware_keys_power_key_title">電源鍵</string>
-  <string name="hardware_keys_home_key_title">主螢幕鍵</string>
+  <string name="hardware_keys_home_key_title">主畫面鍵</string>
   <string name="hardware_keys_back_key_title">返回鍵</string>
   <string name="hardware_keys_menu_key_title">選單鍵</string>
   <string name="hardware_keys_assist_key_title">搜尋鍵</string>
@@ -479,11 +479,11 @@
   <string name="hardware_keys_volume_keys_title">音量鍵</string>
   <string name="hardware_keys_short_press_title">短按動作</string>
   <string name="hardware_keys_long_press_title">長按動作</string>
-  <string name="hardware_keys_double_tap_title">輕觸兩次動作</string>
+  <string name="hardware_keys_double_tap_title">輕觸兩下動作</string>
   <string name="hardware_keys_action_nothing">無動作</string>
   <string name="hardware_keys_action_menu">開啟/關閉選單</string>
   <string name="hardware_keys_action_app_switch">最近使用程式切換器</string>
-  <string name="hardware_keys_action_search">搜尋助手</string>
+  <string name="hardware_keys_action_search">搜尋助理</string>
   <string name="hardware_keys_action_voice_search">語音搜尋</string>
   <string name="hardware_keys_action_in_app_search">應用程式內搜尋</string>
   <string name="hardware_keys_action_launch_camera">啟動相機</string>
@@ -505,7 +505,7 @@
   <string name="swap_volume_buttons_summary">旋轉螢幕時交換上/下音量鍵</string>
   <string name="button_wake_title">喚醒裝置</string>
   <string name="home_answer_call_title">接聽電話</string>
-  <string name="home_answer_call_summary">按主螢幕鍵將會接通目前來電</string>
+  <string name="home_answer_call_summary">按主畫面鍵將會接通目前來電</string>
   <!-- Backlight brightness settings screen -->
   <string name="adaptive_backlight_title">自動背光調整</string>
   <string name="adaptive_backlight_summary">在使用中動態調整螢幕背光亮度，即可最佳化電池使用時間</string>
@@ -532,7 +532,7 @@
   <!-- Power menu -->
   <string name="power_menu_title">電源選單</string>
   <string name="power_menu_reboot_title">重新啟動選單</string>
-  <string name="power_menu_screenshot_title">螢幕截圖</string>
+  <string name="power_menu_screenshot_title">螢幕擷取</string>
   <string name="power_menu_airplane_title">飛航模式</string>
   <string name="power_menu_users_title">使用者切換器</string>
   <string name="power_menu_settings_title">設定捷徑</string>
@@ -541,11 +541,11 @@
   <string name="power_menu_sound_title">音效面板</string>
   <string name="power_menu_bug_report_disabled">已在開發人員選項中停用錯誤報告</string>
   <!-- Buttons - Enable navbar -->
-  <string name="disable_navkeys_title">啟用螢幕上的導航列</string>
-  <string name="disable_navkeys_summary">啟用螢幕上的導航列和停用硬體按鍵</string>
+  <string name="disable_navkeys_title">啟用螢幕上的導覽列</string>
+  <string name="disable_navkeys_summary">啟用螢幕上的導覽列和停用實體按鍵</string>
   <!-- tap-to-wake -->
-  <string name="double_tap_to_wake_title">輕觸兩次即可喚醒</string>
-  <string name="double_tap_to_wake_summary">輕點螢幕兩次來喚醒手機</string>
+  <string name="double_tap_to_wake_title">輕觸兩下即可喚醒</string>
+  <string name="double_tap_to_wake_summary">輕觸兩下螢幕即可開啟螢幕</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">輕觸兩次即可休眠</string>
   <string name="double_tap_to_sleep_summary">輕觸兩次狀態列來關閉螢幕</string>
@@ -579,7 +579,7 @@
   <string name="display_rotation_title">旋轉</string>
   <string name="display_rotation_disabled">已停用</string>
   <string name="display_rotation_unit">度</string>
-  <string name="display_lockscreen_rotation_title">旋轉鎖定螢幕</string>
+  <string name="display_lockscreen_rotation_title">旋轉鎖定畫面</string>
   <string name="display_rotation_category_title">旋轉模式</string>
   <string name="display_rotation_0_title">0 度</string>
   <string name="display_rotation_90_title">90 度</string>
@@ -589,10 +589,10 @@
   <string name="live_display_summary">根據日夜和環境條件調整您的螢幕色溫，即可改善可讀性和減少眼睛疲勞</string>
   <string name="live_display_mode">顯示模式</string>
   <string name="live_display_color_temperature_title">色溫</string>
-  <string name="live_display_color_temperature_summary">白天：<xliff:g id="day_temperature">%1$d</xliff:g>K 夜晚：<xliff:g id="night_temperature">%2$d</xliff:g>K</string>
+  <string name="live_display_color_temperature_summary">日間：<xliff:g id="day_temperature">%1$d</xliff:g>K 夜間：<xliff:g id="night_temperature">%2$d</xliff:g>K</string>
   <string name="live_display_color_temperature_label"><xliff:g id="degrees">%1$d </xliff:g>K</string>
-  <string name="live_display_day">白天</string>
-  <string name="live_display_night">夜晚</string>
+  <string name="live_display_day">日間</string>
+  <string name="live_display_night">夜間</string>
   <string name="live_display_outdoor_mode_title">自動戶外模式</string>
   <string name="live_display_outdoor_mode_summary">自動在陽光下提高亮度和飽和度</string>
   <string name="live_display_low_power_title">降低耗電</string>
@@ -611,7 +611,7 @@
   <string name="live_display_color_profile_astronomy_title">天文學</string>
   <string name="live_display_color_profile_astronomy_summary">深紅色即可保護夜間視力</string>
   <string name="live_display_color_profile_photography_title">攝影</string>
-  <string name="live_display_color_profile_photography_summary">完美重現照片色彩</string>
+  <string name="live_display_color_profile_photography_summary">完美重現相片色彩</string>
   <string name="live_display_color_profile_basic_title">基本</string>
   <string name="live_display_color_profile_basic_summary">使用未校正的顯示</string>
   <string name="live_display_color_profile_adaptive_title">自動調節</string>
@@ -624,8 +624,8 @@
   <string name="adj_intensity_title">強度</string>
   <string name="adj_contrast_title">對比度</string>
   <!-- Whether to display IME switcher notifcation -->
-  <string name="ime_switcher_notify">輸入法選擇器圖示</string>
-  <string name="ime_switcher_notify_summary">顯示輸入法選擇器圖示</string>
+  <string name="ime_switcher_notify">輸入法選擇工具圖示</string>
+  <string name="ime_switcher_notify_summary">顯示輸入法選擇工具圖示</string>
   <!-- Heads up -->
   <string name="heads_up_notifications">浮動通知</string>
   <string name="summary_heads_up_enabled">浮動通知已啟用</string>
@@ -636,8 +636,8 @@
   <string name="high_touch_sensitivity_title">高觸控靈敏度</string>
   <string name="high_touch_sensitivity_summary">增加觸控螢幕的靈敏度，因此戴著手套也可以使用手機</string>
   <!-- Display & Lights screen, setting options for LCD density -->
-  <string name="lcd_density">LCD密度</string>
-  <string name="dialog_title_lcd_density">LCD密度</string>
+  <string name="lcd_density">LCD 密度</string>
+  <string name="dialog_title_lcd_density">LCD 密度</string>
   <string name="lcd_density_value_format">DPI %d</string>
   <string name="lcd_density_default_value_format">%d DPI (預設值)</string>
   <string name="restarting_ui">正在重新啟動使用者介面\u2026</string>
@@ -656,7 +656,7 @@
   <string name="gestures_up_spen_title_head">向上滑動</string>
   <string name="gestures_down_spen_title_head">向下滑動</string>
   <string name="gestures_long_spen_title_head">長按</string>
-  <string name="gestures_double_spen_title_head">輕觸兩次</string>
+  <string name="gestures_double_spen_title_head">輕觸兩下</string>
   <!-- Gestures Options -->
   <string name="gestures_action_empty">無動作</string>
   <string name="gestures_action_home">首頁</string>
@@ -665,7 +665,7 @@
   <string name="gestures_action_search">啟動搜尋</string>
   <string name="gestures_action_recent">最近使用的應用程式</string>
   <!-- Stylus gestures -->
-  <string name="stylus_app_not_installed">未安裝 %s</string>
+  <string name="stylus_app_not_installed">未安裝「%s」</string>
   <!-- Touchscreen hovering -->
   <string name="touchscreen_hovering_title">懸浮操作</string>
   <string name="touchscreen_hovering_summary">允許您把手指懸停在螢幕上作為瀏覽器、遠程桌面等的滑鼠</string>
@@ -702,8 +702,8 @@
   <string name="status_bar_notif_count_summary">顯示未處理通知的數量</string>
   <string name="status_bar_quick_qs_pulldown_title">快速下拉</string>
   <string name="status_bar_quick_qs_pulldown_summary">從狀態列的%1$s邊拉下快速設定</string>
-  <string name="status_bar_quick_qs_pulldown_summary_left">居左</string>
-  <string name="status_bar_quick_qs_pulldown_summary_right">居右</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">靠左</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">靠右</string>
   <string name="status_bar_quick_qs_pulldown_off">關閉</string>
   <string name="status_bar_quick_qs_pulldown_left">靠左</string>
   <string name="status_bar_quick_qs_pulldown_right">靠右</string>
@@ -750,30 +750,30 @@
   <string name="privacy_guard_no_user_apps">未安裝任何應用程式</string>
   <string name="privacy_guard_help_title">說明</string>
   <string name="privacy_guard_reset_title">重設</string>
-  <string name="privacy_guard_reset_text">是否重設權限？</string>
-  <string name="privacy_guard_help_text">在此螢幕您只要輕觸應用程式即可選擇是否對其啟用隱私守衛。被選取的應用程式將不能存取您的個人資料，例如聯絡人、訊息或通話記錄。長按應用程式可開啟其應用程式資訊螢幕。\n\n內建應用程式預設不會顯示，但是可從選單中開啟顯示。</string>
+  <string name="privacy_guard_reset_text">重設權限？</string>
+  <string name="privacy_guard_help_text">在此畫面您只要輕按應用程式即可選擇是否對其啟用隱私守衛。被選取的應用程式將不能存取您的個人資料，例如聯絡人、訊息或通話記錄。長按應用程式可開啟其應用程式資訊畫面。\n\n內建應用程式預設不會顯示，但是可從選單中開啟顯示。</string>
   <string name="privacy_guard_manager_show_system_apps">顯示內建應用程式</string>
   <string name="privacy_guard_advanced_settings_title">進階</string>
   <string name="privacy_guard_notification_title">顯示通知</string>
   <!-- Sizes for pattern lockscreen -->
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
-  <string name="lockpattern_settings_enable_error_path_title">顯示解鎖圖形錯誤</string>
+  <string name="lockpattern_settings_enable_error_path_title">顯示解鎖圖案錯誤</string>
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
-  <string name="lockpattern_settings_enable_dots_title">顯示解鎖圖形點</string>
+  <string name="lockpattern_settings_enable_dots_title">顯示解鎖圖案節點</string>
   <!-- Whether the keyguard will directly pass to password entry -->
   <string name="lock_directly_show_password">直接顯示密碼輸入框</string>
   <!-- Whether the keyguard will directly pass to pattern view -->
-  <string name="lock_directly_show_pattern">直接顯示圖形密碼輸入</string>
+  <string name="lock_directly_show_pattern">直接顯示圖案密碼輸入</string>
   <!-- Whether the keyguard will directly pass to PIN entry -->
   <string name="lock_directly_show_pin">直接顯示 PIN 碼輸入框</string>
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">顯示音樂視覺效果</string>
   <!-- lock screen disabled by QS tile warning -->
-  <string name="lockscreen_disabled_by_qs_tile_title">經由快速設定瓷磚停用</string>
+  <string name="lockscreen_disabled_by_qs_tile_title">經由快速設定圖塊停用</string>
   <string name="lockscreen_disabled_by_qs_tile_summary">輕觸即可啟用螢幕鎖定</string>
-  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">螢幕鎖定已啟用</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">鎖定畫面已啟用！</string>
   <!-- Battery saver -->
-  <string name="battery_saver_threshold">省電助手的閾值</string>
+  <string name="battery_saver_threshold">省電閾值</string>
   <string name="battery_saver_summary">降低效能，並限制背景資料</string>
   <string name="battery_saver_summary_unavailable">無法在充電時啟用</string>
   <!-- Battery : Automatic performance profiles -->
@@ -792,9 +792,9 @@
   <string name="power_menu_expanded_desktop">延伸桌面</string>
   <string name="expanded_hide_nothing">不隱藏</string>
   <string name="expanded_hide_status">隱藏狀態列</string>
-  <string name="expanded_hide_navigation">隱藏導航列</string>
+  <string name="expanded_hide_navigation">隱藏導覽列</string>
   <string name="expanded_hide_both">全部隱藏</string>
-  <string name="expanded_nothing_to_show">若要新增一個讓應用程式啟動的延伸狀態，請先關閉「全部啟用」</string>
+  <string name="expanded_nothing_to_show">若要新增一個讓應用程式啟動的延伸狀態，請先關閉 [全部啟用]</string>
   <string name="expanded_enabled_for_all">全部啟用</string>
   <string name="expanded_desktop_style">延伸桌面樣式</string>
   <string name="expanded_desktop_style_description">選擇個預設的延伸桌面樣式</string>
@@ -815,14 +815,14 @@
   <string name="select_custom_app_title">選擇自訂應用程式</string>
   <string name="select_custom_activity_title">選擇自訂活動</string>
   <!-- Blacklist preferences -->
-  <string name="blacklist_title">已封鎖來電者名單</string>
-  <string name="blacklist_edit_dialog_title">更改已封鎖的電話號碼</string>
+  <string name="blacklist_title">已封鎖來電名單</string>
+  <string name="blacklist_edit_dialog_title">變更已封鎖的電話號碼</string>
   <string name="blacklist_prefs">設定</string>
   <string name="blacklist_button_delete">刪除</string>
   <string name="blacklist_empty_text">您沒有任何已封鎖的號碼，輕觸新增 (+) 按鍵新增號碼。</string>
-  <string name="blacklist_disabled_empty_text">為了防止某些電話號碼打電話或傳簡訊給您，請啟用已封鎖來電者名單功能。</string>
+  <string name="blacklist_disabled_empty_text">為了防止某些電話號碼打電話或傳簡訊給您，請啟用已封鎖來電名單功能。</string>
   <string name="blacklist_summary_disabled">已停用</string>
-  <string name="blacklist_summary">您將不會收到任何在已封鎖來電者名單上的電話號碼的來電或簡訊</string>
+  <string name="blacklist_summary">您將不會收到任何在已封鎖來電名單上的電話號碼的來電或簡訊</string>
   <string name="blacklist_notify">顯示通知</string>
   <string name="blacklist_private_numbers_title">私人號碼</string>
   <string name="blacklist_private_numbers_summary_disabled">不要封鎖私人號碼的來電</string>
@@ -836,16 +836,16 @@
   <string name="blacklist_regex_title">使用萬用字元</string>
   <string name="blacklist_regex_summary">使用「.」作萬用字元、「*」作重複字元。例子：123.* 會封鎖所有以 123 開頭的號碼，而 .*123.* 會封鎖所有包含 123 的號碼</string>
   <string name="blacklist_policy_block_calls">封鎖來電</string>
-  <string name="blacklist_policy_block_messages">封鎖訊息</string>
-  <string name="blacklist_bad_number_add">無法將不正確的電話號碼加至已封鎖來電者名單</string>
+  <string name="blacklist_policy_block_messages">封鎖接收訊息</string>
+  <string name="blacklist_bad_number_add">無法將不正確的電話號碼加至已封鎖來電名單</string>
   <!-- Blacklist management -->
   <string name="remove_blacklist_number_title">移除號碼</string>
   <string name="remove_blacklist_entry">您確定您要將此已封鎖電話號碼移除嗎？</string>
-  <string name="select_contact">選取聯絡人</string>
+  <string name="select_contact">選擇聯絡人</string>
   <!-- Sms security limit -->
   <string name="app_security_title">應用程式安全</string>
   <string name="sms_security_check_limit_title">簡訊訊息限制</string>
-  <string name="sms_security_check_limit_summary">在使用者認可之前，應用程式在1分鐘內只能傳送 %d 條訊息</string>
+  <string name="sms_security_check_limit_summary">在使用者認可之前，應用程式在 1 分鐘內只能傳送 %d 則訊息</string>
   <string name="sms_security_check_limit_summary_none">未經確認的應用程式不允許傳送任何訊息</string>
   <string name="sms_security_check_limit_none">無</string>
   <!-- Notification spamfilter -->
@@ -853,41 +853,37 @@
   <string name="spam_last_blocked_title">最後封鎖「%1$s」</string>
   <string name="block_notifications_title">篩選通知</string>
   <string name="block_notifications_summary">管理已忽略的通知與篩選器</string>
-  <string name="no_filters_title">沒有過濾設定</string>
+  <string name="no_filters_title">沒有篩選設定</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">LineageOS 統計</string>
-  <string name="anonymous_statistics_summary">加入匿名統計報告以協助改進 LineageOS</string>
-  <string name="anonymous_statistics_warning_title">關於</string>
-  <string name="anonymous_statistics_warning">加入 LineageOS 統計將允許非個人資料被提交到 LineageOS 的開發人員，
-        以追蹤每個裝置上的獨特安裝。提交的資訊包含一個唯一識別碼，此識別碼並不會泄露您的隱私或個人資料。
-        該資料在每次開機時被提交。\n\n輕觸預覽資料以預覽被提交資料的例子。</string>
+  <string name="anonymous_statistics_warning_title">相關資訊</string>
   <string name="enable_reporting_title">啟用報告</string>
   <string name="preview_data_title">預覽資料</string>
   <string name="view_stats_title">檢視統計</string>
   <string name="anonymous_learn_more">了解更多</string>
   <!-- Anonymous Statistics - Preview -->
-  <string name="preview_id_title">Unique ID</string>
+  <string name="preview_id_title">識別 ID</string>
   <string name="preview_device_title">裝置</string>
   <string name="preview_version_title">版本</string>
-  <string name="preview_country_title">國家</string>
+  <string name="preview_country_title">國家/地區</string>
   <string name="preview_carrier_title">電信業者</string>
   <string name="stats_collection_title">統計資料收集</string>
   <string name="stats_collection_summary">啟用時，允許收集數據</string>
   <!-- Protected apps lockpattern reset button -->
-  <string name="lockpattern_reset_button">重設圖形</string>
-  <string name="lockpattern_settings_reset_summary">輸入主電子郵件帳戶和相關的密碼重設圖形鎖</string>
+  <string name="lockpattern_reset_button">重設圖案</string>
+  <string name="lockpattern_settings_reset_summary">輸入主電子郵件帳戶和相關的密碼重設圖案鎖</string>
   <!-- Protected Apps -->
   <string name="menu_hidden_apps_delete">重設</string>
-  <string name="menu_hidden_apps_reset_lock">重設圖形鎖</string>
+  <string name="menu_hidden_apps_reset_lock">重設圖案鎖</string>
   <string name="protected_apps">受保護的應用程式</string>
   <string name="protected_apps_summary">管理安全鎖下隱藏的應用程式</string>
   <string name="saving_protected_components">正在儲存元件狀態\u2026</string>
+  <string name="pa_login_username_hint">使用者名稱 (電子郵件)</string>
   <string name="pa_login_password_hint">密碼</string>
   <string name="pa_login_submit_button">登入</string>
   <string name="pa_login_checking_password">正在檢查帳戶\u2026</string>
   <string name="pa_login_incorrect_login">登入不正確</string>
-  <string name="pa_pattern_or_fingerprint_header">必須使用解鎖圖形或指紋解鎖</string>
+  <string name="pa_pattern_or_fingerprint_header">必須使用解鎖圖案或指紋解鎖</string>
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">貢獻者</string>
   <string name="contributors_cloud_loading_message">正在讀取貢獻者名單\u2026</string>
@@ -900,10 +896,10 @@
   <string name="contributions_info_msg">
         <![CDATA[<b>總貢獻者：</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
                  <b>總認可：</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
-                 <b>最後一次更新：</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
+                 <b>最後更新：</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
   <string name="category_sounds">音效</string>
   <string name="notification_manager">通知</string>
-  <string name="lockscreen_settings">鎖定螢幕</string>
+  <string name="lockscreen_settings">鎖定畫面</string>
   <string name="category_lights">指示燈</string>
   <string name="category_volume">音量</string>
   <string name="category_vibrate">震動</string>
@@ -915,7 +911,7 @@
   <!-- Edit access point labels: PPP number -->
   <string name="apn_ppp_number">APN PPP 電話號碼</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
-  <string name="duplicate_apn_error_title">重覆的 APN</string>
+  <string name="duplicate_apn_error_title">重複的 APN</string>
   <string name="duplicate_apn_error_message">此 APN 已存在，請放棄或修改參數。</string>
   <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g>是<xliff:g id="status" example="disabled">%2$s</xliff:g></string>
   <string name="sim_disabled">已停用</string>
@@ -926,8 +922,8 @@
   <string name="sim_enabler_airplane_on">飛航模式開啟時無法進行此操作。</string>
   <string name="sim_enabler_in_call">通話時無法進行此操作。</string>
   <string name="sim_enabler_both_inactive">無法停用所有 SIM 卡</string>
-  <string name="sim_enabler_enabling">正在啟用\u2026</string>
-  <string name="sim_enabler_disabling">正在關閉\u2026</string>
+  <string name="sim_enabler_enabling">啟用中\u2026</string>
+  <string name="sim_enabler_disabling">停用中\u2026</string>
   <string name="sub_activate_success">SIM 卡已經啟用。</string>
   <string name="sub_activate_failed">啟用失敗。</string>
   <string name="sub_deactivate_success">SIM 卡已經停用。</string>
@@ -937,7 +933,7 @@
   <!-- MSIM SIM status -->
   <string name="sim_card_status_title">Sim 卡 %d 狀態</string>
   <string name="sim_card_lock_settings_title">Sim 卡 %d 鎖定設定</string>
-  <string name="sim_card_summary_empty">沒有插入Sim卡</string>
+  <string name="sim_card_summary_empty">SIM 卡尚未插入</string>
   <string name="sim_mobile_network_settings_category_title">行動網路設定</string>
   <string name="sim_mobile_network_settings_title">Sim 卡 %d 設定</string>
   <!-- Zen mode allowed event setting summary items -->
@@ -946,9 +942,9 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_events">事件</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
-  <string name="zen_mode_summary_selected_callers">已選的來電者</string>
+  <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>
+  <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>
@@ -960,8 +956,8 @@
   <string name="maximum_body_level">身體：%1$s W/kg</string>
   <!-- IC Codes -->
   <string name="ic_code_model">型號：%1$s</string>
-  <string name="ic_code_full">IC: %1$s</string>
-  <string name="sim_ringtone_title">SIM %d 鈴聲</string>
+  <string name="ic_code_full">IC：%1$s</string>
+  <string name="sim_ringtone_title">SIM 卡 %d 鈴聲</string>
   <!-- label for application name -->
   <string name="app_name_label_cm">應用程式：</string>
   <!-- label for last time used -->
@@ -977,11 +973,11 @@
   <string name="factory_reset_instructions_summary">這將移除在此裝置上您所有帳戶、應用程式、應用程式資料及系統設定</string>
   <string name="factory_reset_personal_content">個人內容</string>
   <string name="factory_reset_erase_stored_content">移除儲存空間</string>
-  <string name="factory_reset_erase_stored_content_summary">移除音樂、照片、影片及其他儲存在此裝置上的使用者資料</string>
-  <string name="factory_reset_erase_stored_content_summary_forced">移除音樂、照片、影片及其他儲存在此裝置上的使用者資料。\n\n<b>由於裝置加密，無法儲存內容。</b></string>
-  <string name="factory_reset_erase_sd_card">格式化SD卡</string>
-  <string name="factory_reset_erase_sd_card_summary">移除 SD 卡上所有資料，包括音樂和照片。</string>
-  <string name="factory_reset_warning_text_reset_now">現在重置</string>
+  <string name="factory_reset_erase_stored_content_summary">移除音樂、相片、影片及其他儲存在此裝置上的使用者資料</string>
+  <string name="factory_reset_erase_stored_content_summary_forced">移除音樂、相片、影片及其他儲存在此裝置上的使用者資料。\n\n<b>由於裝置加密，無法儲存內容。</b></string>
+  <string name="factory_reset_erase_sd_card">格式化 SD 卡</string>
+  <string name="factory_reset_erase_sd_card_summary">移除SD卡上所有資料，包括音樂和相片。</string>
+  <string name="factory_reset_warning_text_reset_now">現在重設</string>
   <string name="factory_reset_warning_text_message">您所有帳戶、應用程式、應用程式資料及系統設定將從此裝置上移除，並不可逆轉。</string>
   <!-- Tethering & portable hotspot other category -->
   <string name="tethering_other_category_text">其他</string>
@@ -995,14 +991,14 @@
   <string name="hotstpot_inactivity_timeout_summary_text">可攜式 Wi\u2011Fi 熱點將於 <xliff:g id="timeout">%1$s</xliff:g> 後逾時</string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
-  <string name="live_lock_screen_title">活動鎖定螢幕</string>
+  <string name="live_lock_screen_title">活動鎖定畫面</string>
   <!-- Live lock screen summary -->
-  <string name="live_lock_screen_summary">啟用並設定活動鎖定螢幕</string>
+  <string name="live_lock_screen_summary">啟用並設定活動鎖定畫面</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">設定</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
-  <string name="live_lock_screen_settings_disabled_prompt">要查看可用的活動鎖定螢幕，請啟用活動鎖定螢幕。</string>
-  <string name="interruptions_ignore_while_media_title">防止聲音回避</string>
+  <string name="live_lock_screen_settings_disabled_prompt">要查看可用的活動鎖定畫面，請啟用活動鎖定畫面。</string>
+  <string name="interruptions_ignore_while_media_title">防止音訊回避</string>
   <string name="interruptions_ignore_while_media_summary">有通知時，不減少媒體播放的音量</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">LineageOS 法律條款</string>
@@ -1046,19 +1042,19 @@
   <string name="reset_stats_confirm">確認</string>
   <string name="restrict_cellular_access_title">限制行動數據存取</string>
   <string name="restrict_cellular_access_summary">停用行動數據資料存取權限</string>
-  <string name="restrict_cellular_access_dialog_title">是否限制行動數據存取？</string>
+  <string name="restrict_cellular_access_dialog_title">限制行動數據存取？</string>
   <string name="restrict_cellular_access_dialog_summary">此功能可能會導致依賴於網路存取的應用程式停止工作時，只有行動網路可用。\n\n您可以在應用程式中的可用設定中找到更合適的使用數據控制。</string>
   <!-- Label for settings shortcut: carrier selection -->
-  <string name="shortcut_carrier_title">電信業者</string>
+  <string name="shortcut_carrier_title">網路業者</string>
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">模糊背景</string>
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">顯示天氣資訊</string>
   <!-- Per app controls for LP keyguard notifications -->
-  <string name="app_notification_show_on_keyguard_title">在鎖定螢幕上顯示</string>
-  <string name="app_notification_show_on_keyguard_summary">在鎖定螢幕中顯示此應用程式的通知</string>
-  <string name="app_notification_no_ongoing_on_keyguard_title">在鎖定螢幕上停用持續性通知</string>
-  <string name="app_notification_no_ongoing_on_keyguard_summary">在鎖定螢幕上不再顯示來自此應用程式的持續性通知</string>
+  <string name="app_notification_show_on_keyguard_title">在鎖定畫面上顯示</string>
+  <string name="app_notification_show_on_keyguard_summary">在鎖定畫面中顯示此應用程式的通知</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">在鎖定畫面上停用持續性通知</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">在鎖定畫面上不再顯示來自此應用程式的持續性通知</string>
   <!-- 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>
@@ -1072,8 +1068,8 @@
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">加強無線管理</string>
   <!-- Radio Control (IMS/MBN etc.) -->
-  <string name="cm_radio_info_mbn_auto_load_on_label">關閉MBN自動存取</string>
-  <string name="cm_radio_info_mbn_auto_load_off_label">開啟MBN自動存取</string>
+  <string name="cm_radio_info_mbn_auto_load_on_label">關閉 MBN 自動存取</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">開啟 MBN 自動存取</string>
   <string name="cm_radio_info_volte_avail_ovr_on_label">關閉 VoLTE 偵錯</string>
   <string name="cm_radio_info_volte_avail_ovr_off_label">開啟 VoLTE 偵錯</string>
   <string name="cm_radio_info_vt_avail_ovr_on_label">關閉 VT 偵錯</string>
-- 
cgit v1.1


From cfac78c15acc7d911d67873b68b83f622e061016 Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@lineageos.org>
Date: Wed, 1 Feb 2017 23:12:40 -0800
Subject: Automatic translation import

Change-Id: Ib281a747d6e4428b4b10e699e4681da6e2afd6ea
---
 res/values-bg/cm_strings.xml     | 19 ++++++++------
 res/values-ca/cm_strings.xml     |  3 +++
 res/values-de/cm_strings.xml     |  3 +++
 res/values-es-rUS/cm_strings.xml | 55 ++++++++++++++++++++++++++++++++++++++++
 res/values-es/cm_strings.xml     |  9 +++++++
 res/values-fi/cm_strings.xml     |  3 +++
 res/values-gl-rES/cm_strings.xml |  3 +++
 res/values-it/cm_strings.xml     |  3 +++
 res/values-ja/cm_strings.xml     |  5 +++-
 res/values-nb/cm_strings.xml     |  3 +++
 res/values-nl/cm_strings.xml     |  3 ++-
 res/values-pt-rPT/cm_strings.xml |  3 +++
 res/values-ro/cm_strings.xml     |  5 ++++
 res/values-ru/cm_strings.xml     |  5 +++-
 res/values-sk/cm_strings.xml     |  3 +++
 res/values-sl/cm_strings.xml     |  5 ++++
 res/values-sv/cm_strings.xml     |  1 +
 res/values-tr/cm_strings.xml     | 55 ++++++++++++++++++++++++++++++++++++++++
 res/values-zh-rCN/cm_strings.xml |  3 +++
 res/values-zh-rTW/cm_strings.xml | 17 ++++++++-----
 20 files changed, 189 insertions(+), 17 deletions(-)

diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 3b41123..3aedb9d 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -175,7 +175,7 @@
   <!-- Connection override toggles (not all are used at this time ) -->
   <string name="toggleWifi">Wi\u2011Fi</string>
   <string name="toggleWifiAp">Преносима точка за достъп до Wi\u2011Fi</string>
-  <string name="toggleBluetooth">Bluetooth</string>
+  <string name="toggleBluetooth">Блутуут</string>
   <string name="toggleGPS">GPS</string>
   <string name="toggleData">Мобилни данни</string>
   <string name="toggleSync">Авто-синхронизиране на данни</string>
@@ -209,7 +209,7 @@
   <string name="profile_trigger_a2dp_connect">При включена A2DP връзка</string>
   <string name="profile_trigger_a2dp_disconnect">При изключена A2DP връзка</string>
   <string name="profile_tabs_wifi">Wi\u2011Fi</string>
-  <string name="profile_tabs_bluetooth">Bluetooth</string>
+  <string name="profile_tabs_bluetooth">Блутуут</string>
   <string name="profile_tabs_nfc">NFC</string>
   <string name="profile_triggers_header">Превключватели с които ще се активира този профил</string>
   <string name="profile_setup_setup_triggers_title">Стъпка 1: Добавяне на превключвателите</string>
@@ -226,7 +226,7 @@
   <string name="profile_appgroup_name_title">Име</string>
   <string name="duplicate_appgroup_name">Дублирано име на група от приложения!</string>
   <string name="profile_app_delete_confirm">Да премахна ли това приложение?</string>
-  <string name="no_bluetooth_triggers">Няма сдвоени Bluetooth устройства. \nДокоснете за да сдвойте Bluetooth устройството преди конфигурирането на превключвателите.</string>
+  <string name="no_bluetooth_triggers">Няма сдвоени блутуут устройства. \nДокоснете за да сдвойте блутуут устройството преди конфигурирането на превключвателите.</string>
   <string name="no_wifi_triggers">Няма настроени точки за достъп чрез Wi\u2011Fi.\nДокоснете за да се свържете с Wi\u2011Fi преди конфигурирането на превключвателите.</string>
   <string name="no_triggers_configured">Няма конфигуриран превключвател. Натиснете, за да добавите още.</string>
   <string name="no_triggers_configured_nfc">Натиснете, за да настройте нов NFC превключвател.</string>
@@ -349,7 +349,7 @@
   <string name="app_ops_summaries_media_volume">Сила на звука за мултимедия</string>
   <string name="app_ops_summaries_alarm_volume">Сила на звука за аларма</string>
   <string name="app_ops_summaries_notification_volume">Сила на звука за уведомление</string>
-  <string name="app_ops_summaries_bluetooth_volume">bluetooth сила</string>
+  <string name="app_ops_summaries_bluetooth_volume">блутуут сила</string>
   <string name="app_ops_summaries_keep_awake">дръж буден</string>
   <string name="app_ops_summaries_monitor_location">монитор местоположение</string>
   <string name="app_ops_summaries_monitor_high_power_location">монитор точно местоположение</string>
@@ -374,7 +374,7 @@
   <string name="app_ops_summaries_turn_screen_on">включване на екрана</string>
   <string name="app_ops_summaries_get_accounts">вземи акаунти</string>
   <string name="app_ops_summaries_toggle_wifi">активирай/деактивирай Wi-Fi</string>
-  <string name="app_ops_summaries_toggle_bluetooth">превключване на Bluetooth</string>
+  <string name="app_ops_summaries_toggle_bluetooth">превключване на блутуут</string>
   <string name="app_ops_summaries_start_at_boot">изпълнява се при стартиране</string>
   <string name="app_ops_summaries_toggle_nfc">активиране/деактивиране NFC</string>
   <string name="app_ops_summaries_toggle_mobile_data">Включване / Изключване на мобилни данни</string>
@@ -419,7 +419,7 @@
   <string name="app_ops_labels_media_volume">Сила на звука за мултимедия</string>
   <string name="app_ops_labels_alarm_volume">Сила на звука за аларма</string>
   <string name="app_ops_labels_notification_volume">Сила на звука за уведомление</string>
-  <string name="app_ops_labels_bluetooth_volume">Bluetooth сила</string>
+  <string name="app_ops_labels_bluetooth_volume">Блутуут сила</string>
   <string name="app_ops_labels_keep_awake">Дръж буден</string>
   <string name="app_ops_labels_monitor_location">Проследяване на местоположение</string>
   <string name="app_ops_labels_monitor_high_power_location">Проследяване на точното местоположение</string>
@@ -444,7 +444,7 @@
   <string name="app_ops_labels_turn_screen_on">Включване на екрана</string>
   <string name="app_ops_labels_get_accounts">Вземи акаунти</string>
   <string name="app_ops_labels_toggle_wifi">активирай/деактивирай Wi-Fi</string>
-  <string name="app_ops_labels_toggle_bluetooth">Превключване на Bluetooth</string>
+  <string name="app_ops_labels_toggle_bluetooth">Превключване на блутуут</string>
   <string name="app_ops_labels_start_at_boot">Изпълнява се при стартиране</string>
   <string name="app_ops_labels_toggle_nfc">активиране/деактивиране NFC</string>
   <string name="app_ops_labels_toggle_mobile_data">Включване / Изключване на мобилни данни</string>
@@ -561,7 +561,7 @@
     multiple font sizes in a limited amount of space. -->
   <string name="font_size_sample">Пример</string>
   <!-- Volume settings - Volume adjustment sound -->
-  <string name="volume_adjust_sounds_title">Звук при регулиране на силата на звука</string>
+  <string name="volume_adjust_sounds_title">Звуци при регулиране на силата на звука</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Мощност на вибрация</string>
   <string name="vibrator_warning">Стойности по-високи от %1$d%% не са препоръчителни</string>
@@ -858,7 +858,10 @@
   <string name="no_filters_title">Няма зададени филтри</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">Статистики</string>
+  <string name="anonymous_statistics_summary">Помогнете да направим LineageOS по-добър, като разрешите да събира анонимни статистически данни</string>
   <string name="anonymous_statistics_warning_title">Информация</string>
+  <string name="anonymous_statistics_warning">Активирането ще позволи на LineageOS Statistics да изпраща не лична информация  на разработчиците от LineageOS, за проследяване на инсталациите в устройството. Предоставената информация включва уникален идентификатор, който не застрашава вашата поверителност или лични данни. Данните се подават по време на всяко зареждане.\n\nПример за данните, които са подадени. данни.</string>
   <string name="enable_reporting_title">Разреши отчитане</string>
   <string name="preview_data_title">Визуализиране на данните</string>
   <string name="view_stats_title">Преглед на статистиките</string>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index eefb651..6678c72 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -858,7 +858,10 @@
   <string name="no_filters_title">Sense filtres establerts</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">Estadístiques de LineageOS</string>
+  <string name="anonymous_statistics_summary">Ajuda a fer millor LineageOS optant a transmetre estadístiques anònimes</string>
   <string name="anonymous_statistics_warning_title">Quant a</string>
+  <string name="anonymous_statistics_warning">Optant a les estadístiques de LineageOS permetràs que dades no-personals siguin transmeses als desenvolupadors de LineageOS per rastrejar les instal·lacions individuals a través dels dispositius. La informació transmesa inclou un identificador únic, que no compromet la privacitat o les dades personals. Les dades son transmeses durant cada arrancada.\n\nPer un exemple de les dades transmeses, pica a vista prèvia de Dades.</string>
   <string name="enable_reporting_title">Activa els informes</string>
   <string name="preview_data_title">Vista prèvia de Dades</string>
   <string name="view_stats_title">Veure estadístiques</string>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index c218cb8..102f481 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -858,7 +858,10 @@
   <string name="no_filters_title">Keine Filter aktiv</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">LineageOS-Statistiken</string>
+  <string name="anonymous_statistics_summary">Helfen Sie uns, LineageOS zu verbessern, indem Sie dem Sammeln anonymer Gerätestatistiken zustimmen.</string>
   <string name="anonymous_statistics_warning_title">Über</string>
+  <string name="anonymous_statistics_warning">Die Aktivierung der LineageOS-Statistiken ermöglicht die Übertragung von nicht-personenbezogenen Daten an die Entwickler von LineageOS. Die bei jedem Neustart des Geräts übermittelten Daten beeinträchtigen nicht die Privatsphäre, da sie keinerlei Rückschlüsse auf den Benutzer zulassen.\n\nFür ein Beispiel der gesendeten Daten bitte auf \"Vorschau\" klicken.</string>
   <string name="enable_reporting_title">Berichte einschalten</string>
   <string name="preview_data_title">Vorschau</string>
   <string name="view_stats_title">Statistiken anzeigen</string>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 3f88e77..620b080 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -18,9 +18,16 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Estás a <xliff:g id="step_count">%1$d</xliff:g> paso de obtener el ID del dispositivo.</item>
+    <item quantity="other">Estás a <xliff:g id="step_count">%1$d</xliff:g> pasos de obtener el ID del dispositivo.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">ID del dispositivo: [<xliff:g id="device_id">%1$s </xliff:g>] copiado al portapapeles</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">El ID del dispositivo no está disponible en esta versión</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">ID del dispositivo</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Ahora estás a <xliff:g id="step_count">%1$d </xliff:g> paso de activar las configuraciones de desarrollo.</item>
@@ -44,6 +51,8 @@
   <string name="root_access_adb">Solo ADB</string>
   <string name="root_access_all">Aplicaciones y ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Gestión del acceso raíz (root)</string>
+  <string name="root_appops_summary">Ver y controlar las reglas de la raíz</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, LineageOS version -->
@@ -544,6 +553,7 @@
   <string name="double_tap_to_sleep_summary">Apagar la pantalla mediante un doble toque sobre la barra de estado</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Prevenir activación accidental</string>
+  <string name="proximity_wake_summary">Compruebe el sensor de proximidad antes de despertar mediante gestos</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Activar con cargador</string>
   <string name="wake_when_plugged_or_unplugged_summary">Encender la pantalla al conectar o desconectar el cargador</string>
@@ -554,6 +564,7 @@
   <string name="volume_adjust_sounds_title">Sonidos de ajuste de volumen</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intensidad de vibración</string>
+  <string name="vibrator_warning">No se recomiendan valores mayores a %1$d%%</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Calibración de color</string>
   <string name="color_calibration_summary">Calibrar los colores de la pantalla</string>
@@ -605,8 +616,14 @@
   <string name="live_display_color_profile_photography_summary">Reproducción de color perfecta para fotos</string>
   <string name="live_display_color_profile_basic_title">Básico</string>
   <string name="live_display_color_profile_basic_summary">Utilizar pantalla sin calibrar</string>
+  <string name="live_display_color_profile_adaptive_title">Adaptable</string>
+  <string name="live_display_color_profile_adaptive_summary">Los colores se adaptan a las condiciones ambientales</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Ajuste de imagen</string>
+  <string name="picture_adjustment_summary">Ajustar tono, saturación, intensidad y contraste</string>
+  <string name="adj_hue_title">Tono</string>
   <string name="adj_saturation_title">Saturación</string>
+  <string name="adj_intensity_title">Intensidad</string>
   <string name="adj_contrast_title">Contraste</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Icono de selección</string>
@@ -841,7 +858,10 @@
   <string name="no_filters_title">No hay filtros establecidos</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">Estadísticas de LineageOS</string>
+  <string name="anonymous_statistics_summary">Ayude a mejorar LineageOS mediante el envío anónimo de estadísticas</string>
   <string name="anonymous_statistics_warning_title">Acerca de</string>
+  <string name="anonymous_statistics_warning">Al permitir la recopilación y el envío de estadísticas de LineageOS, autorizas el envío de información de carácter no personal a los desarrolladores de LineageOS para hacer un seguimiento de las instalaciones que realices en los dispositivos. La información enviada incluye un identificador único que no compromete tu privacidad ni tu información personal. Esta información es enviada durante el arranque.\n\nPara ver un ejemplo de la información enviada, pulsa en \u00ABPrevisualizar datos\u00BB.</string>
   <string name="enable_reporting_title">Activar envío de estadísticas</string>
   <string name="preview_data_title">Previsualizar datos</string>
   <string name="view_stats_title">Ver estadísticas</string>
@@ -932,6 +952,10 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">mensajes seleccionados</string>
   <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Vibración</string>
+  <string name="zen_mode_vibration_never">No vibrar</string>
+  <string name="zen_mode_vibration_calls_only">Sólo vibrar para llamadas</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Vibración para llamadas y notificaciones</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Cabeza: %1$s W/kg</string>
@@ -1029,6 +1053,7 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operadores de red</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Desenfoque de fondo</string>
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">Mostrar clima</string>
   <!-- Per app controls for LP keyguard notifications -->
@@ -1037,10 +1062,40 @@
   <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 -->
+  <string name="app_notification_sound_timeout_title">Tiempo mínimo entre los sonidos de notificación</string>
+  <string name="app_notification_sound_timeout_summary_template">Permitir sonidos o vibraciones no más de una vez cada <xliff:g id="duration">%1$s </xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Sin restricció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 avanzado de la radio</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Desactivar la carga automática del MBN</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Activar la carga automática del MBN</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Desactivar depuración de VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Activar depuración de VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Desactivar depuración de VT</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Activar depuración de VT</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Desactivar depuración de WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Activar depuración de WFC</string>
+  <string name="cm_radio_info_adb_log_on_label">Desactivar el registro en ADB de la radio</string>
+  <string name="cm_radio_info_adb_log_off_label">Activar el registro en ADB de la radio</string>
+  <string name="cm_radio_info_diag_log_on_label">Desactivar el registro Diag</string>
+  <string name="cm_radio_info_diag_log_off_label">Activar el registro Diag</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Fondo de pantalla</string>
+  <string name="not_available_with_app">No disponible con %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Ubique el sensor de huella digital en el <xliff:g id="sensor_location">%1$s </xliff:g> de su teléfono.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">lado trasero</string>
+  <string name="security_settings_fingerprint_sensor_location_front">lado frontal</string>
+  <string name="security_settings_fingerprint_sensor_location_left">lado izquierdo</string>
+  <string name="security_settings_fingerprint_sensor_location_right">lado derecho</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Voz: <xliff:g id="voice_status">%1$s</xliff:g> / Datos: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 4e7748c..bf995df 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -18,9 +18,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">Usted está a <xliff:g id="step_count">%1$d</xliff:g> paso de obtener el ID del dispositivo.</item>
+    <item quantity="other">Usted está a <xliff:g id="step_count">%1$d</xliff:g> pasos de obtener el ID del dispositivo.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">ID del dispositivo: [<xliff:g id="device_id">%1$s </xliff:g>] copiada al portapapeles</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">ID del dispositivo no está disponible en esta versión</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">ID del dispositivo</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Ahora estás a <xliff:g id="step_count">%1$d</xliff:g> paso de habilitar las opciones de desarrollo.</item>
@@ -44,6 +51,8 @@
   <string name="root_access_adb">Solo ADB</string>
   <string name="root_access_all">Aplicaciones y ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Gestión del acceso administrativo (root)</string>
+  <string name="root_appops_summary">Ver y controlar las reglas de la raíz</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, LineageOS version -->
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index ae4bb7a..18d6b44 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -858,7 +858,10 @@
   <string name="no_filters_title">Suodattimia ei asetettu</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">LineageOS-tilastot</string>
+  <string name="anonymous_statistics_summary">Auta tekemään LineageOSista parempi tarjoamalla anonyymejä tilastoraportteja</string>
   <string name="anonymous_statistics_warning_title">Tietoja</string>
+  <string name="anonymous_statistics_warning">LineageOS-tilastojen käyttöönotto mahdollistaa anonyymien tietojen lähettämisen LineageOSin kehittäjille, jotta laitteiden järjestelmäasennuksia voidaan seurata. Tiedot sisältävät yksilöllisen tunnisteen, joka ei vaaranna henkilökohtaisia tietojasi. Tietoja lähetetään jokaisella uudelleenkäynnistyskerralla.\n\nValitse Esikatsele tietoja nähdäksesi, millaisia tietoja laitteestasi lähetetään.</string>
   <string name="enable_reporting_title">Ota raportointi käyttöön</string>
   <string name="preview_data_title">Esikatsele tietoja</string>
   <string name="view_stats_title">Näytä tilastot</string>
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index c4b4649..2bb5b62 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -858,7 +858,10 @@
   <string name="no_filters_title">Non se estabeleceron filtros</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">Estadísticas LineageOS</string>
+  <string name="anonymous_statistics_summary">Axude a mellorar LineageOS enviando informes de estatísiticas anónimas</string>
   <string name="anonymous_statistics_warning_title">Acerca de</string>
+  <string name="anonymous_statistics_warning">Optar polo envío de estatísticas LineageOS permitirá que se transmitan datos non personais aos desenvolvedores de LineageOS para rastrear intalacións únicas através dos dispositivos. Os datos transmitidos teñen un identificador único, que non compromete a súa privacidade ou datos persoais. Os datos serán enviados cada vez que se inicie.\n\nPara ver un exemplo dos datos van ser enviados, toque en Previsualizar datos.</string>
   <string name="enable_reporting_title">Activar envío de estatísticas</string>
   <string name="preview_data_title">Previsualizar datos</string>
   <string name="view_stats_title">Ver as estatísticas</string>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 133b20a..3b5ceb2 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -858,7 +858,10 @@
   <string name="no_filters_title">Nessun filtro impostato</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">Statistiche LineageOS</string>
+  <string name="anonymous_statistics_summary">Aiuta a migliorare LineageOS consentendo l\'invio di statistiche anonime</string>
   <string name="anonymous_statistics_warning_title">Info</string>
+  <string name="anonymous_statistics_warning">Attivando le Statistiche LineageOS consentirai l\'invio di dati non personali agli sviluppatori per contare il numero di installazioni sui dispositivi. Le informazioni inviate includono un\'identificatore unico che non compromette in alcun modo la tua privacy o dati personali.\n\nPer vedere un esempio di dati inviati, tocca Anteprima Dati.</string>
   <string name="enable_reporting_title">Attiva report</string>
   <string name="preview_data_title">Anteprima dati</string>
   <string name="view_stats_title">Vedi statistiche</string>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 3cf1755..aa94905 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -172,7 +172,7 @@
   <string name="profile_brightness_override_checkbox_label">明るさを変更</string>
   <!-- Connection override toggles (not all are used at this time ) -->
   <string name="toggleWifi">Wi\u2011Fi</string>
-  <string name="toggleWifiAp">Wi\u2011Fiテザリング</string>
+  <string name="toggleWifiAp">Wi-Fi テザリング</string>
   <string name="toggleBluetooth">Bluetooth</string>
   <string name="toggleGPS">GPS</string>
   <string name="toggleData">データ接続</string>
@@ -856,7 +856,10 @@
   <string name="no_filters_title">フィルターが設定されていません</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">LineageOS の統計</string>
+  <string name="anonymous_statistics_summary">匿名の統計のレポートに同意して LineageOS の改善に協力する</string>
   <string name="anonymous_statistics_warning_title">情報</string>
+  <string name="anonymous_statistics_warning">LineageOS の統計に同意すると、端末間のユニークインストール回数を調べるために LineageOS の開発者への非個人情報の送信を許可します。送信される情報にはユニーク ID が含まれますが、プライバシーや個人データが危険にさらされることはありません。データはブート時に送信されます。\n\n送信されるデータの見本は[データをプレビュー]をタップして確認することができます。</string>
   <string name="enable_reporting_title">レポートを有効化</string>
   <string name="preview_data_title">データをプレビュー</string>
   <string name="view_stats_title">統計を表示</string>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 5e00893..25e848f 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -858,7 +858,10 @@
   <string name="no_filters_title">Ingen filtre valgt</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">LineageOS statistikk</string>
+  <string name="anonymous_statistics_summary">Hjelp oss med å gjøre LineageOS bedre ved å velge å sende inn anonym statistikkrapportering</string>
   <string name="anonymous_statistics_warning_title">Om</string>
+  <string name="anonymous_statistics_warning">Ved å bli med i innsamlingen av LineageOS statistikk vil ikke-personlige data bli sendt til utviklerne av LineageOS for å spore antall unike installasjoner spredt over typer enheter. Informasjonen som sendes inkluderer en unik identitetskode, som ikke kompromitterer ditt personvern eller dine personlige data. Data blir sendt ved hver oppstart.\n\nFor ett eksempel over data som blir sendt, trykk på Forhåndsvis data.</string>
   <string name="enable_reporting_title">Aktiver rapportering</string>
   <string name="preview_data_title">Forhåndsvis data</string>
   <string name="view_stats_title">Vis statistikk</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 2f7a40f..627b531 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -81,7 +81,7 @@
   <string name="ring_mode_title">Belmodus</string>
   <string name="ring_mode_normal">Normaal</string>
   <string name="ring_mode_vibrate">Trillen</string>
-  <string name="ring_mode_mute">Dempen</string>
+  <string name="ring_mode_mute">Stil</string>
   <string name="settings_reset_button">Opnieuw instellen</string>
   <!-- Profiles settings  -->
   <string name="profiles_settings_title">Systeemprofielen</string>
@@ -858,6 +858,7 @@
   <string name="no_filters_title">Geen filters ingesteld</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">LineageOS-statistieken</string>
   <string name="anonymous_statistics_warning_title">Over</string>
   <string name="enable_reporting_title">Statistieken verzenden</string>
   <string name="preview_data_title">Voorbeeld van gegevens</string>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 5f4fba0..5cbc7c7 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -858,7 +858,10 @@
   <string name="no_filters_title">Sem filtros definidos</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">Estatísticas LineageOS</string>
+  <string name="anonymous_statistics_summary">Ajude a melhorar a LineageOS optando por ativar o envio do relatório de estatísticas anónimas</string>
   <string name="anonymous_statistics_warning_title">Sobre</string>
+  <string name="anonymous_statistics_warning">Optar pelo envio de estatísticas LineageOS vai permitir que dados não pessoais sejam transmitidos aos desenvolvedores da LineageOS para análise de instalações nos dispositivos. As informações submetidas incluem um identificador único, que não compromete a sua privacidade ou dados pessoais. Os dados são enviados durante cada inicialização.\n\nPara ver um exemplo dos dados que são enviados, toque em \'Pré-visualizar dados\'.</string>
   <string name="enable_reporting_title">Ativar relatório</string>
   <string name="preview_data_title">Pré-visualizar dados</string>
   <string name="view_stats_title">Ver estatísticas</string>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 1fd829e..dc88e83 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -860,7 +860,12 @@
   <string name="no_filters_title">Niciun filtru setat</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">Statistici LineageOS</string>
+  <string name="anonymous_statistics_summary">Ajutați la îmbunătățirea LineageOS prin optarea pentru raportarea anonimă de statistici</string>
   <string name="anonymous_statistics_warning_title">Despre</string>
+  <string name="anonymous_statistics_warning">Optând să trimiteți Statistici LineageOS, le permite dezvoltatorilor LineageOS
+        să primească date ne-personale pentru a urmări instalările unice la o gamă mare de dispozitive. Informația transmisă include un identificator unic,
+        care nu vă compromite intimitatea sau datele personale. Datele sunt trimise la fiecare pornire a dispozitivului.\n\nPentru a vedea un exemplu de date ce se trimit, apăsați pe Previzualizare Date.</string>
   <string name="enable_reporting_title">Activare raportare</string>
   <string name="preview_data_title">Previzualizare date</string>
   <string name="view_stats_title">Vezi statistici</string>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 51714bc..bb06f8d 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -26,7 +26,7 @@
   <!--  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>
+  <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 -->
@@ -860,7 +860,10 @@
   <string name="no_filters_title">Фильтр не установлен</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">Отправка статистики</string>
+  <string name="anonymous_statistics_summary">Помогите сделать LineageOS лучше, разрешив отправку анонимной статистики</string>
   <string name="anonymous_statistics_warning_title">Сведения</string>
+  <string name="anonymous_statistics_warning">Анонимные отчёты позволяют разработчикам LineageOS отслеживать работу ОС на различных устройствах. Отправляемая информация включает в себя название устройства, версию прошивки и уникальный идентификатор, что никаким образом не затрагивает Вашу конфиденциальность. Данные отправляются при каждой загрузке устройства.\n\nЧтобы просмотреть пример, нажмите «Просмотр данных».</string>
   <string name="enable_reporting_title">Разрешить сбор статистики</string>
   <string name="preview_data_title">Просмотр данных</string>
   <string name="view_stats_title">Просмотр статистики</string>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 66c8099..1a78e6b 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -860,7 +860,10 @@
   <string name="no_filters_title">Nenastavené žiadne filtre</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">Štatistiky LineageOS</string>
+  <string name="anonymous_statistics_summary">Pomôžte zlepšiť LineageOS povolením anonymných štatistických hlásení</string>
   <string name="anonymous_statistics_warning_title">O aplikácii</string>
+  <string name="anonymous_statistics_warning">Povolením štatistík LineageOS súhlasíte s odosielaním neosobných údajov vývojárom LineageOSu, za účelom evidencie jedinečných inštalácií naprieč všetkými zariadeniami. Informácie obsahujú unikátny identifikátor, ktorý neohrozuje vaše súkromné alebo osobné údaje. Údaje sú odoslané pri každom spustení.\n\nNa ukážku odosielaných údajov kliknite na Prehľad údajov.</string>
   <string name="enable_reporting_title">Povoliť hlásenia</string>
   <string name="preview_data_title">Prehľad údajov</string>
   <string name="view_stats_title">Zobraziť štatistiky</string>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index cda1e1d..c840954 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -862,7 +862,12 @@
   <string name="no_filters_title">Ni nastavljenih filtrov</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">Statistika LineageOS</string>
+  <string name="anonymous_statistics_summary">Pomagajte izboljšati LineageOS tako, da izberete pošiljanje anonimne statistike</string>
   <string name="anonymous_statistics_warning_title">O programu</string>
+  <string name="anonymous_statistics_warning">Izbira statistike LineageOS bo dovolila pošiljanje neosebnih podatkov
+        razvijalcem LineageOSa, da lahko sledijo edinstvenim namestitvam v napravah. Poslani podatki vključujejo edinstven določilnik,
+        ki ne ogroža vaše zasebnosti in osebnih podatkov. Podatki so poslani ob vsakem zagonu.\n\nZa primer poslanih podatkov tapnite Predogled podatkov.</string>
   <string name="enable_reporting_title">Omogoči poročanje</string>
   <string name="preview_data_title">Predogled podatkov</string>
   <string name="view_stats_title">Pokaži statistiko</string>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 1d9c014..6156bc9 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -21,6 +21,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">Enhets-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 är nu <xliff:g id="step_count">%1$d</xliff:g> steg från att aktivera utvecklingsinställningar.</item>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 6b0ed07..32187be 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -18,9 +18,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">Cihaz ID\'sini görmekten <xliff:g id="step_count">%1$d</xliff:g> adım uzaktasınız.</item>
+    <item quantity="other">Cihaz ID\'sini görmekten <xliff:g id="step_count">%1$d</xliff:g> adım uzaktasınız.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">Cihaz ID:[<xliff:g id="device_id">%1$s</xliff:g>] panoya kopyalandı</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">Bu sürümde Cihaz ID mevcut değil</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">Cihaz 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">Geliştirici ayarlarının etkinleştirilmesi için <xliff:g id="step_count">%1$d</xliff:g> adım kaldı.</item>
@@ -44,6 +51,8 @@
   <string name="root_access_adb">Sadece ADB</string>
   <string name="root_access_all">Uygulamalar ve ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Root erişimini yönet</string>
+  <string name="root_appops_summary">Root kurallarını görüntüle ve kontrol et</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, LineageOS version -->
@@ -544,6 +553,7 @@
   <string name="double_tap_to_sleep_summary">Ekranı kapatmak için durum çubuğuna iki defa dokunun</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Yanlış uyandırmaları önle</string>
+  <string name="proximity_wake_summary">Jestler tarafından tetiklenen uyanmadan önce yakınlık sensörünü kontrol edin</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Takıp çıkarmada uyan</string>
   <string name="wake_when_plugged_or_unplugged_summary">Bir güç kaynağına bağlanırken ya da bağlantısını keserken ekranı aç</string>
@@ -554,6 +564,7 @@
   <string name="volume_adjust_sounds_title">Ses arttırma tonları</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Titreşim yoğunluğu</string>
+  <string name="vibrator_warning">%1$d%% değerinden daha yüksek değerler tavsiye edilmez</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Renk kalibrasyonu</string>
   <string name="color_calibration_summary">Ekran renklerini kalibre edin</string>
@@ -605,8 +616,14 @@
   <string name="live_display_color_profile_photography_summary">Fotoğraflar için mükemmel renk sunumu</string>
   <string name="live_display_color_profile_basic_title">Temel</string>
   <string name="live_display_color_profile_basic_summary">Ekranı ayarlanmamış şekilde kullan</string>
+  <string name="live_display_color_profile_adaptive_title">Uyarlanabilir</string>
+  <string name="live_display_color_profile_adaptive_summary">Renkleri ortam koşullarına uydur</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Resim ayarlama</string>
+  <string name="picture_adjustment_summary">Ton, doygunluk, yoğunluğu ve kontrastı ayarla</string>
+  <string name="adj_hue_title">Renk Tonu</string>
   <string name="adj_saturation_title">Doygunluk</string>
+  <string name="adj_intensity_title">Yoğunluk</string>
   <string name="adj_contrast_title">Karşıtlık</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Seçici simgesi</string>
@@ -841,7 +858,10 @@
   <string name="no_filters_title">Hiçbir filtre ayarlanmadı</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">LineageOS istatistikleri</string>
+  <string name="anonymous_statistics_summary">LineageOS\'u geliştirmeye yardım etmek için anonim istatistik göndermeyi kabul edin</string>
   <string name="anonymous_statistics_warning_title">Hakkında</string>
+  <string name="anonymous_statistics_warning">LineageOS İstatistiklerine dahil olmak kişisel olmayan verilerin LineageOS geliştiricilerine cihazlar arasındaki benzersiz yüklemeleri takip etmeleri için gönderilmesine izin verir. Bu bilgi, kişisel bilgi içermeyen ve gizliliğinizi tehdit etmeyen bir benzersiz numara da içerir. Veri her başlangıçta gönderilir.\n\nGönderilecek verinin örneğini görmek için Veriyi Önizle butonunu kullanın.</string>
   <string name="enable_reporting_title">Raporlamayı etkinleştir</string>
   <string name="preview_data_title">Veriyi önizle</string>
   <string name="view_stats_title">İstatistikleri görüntüle</string>
@@ -932,6 +952,10 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">seçili mesajlar</string>
   <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Titreşim</string>
+  <string name="zen_mode_vibration_never">Titreşim yok</string>
+  <string name="zen_mode_vibration_calls_only">Sadece çağrılarda titret</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Arama ve bildirimlerde titret</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Baş: %1$s W/kg</string>
@@ -1029,6 +1053,7 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Ağ operatörleri</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Bulanık arkaplan</string>
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">Hava durumunu göster</string>
   <!-- Per app controls for LP keyguard notifications -->
@@ -1037,10 +1062,40 @@
   <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 -->
+  <string name="app_notification_sound_timeout_title">Bildirim sesleri arasında en az zaman</string>
+  <string name="app_notification_sound_timeout_summary_template">Bir defadan fazla olmayacak şekilde her <xliff:g id="duration">%1$s</xliff:g>\'da bir titreme veya sese izin ver</string>
+  <string name="app_notification_sound_timeout_value_none">Kısıtlama yok</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 saniye</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 Saniye</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 dakika</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 dakika</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 dakika</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 dakika</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Gelişmiş radyo kontrolü</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">MBN otomatik yüklemeyi kapat</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">MBN otomatik yüklemeyi aç</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">VoLTE hata ayıklamayı kapat</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">VoLTE hata ayıklamayı aç</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">VT hata ayıklamayı kapat</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">VT hata ayıklamayı aç</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">WFC hata ayıklamayı kapat</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">WFC hata ayıklamayı aç</string>
+  <string name="cm_radio_info_adb_log_on_label">ADB radyo log kapat</string>
+  <string name="cm_radio_info_adb_log_off_label">ADB radyo log aç</string>
+  <string name="cm_radio_info_diag_log_on_label">Diag log kapat</string>
+  <string name="cm_radio_info_diag_log_off_label">Diag log aç</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Duvar kağıdı</string>
+  <string name="not_available_with_app">%1$s için uygun değil</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Telefonunuzdaki <xliff:g id="sensor_location">%1$s</xliff:g> üzerinde parmak izi sensörünü bulun.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">geri</string>
+  <string name="security_settings_fingerprint_sensor_location_front">ön</string>
+  <string name="security_settings_fingerprint_sensor_location_left">sol taraf</string>
+  <string name="security_settings_fingerprint_sensor_location_right">sağ taraf</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Ses: <xliff:g id="voice_state">%1$s</xliff:g>, veri: <xliff:g id="data_state">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 00d2ac5..3ff7ec8 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -856,7 +856,10 @@
   <string name="no_filters_title">没有设置过滤</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">LineageOS 统计</string>
+  <string name="anonymous_statistics_summary">开启匿名统计报告以便帮助 LineageOS 未来向更好的方向发展</string>
   <string name="anonymous_statistics_warning_title">关于</string>
+  <string name="anonymous_statistics_warning">开启 LineageOS 统计将允许非个人数据被提交到 LineageOS 的开发者以便记录各种设备上的唯一安装。提交的信息包含一个唯一的标识符，而不会涉及您的隐私与个人数据。该数据将在每次启动时被提交。\n\n如您想看一个作为被提交数据的实例，请点击预览数据。</string>
   <string name="enable_reporting_title">开启报告</string>
   <string name="preview_data_title">预览数据</string>
   <string name="view_stats_title">查看统计</string>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 0876be0..b327c76 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -702,11 +702,11 @@
   <string name="status_bar_notif_count_summary">顯示未處理通知的數量</string>
   <string name="status_bar_quick_qs_pulldown_title">快速下拉</string>
   <string name="status_bar_quick_qs_pulldown_summary">從狀態列的%1$s邊拉下快速設定</string>
-  <string name="status_bar_quick_qs_pulldown_summary_left">靠左</string>
-  <string name="status_bar_quick_qs_pulldown_summary_right">靠右</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">左</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">右</string>
   <string name="status_bar_quick_qs_pulldown_off">關閉</string>
-  <string name="status_bar_quick_qs_pulldown_left">靠左</string>
-  <string name="status_bar_quick_qs_pulldown_right">靠右</string>
+  <string name="status_bar_quick_qs_pulldown_left">左</string>
+  <string name="status_bar_quick_qs_pulldown_right">右</string>
   <!-- Status bar - Clock -->
   <string name="status_bar_clock_style_title">時鐘樣式</string>
   <string name="status_bar_clock_style_right">靠右</string>
@@ -834,7 +834,7 @@
   <string name="blacklist_summary_type_messages_only">訊息</string>
   <string name="blacklist_summary_type_calls_and_messages">通話與訊息</string>
   <string name="blacklist_regex_title">使用萬用字元</string>
-  <string name="blacklist_regex_summary">使用「.」作萬用字元、「*」作重複字元。例子：123.* 會封鎖所有以 123 開頭的號碼，而 .*123.* 會封鎖所有包含 123 的號碼</string>
+  <string name="blacklist_regex_summary">使用「.」作萬用字元、「*」作重複字元。例：123.* 會封鎖所有以 123 開頭的號碼，而 .*123.* 會封鎖所有包含 123 的號碼</string>
   <string name="blacklist_policy_block_calls">封鎖來電</string>
   <string name="blacklist_policy_block_messages">封鎖接收訊息</string>
   <string name="blacklist_bad_number_add">無法將不正確的電話號碼加至已封鎖來電名單</string>
@@ -856,7 +856,12 @@
   <string name="no_filters_title">沒有篩選設定</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">LineageOS 統計</string>
+  <string name="anonymous_statistics_summary">加入匿名統計報告即可協助改進 LineageOS</string>
   <string name="anonymous_statistics_warning_title">相關資訊</string>
+  <string name="anonymous_statistics_warning">加入 LineageOS 統計將允許非個人資料被提交到 LineageOS 的開發人員，
+        以追蹤每個裝置上的獨特安裝。提交的資訊包含一個唯一識別碼，此識別碼並不會泄露您的隱私或個人資料。
+        該資料在每次開機時被提交。\n\n輕觸預覽資料以預覽被提交資料的範例。</string>
   <string name="enable_reporting_title">啟用報告</string>
   <string name="preview_data_title">預覽資料</string>
   <string name="view_stats_title">檢視統計</string>
@@ -976,7 +981,7 @@
   <string name="factory_reset_erase_stored_content_summary">移除音樂、相片、影片及其他儲存在此裝置上的使用者資料</string>
   <string name="factory_reset_erase_stored_content_summary_forced">移除音樂、相片、影片及其他儲存在此裝置上的使用者資料。\n\n<b>由於裝置加密，無法儲存內容。</b></string>
   <string name="factory_reset_erase_sd_card">格式化 SD 卡</string>
-  <string name="factory_reset_erase_sd_card_summary">移除SD卡上所有資料，包括音樂和相片。</string>
+  <string name="factory_reset_erase_sd_card_summary">移除 SD 卡上所有資料，包括音樂和相片。</string>
   <string name="factory_reset_warning_text_reset_now">現在重設</string>
   <string name="factory_reset_warning_text_message">您所有帳戶、應用程式、應用程式資料及系統設定將從此裝置上移除，並不可逆轉。</string>
   <!-- Tethering & portable hotspot other category -->
-- 
cgit v1.1


From 75ddcf37e41a8df5d5b8b97bfcd222f3e32f1a37 Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@lineageos.org>
Date: Thu, 2 Feb 2017 22:18:47 -0800
Subject: Automatic translation import

Change-Id: I9e08273831f24cedca02062841f5f40d274bb745
---
 res/values-es-rUS/cm_strings.xml | 20 ++++++++++----------
 res/values-es/cm_strings.xml     | 27 +++++++++++++++++++++++++++
 res/values-ja/cm_strings.xml     | 10 +++++-----
 res/values-nl/cm_strings.xml     |  6 +++---
 res/values-pt-rBR/cm_strings.xml |  1 +
 res/values-sr/cm_strings.xml     |  3 +++
 6 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 620b080..e62c0dd 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -100,8 +100,8 @@
   <string name="profile_add_nfc_text">Esta etiqueta NFC hace referencia a un perfil desconocido. Añadir esta etiqueta NFC a un perfil existente permitirá seleccionar el perfil en el futuro.</string>
   <string name="profile_select">Seleccionar perfil</string>
   <string name="profile_remove_dialog_message">¿Eliminar perfil %1$s?</string>
-  <string name="profile_populate_profile_from_state">¿Configurar el perfil usando la configuración actual del dispositivo?</string>
-  <string name="profile_menu_fill_from_state">Importar la configuración actual del dispositivo</string>
+  <string name="profile_populate_profile_from_state">¿Configurar el perfil usando los ajustes actuales del dispositivo?</string>
+  <string name="profile_menu_fill_from_state">Importar los ajustes actuales del dispositivo</string>
   <string name="profile_remove_current_profile">¡No se puede eliminar el perfil actual!</string>
   <string name="profile_app_group_category_title">Anulaciones de notificación</string>
   <string name="profile_app_group_item_instructions">Añadir o quitar grupos</string>
@@ -163,7 +163,7 @@
   <!-- Add application dialog box title -->
   <string name="profile_choose_app">Elegir aplicación</string>
   <!-- Profiles - system settings -->
-  <string name="profile_system_settings_title">Configuración del sistema</string>
+  <string name="profile_system_settings_title">Ajustes del sistema</string>
   <string name="profile_lockmode_title">Modo de pantalla bloqueada</string>
   <string name="profile_lockmode_policy_disabled_summary">Esta opción ha sido desactivada por una política del administrador del dispositivo</string>
   <string name="profile_lockmode_insecure_summary">No pedir PIN o contraseña</string>
@@ -241,7 +241,7 @@
   <string name="navigation_restore_button_text">Restaurar\nde forma predeterminada.</string>
   <string name="navigation_edit_button_text">Editar</string>
   <string name="navigation_save_button_text">Guardar</string>
-  <string name="navigation_bar_reset_message">¿Eliminar la configuración actual y restaurar la disposición predeterminada?</string>
+  <string name="navigation_bar_reset_message">¿Borrar los ajustes actuales y restaurar la disposición predeterminada?</string>
   <string name="navigation_bar_arrow_keys_title">Mostrar teclas de flechas al escribir</string>
   <string name="navigation_bar_arrow_keys_summary">Mostrar los cursores izquierda y derecha durante la escritura. Reemplaza al selector IME.</string>
   <string name="navigation_bar_recents_title">Pulsación prolongada en recientes</string>
@@ -295,7 +295,7 @@
   <string name="enable_adb_summary_cm">Habilitar la interfaz Android Debug Bridge (adb)</string>
   <!-- Android debugging over WiFi -->
   <string name="adb_over_network">ADB sobre red</string>
-  <string name="adb_over_network_summary">Activar la depuración TCP/IP sobre las interfaces de red (Wi\u2011Fi, redes USB). Esta configuración se restablece al reiniciar el dispositivo</string>
+  <string name="adb_over_network_summary">Activar la depuración TCP/IP sobre las interfaces de red (Wi\u2011Fi, redes USB). Este ajuste se restablece al reiniciar el dispositivo</string>
   <!-- Warning for Adb over Network -->
   <string name="adb_over_network_warning">ADVERTENCIA: Cuando ADB sobre red está activado, el dispositivo está abierto para intrusiones en todas las redes conectadas.\n\nUtiliza esta función solamente cuando estés conectado a redes de confianza.\n\n¿Realmente deseas activar esta función?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
@@ -771,7 +771,7 @@
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">Mostrar visualizador musical</string>
   <!-- lock screen disabled by QS tile warning -->
-  <string name="lockscreen_disabled_by_qs_tile_title">Desactivado por la configuración rápida de los mosaicos</string>
+  <string name="lockscreen_disabled_by_qs_tile_title">Desactivado por los mosaicos de ajustes rápidos</string>
   <string name="lockscreen_disabled_by_qs_tile_summary">Pulsar para activar la pantalla bloqueada</string>
   <string name="lockscreen_disabled_by_qs_tile_summary_enabled">¡Pantalla bloqueada activada!</string>
   <!-- Battery saver -->
@@ -796,7 +796,7 @@
   <string name="expanded_hide_status">Ocultar barra de estado</string>
   <string name="expanded_hide_navigation">Ocultar la barra de navegación</string>
   <string name="expanded_hide_both">Ocultar ambas</string>
-  <string name="expanded_nothing_to_show">Para añadir una configuración personalizada por aplicación para el estado ampliado, configurar \"Habilitado para todos\" en la posición de apagado</string>
+  <string name="expanded_nothing_to_show">Para añadir un ajuste personalizado por aplicación para el estado ampliado, configurar \"Activado para todos\" en la posición de apagado</string>
   <string name="expanded_enabled_for_all">Habilitado para todos</string>
   <string name="expanded_desktop_style">Estilo de escritorio ampliado</string>
   <string name="expanded_desktop_style_description">Elige un valor predeterminado para el estilo del escritorio ampliado</string>
@@ -940,7 +940,7 @@
   <string name="sim_card_status_title">Estado de SIM %d</string>
   <string name="sim_card_lock_settings_title">Ajustes de bloqueo de SIM %d</string>
   <string name="sim_card_summary_empty">Tarjeta SIM no insertada</string>
-  <string name="sim_mobile_network_settings_category_title">Configuración de red móvil</string>
+  <string name="sim_mobile_network_settings_category_title">Ajustes de la red móvil</string>
   <string name="sim_mobile_network_settings_title">Ajustes de la tarjeta SIM %d</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
@@ -1027,7 +1027,7 @@
   <string name="weather_settings_title">El tiempo</string>
   <string name="weather_settings_no_services_prompt">No hay servicios de proveedores del clima instalados</string>
   <string name="weather_settings_button">Ajustes del proveedor</string>
-  <string name="weather_settings_activity_not_found">No se puede iniciar el menú de configuración de este proveedor</string>
+  <string name="weather_settings_activity_not_found">No se puede iniciar el menú de ajustes de este proveedor</string>
   <string name="weather_settings_add_weather_provider">Agregar proveedor de clima</string>
   <string name="weather_settings_general_settings_title">General</string>
   <string name="weather_settings_providers_title">Proveedores</string>
@@ -1049,7 +1049,7 @@
   <string name="restrict_cellular_access_title">Restringir el acceso de datos móviles</string>
   <string name="restrict_cellular_access_summary">Desactivar el acceso de datos en redes móviles</string>
   <string name="restrict_cellular_access_dialog_title">¿Restringir el acceso de datos móviles?</string>
-  <string name="restrict_cellular_access_dialog_summary">Esta función puede causar que una aplicación que depende del acceso a la red deje de funcionar cuando haya solo redes móviles disponibles.\n\nPuede encontrar los controles de uso de datos más adecuados en la configuración disponible dentro de la aplicación.</string>
+  <string name="restrict_cellular_access_dialog_summary">Esta función puede causar que una aplicación que depende del acceso a la red deje de funcionar cuando haya solo redes móviles disponibles.\n\nPuede encontrar los controles de uso de datos más adecuados en los ajustes disponibles dentro de la aplicación.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operadores de red</string>
   <!-- title for lock screen blur preference -->
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index bf995df..c11e751 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -553,6 +553,7 @@
   <string name="double_tap_to_sleep_summary">Apagar la pantalla realizando un doble toque sobre la barra de estado</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Prevenir encendido accidental</string>
+  <string name="proximity_wake_summary">Comprueba el sensor de proximidad antes del encendido por gestos</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Encender al conectar el cargador</string>
   <string name="wake_when_plugged_or_unplugged_summary">Encender la pantalla al conectar o desconectar el cargador</string>
@@ -563,6 +564,7 @@
   <string name="volume_adjust_sounds_title">Sonidos de ajuste de volumen</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intensidad de vibración</string>
+  <string name="vibrator_warning">No son recomendables valores superiores a %1$d%%</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Calibración de color</string>
   <string name="color_calibration_summary">Calibrar los colores de la pantalla</string>
@@ -617,7 +619,11 @@
   <string name="live_display_color_profile_adaptive_title">Adaptable</string>
   <string name="live_display_color_profile_adaptive_summary">Los colores se adaptan a las condiciones ambientales</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Ajuste de imagen</string>
+  <string name="picture_adjustment_summary">Ajustar tono, saturación, intensidad y contraste</string>
+  <string name="adj_hue_title">Tono</string>
   <string name="adj_saturation_title">Saturación</string>
+  <string name="adj_intensity_title">Intensidad</string>
   <string name="adj_contrast_title">Contraste</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Icono de selección</string>
@@ -852,7 +858,10 @@
   <string name="no_filters_title">No hay filtros establecidos</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">Estadísticas de LineageOS</string>
+  <string name="anonymous_statistics_summary">Ayude a mejorar LineageOS mediante el envío anónimo de estadísticas</string>
   <string name="anonymous_statistics_warning_title">Acerca de</string>
+  <string name="anonymous_statistics_warning">Al permitir la recopilación y el envío de estadísticas de LineageOS, autorizas el envío de información de carácter no personal a los desarrolladores de LineageOS para hacer un seguimiento de las instalaciones que realices en los dispositivos. La información enviada incluye un identificador único que no compromete tu privacidad ni tu información personal. Esta información es enviada durante el arranque.\n\nPara ver un ejemplo de la información enviada, pulsa en \u00ABPrevisualizar datos\u00BB.</string>
   <string name="enable_reporting_title">Activar envío de estadísticas</string>
   <string name="preview_data_title">Previsualizar datos</string>
   <string name="view_stats_title">Ver estadísticas</string>
@@ -943,6 +952,9 @@
   <!-- [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 -->
+  <string name="zen_mode_vibration">Vibración</string>
+  <string name="zen_mode_vibration_never">No vibrar</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Vibrar en llamadas y notificaciones</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Cabeza: %1$s W/kg</string>
@@ -1049,11 +1061,26 @@
   <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 -->
+  <string name="app_notification_sound_timeout_title">Tiempo mínimo entre sonidos de notificaciones</string>
+  <string name="app_notification_sound_timeout_summary_template">Permite sonidos o vibraciones no más de una vez cada <xliff:g id="duration">%1$s </xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Sin restricció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 avanzado de la radio</string>
   <!-- Radio Control (IMS/MBN etc.) -->
   <string name="cm_radio_info_mbn_auto_load_on_label">Desactivar la carga automática del MBN</string>
   <string name="cm_radio_info_mbn_auto_load_off_label">Activar la carga automática del MBN</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Desactivar el depurador de VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Activar el depurador de VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Desactivar el depurador de VT</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Activar el depurador de VT</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Desactivar el depurador de WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Activar el depurador de WFC</string>
   <string name="cm_radio_info_adb_log_on_label">Desactivar el registro en ADB de la radio</string>
   <string name="cm_radio_info_adb_log_off_label">Activar el registro en ADB de la radio</string>
   <string name="cm_radio_info_diag_log_on_label">Desactivar el registro Diag</string>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index aa94905..66db1b9 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -640,7 +640,7 @@
   <string name="dialog_title_lcd_density">画素密度</string>
   <string name="lcd_density_value_format">%d DPI</string>
   <string name="lcd_density_default_value_format">%d DPI（デフォルト）</string>
-  <string name="restarting_ui">UIを再起動中\u2026</string>
+  <string name="restarting_ui">UIを再起動中...</string>
   <!-- Stylus Icon -->
   <string name="stylus_icon_enabled_title">スタイラス使用時にアイコンを表示</string>
   <string name="stylus_icon_enabled_summary">スタイラスでホバリングまたは描写しているときにポインターアイコンを表示する</string>
@@ -880,16 +880,16 @@
   <string name="menu_hidden_apps_reset_lock">パターンロックをリセット</string>
   <string name="protected_apps">アプリの保護</string>
   <string name="protected_apps_summary">パスワードでロックしている場合に非表示にするアプリを管理する</string>
-  <string name="saving_protected_components">コンポーネントの状態を保存中\u2026</string>
+  <string name="saving_protected_components">コンポーネントの状態を保存中...</string>
   <string name="pa_login_username_hint">ユーザー名（メール）</string>
   <string name="pa_login_password_hint">パスワード</string>
   <string name="pa_login_submit_button">サインイン</string>
-  <string name="pa_login_checking_password">アカウントを確認中\u2026</string>
+  <string name="pa_login_checking_password">アカウントを確認中...</string>
   <string name="pa_login_incorrect_login">ログインできませんでした</string>
   <string name="pa_pattern_or_fingerprint_header">ロック解除用にパターンか指紋を使用してください</string>
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">貢献者</string>
-  <string name="contributors_cloud_loading_message">貢献者のデータを読み込み中\u2026</string>
+  <string name="contributors_cloud_loading_message">貢献者のデータを読み込み中...</string>
   <string name="contributors_cloud_failed_message">貢献者の情報を読み込めません</string>
   <string name="contributor_info_menu">貢献者の情報</string>
   <string name="contributor_info_msg">
@@ -926,7 +926,7 @@
   <string name="sim_enabler_airplane_on">機内モードがONになっている間はこの操作を実行することはできません。</string>
   <string name="sim_enabler_in_call">通話中はこの操作を実行することはできません。</string>
   <string name="sim_enabler_both_inactive">すべてのSIMカードを無効にはできません</string>
-  <string name="sim_enabler_enabling">アクティベート中\u2026</string>
+  <string name="sim_enabler_enabling">アクティベート中...</string>
   <string name="sim_enabler_disabling">アクティベート解除中\u2026</string>
   <string name="sub_activate_success">SIMをアクティベートしました。</string>
   <string name="sub_activate_failed">アクティベートできませんでした。</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 627b531..de8ec79 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -56,19 +56,19 @@
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, LineageOS version -->
-  <string name="mod_version">LineageOS-versie</string>
+  <string name="mod_version">LineageOS versie</string>
   <string name="mod_version_default">Onbekend</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Model</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Apparaatnaam</string>
   <!-- About phone screen, LineageOS Api Level -->
-  <string name="mod_api_level">Niveau van LineageOS-API</string>
+  <string name="mod_api_level">LineageOS API niveau</string>
   <string name="mod_api_level_default">Onbekend</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Build-datum</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">LineageOS-updates</string>
+  <string name="cmupdate_settings_title">LineageOS updates</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Cyanogen-recovery bijwerken</string>
   <string name="update_recovery_summary">Recovery bijwerken met systeemupdates</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 1ff832d..07d4355 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -858,6 +858,7 @@
   <string name="no_filters_title">Nenhum filtro definido</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">Estatísticas LineageOS</string>
   <string name="anonymous_statistics_warning_title">Sobre</string>
   <string name="enable_reporting_title">Ativar relatório</string>
   <string name="preview_data_title">Pré-visualizar dados</string>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index a96daaf..c01863c 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -860,7 +860,10 @@
   <string name="no_filters_title">Нема постављених филтера</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">LineageOS статистика</string>
+  <string name="anonymous_statistics_summary">Помозите да побољшамо LineageOS слањем анонимних извештаја статистике</string>
   <string name="anonymous_statistics_warning_title">О</string>
+  <string name="anonymous_statistics_warning">Омогућавањем слања LineageOS статистикe дозволиће се да се нелични подаци доставе развојном тиму LineageOS-а како би се пратио број појединачних инсталација на различите уређаје. Информације које се шаљу садрже јединствену идентификацију која не компромитује приватност или личне податке. Подаци се шаљу при сваком покретању уређаја.\n\nЗа пример података који се шаљу, додирните преглед података.</string>
   <string name="enable_reporting_title">Омогући извештавање</string>
   <string name="preview_data_title">Преглед података</string>
   <string name="view_stats_title">Погледај статистике</string>
-- 
cgit v1.1


From 67bd36ac806fc8ecddd8af5eb7d32b4528071204 Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@lineageos.org>
Date: Mon, 6 Feb 2017 20:19:10 -0800
Subject: Automatic translation import

Change-Id: I53c6c59d7d7828e39debd458873646c7a7ac504e
---
 res/values-bg/cm_strings.xml     |  2 +-
 res/values-ca/cm_strings.xml     |  2 +-
 res/values-cs/cm_strings.xml     |  3 +++
 res/values-es/cm_strings.xml     |  1 +
 res/values-in/cm_strings.xml     |  3 +++
 res/values-nb/cm_strings.xml     |  4 +--
 res/values-nl/cm_strings.xml     | 15 +++++------
 res/values-pt-rBR/cm_strings.xml |  2 ++
 res/values-vi/cm_strings.xml     | 54 ++++++++++++++++++++++++++++++++++++++++
 res/values-zh-rTW/cm_strings.xml |  2 +-
 10 files changed, 76 insertions(+), 12 deletions(-)

diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 3aedb9d..2e92f23 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -527,7 +527,7 @@
   <string name="backlight_timeout_unlimited">Не изключвай</string>
   <string name="backlight_summary_disabled">Изключено</string>
   <string name="backlight_summary_enabled_with_timeout">Разрешена за <xliff:g id="timeout">%s </xliff:g></string>
-  <string name="backlight_summary_enabled">Разрешено</string>
+  <string name="backlight_summary_enabled">Активирани</string>
   <!-- Gesture Settings -->
   <!-- Settings main menu entry -->
   <string name="gesture_settings_title">Жестове</string>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 6678c72..572b731 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -502,7 +502,7 @@
   <string name="volbtn_cursor_control_on">Volum amunt/avall mou el cursor a esquerra/dreta</string>
   <string name="volbtn_cursor_control_on_reverse">Volum amunt/avall mou el cursor a dreta/esquerra</string>
   <string name="power_end_call_title">Finalitza la trucada</string>
-  <string name="power_end_call_summary">Apretant el botó d\'apagat es finalitzarà la trucada actual</string>
+  <string name="power_end_call_summary">Prement el botó d\'apagat es finalitzarà la trucada actual</string>
   <string name="swap_volume_buttons_title">Reorienta</string>
   <string name="swap_volume_buttons_summary">Intercanvia els botons de volum quan la pantalla estigui rotada</string>
   <string name="button_wake_title">Desperta el dispositiu</string>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index d221526..2616c44 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -860,7 +860,10 @@
   <string name="no_filters_title">Nenastaven žádný filtr</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">LineageOS statistiky</string>
+  <string name="anonymous_statistics_summary">Pomozte zdokonalit LineageOS povolením zasíláním anonymních statistik</string>
   <string name="anonymous_statistics_warning_title">O aplikaci</string>
+  <string name="anonymous_statistics_warning">Povolením zasílání statistik systému LineageOS umožní odesílat neosobní statistická data vývojářům k zjišťování stavu instalace na různých zařízeních. Odesílaná data obsahují unikátní identifikátor zařízení, který nezpůsobí žádnou kompromitaci soukromí nebo osobních dat. Data jsou odesílána při každém restartu zařízení.\n\nDotykem na „Náhled dat“ se můžete podívat na příklad odesílaných dat.</string>
   <string name="enable_reporting_title">Povolit odesílání</string>
   <string name="preview_data_title">Náhled dat</string>
   <string name="view_stats_title">Zobrazit statistiky</string>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index c11e751..6d643fc 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -954,6 +954,7 @@
   <!-- Allow vibration in zen mode -->
   <string name="zen_mode_vibration">Vibración</string>
   <string name="zen_mode_vibration_never">No vibrar</string>
+  <string name="zen_mode_vibration_calls_only">Vibrar únicamente para las llamadas</string>
   <string name="zen_mode_vibration_calls_and_notifications">Vibrar en llamadas y notificaciones</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 46cdd7c..716d6d4 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -856,7 +856,10 @@
   <string name="no_filters_title">Belum ada penyaring</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">Statistik LineageOS</string>
+  <string name="anonymous_statistics_summary">Bantu LineageOS untuk menjadi lebih baik dengan memilih ikut dalam pelaporan statistik anonim</string>
   <string name="anonymous_statistics_warning_title">Mengenai</string>
+  <string name="anonymous_statistics_warning">Memilih ikut dalam Statistik LineageOS akan memungkinkan data tidak pribadi dikirimkan kepada para pengembang LineageOS untuk dilacak instalasi unik pada berbagai macam perangkat. Informasi yang dikirimkan berisi pengenal unik, dan tidak membahayakan privasi atau data pribadi Anda. Data dikirim setiap kali perangkat di mulai ulang.\n\nUntuk melihat contoh data yang akan dikirim, ketuk Pratinjau Data.</string>
   <string name="enable_reporting_title">Aktifkan pelaporan</string>
   <string name="preview_data_title">Pratinjau data</string>
   <string name="view_stats_title">Lihat statistik</string>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 25e848f..b0096b7 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -636,7 +636,7 @@
   <string name="bluetooth_accept_all_files">Godta alle filtyper</string>
   <!-- High touch sensitivity -->
   <string name="high_touch_sensitivity_title">Høy touch sensitivitet</string>
-  <string name="high_touch_sensitivity_summary">Øk touchscreen følsomhet slik at den kan brukes med hansker</string>
+  <string name="high_touch_sensitivity_summary">Øk berøringsskjermens følsomhet slik at den kan brukes med hansker</string>
   <!-- Display & Lights screen, setting options for LCD density -->
   <string name="lcd_density">LCD tetthet</string>
   <string name="dialog_title_lcd_density">LCD tetthet</string>
@@ -669,7 +669,7 @@
   <!-- Stylus gestures -->
   <string name="stylus_app_not_installed">%s er ikke installert</string>
   <!-- Touchscreen hovering -->
-  <string name="touchscreen_hovering_title">Touchskjerm hovring</string>
+  <string name="touchscreen_hovering_title">Berøringsskjerm hovring</string>
   <string name="touchscreen_hovering_summary">Lar deg hovre over skjermen som en mus på en nettleser, eksternt skrivebord osv</string>
   <!-- Increasing ring tone volume -->
   <string name="increasing_ring_volume_option_title">Økende ringevolum</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index de8ec79..86c7b19 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -56,19 +56,19 @@
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, LineageOS version -->
-  <string name="mod_version">LineageOS versie</string>
+  <string name="mod_version">LineageOS-versie</string>
   <string name="mod_version_default">Onbekend</string>
   <!-- About phone screen, Device model -->
   <string name="device_model">Model</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Apparaatnaam</string>
   <!-- About phone screen, LineageOS Api Level -->
-  <string name="mod_api_level">LineageOS API niveau</string>
+  <string name="mod_api_level">Niveau van LineageOS-API</string>
   <string name="mod_api_level_default">Onbekend</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Build-datum</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">LineageOS updates</string>
+  <string name="cmupdate_settings_title">LineageOS-updates</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Cyanogen-recovery bijwerken</string>
   <string name="update_recovery_summary">Recovery bijwerken met systeemupdates</string>
@@ -703,12 +703,12 @@
   <string name="status_bar_notif_count_title">Aantal meldingen tonen</string>
   <string name="status_bar_notif_count_summary">Aantal nieuwe meldingen tonen</string>
   <string name="status_bar_quick_qs_pulldown_title">Snel openen</string>
-  <string name="status_bar_quick_qs_pulldown_summary">%1$s van statusbalk opent paneel</string>
+  <string name="status_bar_quick_qs_pulldown_summary">%1$s van statusbalk opent Snelle Instellingen</string>
   <string name="status_bar_quick_qs_pulldown_summary_left">Linkerkant</string>
   <string name="status_bar_quick_qs_pulldown_summary_right">Rechterkant</string>
   <string name="status_bar_quick_qs_pulldown_off">Uit</string>
-  <string name="status_bar_quick_qs_pulldown_left">Links</string>
-  <string name="status_bar_quick_qs_pulldown_right">Rechts</string>
+  <string name="status_bar_quick_qs_pulldown_left">Linkerkant</string>
+  <string name="status_bar_quick_qs_pulldown_right">Rechterkant</string>
   <!-- Status bar - Clock -->
   <string name="status_bar_clock_style_title">Indeling klok</string>
   <string name="status_bar_clock_style_right">Rechts</string>
@@ -859,6 +859,7 @@
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
   <string name="anonymous_statistics_title">LineageOS-statistieken</string>
+  <string name="anonymous_statistics_summary">Help LineageOS te verbeteren door anonieme statistieken te verzenden</string>
   <string name="anonymous_statistics_warning_title">Over</string>
   <string name="enable_reporting_title">Statistieken verzenden</string>
   <string name="preview_data_title">Voorbeeld van gegevens</string>
@@ -910,7 +911,7 @@
   <string name="category_misc">Overig</string>
   <string name="title_general">Algemeen</string>
   <string name="advanced">Geavanceerd</string>
-  <string name="link_volume_option_title">Volumen koppelen</string>
+  <string name="link_volume_option_title">Volume beltoon en meldingen koppelen</string>
   <string name="lcd_density_prompt_message">Sommige apps werken mogelijk niet goed met een aangepaste DPI.\n\nUw apparaat zal herstarten.</string>
   <!-- Edit access point labels: PPP number -->
   <string name="apn_ppp_number">APN PPP telefoonnummer</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 07d4355..8a9e55e 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -859,7 +859,9 @@
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
   <string name="anonymous_statistics_title">Estatísticas LineageOS</string>
+  <string name="anonymous_statistics_summary">Ajude a melhorar o LineageOS optando por enviar estatísticas anônimas</string>
   <string name="anonymous_statistics_warning_title">Sobre</string>
+  <string name="anonymous_statistics_warning">Optar por enviar estatísticas anônimas ao LineageOS permitirá que dados não pessoais sejam enviados para os desenvolvedores do LineageOS para rastrear instalações únicas em dispositivos. As informações enviadas incluem um identificador único que não compromete sua privacidade ou dados pessoais. Os dados são enviados durante cada inicialização.\n\nPara ver um exemplo dos dados enviados, toque em \'Pré-visualizar dados\'.</string>
   <string name="enable_reporting_title">Ativar relatório</string>
   <string name="preview_data_title">Pré-visualizar dados</string>
   <string name="view_stats_title">Ver estatísticas</string>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 3054682..229fd3d 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -18,9 +18,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">Bạn đang còn <xliff:g id="step_count">%1$d</xliff:g> bước để truy vấn ID thiết bị.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">ID thiết bị:[<xliff:g id="device_id">%1$s</xliff:g>] đã sao chép vào bảng tạm</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">ID thiết bị không có sẵn trên bản dựng này</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">ID thiết bị</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="other">Hiện tại bạn còn <xliff:g id="step_count">%1$d</xliff:g> bước nữa để bật cài đặt nhà phát triển.</item>
@@ -43,6 +49,8 @@
   <string name="root_access_adb">Chỉ cho ADB</string>
   <string name="root_access_all">Cả ứng dụng và ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Quản lý truy cập root</string>
+  <string name="root_appops_summary">Xem và kiểm soát các truy cập root</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, LineageOS version -->
@@ -543,6 +551,7 @@
   <string name="double_tap_to_sleep_summary">Chạm hai lần vào thanh trạng thái để tắt màn hình hiển thị</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Ngăn ngừa tình cờ mở màn hình</string>
+  <string name="proximity_wake_summary">Kiểm tra cảm biến tiệm cận trước khi đánh thức được kích hoạt bằng cử chỉ</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Sáng màn hình khi cắm sạc</string>
   <string name="wake_when_plugged_or_unplugged_summary">Bật màn hình khi kết nối hoặc ngắt kết nối nguồn điện</string>
@@ -553,6 +562,7 @@
   <string name="volume_adjust_sounds_title">Âm thanh điều chỉnh âm lượng</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Cường độ rung</string>
+  <string name="vibrator_warning">Giá trị cao hơn %1$d%% không được khuyến cáo</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Hiệu chỉnh màu sắc</string>
   <string name="color_calibration_summary">Hiệu chỉnh màu sắc trên màn hình</string>
@@ -604,8 +614,14 @@
   <string name="live_display_color_profile_photography_summary">Tái tạo màu sắc hoàn hảo cho hình ảnh</string>
   <string name="live_display_color_profile_basic_title">Cơ bản</string>
   <string name="live_display_color_profile_basic_summary">Dùng màn hình không hiệu chỉnh</string>
+  <string name="live_display_color_profile_adaptive_title">Thích nghi</string>
+  <string name="live_display_color_profile_adaptive_summary">Màu sắc thích ứng với điều kiện môi trường xung quanh</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Hiệu chỉnh hình ảnh</string>
+  <string name="picture_adjustment_summary">Hiệu chỉnh tông màu, bão hòa, cường độ và độ tương phản</string>
+  <string name="adj_hue_title">Tông màu</string>
   <string name="adj_saturation_title">Độ bão hòa</string>
+  <string name="adj_intensity_title">Cường độ</string>
   <string name="adj_contrast_title">Độ tương phản</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Biểu tượng trình chọn</string>
@@ -840,7 +856,10 @@
   <string name="no_filters_title">Chưa thiết lập bộ lọc</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">Thống kê LineageOS</string>
+  <string name="anonymous_statistics_summary">Giúp làm cho LineageOS tốt hơn bằng cách chọn vào báo cáo số liệu thống kê ẩn danh</string>
   <string name="anonymous_statistics_warning_title">Thông tin</string>
+  <string name="anonymous_statistics_warning">Chọn tham gia Thống kê LineageOS sẽ cho phép gửi dữ liệu không liên quan đến cá nhân đến những nhà phát triển của LineageOS để theo dõi số lượt cài đặt duy nhất trên các thiết bị. Thông tin đã gửi sẽ bao gồm một ký hiệu nhận dạng duy nhất, nó sẽ không ảnh hưởng đến sự riêng tư hoặc dữ liệu cá nhân của bạn. Dữ liệu được gửi vào mỗi lần khởi động.\n\nĐể xem mẫu dữ liệu được gửi, chạm vào Xem trước dữ liệu.</string>
   <string name="enable_reporting_title">Cho phép báo cáo</string>
   <string name="preview_data_title">Xem trước dữ liệu</string>
   <string name="view_stats_title">Xem thống kê</string>
@@ -931,6 +950,10 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">tin nhắn đã chọn</string>
   <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Rung</string>
+  <string name="zen_mode_vibration_never">Không rung</string>
+  <string name="zen_mode_vibration_calls_only">Chỉ rung cho các cuộc gọi</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Rung cho cuộc gọi và thông báo</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Đầu: %1$s W/kg</string>
@@ -1028,6 +1051,7 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Nhà điều hành mạng</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Nền mờ</string>
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">Hiển thị thời tiết</string>
   <!-- Per app controls for LP keyguard notifications -->
@@ -1036,10 +1060,40 @@
   <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 -->
+  <string name="app_notification_sound_timeout_title">Thời gian tối thiểu giữa các âm thanh thông báo</string>
+  <string name="app_notification_sound_timeout_summary_template">Cho phép âm thanh hoặc rung không nhiều hơn một lần mỗi <xliff:g id="duration">%1$s</xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Không giới hạn</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 giây</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 giây</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 phút</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 phút</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 phút</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 phút</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Điều khiển radio tăng cường</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Tắt MBN tự động tải</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Bật MBN tự động tải</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Tắt gỡ lỗi VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Bật gỡ lỗi VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Tắt gỡ lỗi VT</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Tắt gỡ lỗi VT</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Tắt gỡ lỗi WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Bật gỡ lỗi WFC</string>
+  <string name="cm_radio_info_adb_log_on_label">Tắt nhật ký ADB radio</string>
+  <string name="cm_radio_info_adb_log_off_label">Bật nhật ký ADB radio</string>
+  <string name="cm_radio_info_diag_log_on_label">Tắt nhật ký Diag</string>
+  <string name="cm_radio_info_diag_log_off_label">Bật nhật ký Diag</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Hình nền</string>
+  <string name="not_available_with_app">Không có sẵn với %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Xác định vị trí cảm biến vân tay trên <xliff:g id="sensor_location">%1$s</xliff:g> điện thoại của bạn.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">quay lại</string>
+  <string name="security_settings_fingerprint_sensor_location_front">trước</string>
+  <string name="security_settings_fingerprint_sensor_location_left">cạnh trái</string>
+  <string name="security_settings_fingerprint_sensor_location_right">cạnh phải</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Thoại: <xliff:g id="voice_status">%1$s</xliff:g> / Dữ liệu: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index b327c76..e9239df 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -714,7 +714,7 @@
   <string name="status_bar_clock_style_center">置中</string>
   <string name="status_bar_clock_style_hidden">隱藏</string>
   <string name="status_bar_am_pm_title">上午/下午樣式</string>
-  <string name="status_bar_am_pm_info">24小時制時鐘已啟用</string>
+  <string name="status_bar_am_pm_info">24 小時制時鐘已啟用</string>
   <string name="status_bar_am_pm_normal">正常</string>
   <string name="status_bar_am_pm_small">小</string>
   <string name="status_bar_am_pm_hidden">隱藏</string>
-- 
cgit v1.1