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

Change-Id: I53e8f93c43ddb93433c81d457e9721c0fff07b81
Ticket: -
---
 core/res/res/values-be/cm_strings.xml             | 2 +-
 packages/SettingsLib/res/values-nb/cm_strings.xml | 2 +-
 packages/SystemUI/res/values-be/cm_strings.xml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/res/res/values-be/cm_strings.xml b/core/res/res/values-be/cm_strings.xml
index 5e73c39..9053cf0 100644
--- a/core/res/res/values-be/cm_strings.xml
+++ b/core/res/res/values-be/cm_strings.xml
@@ -102,7 +102,7 @@
   <!-- App ops requests -->
   <string name="app_ops_access_camera">атрымаць доступ да камеры</string>
   <string name="app_ops_access_location">атрымаць доступ да месцазнаходжання прылады</string>
-  <string name="app_ops_access_notifications">атрымаць доступ да апавяшчэнняў</string>
+  <string name="app_ops_access_notifications">чытаньне паведамленьняў</string>
   <string name="app_ops_activate_vpn">актываваць VPN</string>
   <string name="app_ops_auto_start">прызначыць запуск пры ўлучэнні прылады</string>
   <string name="app_ops_delete_call_log">выдаліць часопіс званкоў</string>
diff --git a/packages/SettingsLib/res/values-nb/cm_strings.xml b/packages/SettingsLib/res/values-nb/cm_strings.xml
index e55d4a1..28be6da 100644
--- a/packages/SettingsLib/res/values-nb/cm_strings.xml
+++ b/packages/SettingsLib/res/values-nb/cm_strings.xml
@@ -19,7 +19,7 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="profile_applist_title">Apps</string>
+  <string name="profile_applist_title">Apper</string>
   <string name="picker_activities">Aktiviteter</string>
   <string name="select_custom_app_title">Velg egendefinert app</string>
   <string name="select_custom_activity_title">Velg egendefinert aktivitet</string>
diff --git a/packages/SystemUI/res/values-be/cm_strings.xml b/packages/SystemUI/res/values-be/cm_strings.xml
index 4db516e..6736912 100644
--- a/packages/SystemUI/res/values-be/cm_strings.xml
+++ b/packages/SystemUI/res/values-be/cm_strings.xml
@@ -35,7 +35,7 @@
   <string name="lockscreen_choose_action_title">Выбар дзеяння</string>
   <string name="lockscreen_none_target">Нічога</string>
   <!-- Dialog title for navigation bar button selection -->
-  <string name="navbar_dialog_title">Выберыце дзеянне</string>
+  <string name="navbar_dialog_title">Абяры дзеяньне</string>
   <string name="navbar_home_button">Дамоў</string>
   <string name="navbar_recent_button">Запушчаныя дадаткі</string>
   <string name="navbar_search_button">Пошук</string>
-- 
cgit v1.1


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

Change-Id: I86e57b89e58d2cf5985e62b8d582f49285c265f3
Ticket: -
---
 core/res/res/values-sk/cm_strings.xml             | 23 +++++++++++++
 packages/Keyguard/res/values-sk/cm_strings.xml    |  7 ++++
 packages/SettingsLib/res/values-sk/cm_strings.xml | 27 ++++++++++++++++
 packages/SystemUI/res/values-sk/cm_strings.xml    | 39 +++++++++++++++++++++++
 4 files changed, 96 insertions(+)
 create mode 100644 packages/SettingsLib/res/values-sk/cm_strings.xml

diff --git a/core/res/res/values-sk/cm_strings.xml b/core/res/res/values-sk/cm_strings.xml
index 31eb96b..fd847e2 100644
--- a/core/res/res/values-sk/cm_strings.xml
+++ b/core/res/res/values-sk/cm_strings.xml
@@ -135,7 +135,9 @@
   <string name="app_ops_start_at_bootup">spustiť pri štaťte</string>
   <string name="app_ops_toast_window">zobraziť vyskakovacie oznámenia</string>
   <string name="app_ops_toggle_bluetooth">prepnúť bluetooth</string>
+  <string name="app_ops_toggle_mobile_data">prepnúť mobilné dáta</string>
   <string name="app_ops_toggle_nfc">prepnúť NFC</string>
+  <string name="app_ops_toggle_wifi">prepnúť Wi-Fi</string>
   <string name="app_ops_use_alarm_volume">ovládať hlasitosť budíka</string>
   <string name="app_ops_use_audio_focus">ovládať zvukové zdroje</string>
   <string name="app_ops_use_bluetooth_volume">ovládať hlasitosť bluetooh</string>
@@ -148,6 +150,21 @@
   <string name="app_ops_use_voice_volume">ovládať hlasitosť hovoru</string>
   <string name="app_ops_write_mms">napísať správu MMS</string>
   <string name="app_ops_write_sms">napísať správu SMS</string>
+  <string name="app_ops_use_fingerprint">použiť odtlačok prsta</string>
+  <string name="app_ops_add_voicemail">pridať hlasovú poštu</string>
+  <string name="app_ops_read_phone_state">pristupovať k stavu telefónu</string>
+  <string name="app_ops_scan_wifi">prehľadať Wi-Fi siete</string>
+  <string name="app_ops_change_wallpaper">zmeniť tapetu</string>
+  <string name="app_ops_assist_structure">použiť asistovanú štruktúru</string>
+  <string name="app_ops_assist_screenshot">urobiť snímok obrazovky</string>
+  <string name="app_ops_use_body_sensors">použiť telové senzory</string>
+  <string name="app_ops_read_cell_broadcasts">čítať bunkové vysielanie</string>
+  <string name="app_ops_mock_location">falšovať vašu polohu</string>
+  <string name="app_ops_read_external_storage">čítať externé úložisko</string>
+  <string name="app_ops_write_external_storage">zapisovať do externého úložiska</string>
+  <string name="app_ops_turn_on_screen">zapnúť obrazovku</string>
+  <string name="app_ops_get_accounts">získať účty zariadenia</string>
+  <string name="app_ops_wifi_change">zmeniť stav Wi-Fi</string>
   <string name="app_ops_su">získať root prístup</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Na odopnutie tejto obrazovky stlačte a podržte tlačidlo Späť.</string>
@@ -159,7 +176,11 @@
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
          with spaces on either side. [CHAR LIMIT=3] -->
   <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">Spustenie aktivity zablokované</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> je chránená proti spusteniu. Kliknite na overenie a spustenie aplikácie.</string>
   <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">Batéria plne nabitá</string>
+  <string name="notify_battery_fully_charged_text">Odpojte zariadenie od nabíjačky pre zlepšenie životnosti batérie.</string>
   <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
          whether they want to allow the application to do this. -->
   <string name="permlab_resetBatteryStats">obnoviť štatistiky batérie</string>
@@ -167,4 +188,6 @@
          whether they want to allow the application to do this. -->
   <string name="permdesc_resetBatteryStats">Umožňuje aplikácii obnoviť aktuálne nízkoúrovňové údaje o využití batérie.</string>
   <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIM karty sa zmenili</string>
+  <string name="uicc_hot_swapped_event_text">Kliknite na nastavenie redvolieb SIM karty</string>
 </resources>
diff --git a/packages/Keyguard/res/values-sk/cm_strings.xml b/packages/Keyguard/res/values-sk/cm_strings.xml
index f54f1ff..bcc9ea0 100644
--- a/packages/Keyguard/res/values-sk/cm_strings.xml
+++ b/packages/Keyguard/res/values-sk/cm_strings.xml
@@ -17,8 +17,15 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">SIM/RUIM je uzamknutá pomocou Perso</string>
   <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Neplatná karta.</string>
   <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">Zadajte kód PIN. Máte <xliff:g id="number">%d</xliff:g> zostávajúci pokus predtým, ako budete musieť kontaktovať vášho operátora pre odomknutie zariadenia.</item>
+    <item quantity="few">Zadajte kód PIN. Máte <xliff:g id="number">%d</xliff:g> zostávajúce pokusy.</item>
+    <item quantity="other">Zadajte kód PIN. Máte <xliff:g id="number">%d</xliff:g> zostávajúcich pokusov.</item>
+  </plurals>
   <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">Chyba: Vstup je kratší ako minimálna dĺžka</string>
 </resources>
diff --git a/packages/SettingsLib/res/values-sk/cm_strings.xml b/packages/SettingsLib/res/values-sk/cm_strings.xml
new file mode 100644
index 0000000..a423c4d
--- /dev/null
+++ b/packages/SettingsLib/res/values-sk/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Aplikácie</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>
+  <string name="lockscreen_targets_message">Ikony obrazovky uzamknutia</string>
+</resources>
diff --git a/packages/SystemUI/res/values-sk/cm_strings.xml b/packages/SystemUI/res/values-sk/cm_strings.xml
index 68e99e4..612b5ac 100644
--- a/packages/SystemUI/res/values-sk/cm_strings.xml
+++ b/packages/SystemUI/res/values-sk/cm_strings.xml
@@ -17,7 +17,9 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
   <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
   <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
   <!-- Text to use when the number in a notification info is too large
@@ -27,6 +29,8 @@
   <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Potiahnite doprava pre %1$s</string>
   <string name="right_shortcut_hint">Potiahnite doľava pre %1$s</string>
+  <string name="lockscreen_message">Kliknutím na ikonu vľavo alebo vpravo a zmeňte ikony na obrazovke uzamknutia.</string>
+  <string name="lockscreen_default_target">Predvolené</string>
   <string name="select_application">Vyberte aplikáciu</string>
   <string name="lockscreen_choose_action_title">Vyberte akciu</string>
   <string name="lockscreen_none_target">Žiadna</string>
@@ -50,6 +54,7 @@
   <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Odinštalovať</string>
   <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">Nastavenie jasu</string>
   <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profily vyp.</string>
   <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -60,6 +65,18 @@
   <string name="accessibility_quick_settings_profiles_changed">Profil sa zmenil na <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Inicializácia\u2026</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Nastavenia svetla</string>
+  <string name="led_notification_text">LED svetlo povolené nastaveniami</string>
+  <string name="qs_tile_edit_header_instruction">Stlačte a podržte dlaždicu na preusporiadanie</string>
+  <string name="quick_settings_edit_label">Upraviť dlaždice</string>
+  <string name="quick_settings_cannot_delete_edit_tile">Nie je možné vymazať dlaždicu Upraviť</string>
+  <string name="qs_tiles_reset_confirmation">Obnoviť dlaždice rýchlych nastavení na predvolené nastavenie?</string>
+  <string name="quick_settings_tile_reset_to_default">Obnoviť predvolené rozloženie</string>
+  <string name="quick_settings_title_header">Hlavička</string>
+  <string name="quick_settings_title_tiles">Dlaždice</string>
+  <string name="quick_settings_title_show_weather">Zobraziť počasie</string>
+  <string name="quick_settings_title_show_brightness_slider">Zobraziť posuvník jasu</string>
+  <string name="quick_settings_title_enlarge_first_row">Zväčšiť prvý riadok</string>
   <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Zobrazenie aktuálnej obrazovky je zaistené, dokým ju neuvoľníte. Dotknite a podržte tlačidlo Späť pre uvoľnenie.</string>
   <string name="quick_settings_custom_tile_detail_title">Vlastná dlaždica</string>
@@ -72,6 +89,8 @@
   <string name="quick_settings_heads_up_label">Plávajúce oznámenia</string>
   <string name="quick_settings_battery_saver_label">Šetrič batérie</string>
   <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Šetrič batérie (nabíjanie)</string>
+  <string name="quick_settings_caffeine_label">Kofeín</string>
   <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Synch. vyp.</string>
   <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -87,6 +106,7 @@
   <string name="quick_settings_lockscreen_label">Obrazovka uzamknutia</string>
   <string name="quick_settings_ambient_display_label">Ambientné zobrazenie</string>
   <string name="quick_settings_lockscreen_label_enforced">Obrazovka uzamknutia povolená</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Zakázané profilom</string>
   <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Časový limit obrazovky: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -138,7 +158,9 @@
   <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Plávajúce oznámenia povolené.</string>
   <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">Kofeín vypnutý.</string>
   <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Kofeín zapnutý.</string>
   <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Šetrič batérie vypnutý.</string>
   <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -152,6 +174,8 @@
   <string name="dynamic_qs_tile_next_alarm_label">Ďalší budík</string>
   <string name="dynamic_qs_tile_ime_selector_label">Výber IME</string>
   <string name="dynamic_qs_tile_su_label">Root prístup</string>
+  <string name="dynamic_qs_tile_themes_label">Témy</string>
+  <string name="quick_settings_title_advanced_location">Trojstavové nastavenie určenia polohy</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Hlásenie polohy: režim šetrenia batérie.</string>
   <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -172,11 +196,22 @@
   <string name="accessibility_quick_settings_location_changed_gps_only">Hlásenie polohy sa zmenilo na režim iba senzorov.</string>
   <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Hlásenie polohy sa zmenilo na režim vysokej presnosti.</string>
+  <string name="quick_settings_tiles_category_system">Systémové dlaždice</string>
   <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">Pridať dlaždicu</string>
   <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">Nie je možné sa pripojiť sa k mobilným sieťam, pokiaľ je povolený Režim v lietadle. Vypnite Režim v lietadle a skúste to znovu.</string>
   <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">Baterka je zapnutá</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Dotykom vypnúť</string>
   <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d klient</item>
+    <item quantity="few">%1$d klienti</item>
+    <item quantity="other">%1$d klientov</item>
+  </plurals>
   <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Žiadna dátová SIM</string>
   <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_dock_battery_level">Batéria doku <xliff:g id="number">%d</xliff:g> percent.</string>
   <!-- Play queue -->
@@ -185,4 +220,8 @@
   <!-- Path data for landscape battery -->
   <!-- Path data for circle battery -->
   <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Potiahnutím nadol rozbaľte</string>
+  <string name="swipe_left_hint">Potiahnite prstom doľava na <xliff:g id="app_name">%1$s </xliff:g></string>
+  <string name="swipe_right_hint">Posunutím doprava zobraziť oznámenie</string>
 </resources>
-- 
cgit v1.1


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

Change-Id: I7eff0ec212cba24f97f35bddf3310e39b5fd1ce6
Ticket: -
---
 core/res/res/values-nl/cm_strings.xml          | 2 +-
 packages/SystemUI/res/values-nl/cm_strings.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/res/res/values-nl/cm_strings.xml b/core/res/res/values-nl/cm_strings.xml
index 9ef6871..0dcc2aa 100644
--- a/core/res/res/values-nl/cm_strings.xml
+++ b/core/res/res/values-nl/cm_strings.xml
@@ -57,7 +57,7 @@
   <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
   <!-- Button to soft reboot the device, within the Reboot Options dialog -->
-  <string name="reboot_soft">Soft reboot</string>
+  <string name="reboot_soft">Snelle herstart</string>
   <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Herstarten</string>
   <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
diff --git a/packages/SystemUI/res/values-nl/cm_strings.xml b/packages/SystemUI/res/values-nl/cm_strings.xml
index ac6ec80..eb58814 100644
--- a/packages/SystemUI/res/values-nl/cm_strings.xml
+++ b/packages/SystemUI/res/values-nl/cm_strings.xml
@@ -37,7 +37,7 @@
   <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Kies de toe te wijzen functie</string>
   <string name="navbar_home_button">Thuisknop</string>
-  <string name="navbar_recent_button">Recentknop</string>
+  <string name="navbar_recent_button">Recente apps-knop</string>
   <string name="navbar_search_button">Zoekknop</string>
   <string name="navbar_back_button">Terugknop</string>
   <string name="navbar_empty_button">Lege knop</string>
-- 
cgit v1.1


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

Change-Id: Icd3adceb4cfd523f56b7072934a037a203fd0b81
Ticket: -
---
 packages/SettingsLib/res/values-am/cm_strings.xml   | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-az-rAZ/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-bn-rBD/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-br-rFR/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-bs-rBA/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-csb-rPL/cm_strings.xml   | 21 +++++++++++++++++++++
 packages/SettingsLib/res/values-cy/cm_strings.xml   | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-en-rAU/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-en-rGB/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-en-rPT/cm_strings.xml    | 21 +++++++++++++++++++++
 packages/SettingsLib/res/values-eo/cm_strings.xml   | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-es-rCO/cm_strings.xml    | 21 +++++++++++++++++++++
 packages/SettingsLib/res/values-fa/cm_strings.xml   | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-fil-rPH/cm_strings.xml   | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-fr-rCA/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-frp-rIT/cm_strings.xml   | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-fy-rNL/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-ga-rIE/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-gd-rGB/cm_strings.xml    | 21 +++++++++++++++++++++
 packages/SettingsLib/res/values-hi/cm_strings.xml   | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-hy-rAM/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-is-rIS/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-ka-rGE/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-kk-rKZ/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-km-rKH/cm_strings.xml    | 21 +++++++++++++++++++++
 packages/SettingsLib/res/values-ku/cm_strings.xml   | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-ky-rKG/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-lo-rLA/cm_strings.xml    | 21 +++++++++++++++++++++
 packages/SettingsLib/res/values-lt/cm_strings.xml   | 21 +++++++++++++++++++++
 packages/SettingsLib/res/values-lv/cm_strings.xml   | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-mk-rMK/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-mn-rMN/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-ms-rMY/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-my-rMM/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-ne-rNP/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-oc-rFR/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-pa-rIN/cm_strings.xml    | 21 +++++++++++++++++++++
 packages/SettingsLib/res/values-rm/cm_strings.xml   | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-si-rLK/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-sq-rAL/cm_strings.xml    | 21 +++++++++++++++++++++
 packages/SettingsLib/res/values-sw/cm_strings.xml   | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-ur-rPK/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-uz-rUZ/cm_strings.xml    | 21 +++++++++++++++++++++
 .../SettingsLib/res/values-zh-rHK/cm_strings.xml    | 21 +++++++++++++++++++++
 packages/SettingsLib/res/values-zu/cm_strings.xml   | 21 +++++++++++++++++++++
 45 files changed, 945 insertions(+)
 create mode 100644 packages/SettingsLib/res/values-am/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-az-rAZ/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-bn-rBD/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-br-rFR/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-bs-rBA/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-csb-rPL/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-cy/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-en-rAU/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-en-rGB/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-en-rPT/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-eo/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-es-rCO/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-fa/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-fil-rPH/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-fr-rCA/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-frp-rIT/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-fy-rNL/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-ga-rIE/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-gd-rGB/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-hi/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-hy-rAM/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-is-rIS/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-ka-rGE/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-kk-rKZ/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-km-rKH/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-ku/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-ky-rKG/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-lo-rLA/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-lt/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-lv/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-mk-rMK/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-mn-rMN/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-ms-rMY/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-my-rMM/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-ne-rNP/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-oc-rFR/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-pa-rIN/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-rm/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-si-rLK/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-sq-rAL/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-sw/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-ur-rPK/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-uz-rUZ/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-zh-rHK/cm_strings.xml
 create mode 100644 packages/SettingsLib/res/values-zu/cm_strings.xml

diff --git a/packages/SettingsLib/res/values-am/cm_strings.xml b/packages/SettingsLib/res/values-am/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-am/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-az-rAZ/cm_strings.xml b/packages/SettingsLib/res/values-az-rAZ/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-az-rAZ/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-bn-rBD/cm_strings.xml b/packages/SettingsLib/res/values-bn-rBD/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-bn-rBD/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-br-rFR/cm_strings.xml b/packages/SettingsLib/res/values-br-rFR/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-br-rFR/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-bs-rBA/cm_strings.xml b/packages/SettingsLib/res/values-bs-rBA/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-bs-rBA/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-csb-rPL/cm_strings.xml b/packages/SettingsLib/res/values-csb-rPL/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-csb-rPL/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-cy/cm_strings.xml b/packages/SettingsLib/res/values-cy/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-cy/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-en-rAU/cm_strings.xml b/packages/SettingsLib/res/values-en-rAU/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-en-rAU/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-en-rGB/cm_strings.xml b/packages/SettingsLib/res/values-en-rGB/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-en-rGB/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-en-rPT/cm_strings.xml b/packages/SettingsLib/res/values-en-rPT/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-en-rPT/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-eo/cm_strings.xml b/packages/SettingsLib/res/values-eo/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-eo/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-es-rCO/cm_strings.xml b/packages/SettingsLib/res/values-es-rCO/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-es-rCO/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-fa/cm_strings.xml b/packages/SettingsLib/res/values-fa/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-fa/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-fil-rPH/cm_strings.xml b/packages/SettingsLib/res/values-fil-rPH/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-fil-rPH/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-fr-rCA/cm_strings.xml b/packages/SettingsLib/res/values-fr-rCA/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-fr-rCA/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-frp-rIT/cm_strings.xml b/packages/SettingsLib/res/values-frp-rIT/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-frp-rIT/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-fy-rNL/cm_strings.xml b/packages/SettingsLib/res/values-fy-rNL/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-fy-rNL/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-ga-rIE/cm_strings.xml b/packages/SettingsLib/res/values-ga-rIE/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-ga-rIE/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-gd-rGB/cm_strings.xml b/packages/SettingsLib/res/values-gd-rGB/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-gd-rGB/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-hi/cm_strings.xml b/packages/SettingsLib/res/values-hi/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-hi/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-hy-rAM/cm_strings.xml b/packages/SettingsLib/res/values-hy-rAM/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-hy-rAM/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-is-rIS/cm_strings.xml b/packages/SettingsLib/res/values-is-rIS/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-is-rIS/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-ka-rGE/cm_strings.xml b/packages/SettingsLib/res/values-ka-rGE/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-ka-rGE/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-kk-rKZ/cm_strings.xml b/packages/SettingsLib/res/values-kk-rKZ/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-kk-rKZ/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-km-rKH/cm_strings.xml b/packages/SettingsLib/res/values-km-rKH/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-km-rKH/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-ku/cm_strings.xml b/packages/SettingsLib/res/values-ku/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-ku/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-ky-rKG/cm_strings.xml b/packages/SettingsLib/res/values-ky-rKG/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-ky-rKG/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-lo-rLA/cm_strings.xml b/packages/SettingsLib/res/values-lo-rLA/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-lo-rLA/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-lt/cm_strings.xml b/packages/SettingsLib/res/values-lt/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-lt/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-lv/cm_strings.xml b/packages/SettingsLib/res/values-lv/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-lv/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-mk-rMK/cm_strings.xml b/packages/SettingsLib/res/values-mk-rMK/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-mk-rMK/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-mn-rMN/cm_strings.xml b/packages/SettingsLib/res/values-mn-rMN/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-mn-rMN/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-ms-rMY/cm_strings.xml b/packages/SettingsLib/res/values-ms-rMY/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-ms-rMY/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-my-rMM/cm_strings.xml b/packages/SettingsLib/res/values-my-rMM/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-my-rMM/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-ne-rNP/cm_strings.xml b/packages/SettingsLib/res/values-ne-rNP/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-ne-rNP/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-oc-rFR/cm_strings.xml b/packages/SettingsLib/res/values-oc-rFR/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-oc-rFR/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-pa-rIN/cm_strings.xml b/packages/SettingsLib/res/values-pa-rIN/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-pa-rIN/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-rm/cm_strings.xml b/packages/SettingsLib/res/values-rm/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-rm/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-si-rLK/cm_strings.xml b/packages/SettingsLib/res/values-si-rLK/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-si-rLK/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-sq-rAL/cm_strings.xml b/packages/SettingsLib/res/values-sq-rAL/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-sq-rAL/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-sw/cm_strings.xml b/packages/SettingsLib/res/values-sw/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-sw/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-ur-rPK/cm_strings.xml b/packages/SettingsLib/res/values-ur-rPK/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-ur-rPK/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-uz-rUZ/cm_strings.xml b/packages/SettingsLib/res/values-uz-rUZ/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-uz-rUZ/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-zh-rHK/cm_strings.xml b/packages/SettingsLib/res/values-zh-rHK/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-zh-rHK/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SettingsLib/res/values-zu/cm_strings.xml b/packages/SettingsLib/res/values-zu/cm_strings.xml
new file mode 100644
index 0000000..220d5f5
--- /dev/null
+++ b/packages/SettingsLib/res/values-zu/cm_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
-- 
cgit v1.1


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

Change-Id: Ic49d5ed34f92ca0298510b6ca8a3a279a0ea6e4d
Ticket: -
---
 core/res/res/values-zh-rTW/cm_strings.xml          | 46 +++++++++--------
 packages/Keyguard/res/values-zh-rTW/cm_strings.xml |  5 +-
 .../SettingsLib/res/values-zh-rTW/cm_strings.xml   |  2 +-
 packages/SystemUI/res/values-zh-rTW/cm_strings.xml | 59 ++++++++++++++++++----
 4 files changed, 78 insertions(+), 34 deletions(-)

diff --git a/core/res/res/values-zh-rTW/cm_strings.xml b/core/res/res/values-zh-rTW/cm_strings.xml
index 950c435..587cf06 100644
--- a/core/res/res/values-zh-rTW/cm_strings.xml
+++ b/core/res/res/values-zh-rTW/cm_strings.xml
@@ -18,7 +18,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- label for item that screenshots in phone options dialog -->
-  <string name="global_action_screenshot">螢幕擷取</string>
+  <string name="global_action_screenshot">螢幕截圖</string>
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">接收受保護的簡訊</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -36,13 +36,13 @@
   <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">允許應用程式讀取關於被封鎖來電或訊息的電話號碼的資訊。</string>
   <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permlab_changePhoneBlacklist">變更手機黑名單</string>
+  <string name="permlab_changePhoneBlacklist">更改手機黑名單</string>
   <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permdesc_changePhoneBlacklist">允許應用程式變更被封鎖來電或訊息的電話號碼。</string>
+  <string name="permdesc_changePhoneBlacklist">允許應用程式更改被封鎖來電或訊息的電話號碼。</string>
   <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
-  <string name="permlab_setKeyguardWallpaper">設定鎖定畫面桌布</string>
+  <string name="permlab_setKeyguardWallpaper">設定鎖定螢幕桌布</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permdesc_setKeyguardWallpaper">允許應用程式變更鎖定畫面桌布。</string>
+  <string name="permdesc_setKeyguardWallpaper">允許應用程式更改鎖定螢幕桌布。</string>
   <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">重新啟動</string>
   <!-- label for current user in phone options dialog -->
@@ -57,7 +57,7 @@
   <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
   <!-- Button to soft reboot the device, within the Reboot Options dialog -->
-  <string name="reboot_soft">軟件重新啟動</string>
+  <string name="reboot_soft">軟體重新啟動</string>
   <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">重新啟動</string>
   <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
@@ -71,12 +71,12 @@
   <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">已啟用網路 ADB</string>
   <!-- ADB over USB and network notification -->
-  <string name="adb_both_active_notification_title">已啟用 USB 及網路 ADB</string>
+  <string name="adb_both_active_notification_title">ADB 透過 USB 和網路已啟用</string>
   <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">輕觸即可停用偵錯。</string>
   <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
-  <string name="adb_active_custom_tile_both">USB和網路</string>
+  <string name="adb_active_custom_tile_both">USB 和網路</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">網路</string>
   <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
@@ -87,10 +87,12 @@
   <string name="silent_mode_priority">優先度</string>
   <string name="silent_mode_none">無</string>
   <!-- Wifi Hotspot disabled due to subscription change -->
+  <string name="subscription_change_disabled_wifi_ap">由於 SIM 卡資訊變更，已停用 Wi-Fi 熱點</string>
   <!-- WiFi turn off notification action text -->
+  <string name="notify_turn_wifi_off_title">關閉 Wi-Fi</string>
   <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">啟用或停用隱私守衛</string>
-  <string name="permdesc_changePrivacyGuardState">允許應用程式變更其他應用程式執行時是否啟用隱私守衛。當應用程式執行時啟用了隱私守衛，它將無法存取個人資料，例如聯絡人、通話記錄或訊息。</string>
+  <string name="permdesc_changePrivacyGuardState">允許應用程式更改其他應用程式執行時是否啟用隱私守衛。當應用程式執行時啟用了隱私守衛，它將無法存取個人資料，例如聯絡人、通話記錄或訊息。</string>
   <string name="privacy_guard_notification">隱私守衛正在運作</string>
   <string name="privacy_guard_notification_detail">「<xliff:g id="app">%1$s</xliff:g>」將無法存取個人資料</string>
   <string name="privacy_guard_dialog_title">隱私守衛</string>
@@ -104,7 +106,7 @@
   <string name="app_ops_activate_vpn">啟動 VPN</string>
   <string name="app_ops_auto_start">開機時啟動</string>
   <string name="app_ops_delete_call_log">刪除您的通話紀錄</string>
-  <string name="app_ops_delete_contacts">刪除您的連絡人</string>
+  <string name="app_ops_delete_contacts">刪除您的聯絡人</string>
   <string name="app_ops_delete_mms">刪除您的多媒體訊息</string>
   <string name="app_ops_delete_sms">刪除您的簡訊</string>
   <string name="app_ops_draw_on_top">在頂層繪製視窗</string>
@@ -132,15 +134,15 @@
   <string name="app_ops_send_sms">傳送簡訊</string>
   <string name="app_ops_start_at_bootup">開機時啟動</string>
   <string name="app_ops_toast_window">顯示彈出信息</string>
-  <string name="app_ops_toggle_bluetooth">開關藍牙</string>
-  <string name="app_ops_toggle_mobile_data">切換數據用量</string>
+  <string name="app_ops_toggle_bluetooth">切換至藍牙</string>
+  <string name="app_ops_toggle_mobile_data">切換至行動數據</string>
   <string name="app_ops_toggle_nfc">開關 NFC</string>
-  <string name="app_ops_toggle_wifi">切換 Wi-Fi</string>
+  <string name="app_ops_toggle_wifi">切換至 Wi-Fi</string>
   <string name="app_ops_use_alarm_volume">控制鬧鐘音量</string>
   <string name="app_ops_use_audio_focus">控制音訊焦點</string>
   <string name="app_ops_use_bluetooth_volume">控制藍牙音量</string>
   <string name="app_ops_use_master_volume">控制主音量</string>
-  <string name="app_ops_use_media_buttons">使用媒體按鈕</string>
+  <string name="app_ops_use_media_buttons">使用媒體鍵</string>
   <string name="app_ops_use_media_volume">控制媒體音量</string>
   <string name="app_ops_use_notification_volume">控制通知音量</string>
   <string name="app_ops_use_ring_volume">控制鈴聲音量</string>
@@ -152,9 +154,9 @@
   <string name="app_ops_add_voicemail">新增語音訊息</string>
   <string name="app_ops_read_phone_state">存取電話狀態</string>
   <string name="app_ops_scan_wifi">掃描 Wi-Fi 網路</string>
-  <string name="app_ops_change_wallpaper">變更桌布</string>
+  <string name="app_ops_change_wallpaper">更改桌布</string>
   <string name="app_ops_assist_structure">使用協助工具</string>
-  <string name="app_ops_assist_screenshot">擷取螢幕畫面</string>
+  <string name="app_ops_assist_screenshot">螢幕截圖</string>
   <string name="app_ops_use_body_sensors">使用人體感應器</string>
   <string name="app_ops_read_cell_broadcasts">讀取區域廣播</string>
   <string name="app_ops_mock_location">模擬所在位置</string>
@@ -162,7 +164,7 @@
   <string name="app_ops_write_external_storage">寫入外部儲存空間</string>
   <string name="app_ops_turn_on_screen">開啟螢幕</string>
   <string name="app_ops_get_accounts">取得裝置帳號</string>
-  <string name="app_ops_wifi_change">變更 Wi-Fi 狀態</string>
+  <string name="app_ops_wifi_change">更改 Wi-Fi 狀態</string>
   <string name="app_ops_su">取得 Root 權限</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">要解鎖此螢幕，觸摸並按住返回鍵。</string>
@@ -174,11 +176,11 @@
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
          with spaces on either side. [CHAR LIMIT=3] -->
   <!-- Protected Apps Notification -->
-  <string name="notify_package_component_protected_title">已阻止啟動活動</string>
-  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s </xliff:g> 正被防止啟動。按一下以進行身份驗證並啟動應用程式。</string>
+  <string name="notify_package_component_protected_title">已封鎖啟動活動</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s </xliff:g> 正被防止啟動。按一下即可進行身份驗證並啟動應用程式。</string>
   <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">電池完全充滿</string>
-  <string name="notify_battery_fully_charged_text">請將設備與充電線拔除，以提高電池壽命。</string>
+  <string name="notify_battery_fully_charged_text">請將裝置與充電線拔除，以提高電池壽命。</string>
   <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
          whether they want to allow the application to do this. -->
   <string name="permlab_resetBatteryStats">重設電池統計資訊</string>
@@ -186,6 +188,6 @@
          whether they want to allow the application to do this. -->
   <string name="permdesc_resetBatteryStats">允許應用程式重設目前低電量的電池使用資料。</string>
   <!-- Uicc hotswapped event configuration needed notification -->
-  <string name="uicc_hot_swapped_event_title">SIM 卡已變更</string>
-  <string name="uicc_hot_swapped_event_text">點按以設定SIM卡預設選項</string>
+  <string name="uicc_hot_swapped_event_title">SIM 卡已更改</string>
+  <string name="uicc_hot_swapped_event_text">輕觸即可設定 SIM卡 預設首選項</string>
 </resources>
diff --git a/packages/Keyguard/res/values-zh-rTW/cm_strings.xml b/packages/Keyguard/res/values-zh-rTW/cm_strings.xml
index 9ab7837..26a9005 100644
--- a/packages/Keyguard/res/values-zh-rTW/cm_strings.xml
+++ b/packages/Keyguard/res/values-zh-rTW/cm_strings.xml
@@ -17,10 +17,13 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM/RUIM 卡已被鎖定</string>
+  <string name="keyguard_perso_locked_message">SIM 卡已被鎖定</string>
   <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">無效的 SIM 卡。</string>
   <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="other">輸入 SIM 卡的 PIN，您剩餘 <xliff:g id="number">%d </xliff:g> 次嘗試機會。</item>
+  </plurals>
   <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">錯誤：輸入少於最小長度</string>
 </resources>
diff --git a/packages/SettingsLib/res/values-zh-rTW/cm_strings.xml b/packages/SettingsLib/res/values-zh-rTW/cm_strings.xml
index 478d992..964e5f4 100644
--- a/packages/SettingsLib/res/values-zh-rTW/cm_strings.xml
+++ b/packages/SettingsLib/res/values-zh-rTW/cm_strings.xml
@@ -23,5 +23,5 @@
   <string name="picker_activities">活動</string>
   <string name="select_custom_app_title">選取自訂應用程式</string>
   <string name="select_custom_activity_title">選取自訂活動</string>
-  <string name="lockscreen_targets_message">鎖定畫面捷徑</string>
+  <string name="lockscreen_targets_message">鎖定螢幕捷徑</string>
 </resources>
diff --git a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
index 09770c6..255e791 100644
--- a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
@@ -29,7 +29,7 @@
   <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">向右滑動即可%1$s</string>
   <string name="right_shortcut_hint">向左滑動即可%1$s</string>
-  <string name="lockscreen_message">輕觸左側或右側的圖示以設定鎖定畫面捷徑</string>
+  <string name="lockscreen_message">輕觸左側或右側的圖示即可設定鎖定螢幕捷徑</string>
   <string name="lockscreen_default_target">預設</string>
   <string name="select_application">選取應用程式</string>
   <string name="lockscreen_choose_action_title">選取操作</string>
@@ -56,14 +56,18 @@
   <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">亮度</string>
   <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_off">設定檔關閉</string>
   <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles">設定檔：<xliff:g id="profile" example="Default">%s</xliff:g></string>
   <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed_off">設定檔已關閉</string>
   <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed">設定檔已更改為 <xliff:g id="profile"example="Default">%s </xliff:g></string>
   <string name="quick_settings_compass_init">正在初始化\u2026</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">指示燈設定</string>
   <string name="led_notification_text">已透過設定啟用 LED 指示燈</string>
-  <string name="qs_tile_edit_header_instruction">按住瓷磚以重新排列</string>
+  <string name="qs_tile_edit_header_instruction">按住瓷磚即可重新排列</string>
   <string name="quick_settings_edit_label">編輯瓷磚</string>
   <string name="quick_settings_cannot_delete_edit_tile">無法刪除編輯瓷磚</string>
   <string name="qs_tiles_reset_confirmation">將快速設定瓷磚還原至預設配置？</string>
@@ -74,6 +78,7 @@
   <string name="quick_settings_title_show_brightness_slider">顯示亮度滑桿</string>
   <string name="quick_settings_title_enlarge_first_row">擴大首行</string>
   <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">此功能會固定螢幕顯示直到您取消固定。觸控並長按返回鍵即可解除固定。</string>
   <string name="quick_settings_custom_tile_detail_title">自訂瓷磚</string>
   <string name="quick_settings_remove">移除瓷磚</string>
   <string name="quick_settings_network_adb_label">網路 ADB</string>
@@ -82,8 +87,9 @@
   <string name="quick_settings_profiles">系統設定檔</string>
   <string name="quick_settings_profiles_off">已停用設定檔</string>
   <string name="quick_settings_heads_up_label">浮動通知</string>
+  <string name="quick_settings_battery_saver_label">省電模式</string>
   <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
-  <string name="quick_settings_battery_saver_label_charging">省電模式（充電中）</string>
+  <string name="quick_settings_battery_saver_label_charging">省電模式 (充電中)</string>
   <string name="quick_settings_caffeine_label">暫停休眠</string>
   <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">同步關閉</string>
@@ -94,28 +100,47 @@
   <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">同步已開啟</string>
   <string name="quick_settings_sync_label">同步</string>
-  <string name="quick_settings_usb_tether_label">USB 網路共用</string>
-  <string name="quick_settings_screen_timeout_detail_title">螢幕閒置時間</string>
-  <string name="quick_settings_lockscreen_label">鎖定畫面</string>
+  <string name="quick_settings_volume_panel_label">音量面板</string>
+  <string name="quick_settings_usb_tether_label">USB 網路共享</string>
+  <string name="quick_settings_screen_timeout_detail_title">螢幕逾時</string>
+  <string name="quick_settings_lockscreen_label">鎖定螢幕</string>
   <string name="quick_settings_ambient_display_label">環境顯示</string>
-  <string name="quick_settings_lockscreen_label_enforced">強制執行鎖定畫面</string>
-  <string name="quick_settings_lockscreen_label_locked_by_profile">已由設定檔禁用</string>
+  <string name="quick_settings_lockscreen_label_enforced">強制執行鎖定螢幕</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">已由設定檔停用</string>
   <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout">螢幕逾時：<xliff:g id="timeout" example="30 seconds">%s</xliff:g></string>
   <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout_changed">螢幕逾時即可更改為 <xliff:g id="timeout" example="30 seconds">%s</xliff:g></string>
+  <string name="qs_tile_performance">電池模式</string>
   <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_pwrsv">電池模式：省電模式。</string>
   <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bal">電池模式：平衡模式。</string>
   <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_perf">電池模式：高效能模式。</string>
   <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_power">電池模式：效率模式。</string>
   <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_perf">電池模式：快速模式。</string>
   <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">電池模式已更改為省電模式。</string>
   <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bal">電池模式已更改為平衡模式。</string>
   <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">電池模式已更改為高效能模式。</string>
   <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">電池模式已更改為效率模式。</string>
   <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">電池模式已更改為快速模式。</string>
+  <string name="quick_settings_performance_profile_detail_title">電池模式</string>
   <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_off">鎖定螢幕關閉</string>
   <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_on">鎖定螢幕開啟</string>
   <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_off">鎖定螢幕已關閉</string>
   <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_on">鎖定螢幕已開啟</string>
   <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">環境顯示關閉</string>
   <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -137,14 +162,19 @@
   <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">暫停休眠開啟</string>
   <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_off">省電模式關閉</string>
   <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_on">省電模式開啟</string>
   <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_off">省電模式已關閉</string>
   <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_on">省電模式已開啟</string>
   <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">動態磚</string>
   <string name="dynamic_qs_tile_next_alarm_label">下一個鬧鐘</string>
   <string name="dynamic_qs_tile_ime_selector_label">輸入法選擇器</string>
   <string name="dynamic_qs_tile_su_label">Root 權限</string>
+  <string name="dynamic_qs_tile_themes_label">主題</string>
   <string name="quick_settings_title_advanced_location">定位模式</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">位置回報：節約耗電量</string>
@@ -161,26 +191,35 @@
   <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">高精確度</string>
   <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_battery_saving">定位服務已更改為省電模式。</string>
   <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_gps_only">定位服務已更改為僅感應器模式。</string>
   <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">定位服務已更改為高精確度模式。</string>
   <string name="quick_settings_tiles_category_system">系統瓷磚</string>
   <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">新增瓷磚</string>
   <!-- Hotspot dialog message -->
-  <string name="hotspot_apm_message">飛航模式啟用時無法連接行動網路，請停用飛航模式後再嘗試。</string>
+  <string name="hotspot_apm_message">飛航模式啟用時無法連線行動網路，請停用飛航模式後再嘗試。</string>
   <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">手電筒已經開啟</string>
   <string name="quick_settings_tile_flashlight_not_summary">點擊關閉</string>
   <!-- Wi-Fi hotspot label when enabled -->
   <plurals name="wifi_hotspot_connected_clients_label">
-    <item quantity="other">%1$d 用戶</item>
+    <item quantity="other">%1$d 客戶端</item>
   </plurals>
   <!-- CellularTile data sim not configured state string -->
   <string name="data_sim_not_configured">沒有數據資料傳輸的 SIM 卡</string>
   <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">座架電池百分之 <xliff:g id="number">%d</xliff:g>。</string>
   <!-- Play queue -->
+  <string name="play_queue_extention">顯示播放佇列</string>
   <!-- Path data for portrait battery -->
   <!-- Path data for landscape battery -->
   <!-- Path data for circle battery -->
   <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">向下滑動即可以展開</string>
+  <string name="swipe_left_hint">向左滑動即可 <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">向右滑動即可查看通知</string>
 </resources>
-- 
cgit v1.1


From e74ee31f3cee2139deafc17581e7408cd7aa9b22 Mon Sep 17 00:00:00 2001
From: Omico <294958213@qq.com>
Date: Fri, 23 Dec 2016 03:56:29 +0800
Subject: Fix "Error parsing XML: not well-formed"

frameworks/base/packages/SystemUI/res/values-zh-rTW/cm_strings.xml:65: error: Error parsing XML: not well-formed (invalid token)

Change-Id: Ic29b77776c48d4a663656bf6ea40c8c4f0253414
---
 packages/SystemUI/res/values-zh-rTW/cm_strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
index 255e791..382aa3c 100644
--- a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
@@ -62,7 +62,7 @@
   <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">設定檔已關閉</string>
   <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_profiles_changed">設定檔已更改為 <xliff:g id="profile"example="Default">%s </xliff:g></string>
+  <string name="accessibility_quick_settings_profiles_changed">設定檔已更改為<xliff:g id="profile" example="Default">%s</xliff:g>。</string>
   <string name="quick_settings_compass_init">正在初始化\u2026</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">指示燈設定</string>
-- 
cgit v1.1


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

Change-Id: I251ee7b9d1508a91692a8a8c1ba863730fcf125b
Ticket: -
---
 core/res/res/values-as-rIN/strings.xml             | 35 ++++++++++++++++++++++
 core/res/res/values-ast-rES/strings.xml            | 35 ++++++++++++++++++++++
 core/res/res/values-br-rFR/strings.xml             | 35 ++++++++++++++++++++++
 core/res/res/values-csb-rPL/strings.xml            | 35 ++++++++++++++++++++++
 core/res/res/values-cy/strings.xml                 | 35 ++++++++++++++++++++++
 core/res/res/values-en-rPT/strings.xml             | 35 ++++++++++++++++++++++
 core/res/res/values-eo/strings.xml                 | 35 ++++++++++++++++++++++
 core/res/res/values-es-rCO/strings.xml             | 35 ++++++++++++++++++++++
 core/res/res/values-es-rMX/strings.xml             | 35 ++++++++++++++++++++++
 core/res/res/values-frp-rIT/strings.xml            | 35 ++++++++++++++++++++++
 core/res/res/values-fy-rNL/strings.xml             | 35 ++++++++++++++++++++++
 core/res/res/values-ga-rIE/strings.xml             | 35 ++++++++++++++++++++++
 core/res/res/values-gd-rGB/strings.xml             | 35 ++++++++++++++++++++++
 core/res/res/values-ku/strings.xml                 | 35 ++++++++++++++++++++++
 core/res/res/values-lb/strings.xml                 | 35 ++++++++++++++++++++++
 core/res/res/values-oc-rFR/strings.xml             | 35 ++++++++++++++++++++++
 core/res/res/values-or-rIN/strings.xml             | 35 ++++++++++++++++++++++
 core/res/res/values-ug/strings.xml                 | 35 ++++++++++++++++++++++
 core/res/res/values-zh-rTW/cm_strings.xml          |  4 +--
 .../res/values-as-rIN/strings.xml                  |  3 ++
 .../res/values-br-rFR/strings.xml                  |  3 ++
 .../res/values-csb-rPL/strings.xml                 |  3 ++
 .../CaptivePortalLogin/res/values-cy/strings.xml   |  3 ++
 .../res/values-en-rPT/strings.xml                  |  3 ++
 .../CaptivePortalLogin/res/values-eo/strings.xml   |  3 ++
 .../res/values-es-rCO/strings.xml                  |  3 ++
 .../res/values-es-rMX/strings.xml                  |  3 ++
 .../res/values-frp-rIT/strings.xml                 |  3 ++
 .../res/values-fy-rNL/strings.xml                  |  3 ++
 .../res/values-ga-rIE/strings.xml                  |  3 ++
 .../res/values-gd-rGB/strings.xml                  |  3 ++
 .../res/values-oc-rFR/strings.xml                  |  3 ++
 .../res/values-or-rIN/strings.xml                  |  3 ++
 packages/Keyguard/res/values-as-rIN/strings.xml    |  2 ++
 packages/Keyguard/res/values-ast-rES/strings.xml   |  2 ++
 packages/Keyguard/res/values-br-rFR/strings.xml    |  2 ++
 packages/Keyguard/res/values-csb-rPL/strings.xml   |  2 ++
 packages/Keyguard/res/values-cy/strings.xml        |  2 ++
 packages/Keyguard/res/values-en-rPT/strings.xml    |  2 ++
 packages/Keyguard/res/values-eo/strings.xml        |  2 ++
 packages/Keyguard/res/values-es-rCO/strings.xml    |  2 ++
 packages/Keyguard/res/values-es-rMX/strings.xml    |  2 ++
 packages/Keyguard/res/values-frp-rIT/strings.xml   |  2 ++
 packages/Keyguard/res/values-fy-rNL/strings.xml    |  2 ++
 packages/Keyguard/res/values-ga-rIE/strings.xml    |  2 ++
 packages/Keyguard/res/values-gd-rGB/strings.xml    |  2 ++
 packages/Keyguard/res/values-ku/strings.xml        |  2 ++
 packages/Keyguard/res/values-lb/strings.xml        |  2 ++
 packages/Keyguard/res/values-oc-rFR/strings.xml    |  2 ++
 packages/Keyguard/res/values-or-rIN/strings.xml    |  2 ++
 packages/Keyguard/res/values-ug/strings.xml        |  2 ++
 packages/SettingsLib/res/values-as-rIN/arrays.xml  |  2 ++
 packages/SettingsLib/res/values-ast-rES/arrays.xml |  6 ++--
 packages/SettingsLib/res/values-br-rFR/arrays.xml  |  2 ++
 packages/SettingsLib/res/values-csb-rPL/arrays.xml |  2 ++
 packages/SettingsLib/res/values-cy/arrays.xml      |  2 ++
 packages/SettingsLib/res/values-en-rPT/arrays.xml  |  2 ++
 packages/SettingsLib/res/values-eo/arrays.xml      |  6 ++--
 packages/SettingsLib/res/values-es-rCO/arrays.xml  |  2 ++
 packages/SettingsLib/res/values-es-rMX/arrays.xml  |  2 ++
 packages/SettingsLib/res/values-frp-rIT/arrays.xml |  2 ++
 packages/SettingsLib/res/values-fy-rNL/arrays.xml  |  2 ++
 packages/SettingsLib/res/values-ga-rIE/arrays.xml  |  2 ++
 packages/SettingsLib/res/values-gd-rGB/arrays.xml  |  2 ++
 packages/SettingsLib/res/values-ku/arrays.xml      |  2 ++
 packages/SettingsLib/res/values-lb/arrays.xml      |  2 ++
 packages/SettingsLib/res/values-oc-rFR/arrays.xml  |  2 ++
 packages/SettingsLib/res/values-or-rIN/arrays.xml  |  2 ++
 packages/SettingsLib/res/values-ug/arrays.xml      |  4 ++-
 .../StatementService/res/values-as-rIN/strings.xml | 17 +++++++++++
 .../StatementService/res/values-br-rFR/strings.xml | 17 +++++++++++
 .../res/values-csb-rPL/strings.xml                 | 17 +++++++++++
 .../StatementService/res/values-cy/strings.xml     | 17 +++++++++++
 .../StatementService/res/values-en-rPT/strings.xml | 17 +++++++++++
 .../StatementService/res/values-eo/strings.xml     | 17 +++++++++++
 .../StatementService/res/values-es-rCO/strings.xml | 17 +++++++++++
 .../StatementService/res/values-es-rMX/strings.xml | 17 +++++++++++
 .../res/values-frp-rIT/strings.xml                 | 17 +++++++++++
 .../StatementService/res/values-fy-rNL/strings.xml | 17 +++++++++++
 .../StatementService/res/values-ga-rIE/strings.xml | 17 +++++++++++
 .../StatementService/res/values-gd-rGB/strings.xml | 17 +++++++++++
 .../StatementService/res/values-ku/strings.xml     | 17 +++++++++++
 .../StatementService/res/values-lb/strings.xml     | 17 +++++++++++
 .../StatementService/res/values-oc-rFR/strings.xml | 17 +++++++++++
 .../StatementService/res/values-or-rIN/strings.xml | 17 +++++++++++
 packages/SystemUI/res/values-as-rIN/strings.xml    |  1 +
 packages/SystemUI/res/values-ast-rES/strings.xml   |  1 +
 packages/SystemUI/res/values-br-rFR/strings.xml    |  1 +
 packages/SystemUI/res/values-csb-rPL/strings.xml   |  1 +
 packages/SystemUI/res/values-cy/strings.xml        |  1 +
 packages/SystemUI/res/values-en-rPT/strings.xml    |  1 +
 packages/SystemUI/res/values-eo/strings.xml        |  1 +
 packages/SystemUI/res/values-es-rCO/strings.xml    |  1 +
 packages/SystemUI/res/values-es-rMX/strings.xml    |  1 +
 packages/SystemUI/res/values-frp-rIT/strings.xml   |  1 +
 packages/SystemUI/res/values-fy-rNL/strings.xml    |  1 +
 packages/SystemUI/res/values-ga-rIE/strings.xml    |  1 +
 packages/SystemUI/res/values-gd-rGB/strings.xml    |  1 +
 packages/SystemUI/res/values-ku/strings.xml        |  1 +
 packages/SystemUI/res/values-lb/strings.xml        |  1 +
 packages/SystemUI/res/values-oc-rFR/strings.xml    |  1 +
 packages/SystemUI/res/values-or-rIN/strings.xml    |  1 +
 packages/SystemUI/res/values-ug/strings.xml        |  1 +
 103 files changed, 1041 insertions(+), 7 deletions(-)
 create mode 100644 packages/CaptivePortalLogin/res/values-as-rIN/strings.xml
 create mode 100644 packages/CaptivePortalLogin/res/values-br-rFR/strings.xml
 create mode 100644 packages/CaptivePortalLogin/res/values-csb-rPL/strings.xml
 create mode 100644 packages/CaptivePortalLogin/res/values-cy/strings.xml
 create mode 100644 packages/CaptivePortalLogin/res/values-en-rPT/strings.xml
 create mode 100644 packages/CaptivePortalLogin/res/values-eo/strings.xml
 create mode 100644 packages/CaptivePortalLogin/res/values-es-rCO/strings.xml
 create mode 100644 packages/CaptivePortalLogin/res/values-es-rMX/strings.xml
 create mode 100644 packages/CaptivePortalLogin/res/values-frp-rIT/strings.xml
 create mode 100644 packages/CaptivePortalLogin/res/values-fy-rNL/strings.xml
 create mode 100644 packages/CaptivePortalLogin/res/values-ga-rIE/strings.xml
 create mode 100644 packages/CaptivePortalLogin/res/values-gd-rGB/strings.xml
 create mode 100644 packages/CaptivePortalLogin/res/values-oc-rFR/strings.xml
 create mode 100644 packages/CaptivePortalLogin/res/values-or-rIN/strings.xml
 create mode 100644 packages/StatementService/res/values-as-rIN/strings.xml
 create mode 100644 packages/StatementService/res/values-br-rFR/strings.xml
 create mode 100644 packages/StatementService/res/values-csb-rPL/strings.xml
 create mode 100644 packages/StatementService/res/values-cy/strings.xml
 create mode 100644 packages/StatementService/res/values-en-rPT/strings.xml
 create mode 100644 packages/StatementService/res/values-eo/strings.xml
 create mode 100644 packages/StatementService/res/values-es-rCO/strings.xml
 create mode 100644 packages/StatementService/res/values-es-rMX/strings.xml
 create mode 100644 packages/StatementService/res/values-frp-rIT/strings.xml
 create mode 100644 packages/StatementService/res/values-fy-rNL/strings.xml
 create mode 100644 packages/StatementService/res/values-ga-rIE/strings.xml
 create mode 100644 packages/StatementService/res/values-gd-rGB/strings.xml
 create mode 100644 packages/StatementService/res/values-ku/strings.xml
 create mode 100644 packages/StatementService/res/values-lb/strings.xml
 create mode 100644 packages/StatementService/res/values-oc-rFR/strings.xml
 create mode 100644 packages/StatementService/res/values-or-rIN/strings.xml

diff --git a/core/res/res/values-as-rIN/strings.xml b/core/res/res/values-as-rIN/strings.xml
index 58b884b..b4c9596 100644
--- a/core/res/res/values-as-rIN/strings.xml
+++ b/core/res/res/values-as-rIN/strings.xml
@@ -48,6 +48,7 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
+  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -98,6 +99,7 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -107,11 +109,14 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
+  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
+  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -126,15 +131,18 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
+  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -152,11 +160,13 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
+  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
+  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -165,6 +175,7 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
+  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -177,6 +188,7 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
+  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -187,11 +199,13 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
+  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
+  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -453,6 +467,8 @@
   <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
   <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
   <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_acquired_vendor">
+    </string-array>
   <!-- Error message shown when the fingerprint hardware can't be accessed -->
   <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
   <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
@@ -461,6 +477,8 @@
   <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
   <!-- Template to be used to name enrolled fingerprints by default. -->
   <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_error_vendor">
+    </string-array>
   <!-- Content description which should be used for the fingerprint icon. -->
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -549,16 +567,22 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -650,6 +674,7 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
+  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -757,6 +782,7 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -879,6 +905,7 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
+  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -985,9 +1012,11 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
+  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
+  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1038,6 +1067,7 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
+  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1059,11 +1089,13 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
+  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
+  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1074,6 +1106,7 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
+  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1134,6 +1167,7 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
+  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1189,6 +1223,7 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
+  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-ast-rES/strings.xml b/core/res/res/values-ast-rES/strings.xml
index 65cdade..e1b3d01 100644
--- a/core/res/res/values-ast-rES/strings.xml
+++ b/core/res/res/values-ast-rES/strings.xml
@@ -78,6 +78,7 @@
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <string name="defaultMsisdnAlphaTag">MSISDN1</string>
   <!-- For GsmMmiCode.java -->
+  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <string name="mmiError">Hebo un fallu de conexón o\'l códigu MMI nun ye válidu.</string>
@@ -185,6 +186,7 @@
   <string name="peerTtyModeVco">El preséu solicitó\'l mou TTY VCO.</string>
   <string name="peerTtyModeOff">El preséu solicitó\'l mou TTY OFF.</string>
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassVoice">Voz</string>
   <!-- Example: Service was enabled for: Voice, Data -->
@@ -202,6 +204,7 @@
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <string name="serviceClassPAD">PAD</string>
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <skip></skip>
   <!-- Default roaming indicator text -->
   <string name="roamingText0">Indicador d\'itinerancia activáu</string>
   <string name="roamingText1">Indicador d\'itinerancia desactiváu</string>
@@ -221,7 +224,9 @@
   <string name="wfcRegErrorTitle">Llamaes Wifi</string>
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
+  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
+  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <string name="wfcSpnFormat">%s</string>
   <!-- Template for showing operator name for data connection while WFC is active -->
@@ -242,6 +247,7 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
+  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <string name="cfTemplateNotForwarded"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Non esviada</string>
   <!-- Displayed when the call forwarding query was forwarded. -->
@@ -253,11 +259,13 @@
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegisteredTime"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Non esviada</string>
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <string name="fcComplete">Códigu de función completu</string>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <string name="fcError">Hebo un fallu de conexón o\'l códigu de la función nun ye válidu.</string>
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <string name="httpErrorOk">Aceutar</string>
   <!-- Displayed when a web request failed with a generic network error. -->
@@ -291,12 +299,14 @@
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <string name="httpErrorTooManyRequests">Tán procesándose abondes solicitúes. Vuelvi a intentalo dempués.</string>
   <!-- Account notifications -->
+  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <string name="notification_title">Error d\'aniciu de sesión de <xliff:g id="account" example="foo@gmail.com">%1$s</xliff:g></string>
   <!-- Sync notifications -->
+  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <string name="contentServiceSync">Sincronización</string>
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
@@ -312,6 +322,7 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="default">Escosó l\'espaciu d\'almacenamientu del teléfonu. Desanicia dalgunos ficheros pa lliberar espaciu.</string>
   <!-- SSL CA cert notification -->
+  <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">Ye dable que la rede tea supervisada</string>
@@ -328,6 +339,7 @@
          [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_managed">Por <xliff:g id="MANAGING_DOMAIN">%s</xliff:g></string>
   <!-- Work profile deleted notification-->
+  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <string name="work_profile_deleted">Perfil de trabayu desaniciáu</string>
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
@@ -343,6 +355,7 @@
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <string name="work_profile_deleted_description_dpm_wipe">El to perfil de trabayu yá nun ta disponible nesti preséu.</string>
   <!-- Factory reset warning dialog strings-->
+  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <string name="factory_reset_warning">Van desaniciase los datos del preséu</string>
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
@@ -352,6 +365,7 @@
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">Yo</string>
   <!-- Power Dialog -->
+  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="tablet">Opciones de la tablet</string>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -850,6 +864,8 @@
   <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
   <string name="fingerprint_acquired_too_slow">Movisti\'l deu mui lento. Vuelvi intentalo.</string>
   <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_acquired_vendor">
+    </string-array>
   <!-- Error message shown when the fingerprint hardware can't be accessed -->
   <string name="fingerprint_error_hw_not_available">El hardware pa buelgues dixitales nun ta disponible.</string>
   <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
@@ -865,6 +881,8 @@
   <!-- Template to be used to name enrolled fingerprints by default. -->
   <string name="fingerprint_name_template">Deu <xliff:g id="fingerId" example="1">%d</xliff:g></string>
   <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_error_vendor">
+    </string-array>
   <!-- Content description which should be used for the fingerprint icon. -->
   <string name="fingerprint_icon_content_description">Iconu de buelga</string>
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -1042,6 +1060,7 @@
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <string name="policydesc_disableKeyguardFeatures">Evita l\'usu de dalgunes funciones de bloquéu de pantalla.</string>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <string-array name="phoneTypes">
     <item>Casa</item>
@@ -1054,6 +1073,7 @@
     <item>Personalizar</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <string-array name="emailAddressTypes">
     <item>Casa</item>
@@ -1062,6 +1082,7 @@
     <item>Personalizar</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <string-array name="postalAddressTypes">
     <item>Casa</item>
@@ -1070,6 +1091,7 @@
     <item>Personalizar</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <string-array name="imAddressTypes">
     <item>Casa</item>
@@ -1078,6 +1100,7 @@
     <item>Personalizar</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <string-array name="organizationTypes">
     <item>Trabayu</item>
@@ -1085,6 +1108,7 @@
     <item>Personalizar</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <string-array name="imProtocols">
     <item>AIM</item>
@@ -1267,6 +1291,7 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
+  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <string name="lockscreen_carrier_default">Ensin serviciu</string>
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
@@ -1459,6 +1484,7 @@
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">Área pa eslizar</string>
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_symbol_key">\?123</string>
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
@@ -1693,6 +1719,7 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">desaniciar</string>
   <!-- Strings used for search bar -->
+  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">Guetar</string>
@@ -1896,11 +1923,13 @@
          activity chooser. See the "Select an action" title. -->
   <string name="noApplications">Nenguna aplicación pue facer esta aición.</string>
   <!-- Title of the alert when an application has crashed. -->
+  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_application">Detúvose l\'aplicación <xliff:g id="APPLICATION">%1$s</xliff:g>.</string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_process">Detúvose\'l procesu <xliff:g id="PROCESS">%1$s</xliff:g>.</string>
   <!-- Title of the alert when an application is not responding. -->
+  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_application">L\'aplicación <xliff:g id="APPLICATION">%2$s</xliff:g> nun respuende.\n\n¿Quies zarrala?</string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -2005,6 +2034,7 @@
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_notification">Volume de notificaciones</string>
   <!-- Ringtone picker strings -->
+  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <string name="ringtone_default">Tonu predetermináu</string>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
@@ -2065,6 +2095,7 @@
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <string name="select_character">Inxertar carácter</string>
   <!-- SMS per-application rate control Dialog -->
+  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <string name="sms_control_title">Unviando mensaxes SMS\u2026</string>
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
@@ -2074,6 +2105,7 @@
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">Refugar</string>
   <!-- SMS short code verification dialog. -->
+  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_short_code_confirm_message">&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; quier unviar un mensaxe a &lt;b&gt;<xliff:g id="DEST_ADDRESS">%2$s</xliff:g>&lt;/b&gt;.</string>
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
@@ -2093,6 +2125,7 @@
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_never_allow">Nun permitir enxamás</string>
   <!-- SIM swap and device reboot Dialog -->
+  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_removed_title">Tarxeta SIM desaniciada</string>
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
@@ -2204,6 +2237,7 @@
   <string name="fast_scroll_numeric_alphabet"> 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="candidates_style"><u>candidatos</u></string>
   <!-- External media notification strings -->
+  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <string name="ext_media_checking_notification_title">Tresnando\'l mediu <xliff:g id="name" example="SD card">%s</xliff:g></string>
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
@@ -2311,6 +2345,7 @@
   <string name="ime_action_default">Executar</string>
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
+  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <string name="dial_number_using">Marcar númberu\ncon <xliff:g id="NUMBER">%s</xliff:g></string>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
diff --git a/core/res/res/values-br-rFR/strings.xml b/core/res/res/values-br-rFR/strings.xml
index 58b884b..b4c9596 100644
--- a/core/res/res/values-br-rFR/strings.xml
+++ b/core/res/res/values-br-rFR/strings.xml
@@ -48,6 +48,7 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
+  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -98,6 +99,7 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -107,11 +109,14 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
+  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
+  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -126,15 +131,18 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
+  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -152,11 +160,13 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
+  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
+  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -165,6 +175,7 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
+  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -177,6 +188,7 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
+  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -187,11 +199,13 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
+  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
+  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -453,6 +467,8 @@
   <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
   <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
   <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_acquired_vendor">
+    </string-array>
   <!-- Error message shown when the fingerprint hardware can't be accessed -->
   <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
   <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
@@ -461,6 +477,8 @@
   <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
   <!-- Template to be used to name enrolled fingerprints by default. -->
   <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_error_vendor">
+    </string-array>
   <!-- Content description which should be used for the fingerprint icon. -->
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -549,16 +567,22 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -650,6 +674,7 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
+  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -757,6 +782,7 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -879,6 +905,7 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
+  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -985,9 +1012,11 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
+  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
+  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1038,6 +1067,7 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
+  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1059,11 +1089,13 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
+  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
+  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1074,6 +1106,7 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
+  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1134,6 +1167,7 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
+  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1189,6 +1223,7 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
+  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-csb-rPL/strings.xml b/core/res/res/values-csb-rPL/strings.xml
index 58b884b..b4c9596 100644
--- a/core/res/res/values-csb-rPL/strings.xml
+++ b/core/res/res/values-csb-rPL/strings.xml
@@ -48,6 +48,7 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
+  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -98,6 +99,7 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -107,11 +109,14 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
+  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
+  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -126,15 +131,18 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
+  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -152,11 +160,13 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
+  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
+  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -165,6 +175,7 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
+  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -177,6 +188,7 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
+  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -187,11 +199,13 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
+  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
+  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -453,6 +467,8 @@
   <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
   <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
   <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_acquired_vendor">
+    </string-array>
   <!-- Error message shown when the fingerprint hardware can't be accessed -->
   <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
   <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
@@ -461,6 +477,8 @@
   <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
   <!-- Template to be used to name enrolled fingerprints by default. -->
   <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_error_vendor">
+    </string-array>
   <!-- Content description which should be used for the fingerprint icon. -->
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -549,16 +567,22 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -650,6 +674,7 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
+  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -757,6 +782,7 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -879,6 +905,7 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
+  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -985,9 +1012,11 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
+  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
+  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1038,6 +1067,7 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
+  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1059,11 +1089,13 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
+  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
+  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1074,6 +1106,7 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
+  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1134,6 +1167,7 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
+  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1189,6 +1223,7 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
+  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-cy/strings.xml b/core/res/res/values-cy/strings.xml
index 58b884b..b4c9596 100644
--- a/core/res/res/values-cy/strings.xml
+++ b/core/res/res/values-cy/strings.xml
@@ -48,6 +48,7 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
+  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -98,6 +99,7 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -107,11 +109,14 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
+  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
+  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -126,15 +131,18 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
+  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -152,11 +160,13 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
+  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
+  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -165,6 +175,7 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
+  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -177,6 +188,7 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
+  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -187,11 +199,13 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
+  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
+  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -453,6 +467,8 @@
   <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
   <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
   <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_acquired_vendor">
+    </string-array>
   <!-- Error message shown when the fingerprint hardware can't be accessed -->
   <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
   <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
@@ -461,6 +477,8 @@
   <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
   <!-- Template to be used to name enrolled fingerprints by default. -->
   <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_error_vendor">
+    </string-array>
   <!-- Content description which should be used for the fingerprint icon. -->
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -549,16 +567,22 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -650,6 +674,7 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
+  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -757,6 +782,7 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -879,6 +905,7 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
+  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -985,9 +1012,11 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
+  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
+  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1038,6 +1067,7 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
+  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1059,11 +1089,13 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
+  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
+  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1074,6 +1106,7 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
+  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1134,6 +1167,7 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
+  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1189,6 +1223,7 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
+  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-en-rPT/strings.xml b/core/res/res/values-en-rPT/strings.xml
index 58b884b..b4c9596 100644
--- a/core/res/res/values-en-rPT/strings.xml
+++ b/core/res/res/values-en-rPT/strings.xml
@@ -48,6 +48,7 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
+  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -98,6 +99,7 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -107,11 +109,14 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
+  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
+  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -126,15 +131,18 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
+  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -152,11 +160,13 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
+  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
+  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -165,6 +175,7 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
+  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -177,6 +188,7 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
+  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -187,11 +199,13 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
+  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
+  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -453,6 +467,8 @@
   <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
   <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
   <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_acquired_vendor">
+    </string-array>
   <!-- Error message shown when the fingerprint hardware can't be accessed -->
   <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
   <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
@@ -461,6 +477,8 @@
   <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
   <!-- Template to be used to name enrolled fingerprints by default. -->
   <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_error_vendor">
+    </string-array>
   <!-- Content description which should be used for the fingerprint icon. -->
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -549,16 +567,22 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -650,6 +674,7 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
+  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -757,6 +782,7 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -879,6 +905,7 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
+  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -985,9 +1012,11 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
+  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
+  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1038,6 +1067,7 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
+  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1059,11 +1089,13 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
+  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
+  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1074,6 +1106,7 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
+  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1134,6 +1167,7 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
+  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1189,6 +1223,7 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
+  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-eo/strings.xml b/core/res/res/values-eo/strings.xml
index f58ee6e..67cf790 100644
--- a/core/res/res/values-eo/strings.xml
+++ b/core/res/res/values-eo/strings.xml
@@ -63,6 +63,7 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
+  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -116,6 +117,7 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -125,11 +127,14 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
+  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
+  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <string name="wfcSpnFormat">%s</string>
   <!-- Template for showing operator name for data connection while WFC is active -->
@@ -146,15 +151,18 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
+  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -172,11 +180,13 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
+  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
+  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -185,6 +195,7 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
+  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -197,6 +208,7 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
+  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -207,12 +219,14 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
+  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">Mi</string>
   <!-- Power Dialog -->
+  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -485,6 +499,8 @@
   <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
   <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
   <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_acquired_vendor">
+    </string-array>
   <!-- Error message shown when the fingerprint hardware can't be accessed -->
   <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
   <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
@@ -493,6 +509,8 @@
   <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
   <!-- Template to be used to name enrolled fingerprints by default. -->
   <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_error_vendor">
+    </string-array>
   <!-- Content description which should be used for the fingerprint icon. -->
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -581,16 +599,22 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <string name="phoneTypeCustom">Propra</string>
@@ -698,6 +722,7 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
+  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -810,6 +835,7 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -941,6 +967,7 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">forigi</string>
   <!-- Strings used for search bar -->
+  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">Serĉi</string>
@@ -1073,9 +1100,11 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
+  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
+  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1126,6 +1155,7 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
+  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1147,6 +1177,7 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
+  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
@@ -1154,6 +1185,7 @@
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">Malpermesi</string>
   <!-- SMS short code verification dialog. -->
+  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1166,6 +1198,7 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
+  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1228,6 +1261,7 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
+  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1287,6 +1321,7 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
+  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-es-rCO/strings.xml b/core/res/res/values-es-rCO/strings.xml
index 58b884b..b4c9596 100644
--- a/core/res/res/values-es-rCO/strings.xml
+++ b/core/res/res/values-es-rCO/strings.xml
@@ -48,6 +48,7 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
+  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -98,6 +99,7 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -107,11 +109,14 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
+  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
+  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -126,15 +131,18 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
+  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -152,11 +160,13 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
+  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
+  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -165,6 +175,7 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
+  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -177,6 +188,7 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
+  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -187,11 +199,13 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
+  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
+  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -453,6 +467,8 @@
   <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
   <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
   <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_acquired_vendor">
+    </string-array>
   <!-- Error message shown when the fingerprint hardware can't be accessed -->
   <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
   <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
@@ -461,6 +477,8 @@
   <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
   <!-- Template to be used to name enrolled fingerprints by default. -->
   <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_error_vendor">
+    </string-array>
   <!-- Content description which should be used for the fingerprint icon. -->
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -549,16 +567,22 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -650,6 +674,7 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
+  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -757,6 +782,7 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -879,6 +905,7 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
+  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -985,9 +1012,11 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
+  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
+  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1038,6 +1067,7 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
+  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1059,11 +1089,13 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
+  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
+  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1074,6 +1106,7 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
+  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1134,6 +1167,7 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
+  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1189,6 +1223,7 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
+  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-es-rMX/strings.xml b/core/res/res/values-es-rMX/strings.xml
index 58b884b..b4c9596 100644
--- a/core/res/res/values-es-rMX/strings.xml
+++ b/core/res/res/values-es-rMX/strings.xml
@@ -48,6 +48,7 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
+  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -98,6 +99,7 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -107,11 +109,14 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
+  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
+  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -126,15 +131,18 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
+  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -152,11 +160,13 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
+  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
+  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -165,6 +175,7 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
+  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -177,6 +188,7 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
+  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -187,11 +199,13 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
+  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
+  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -453,6 +467,8 @@
   <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
   <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
   <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_acquired_vendor">
+    </string-array>
   <!-- Error message shown when the fingerprint hardware can't be accessed -->
   <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
   <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
@@ -461,6 +477,8 @@
   <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
   <!-- Template to be used to name enrolled fingerprints by default. -->
   <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_error_vendor">
+    </string-array>
   <!-- Content description which should be used for the fingerprint icon. -->
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -549,16 +567,22 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -650,6 +674,7 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
+  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -757,6 +782,7 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -879,6 +905,7 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
+  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -985,9 +1012,11 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
+  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
+  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1038,6 +1067,7 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
+  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1059,11 +1089,13 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
+  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
+  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1074,6 +1106,7 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
+  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1134,6 +1167,7 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
+  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1189,6 +1223,7 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
+  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-frp-rIT/strings.xml b/core/res/res/values-frp-rIT/strings.xml
index 58b884b..b4c9596 100644
--- a/core/res/res/values-frp-rIT/strings.xml
+++ b/core/res/res/values-frp-rIT/strings.xml
@@ -48,6 +48,7 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
+  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -98,6 +99,7 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -107,11 +109,14 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
+  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
+  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -126,15 +131,18 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
+  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -152,11 +160,13 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
+  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
+  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -165,6 +175,7 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
+  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -177,6 +188,7 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
+  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -187,11 +199,13 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
+  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
+  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -453,6 +467,8 @@
   <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
   <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
   <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_acquired_vendor">
+    </string-array>
   <!-- Error message shown when the fingerprint hardware can't be accessed -->
   <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
   <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
@@ -461,6 +477,8 @@
   <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
   <!-- Template to be used to name enrolled fingerprints by default. -->
   <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_error_vendor">
+    </string-array>
   <!-- Content description which should be used for the fingerprint icon. -->
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -549,16 +567,22 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -650,6 +674,7 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
+  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -757,6 +782,7 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -879,6 +905,7 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
+  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -985,9 +1012,11 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
+  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
+  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1038,6 +1067,7 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
+  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1059,11 +1089,13 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
+  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
+  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1074,6 +1106,7 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
+  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1134,6 +1167,7 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
+  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1189,6 +1223,7 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
+  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-fy-rNL/strings.xml b/core/res/res/values-fy-rNL/strings.xml
index 58b884b..b4c9596 100644
--- a/core/res/res/values-fy-rNL/strings.xml
+++ b/core/res/res/values-fy-rNL/strings.xml
@@ -48,6 +48,7 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
+  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -98,6 +99,7 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -107,11 +109,14 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
+  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
+  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -126,15 +131,18 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
+  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -152,11 +160,13 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
+  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
+  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -165,6 +175,7 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
+  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -177,6 +188,7 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
+  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -187,11 +199,13 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
+  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
+  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -453,6 +467,8 @@
   <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
   <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
   <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_acquired_vendor">
+    </string-array>
   <!-- Error message shown when the fingerprint hardware can't be accessed -->
   <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
   <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
@@ -461,6 +477,8 @@
   <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
   <!-- Template to be used to name enrolled fingerprints by default. -->
   <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_error_vendor">
+    </string-array>
   <!-- Content description which should be used for the fingerprint icon. -->
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -549,16 +567,22 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -650,6 +674,7 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
+  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -757,6 +782,7 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -879,6 +905,7 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
+  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -985,9 +1012,11 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
+  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
+  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1038,6 +1067,7 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
+  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1059,11 +1089,13 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
+  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
+  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1074,6 +1106,7 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
+  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1134,6 +1167,7 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
+  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1189,6 +1223,7 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
+  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-ga-rIE/strings.xml b/core/res/res/values-ga-rIE/strings.xml
index 58b884b..b4c9596 100644
--- a/core/res/res/values-ga-rIE/strings.xml
+++ b/core/res/res/values-ga-rIE/strings.xml
@@ -48,6 +48,7 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
+  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -98,6 +99,7 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -107,11 +109,14 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
+  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
+  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -126,15 +131,18 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
+  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -152,11 +160,13 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
+  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
+  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -165,6 +175,7 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
+  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -177,6 +188,7 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
+  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -187,11 +199,13 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
+  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
+  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -453,6 +467,8 @@
   <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
   <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
   <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_acquired_vendor">
+    </string-array>
   <!-- Error message shown when the fingerprint hardware can't be accessed -->
   <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
   <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
@@ -461,6 +477,8 @@
   <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
   <!-- Template to be used to name enrolled fingerprints by default. -->
   <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_error_vendor">
+    </string-array>
   <!-- Content description which should be used for the fingerprint icon. -->
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -549,16 +567,22 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -650,6 +674,7 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
+  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -757,6 +782,7 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -879,6 +905,7 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
+  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -985,9 +1012,11 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
+  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
+  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1038,6 +1067,7 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
+  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1059,11 +1089,13 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
+  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
+  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1074,6 +1106,7 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
+  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1134,6 +1167,7 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
+  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1189,6 +1223,7 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
+  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-gd-rGB/strings.xml b/core/res/res/values-gd-rGB/strings.xml
index 58b884b..b4c9596 100644
--- a/core/res/res/values-gd-rGB/strings.xml
+++ b/core/res/res/values-gd-rGB/strings.xml
@@ -48,6 +48,7 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
+  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -98,6 +99,7 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -107,11 +109,14 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
+  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
+  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -126,15 +131,18 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
+  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -152,11 +160,13 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
+  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
+  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -165,6 +175,7 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
+  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -177,6 +188,7 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
+  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -187,11 +199,13 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
+  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
+  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -453,6 +467,8 @@
   <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
   <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
   <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_acquired_vendor">
+    </string-array>
   <!-- Error message shown when the fingerprint hardware can't be accessed -->
   <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
   <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
@@ -461,6 +477,8 @@
   <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
   <!-- Template to be used to name enrolled fingerprints by default. -->
   <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_error_vendor">
+    </string-array>
   <!-- Content description which should be used for the fingerprint icon. -->
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -549,16 +567,22 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -650,6 +674,7 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
+  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -757,6 +782,7 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -879,6 +905,7 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
+  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -985,9 +1012,11 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
+  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
+  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1038,6 +1067,7 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
+  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1059,11 +1089,13 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
+  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
+  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1074,6 +1106,7 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
+  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1134,6 +1167,7 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
+  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1189,6 +1223,7 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
+  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-ku/strings.xml b/core/res/res/values-ku/strings.xml
index d4c50e2..fc74ec6 100644
--- a/core/res/res/values-ku/strings.xml
+++ b/core/res/res/values-ku/strings.xml
@@ -58,6 +58,7 @@
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <string name="defaultMsisdnAlphaTag">MSISDN1</string>
   <!-- For GsmMmiCode.java -->
+  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <string name="mmiError">کێشه‌ی په‌یوه‌ندی هه‌یه‌ یان کۆدی MMI ناڕاستە.</string>
@@ -159,6 +160,7 @@
   <string name="RestrictedOnAll">هه‌موو خزمەتگوزارییەکانی ده‌نگ، داتا و کورتەنامە به‌ستراون.</string>
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassVoice">ده‌نگ</string>
   <!-- Example: Service was enabled for: Voice, Data -->
@@ -176,6 +178,7 @@
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <string name="serviceClassPAD">نەزانراو</string>
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <skip></skip>
   <!-- Default roaming indicator text -->
   <string name="roamingText0">دیارخه‌ری ڕۆمینگ هەڵکراوە</string>
   <string name="roamingText1">دیارخه‌ری ڕۆمینگ کوژاوه‌ته‌وه‌</string>
@@ -194,7 +197,9 @@
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
+  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
+  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -209,6 +214,7 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
+  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <string name="cfTemplateNotForwarded"><xliff:g id="bearer_service_code">{0}</xliff:g>: پەیوەندی ئاراستە نەکراوە</string>
   <!-- Displayed when the call forwarding query was forwarded. -->
@@ -220,11 +226,13 @@
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegisteredTime"><xliff:g id="bearer_service_code">{0}</xliff:g>: پەیوەندی  ئاراستە نەکراوە</string>
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <string name="fcComplete">کۆدی تایبەت ته‌واو بوو.</string>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <string name="fcError">کێشه‌ی گرێدان هه‌یه‌ یان کۆدی تایبەت ناڕاسته‌.</string>
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <string name="httpErrorOk">باشه‌</string>
   <!-- Displayed when a web request failed with a generic network error. -->
@@ -258,12 +266,14 @@
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <string name="httpErrorTooManyRequests">داواکاریی زۆر خراوه‌ته‌ ڕوو. دواتر هه‌وڵبده‌وه‌.</string>
   <!-- Account notifications -->
+  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <string name="notification_title">هه‌ڵه‌ له‌ چوونه‌ژووره‌وه‌ بۆ <xliff:g id="account" example="foo@gmail.com">%1$s</xliff:g></string>
   <!-- Sync notifications -->
+  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <string name="contentServiceSync">هاوکاتگەری</string>
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
@@ -277,6 +287,7 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="default">بیرگه‌ی تەلەفۆن پڕە. هه‌ندێک فایل بسڕه‌وه‌ بۆ ئازادکردنی بۆشایی.</string>
   <!-- SSL CA cert notification -->
+  <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>
@@ -292,6 +303,7 @@
          [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_managed">له‌لایه‌ن <xliff:g id="managing_domain">%s</xliff:g></string>
   <!-- Work profile deleted notification-->
+  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -302,12 +314,14 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
+  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">من</string>
   <!-- Power Dialog -->
+  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="tablet">بژارده‌کانی تابلێت</string>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -805,6 +819,8 @@
   <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
   <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
   <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_acquired_vendor">
+    </string-array>
   <!-- Error message shown when the fingerprint hardware can't be accessed -->
   <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
   <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
@@ -813,6 +829,8 @@
   <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
   <!-- Template to be used to name enrolled fingerprints by default. -->
   <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_error_vendor">
+    </string-array>
   <!-- Content description which should be used for the fingerprint icon. -->
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readSyncSettings">خوێندنەوەی زانیاریەکەنی هاوتاکردن</string>
@@ -947,6 +965,7 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <string-array name="phoneTypes">
     <item>ماڵ</item>
@@ -959,6 +978,7 @@
     <item>دروستکراو</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <string-array name="emailAddressTypes">
     <item>ماڵ</item>
@@ -967,6 +987,7 @@
     <item>دروستکراو</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <string-array name="postalAddressTypes">
     <item>ماڵ</item>
@@ -975,6 +996,7 @@
     <item>دروستکراو</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <string-array name="imAddressTypes">
     <item>ماڵ</item>
@@ -983,6 +1005,7 @@
     <item>دروستکراو</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <string-array name="organizationTypes">
     <item>کار</item>
@@ -990,6 +1013,7 @@
     <item>دروستکراو</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <string-array name="imProtocols">
     <item>ئامانج</item>
@@ -1172,6 +1196,7 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
+  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <string name="lockscreen_carrier_default">خزمەتگوزاری نیە.</string>
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
@@ -1387,6 +1412,7 @@
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">ناوچەی لادان.</string>
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_symbol_key">\?123</string>
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
@@ -1618,6 +1644,7 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">سڕینەوە</string>
   <!-- Strings used for search bar -->
+  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">گەڕان</string>
@@ -1806,11 +1833,13 @@
          activity chooser. See the "Select an action" title. -->
   <string name="noApplications">‌هیچ بەرنامەیەک ناتوانێت ڕۆڵی ئەم چالاکیە ببینێت.</string>
   <!-- Title of the alert when an application has crashed. -->
+  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_application">بەداخەوە, <xliff:g id="application">%1$s</xliff:g>وەستا.</string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_process">بەداخەوە پرۆسەکە <xliff:g id="process">%1$s</xliff:g> وەستا.</string>
   <!-- Title of the alert when an application is not responding. -->
+  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_application"><xliff:g id="بەرنامە">%2$s</xliff:g> وەڵام نادانتەوە.\n\nئەتەوێت دایخەیت?</string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1909,6 +1938,7 @@
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_notification">ده‌نگی تێبینی</string>
   <!-- Ringtone picker strings -->
+  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <string name="ringtone_default">زەنگی بنەڕەتی</string>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
@@ -1962,6 +1992,7 @@
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <string name="select_character">تێخستنی نووسە</string>
   <!-- SMS per-application rate control Dialog -->
+  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <string name="sms_control_title">ناردنی کورتە نامە</string>
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
@@ -1971,6 +2002,7 @@
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">نکوڵی</string>
   <!-- SMS short code verification dialog. -->
+  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_short_code_confirm_message">وlt;bوgt;<xliff:g id="app_name">%1$s</xliff:g>وlt;/bوgt; داخوازی ناردنی کورتە نامەی بۆ وlt;bوgt;<xliff:g id="dest_address">%2$s</xliff:g>وlt;/bوgt;.</string>
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
@@ -1988,6 +2020,7 @@
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_never_allow">هەرگیز ڕێگە مەدە</string>
   <!-- SIM swap and device reboot Dialog -->
+  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_removed_title">سیمکارتەکە دەرکرا</string>
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
@@ -2089,6 +2122,7 @@
   <string name="fast_scroll_numeric_alphabet">\u00200123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="candidates_style"><u>دەستنیشانکراوەکان</u></string>
   <!-- External media notification strings -->
+  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -2156,6 +2190,7 @@
   <string name="ime_action_default">بەجێهێنان</string>
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
+  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <string name="dial_number_using">ژمارە بگرە\nبە بەکارهێنانی <xliff:g id="number" example="555">%s</xliff:g></string>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
diff --git a/core/res/res/values-lb/strings.xml b/core/res/res/values-lb/strings.xml
index f89fc67..a6416ed 100644
--- a/core/res/res/values-lb/strings.xml
+++ b/core/res/res/values-lb/strings.xml
@@ -71,6 +71,7 @@
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <string name="defaultMsisdnAlphaTag">MSISDN1</string>
   <!-- For GsmMmiCode.java -->
+  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <string name="mmiError">Connectiounsproblem oder ongëltegen MMI-Code.</string>
@@ -178,6 +179,7 @@
   <string name="peerTtyModeVco">Peer huet TTY-Modus \"VCO\" ugefrot</string>
   <string name="peerTtyModeOff">Peer huet TTY-Modus \"Aus\" ugefrot</string>
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassVoice">Stëmm</string>
   <!-- Example: Service was enabled for: Voice, Data -->
@@ -195,6 +197,7 @@
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <string name="serviceClassPAD">PAD</string>
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <skip></skip>
   <!-- Default roaming indicator text -->
   <string name="roamingText0">Roaming-Anzeig un</string>
   <string name="roamingText1">Roaming-Anzeig aus</string>
@@ -213,7 +216,9 @@
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
+  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
+  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -228,6 +233,7 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
+  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <string name="cfTemplateNotForwarded"><xliff:g id="bearer_service_code">{0}</xliff:g>: Net weidergeleet</string>
   <!-- Displayed when the call forwarding query was forwarded. -->
@@ -239,11 +245,13 @@
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegisteredTime"><xliff:g id="bearer_service_code">{0}</xliff:g>: Net weidergeleet</string>
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <string name="fcComplete">Funktiounscode ofgeschloss.</string>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <string name="fcError">Connectiounsproblem oder ongëltege Funktiounscode.</string>
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <string name="httpErrorOk">OK</string>
   <!-- Displayed when a web request failed with a generic network error. -->
@@ -277,12 +285,14 @@
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <string name="httpErrorTooManyRequests">Et ginn ze vill Ufroe beaarbecht. Probéier méi spéit nees.</string>
   <!-- Account notifications -->
+  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <string name="notification_title">Feeler bei der Umeldung fir <xliff:g id="account" example="foo@gmail.com">%1$s</xliff:g></string>
   <!-- Sync notifications -->
+  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <string name="contentServiceSync">Sync</string>
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
@@ -298,6 +308,7 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="default">Den Telefonsspäicher ass voll. Läsch Dateien, fir Späicherplaz fräizeginn.</string>
   <!-- SSL CA cert notification -->
+  <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>
@@ -314,6 +325,7 @@
          [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_managed">Vu(n) <xliff:g id="managing_domain">%s</xliff:g></string>
   <!-- Work profile deleted notification-->
+  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <string name="work_profile_deleted">Aarbechtsprofil geläscht</string>
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
@@ -327,6 +339,7 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
+  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <string name="factory_reset_warning">Däin Apparat gëtt geläscht</string>
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
@@ -335,6 +348,7 @@
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">Ech</string>
   <!-- Power Dialog -->
+  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="tablet">Tabletoptiounen</string>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -800,6 +814,8 @@
   <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
   <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
   <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_acquired_vendor">
+    </string-array>
   <!-- Error message shown when the fingerprint hardware can't be accessed -->
   <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
   <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
@@ -808,6 +824,8 @@
   <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
   <!-- Template to be used to name enrolled fingerprints by default. -->
   <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_error_vendor">
+    </string-array>
   <!-- Content description which should be used for the fingerprint icon. -->
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readSyncSettings">Synchroniséierungsastellunge liesen</string>
@@ -967,6 +985,7 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <string-array name="phoneTypes">
     <item>Doheem</item>
@@ -979,6 +998,7 @@
     <item>Personaliséiert</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <string-array name="emailAddressTypes">
     <item>Doheem</item>
@@ -987,6 +1007,7 @@
     <item>Personaliséiert</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <string-array name="postalAddressTypes">
     <item>Doheem</item>
@@ -995,6 +1016,7 @@
     <item>Personaliséiert</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <string-array name="imAddressTypes">
     <item>Doheem</item>
@@ -1003,6 +1025,7 @@
     <item>Personaliséiert</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <string-array name="organizationTypes">
     <item>Aarbecht</item>
@@ -1010,6 +1033,7 @@
     <item>Personaliséiert</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <string-array name="imProtocols">
     <item>AIM</item>
@@ -1192,6 +1216,7 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
+  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <string name="lockscreen_carrier_default">Kee Service.</string>
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
@@ -1383,6 +1408,7 @@ Kontaktéier däi Provider fir eng aner SIM-Kaart ze kréien.</string>
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">Beräich fir Fangerbeweegung.</string>
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_symbol_key">\?123</string>
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
@@ -1605,6 +1631,7 @@ Kontaktéier däi Provider fir eng aner SIM-Kaart ze kréien.</string>
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">läschen</string>
   <!-- Strings used for search bar -->
+  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">Sichen</string>
@@ -1808,11 +1835,13 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
          activity chooser. See the "Select an action" title. -->
   <string name="noApplications">Dës Aktioun ka vu kenger App duerchgefouert ginn.</string>
   <!-- Title of the alert when an application has crashed. -->
+  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_application">Leider huet <xliff:g id="application">%1$s</xliff:g> opgehale mat Funktionéieren.</string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_process">Leider gouf de Prozess <xliff:g id="process">%1$s</xliff:g> gestoppt.</string>
   <!-- Title of the alert when an application is not responding. -->
+  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_application"><xliff:g id="application">%2$s</xliff:g> äntwert net.\n\nWëlls de d\'App zoumaachen?</string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1908,6 +1937,7 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_notification">Notifikatiounslautstäerkt</string>
   <!-- Ringtone picker strings -->
+  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <string name="ringtone_default">Standardschelltoun</string>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
@@ -1962,6 +1992,7 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <string name="select_character">Zeechen aginn</string>
   <!-- SMS per-application rate control Dialog -->
+  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <string name="sms_control_title">SMS-Messagë gi geschéckt</string>
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
@@ -1971,6 +2002,7 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">Verweigeren</string>
   <!-- SMS short code verification dialog. -->
+  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_short_code_confirm_message">&lt;b&gt;<xliff:g id="app_name">%1$s</xliff:g>&lt;/b&gt; wëll e Message un &lt;b&gt;<xliff:g id="dest_address">%2$s</xliff:g>&lt;/b&gt; schécken.</string>
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
@@ -1990,6 +2022,7 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_never_allow">Ni erlaben</string>
   <!-- SIM swap and device reboot Dialog -->
+  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_removed_title">SIM-Kaart erausgeholl</string>
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
@@ -2097,6 +2130,7 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <string name="fast_scroll_numeric_alphabet">\u00200123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="candidates_style"><u>Kandidaten</u></string>
   <!-- External media notification strings -->
+  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -2165,6 +2199,7 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <string name="ime_action_default">Ausféieren</string>
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
+  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <string name="dial_number_using">Nummer\nmat <xliff:g id="number" example="555">%s</xliff:g> auswielen</string>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
diff --git a/core/res/res/values-oc-rFR/strings.xml b/core/res/res/values-oc-rFR/strings.xml
index 58b884b..b4c9596 100644
--- a/core/res/res/values-oc-rFR/strings.xml
+++ b/core/res/res/values-oc-rFR/strings.xml
@@ -48,6 +48,7 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
+  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -98,6 +99,7 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -107,11 +109,14 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
+  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
+  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -126,15 +131,18 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
+  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -152,11 +160,13 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
+  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
+  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -165,6 +175,7 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
+  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -177,6 +188,7 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
+  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -187,11 +199,13 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
+  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
+  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -453,6 +467,8 @@
   <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
   <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
   <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_acquired_vendor">
+    </string-array>
   <!-- Error message shown when the fingerprint hardware can't be accessed -->
   <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
   <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
@@ -461,6 +477,8 @@
   <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
   <!-- Template to be used to name enrolled fingerprints by default. -->
   <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_error_vendor">
+    </string-array>
   <!-- Content description which should be used for the fingerprint icon. -->
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -549,16 +567,22 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -650,6 +674,7 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
+  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -757,6 +782,7 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -879,6 +905,7 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
+  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -985,9 +1012,11 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
+  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
+  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1038,6 +1067,7 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
+  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1059,11 +1089,13 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
+  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
+  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1074,6 +1106,7 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
+  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1134,6 +1167,7 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
+  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1189,6 +1223,7 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
+  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-or-rIN/strings.xml b/core/res/res/values-or-rIN/strings.xml
index 58b884b..b4c9596 100644
--- a/core/res/res/values-or-rIN/strings.xml
+++ b/core/res/res/values-or-rIN/strings.xml
@@ -48,6 +48,7 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
+  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -98,6 +99,7 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -107,11 +109,14 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
+  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
+  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -126,15 +131,18 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
+  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -152,11 +160,13 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
+  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
+  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -165,6 +175,7 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
+  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -177,6 +188,7 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
+  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -187,11 +199,13 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
+  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
+  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -453,6 +467,8 @@
   <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
   <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
   <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_acquired_vendor">
+    </string-array>
   <!-- Error message shown when the fingerprint hardware can't be accessed -->
   <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
   <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
@@ -461,6 +477,8 @@
   <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
   <!-- Template to be used to name enrolled fingerprints by default. -->
   <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_error_vendor">
+    </string-array>
   <!-- Content description which should be used for the fingerprint icon. -->
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -549,16 +567,22 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -650,6 +674,7 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
+  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -757,6 +782,7 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -879,6 +905,7 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
+  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -985,9 +1012,11 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
+  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
+  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1038,6 +1067,7 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
+  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1059,11 +1089,13 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
+  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
+  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1074,6 +1106,7 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
+  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1134,6 +1167,7 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
+  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1189,6 +1223,7 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
+  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-ug/strings.xml b/core/res/res/values-ug/strings.xml
index a5d9d1e..1ca6003 100644
--- a/core/res/res/values-ug/strings.xml
+++ b/core/res/res/values-ug/strings.xml
@@ -60,6 +60,7 @@
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <string name="defaultMsisdnAlphaTag">MSISDN1</string>
   <!-- For GsmMmiCode.java -->
+  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <string name="mmiError">باغلىنىشتا مەسىلە كۆرۈلدى ياكى MMI كودى خاتا.</string>
@@ -157,6 +158,7 @@
   <string name="RestrictedOnAll">بارلىق ئاۋاز/سانلىق مەلۇمات/قىسقا ئۇچۇر مۇلازىمىتى توختىتىلدى.</string>
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassVoice">ئاۋاز</string>
   <!-- Example: Service was enabled for: Voice, Data -->
@@ -174,6 +176,7 @@
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <string name="serviceClassPAD">PAD</string>
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <skip></skip>
   <!-- Default roaming indicator text -->
   <string name="roamingText0">كەزمە كۆرسەتكۈچ ئوچۇق</string>
   <string name="roamingText1">كەزمە كۆرسەتكۈچ تاقاق</string>
@@ -192,7 +195,9 @@
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
+  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
+  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -207,6 +212,7 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
+  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <string name="cfTemplateNotForwarded"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>:ئۇلاپ يۆتكىيەلمىدى</string>
   <!-- Displayed when the call forwarding query was forwarded. -->
@@ -218,11 +224,13 @@
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegisteredTime"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>:ئۇلاپ يۆتكىيەلمىدى</string>
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <string name="fcComplete">ئىقتىدار كودى تاماملاندى.</string>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <string name="fcError">باغلىنىشتا مەسىلە كۆرۈلدى ياكى ئىقتىدار كودى ئىناۋەتسىز.</string>
   <!-- android.net.http Error strings -->
+  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <string name="httpErrorOk">جەزملە</string>
   <!-- Displayed when a web request failed with a generic network error. -->
@@ -256,12 +264,14 @@
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <string name="httpErrorTooManyRequests">بىر تەرەپ قىلىۋاتقان ئىلتىماس بەك كۆپ. سەل تۇرۇپ قايتا سىناڭ.</string>
   <!-- Account notifications -->
+  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <string name="notification_title"><xliff:g id="ACCOUNT">%1$s</xliff:g> نىڭ تىزىمغا كىرىش خاتالىقى</string>
   <!-- Sync notifications -->
+  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <string name="contentServiceSync">قەدەمداش</string>
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
@@ -275,6 +285,7 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="default">تېلېفون ساقلىغۇچىسى توشتى. بەزى ھۆججەتلەرنى ئۆچۈرۈپ بوشلۇق بىكارلاڭ.</string>
   <!-- SSL CA cert notification -->
+  <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>
@@ -290,6 +301,7 @@
          [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_managed"><xliff:g id="MANAGING_DOMAIN">%s</xliff:g> نازارىتىدە</string>
   <!-- Work profile deleted notification-->
+  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -300,12 +312,14 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
+  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">مەن</string>
   <!-- Power Dialog -->
+  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="tablet">تاختا كومپيۇتېر تاللانمىلار</string>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -741,6 +755,8 @@
   <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
   <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
   <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_acquired_vendor">
+    </string-array>
   <!-- Error message shown when the fingerprint hardware can't be accessed -->
   <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
   <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
@@ -749,6 +765,8 @@
   <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
   <!-- Template to be used to name enrolled fingerprints by default. -->
   <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <string-array name="fingerprint_error_vendor">
+    </string-array>
   <!-- Content description which should be used for the fingerprint icon. -->
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readSyncSettings">قەدەمداش تەڭشىكىنى ئوقۇيدۇ</string>
@@ -879,6 +897,7 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <string-array name="phoneTypes">
     <item>ئۆي</item>
@@ -891,6 +910,7 @@
     <item>ئىختىيارىي</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <string-array name="emailAddressTypes">
     <item>ئۆي</item>
@@ -899,6 +919,7 @@
     <item>ئىختىيارىي</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <string-array name="postalAddressTypes">
     <item>ئۆي</item>
@@ -907,6 +928,7 @@
     <item>ئىختىيارىي</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <string-array name="imAddressTypes">
     <item>ئۆي</item>
@@ -915,6 +937,7 @@
     <item>ئىختىيارىي</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <string-array name="organizationTypes">
     <item>ئىش</item>
@@ -922,6 +945,7 @@
     <item>ئىختىيارىي</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <string-array name="imProtocols">
     <item>AIM</item>
@@ -1104,6 +1128,7 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
+  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <string name="lockscreen_carrier_default">مۇلازىمەت يوق</string>
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
@@ -1282,6 +1307,7 @@
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">سۈرۈش دائىرىسى</string>
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_symbol_key">\?123</string>
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
@@ -1502,6 +1528,7 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">ئۆچۈر</string>
   <!-- Strings used for search bar -->
+  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">ئىزدە</string>
@@ -1687,11 +1714,13 @@
          activity chooser. See the "Select an action" title. -->
   <string name="noApplications">بۇ مەشغۇلاتنى ئىجرا قىلىدىغان ئەپ يوق.</string>
   <!-- Title of the alert when an application has crashed. -->
+  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_application">ناھايىتى ئەپسۇس، <xliff:g id="APPLICATION">%1$s</xliff:g> توختىدى.</string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_process">ناھايىتى ئەپسۇس، <xliff:g id="PROCESS">%1$s</xliff:g> جەريان توختىدى.</string>
   <!-- Title of the alert when an application is not responding. -->
+  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_application"><xliff:g id="APPLICATION">%2$s</xliff:g> ئىنكاس يوق.\n\nئۇنى تاقامسىز؟</string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1785,6 +1814,7 @@
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_notification">ئۇقتۇرۇش ئاۋازى</string>
   <!-- Ringtone picker strings -->
+  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <string name="ringtone_default">كۆڭۈلدىكى قوڭغۇراق ئاۋازى</string>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
@@ -1836,6 +1866,7 @@
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <string name="select_character">ھەرپ قىستۇر</string>
   <!-- SMS per-application rate control Dialog -->
+  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <string name="sms_control_title">قىسقا ئۇچۇر يوللاۋاتىدۇ</string>
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
@@ -1845,6 +1876,7 @@
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">رەت قىل</string>
   <!-- SMS short code verification dialog. -->
+  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_short_code_confirm_message">بىر ئۇچۇرنى &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; ئۆزى &lt;b&gt;<xliff:g id="DEST_ADDRESS">%2$s</xliff:g>&lt;/b&gt; غا يوللىماقچى.</string>
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
@@ -1862,6 +1894,7 @@
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_never_allow">ھەرگىز يول قويما</string>
   <!-- SIM swap and device reboot Dialog -->
+  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_removed_title">SIM كارتا چىقىرىۋېتىلدى</string>
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
@@ -1963,6 +1996,7 @@
   <string name="fast_scroll_numeric_alphabet"> 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="candidates_style"><u>"نامزات"</u></string>
   <!-- External media notification strings -->
+  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -2030,6 +2064,7 @@
   <string name="ime_action_default">ئىجرا قىل</string>
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
+  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <string name="dial_number_using"><xliff:g id="NUMBER">%s</xliff:g> دا نومۇر بۇرا</string>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
diff --git a/core/res/res/values-zh-rTW/cm_strings.xml b/core/res/res/values-zh-rTW/cm_strings.xml
index 587cf06..e9fb31c 100644
--- a/core/res/res/values-zh-rTW/cm_strings.xml
+++ b/core/res/res/values-zh-rTW/cm_strings.xml
@@ -87,7 +87,7 @@
   <string name="silent_mode_priority">優先度</string>
   <string name="silent_mode_none">無</string>
   <!-- Wifi Hotspot disabled due to subscription change -->
-  <string name="subscription_change_disabled_wifi_ap">由於 SIM 卡資訊變更，已停用 Wi-Fi 熱點</string>
+  <string name="subscription_change_disabled_wifi_ap">由於 SIM 卡資訊更改，已停用 Wi-Fi 熱點</string>
   <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">關閉 Wi-Fi</string>
   <!-- Privacy Guard -->
@@ -151,7 +151,7 @@
   <string name="app_ops_write_mms">撰寫多媒體訊息</string>
   <string name="app_ops_write_sms">撰寫簡訊</string>
   <string name="app_ops_use_fingerprint">使用指紋</string>
-  <string name="app_ops_add_voicemail">新增語音訊息</string>
+  <string name="app_ops_add_voicemail">新增語音信箱</string>
   <string name="app_ops_read_phone_state">存取電話狀態</string>
   <string name="app_ops_scan_wifi">掃描 Wi-Fi 網路</string>
   <string name="app_ops_change_wallpaper">更改桌布</string>
diff --git a/packages/CaptivePortalLogin/res/values-as-rIN/strings.xml b/packages/CaptivePortalLogin/res/values-as-rIN/strings.xml
new file mode 100644
index 0000000..70489fb
--- /dev/null
+++ b/packages/CaptivePortalLogin/res/values-as-rIN/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/packages/CaptivePortalLogin/res/values-br-rFR/strings.xml b/packages/CaptivePortalLogin/res/values-br-rFR/strings.xml
new file mode 100644
index 0000000..70489fb
--- /dev/null
+++ b/packages/CaptivePortalLogin/res/values-br-rFR/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/packages/CaptivePortalLogin/res/values-csb-rPL/strings.xml b/packages/CaptivePortalLogin/res/values-csb-rPL/strings.xml
new file mode 100644
index 0000000..70489fb
--- /dev/null
+++ b/packages/CaptivePortalLogin/res/values-csb-rPL/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/packages/CaptivePortalLogin/res/values-cy/strings.xml b/packages/CaptivePortalLogin/res/values-cy/strings.xml
new file mode 100644
index 0000000..70489fb
--- /dev/null
+++ b/packages/CaptivePortalLogin/res/values-cy/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/packages/CaptivePortalLogin/res/values-en-rPT/strings.xml b/packages/CaptivePortalLogin/res/values-en-rPT/strings.xml
new file mode 100644
index 0000000..70489fb
--- /dev/null
+++ b/packages/CaptivePortalLogin/res/values-en-rPT/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/packages/CaptivePortalLogin/res/values-eo/strings.xml b/packages/CaptivePortalLogin/res/values-eo/strings.xml
new file mode 100644
index 0000000..70489fb
--- /dev/null
+++ b/packages/CaptivePortalLogin/res/values-eo/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/packages/CaptivePortalLogin/res/values-es-rCO/strings.xml b/packages/CaptivePortalLogin/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..70489fb
--- /dev/null
+++ b/packages/CaptivePortalLogin/res/values-es-rCO/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/packages/CaptivePortalLogin/res/values-es-rMX/strings.xml b/packages/CaptivePortalLogin/res/values-es-rMX/strings.xml
new file mode 100644
index 0000000..70489fb
--- /dev/null
+++ b/packages/CaptivePortalLogin/res/values-es-rMX/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/packages/CaptivePortalLogin/res/values-frp-rIT/strings.xml b/packages/CaptivePortalLogin/res/values-frp-rIT/strings.xml
new file mode 100644
index 0000000..70489fb
--- /dev/null
+++ b/packages/CaptivePortalLogin/res/values-frp-rIT/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/packages/CaptivePortalLogin/res/values-fy-rNL/strings.xml b/packages/CaptivePortalLogin/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..70489fb
--- /dev/null
+++ b/packages/CaptivePortalLogin/res/values-fy-rNL/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/packages/CaptivePortalLogin/res/values-ga-rIE/strings.xml b/packages/CaptivePortalLogin/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..70489fb
--- /dev/null
+++ b/packages/CaptivePortalLogin/res/values-ga-rIE/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/packages/CaptivePortalLogin/res/values-gd-rGB/strings.xml b/packages/CaptivePortalLogin/res/values-gd-rGB/strings.xml
new file mode 100644
index 0000000..70489fb
--- /dev/null
+++ b/packages/CaptivePortalLogin/res/values-gd-rGB/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/packages/CaptivePortalLogin/res/values-oc-rFR/strings.xml b/packages/CaptivePortalLogin/res/values-oc-rFR/strings.xml
new file mode 100644
index 0000000..70489fb
--- /dev/null
+++ b/packages/CaptivePortalLogin/res/values-oc-rFR/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/packages/CaptivePortalLogin/res/values-or-rIN/strings.xml b/packages/CaptivePortalLogin/res/values-or-rIN/strings.xml
new file mode 100644
index 0000000..70489fb
--- /dev/null
+++ b/packages/CaptivePortalLogin/res/values-or-rIN/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>
diff --git a/packages/Keyguard/res/values-as-rIN/strings.xml b/packages/Keyguard/res/values-as-rIN/strings.xml
index b53b53e..fb28fd3 100644
--- a/packages/Keyguard/res/values-as-rIN/strings.xml
+++ b/packages/Keyguard/res/values-as-rIN/strings.xml
@@ -45,6 +45,7 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
+  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -69,6 +70,7 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
+  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-ast-rES/strings.xml b/packages/Keyguard/res/values-ast-rES/strings.xml
index c268778..37a1824 100644
--- a/packages/Keyguard/res/values-ast-rES/strings.xml
+++ b/packages/Keyguard/res/values-ast-rES/strings.xml
@@ -60,6 +60,7 @@
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">Empobina al menú pa desbloquiar la pantalla.</string>
   <!-- SIM messages -->
+  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">Bloquiada pa la rede</string>
   <!-- Shown when there is no SIM card. -->
@@ -101,6 +102,7 @@
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_next_alarm">Próxima alarma afitada a les <xliff:g id="alarm" example="Fri 8:30 AM">%1$s</xliff:g></string>
   <!-- KeyguardPinView - accessibility support -->
+  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">Desaniciar</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-br-rFR/strings.xml b/packages/Keyguard/res/values-br-rFR/strings.xml
index b53b53e..fb28fd3 100644
--- a/packages/Keyguard/res/values-br-rFR/strings.xml
+++ b/packages/Keyguard/res/values-br-rFR/strings.xml
@@ -45,6 +45,7 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
+  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -69,6 +70,7 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
+  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-csb-rPL/strings.xml b/packages/Keyguard/res/values-csb-rPL/strings.xml
index b53b53e..fb28fd3 100644
--- a/packages/Keyguard/res/values-csb-rPL/strings.xml
+++ b/packages/Keyguard/res/values-csb-rPL/strings.xml
@@ -45,6 +45,7 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
+  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -69,6 +70,7 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
+  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-cy/strings.xml b/packages/Keyguard/res/values-cy/strings.xml
index b53b53e..fb28fd3 100644
--- a/packages/Keyguard/res/values-cy/strings.xml
+++ b/packages/Keyguard/res/values-cy/strings.xml
@@ -45,6 +45,7 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
+  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -69,6 +70,7 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
+  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-en-rPT/strings.xml b/packages/Keyguard/res/values-en-rPT/strings.xml
index b53b53e..fb28fd3 100644
--- a/packages/Keyguard/res/values-en-rPT/strings.xml
+++ b/packages/Keyguard/res/values-en-rPT/strings.xml
@@ -45,6 +45,7 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
+  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -69,6 +70,7 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
+  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-eo/strings.xml b/packages/Keyguard/res/values-eo/strings.xml
index 170dcac..798b667 100644
--- a/packages/Keyguard/res/values-eo/strings.xml
+++ b/packages/Keyguard/res/values-eo/strings.xml
@@ -45,6 +45,7 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
+  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -69,6 +70,7 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
+  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">Forigi</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-es-rCO/strings.xml b/packages/Keyguard/res/values-es-rCO/strings.xml
index b53b53e..fb28fd3 100644
--- a/packages/Keyguard/res/values-es-rCO/strings.xml
+++ b/packages/Keyguard/res/values-es-rCO/strings.xml
@@ -45,6 +45,7 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
+  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -69,6 +70,7 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
+  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-es-rMX/strings.xml b/packages/Keyguard/res/values-es-rMX/strings.xml
index b53b53e..fb28fd3 100644
--- a/packages/Keyguard/res/values-es-rMX/strings.xml
+++ b/packages/Keyguard/res/values-es-rMX/strings.xml
@@ -45,6 +45,7 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
+  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -69,6 +70,7 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
+  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-frp-rIT/strings.xml b/packages/Keyguard/res/values-frp-rIT/strings.xml
index b53b53e..fb28fd3 100644
--- a/packages/Keyguard/res/values-frp-rIT/strings.xml
+++ b/packages/Keyguard/res/values-frp-rIT/strings.xml
@@ -45,6 +45,7 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
+  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -69,6 +70,7 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
+  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-fy-rNL/strings.xml b/packages/Keyguard/res/values-fy-rNL/strings.xml
index b53b53e..fb28fd3 100644
--- a/packages/Keyguard/res/values-fy-rNL/strings.xml
+++ b/packages/Keyguard/res/values-fy-rNL/strings.xml
@@ -45,6 +45,7 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
+  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -69,6 +70,7 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
+  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-ga-rIE/strings.xml b/packages/Keyguard/res/values-ga-rIE/strings.xml
index b53b53e..fb28fd3 100644
--- a/packages/Keyguard/res/values-ga-rIE/strings.xml
+++ b/packages/Keyguard/res/values-ga-rIE/strings.xml
@@ -45,6 +45,7 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
+  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -69,6 +70,7 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
+  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-gd-rGB/strings.xml b/packages/Keyguard/res/values-gd-rGB/strings.xml
index b53b53e..fb28fd3 100644
--- a/packages/Keyguard/res/values-gd-rGB/strings.xml
+++ b/packages/Keyguard/res/values-gd-rGB/strings.xml
@@ -45,6 +45,7 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
+  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -69,6 +70,7 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
+  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-ku/strings.xml b/packages/Keyguard/res/values-ku/strings.xml
index 336eff9..5861ec9 100644
--- a/packages/Keyguard/res/values-ku/strings.xml
+++ b/packages/Keyguard/res/values-ku/strings.xml
@@ -56,6 +56,7 @@
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">دەست بنێ بە پێڕستدا بۆ کردنه‌وه‌.</string>
   <!-- SIM messages -->
+  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">تۆڕی نێت داخرا</string>
   <!-- Shown when there is no SIM card. -->
@@ -97,6 +98,7 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
+  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">سڕینه‌وه‌</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-lb/strings.xml b/packages/Keyguard/res/values-lb/strings.xml
index 0763983..2ee72e8 100644
--- a/packages/Keyguard/res/values-lb/strings.xml
+++ b/packages/Keyguard/res/values-lb/strings.xml
@@ -60,6 +60,7 @@
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">Menü drécke fir z\'entspären.</string>
   <!-- SIM messages -->
+  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">Netzwierk gespaart</string>
   <!-- Shown when there is no SIM card. -->
@@ -105,6 +106,7 @@ Kontaktéier däi Provider fir eng aner SIM-Kaart ze kréien.</string>
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_next_alarm">Nächste Wecker gesat fir <xliff:g id="alarm" example="Fri 8:30 AM">%1$s</xliff:g></string>
   <!-- KeyguardPinView - accessibility support -->
+  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">Läschen</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-oc-rFR/strings.xml b/packages/Keyguard/res/values-oc-rFR/strings.xml
index b53b53e..fb28fd3 100644
--- a/packages/Keyguard/res/values-oc-rFR/strings.xml
+++ b/packages/Keyguard/res/values-oc-rFR/strings.xml
@@ -45,6 +45,7 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
+  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -69,6 +70,7 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
+  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-or-rIN/strings.xml b/packages/Keyguard/res/values-or-rIN/strings.xml
index b53b53e..fb28fd3 100644
--- a/packages/Keyguard/res/values-or-rIN/strings.xml
+++ b/packages/Keyguard/res/values-or-rIN/strings.xml
@@ -45,6 +45,7 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
+  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -69,6 +70,7 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
+  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-ug/strings.xml b/packages/Keyguard/res/values-ug/strings.xml
index 6ad14ee..232d6dc 100644
--- a/packages/Keyguard/res/values-ug/strings.xml
+++ b/packages/Keyguard/res/values-ug/strings.xml
@@ -56,6 +56,7 @@
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">Menu نى بېسىپ قۇلۇپنى ئېچىڭ.</string>
   <!-- SIM messages -->
+  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">تور قۇلۇپلانغان</string>
   <!-- Shown when there is no SIM card. -->
@@ -96,6 +97,7 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
+  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">ئۆچۈر</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/SettingsLib/res/values-as-rIN/arrays.xml b/packages/SettingsLib/res/values-as-rIN/arrays.xml
index c46bb71..cfe3657 100644
--- a/packages/SettingsLib/res/values-as-rIN/arrays.xml
+++ b/packages/SettingsLib/res/values-as-rIN/arrays.xml
@@ -21,7 +21,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-ast-rES/arrays.xml b/packages/SettingsLib/res/values-ast-rES/arrays.xml
index 6e3c7ef..944d2b2 100644
--- a/packages/SettingsLib/res/values-ast-rES/arrays.xml
+++ b/packages/SettingsLib/res/values-ast-rES/arrays.xml
@@ -21,10 +21,11 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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>Esplorando\u2026</item>
     <!-- Status message of Wi-Fi when it is connecting. -->
@@ -49,10 +50,11 @@
     <item>Desactivando mala conexón 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>Esplorando\u2026</item>
     <!-- Status message of Wi-Fi when it is connecting to a network. -->
diff --git a/packages/SettingsLib/res/values-br-rFR/arrays.xml b/packages/SettingsLib/res/values-br-rFR/arrays.xml
index c46bb71..cfe3657 100644
--- a/packages/SettingsLib/res/values-br-rFR/arrays.xml
+++ b/packages/SettingsLib/res/values-br-rFR/arrays.xml
@@ -21,7 +21,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-csb-rPL/arrays.xml b/packages/SettingsLib/res/values-csb-rPL/arrays.xml
index c46bb71..cfe3657 100644
--- a/packages/SettingsLib/res/values-csb-rPL/arrays.xml
+++ b/packages/SettingsLib/res/values-csb-rPL/arrays.xml
@@ -21,7 +21,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-cy/arrays.xml b/packages/SettingsLib/res/values-cy/arrays.xml
index c46bb71..cfe3657 100644
--- a/packages/SettingsLib/res/values-cy/arrays.xml
+++ b/packages/SettingsLib/res/values-cy/arrays.xml
@@ -21,7 +21,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-en-rPT/arrays.xml b/packages/SettingsLib/res/values-en-rPT/arrays.xml
index c46bb71..cfe3657 100644
--- a/packages/SettingsLib/res/values-en-rPT/arrays.xml
+++ b/packages/SettingsLib/res/values-en-rPT/arrays.xml
@@ -21,7 +21,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-eo/arrays.xml b/packages/SettingsLib/res/values-eo/arrays.xml
index e58c1d5..024e633 100644
--- a/packages/SettingsLib/res/values-eo/arrays.xml
+++ b/packages/SettingsLib/res/values-eo/arrays.xml
@@ -21,10 +21,11 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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>Scanning\u2026</item>
     <!-- Status message of Wi-Fi when it is connecting. -->
@@ -49,10 +50,11 @@
     <item>Temporarily avoiding poor connection</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>Scanning\u2026</item>
     <!-- Status message of Wi-Fi when it is connecting to a network. -->
diff --git a/packages/SettingsLib/res/values-es-rCO/arrays.xml b/packages/SettingsLib/res/values-es-rCO/arrays.xml
index c46bb71..cfe3657 100644
--- a/packages/SettingsLib/res/values-es-rCO/arrays.xml
+++ b/packages/SettingsLib/res/values-es-rCO/arrays.xml
@@ -21,7 +21,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-es-rMX/arrays.xml b/packages/SettingsLib/res/values-es-rMX/arrays.xml
index c46bb71..cfe3657 100644
--- a/packages/SettingsLib/res/values-es-rMX/arrays.xml
+++ b/packages/SettingsLib/res/values-es-rMX/arrays.xml
@@ -21,7 +21,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-frp-rIT/arrays.xml b/packages/SettingsLib/res/values-frp-rIT/arrays.xml
index c46bb71..cfe3657 100644
--- a/packages/SettingsLib/res/values-frp-rIT/arrays.xml
+++ b/packages/SettingsLib/res/values-frp-rIT/arrays.xml
@@ -21,7 +21,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-fy-rNL/arrays.xml b/packages/SettingsLib/res/values-fy-rNL/arrays.xml
index c46bb71..cfe3657 100644
--- a/packages/SettingsLib/res/values-fy-rNL/arrays.xml
+++ b/packages/SettingsLib/res/values-fy-rNL/arrays.xml
@@ -21,7 +21,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-ga-rIE/arrays.xml b/packages/SettingsLib/res/values-ga-rIE/arrays.xml
index c46bb71..cfe3657 100644
--- a/packages/SettingsLib/res/values-ga-rIE/arrays.xml
+++ b/packages/SettingsLib/res/values-ga-rIE/arrays.xml
@@ -21,7 +21,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-gd-rGB/arrays.xml b/packages/SettingsLib/res/values-gd-rGB/arrays.xml
index c46bb71..cfe3657 100644
--- a/packages/SettingsLib/res/values-gd-rGB/arrays.xml
+++ b/packages/SettingsLib/res/values-gd-rGB/arrays.xml
@@ -21,7 +21,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-ku/arrays.xml b/packages/SettingsLib/res/values-ku/arrays.xml
index c46bb71..cfe3657 100644
--- a/packages/SettingsLib/res/values-ku/arrays.xml
+++ b/packages/SettingsLib/res/values-ku/arrays.xml
@@ -21,7 +21,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-lb/arrays.xml b/packages/SettingsLib/res/values-lb/arrays.xml
index c46bb71..cfe3657 100644
--- a/packages/SettingsLib/res/values-lb/arrays.xml
+++ b/packages/SettingsLib/res/values-lb/arrays.xml
@@ -21,7 +21,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-oc-rFR/arrays.xml b/packages/SettingsLib/res/values-oc-rFR/arrays.xml
index c46bb71..cfe3657 100644
--- a/packages/SettingsLib/res/values-oc-rFR/arrays.xml
+++ b/packages/SettingsLib/res/values-oc-rFR/arrays.xml
@@ -21,7 +21,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-or-rIN/arrays.xml b/packages/SettingsLib/res/values-or-rIN/arrays.xml
index c46bb71..cfe3657 100644
--- a/packages/SettingsLib/res/values-or-rIN/arrays.xml
+++ b/packages/SettingsLib/res/values-or-rIN/arrays.xml
@@ -21,7 +21,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-ug/arrays.xml b/packages/SettingsLib/res/values-ug/arrays.xml
index 584305e..f954c2b 100644
--- a/packages/SettingsLib/res/values-ug/arrays.xml
+++ b/packages/SettingsLib/res/values-ug/arrays.xml
@@ -21,10 +21,11 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
@@ -49,5 +50,6 @@
     <item>Temporarily avoiding poor connection</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/StatementService/res/values-as-rIN/strings.xml b/packages/StatementService/res/values-as-rIN/strings.xml
new file mode 100644
index 0000000..4987b56
--- /dev/null
+++ b/packages/StatementService/res/values-as-rIN/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/StatementService/res/values-br-rFR/strings.xml b/packages/StatementService/res/values-br-rFR/strings.xml
new file mode 100644
index 0000000..4987b56
--- /dev/null
+++ b/packages/StatementService/res/values-br-rFR/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/StatementService/res/values-csb-rPL/strings.xml b/packages/StatementService/res/values-csb-rPL/strings.xml
new file mode 100644
index 0000000..4987b56
--- /dev/null
+++ b/packages/StatementService/res/values-csb-rPL/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/StatementService/res/values-cy/strings.xml b/packages/StatementService/res/values-cy/strings.xml
new file mode 100644
index 0000000..4987b56
--- /dev/null
+++ b/packages/StatementService/res/values-cy/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/StatementService/res/values-en-rPT/strings.xml b/packages/StatementService/res/values-en-rPT/strings.xml
new file mode 100644
index 0000000..4987b56
--- /dev/null
+++ b/packages/StatementService/res/values-en-rPT/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/StatementService/res/values-eo/strings.xml b/packages/StatementService/res/values-eo/strings.xml
new file mode 100644
index 0000000..4987b56
--- /dev/null
+++ b/packages/StatementService/res/values-eo/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/StatementService/res/values-es-rCO/strings.xml b/packages/StatementService/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..4987b56
--- /dev/null
+++ b/packages/StatementService/res/values-es-rCO/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/StatementService/res/values-es-rMX/strings.xml b/packages/StatementService/res/values-es-rMX/strings.xml
new file mode 100644
index 0000000..4987b56
--- /dev/null
+++ b/packages/StatementService/res/values-es-rMX/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/StatementService/res/values-frp-rIT/strings.xml b/packages/StatementService/res/values-frp-rIT/strings.xml
new file mode 100644
index 0000000..4987b56
--- /dev/null
+++ b/packages/StatementService/res/values-frp-rIT/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/StatementService/res/values-fy-rNL/strings.xml b/packages/StatementService/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..4987b56
--- /dev/null
+++ b/packages/StatementService/res/values-fy-rNL/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/StatementService/res/values-ga-rIE/strings.xml b/packages/StatementService/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..4987b56
--- /dev/null
+++ b/packages/StatementService/res/values-ga-rIE/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/StatementService/res/values-gd-rGB/strings.xml b/packages/StatementService/res/values-gd-rGB/strings.xml
new file mode 100644
index 0000000..4987b56
--- /dev/null
+++ b/packages/StatementService/res/values-gd-rGB/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/StatementService/res/values-ku/strings.xml b/packages/StatementService/res/values-ku/strings.xml
new file mode 100644
index 0000000..4987b56
--- /dev/null
+++ b/packages/StatementService/res/values-ku/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/StatementService/res/values-lb/strings.xml b/packages/StatementService/res/values-lb/strings.xml
new file mode 100644
index 0000000..4987b56
--- /dev/null
+++ b/packages/StatementService/res/values-lb/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/StatementService/res/values-oc-rFR/strings.xml b/packages/StatementService/res/values-oc-rFR/strings.xml
new file mode 100644
index 0000000..4987b56
--- /dev/null
+++ b/packages/StatementService/res/values-oc-rFR/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/StatementService/res/values-or-rIN/strings.xml b/packages/StatementService/res/values-or-rIN/strings.xml
new file mode 100644
index 0000000..4987b56
--- /dev/null
+++ b/packages/StatementService/res/values-or-rIN/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"></resources>
diff --git a/packages/SystemUI/res/values-as-rIN/strings.xml b/packages/SystemUI/res/values-as-rIN/strings.xml
index 7758366..bf55d92 100644
--- a/packages/SystemUI/res/values-as-rIN/strings.xml
+++ b/packages/SystemUI/res/values-as-rIN/strings.xml
@@ -350,6 +350,7 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
+  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-ast-rES/strings.xml b/packages/SystemUI/res/values-ast-rES/strings.xml
index 3b9cdb0..12b0b8c 100644
--- a/packages/SystemUI/res/values-ast-rES/strings.xml
+++ b/packages/SystemUI/res/values-ast-rES/strings.xml
@@ -653,6 +653,7 @@
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <string name="keyguard_indication_charging_time_slowly">Carga lenta (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> pa completar la carga)</string>
   <!-- Related to user switcher -->
+  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <string name="accessibility_multi_user_switch_switcher">Camudar usuariu</string>
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
diff --git a/packages/SystemUI/res/values-br-rFR/strings.xml b/packages/SystemUI/res/values-br-rFR/strings.xml
index 7758366..bf55d92 100644
--- a/packages/SystemUI/res/values-br-rFR/strings.xml
+++ b/packages/SystemUI/res/values-br-rFR/strings.xml
@@ -350,6 +350,7 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
+  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-csb-rPL/strings.xml b/packages/SystemUI/res/values-csb-rPL/strings.xml
index 7758366..bf55d92 100644
--- a/packages/SystemUI/res/values-csb-rPL/strings.xml
+++ b/packages/SystemUI/res/values-csb-rPL/strings.xml
@@ -350,6 +350,7 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
+  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-cy/strings.xml b/packages/SystemUI/res/values-cy/strings.xml
index 7758366..bf55d92 100644
--- a/packages/SystemUI/res/values-cy/strings.xml
+++ b/packages/SystemUI/res/values-cy/strings.xml
@@ -350,6 +350,7 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
+  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-en-rPT/strings.xml b/packages/SystemUI/res/values-en-rPT/strings.xml
index 7758366..bf55d92 100644
--- a/packages/SystemUI/res/values-en-rPT/strings.xml
+++ b/packages/SystemUI/res/values-en-rPT/strings.xml
@@ -350,6 +350,7 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
+  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-eo/strings.xml b/packages/SystemUI/res/values-eo/strings.xml
index 8041df8..2f749ba 100644
--- a/packages/SystemUI/res/values-eo/strings.xml
+++ b/packages/SystemUI/res/values-eo/strings.xml
@@ -367,6 +367,7 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
+  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-es-rCO/strings.xml b/packages/SystemUI/res/values-es-rCO/strings.xml
index 7758366..bf55d92 100644
--- a/packages/SystemUI/res/values-es-rCO/strings.xml
+++ b/packages/SystemUI/res/values-es-rCO/strings.xml
@@ -350,6 +350,7 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
+  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-es-rMX/strings.xml b/packages/SystemUI/res/values-es-rMX/strings.xml
index 7758366..bf55d92 100644
--- a/packages/SystemUI/res/values-es-rMX/strings.xml
+++ b/packages/SystemUI/res/values-es-rMX/strings.xml
@@ -350,6 +350,7 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
+  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-frp-rIT/strings.xml b/packages/SystemUI/res/values-frp-rIT/strings.xml
index 7758366..bf55d92 100644
--- a/packages/SystemUI/res/values-frp-rIT/strings.xml
+++ b/packages/SystemUI/res/values-frp-rIT/strings.xml
@@ -350,6 +350,7 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
+  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-fy-rNL/strings.xml b/packages/SystemUI/res/values-fy-rNL/strings.xml
index 7758366..bf55d92 100644
--- a/packages/SystemUI/res/values-fy-rNL/strings.xml
+++ b/packages/SystemUI/res/values-fy-rNL/strings.xml
@@ -350,6 +350,7 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
+  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-ga-rIE/strings.xml b/packages/SystemUI/res/values-ga-rIE/strings.xml
index 7758366..bf55d92 100644
--- a/packages/SystemUI/res/values-ga-rIE/strings.xml
+++ b/packages/SystemUI/res/values-ga-rIE/strings.xml
@@ -350,6 +350,7 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
+  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-gd-rGB/strings.xml b/packages/SystemUI/res/values-gd-rGB/strings.xml
index 7758366..bf55d92 100644
--- a/packages/SystemUI/res/values-gd-rGB/strings.xml
+++ b/packages/SystemUI/res/values-gd-rGB/strings.xml
@@ -350,6 +350,7 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
+  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-ku/strings.xml b/packages/SystemUI/res/values-ku/strings.xml
index 87d89bb..4799c13 100644
--- a/packages/SystemUI/res/values-ku/strings.xml
+++ b/packages/SystemUI/res/values-ku/strings.xml
@@ -535,6 +535,7 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
+  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-lb/strings.xml b/packages/SystemUI/res/values-lb/strings.xml
index 0217846..9505026 100644
--- a/packages/SystemUI/res/values-lb/strings.xml
+++ b/packages/SystemUI/res/values-lb/strings.xml
@@ -609,6 +609,7 @@ iwwerwaacht sinn</string>
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <string name="keyguard_indication_charging_time_slowly">Gëtt lues opgelueden (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> bis e voll ass)</string>
   <!-- Related to user switcher -->
+  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <string name="accessibility_multi_user_switch_switcher">Benotzer wiesselen</string>
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
diff --git a/packages/SystemUI/res/values-oc-rFR/strings.xml b/packages/SystemUI/res/values-oc-rFR/strings.xml
index 7758366..bf55d92 100644
--- a/packages/SystemUI/res/values-oc-rFR/strings.xml
+++ b/packages/SystemUI/res/values-oc-rFR/strings.xml
@@ -350,6 +350,7 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
+  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-or-rIN/strings.xml b/packages/SystemUI/res/values-or-rIN/strings.xml
index 7758366..bf55d92 100644
--- a/packages/SystemUI/res/values-or-rIN/strings.xml
+++ b/packages/SystemUI/res/values-or-rIN/strings.xml
@@ -350,6 +350,7 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
+  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-ug/strings.xml b/packages/SystemUI/res/values-ug/strings.xml
index 95d4f4d..6c4dac3 100644
--- a/packages/SystemUI/res/values-ug/strings.xml
+++ b/packages/SystemUI/res/values-ug/strings.xml
@@ -493,6 +493,7 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
+  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
-- 
cgit v1.1


From e103f5b6279ef351e614f6ac34085597d2e75b2f Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Fri, 23 Dec 2016 20:35:58 +0800
Subject: SettingsProvider: Remove def_notif_count overlay

This is no longer used.

Change-Id: Ifd8eaa1d9d1f156dbfa4fdf278f95213ee32271e
---
 packages/SettingsProvider/res/values/defaults.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index 9ecbfdd..72f30f3 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -229,9 +229,6 @@
     <!-- Default for Settings.Secure.NFC_PAYMENT_COMPONENT -->
     <string name="def_nfc_payment_component"></string>
 
-    <!-- Default for Settings.System.STATUS_BAR_NOTIF_COUNT. -->
-    <integer name="def_notif_count">0</integer>
-
     <!-- Default protected sms originating address values of Settings.Secure.PROTECTED_SMS_ADDRESSES -->
     <string-array name="def_protected_sms_list_values"></string-array>
 
-- 
cgit v1.1


From 4b4e8b379c8f57895fda5ee14528b72910dfb414 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Fri, 23 Dec 2016 20:44:33 +0800
Subject: StatusBarIconView: Enable notification icon count by default

This used to be enabled by default in previous releases.

Change-Id: I24766bed58d081a0dd4763b9602379ff6435e092
---
 .../src/com/android/systemui/statusbar/StatusBarIconView.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
index 4371cce..857cb08 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java
@@ -90,7 +90,7 @@ public class StatusBarIconView extends AnimatedImageView {
     public void setNotification(Notification notification) {
         mNotification = notification;
         mShowNotificationCount = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.STATUS_BAR_NOTIF_COUNT, 0, UserHandle.USER_CURRENT) == 1;
+                CMSettings.System.STATUS_BAR_NOTIF_COUNT, 1, UserHandle.USER_CURRENT) == 1;
         setContentDescription(notification);
     }
 
@@ -388,7 +388,7 @@ public class StatusBarIconView extends AnimatedImageView {
         @Override
         public void update() {
             boolean showIconCount = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                    CMSettings.System.STATUS_BAR_NOTIF_COUNT, 0, UserHandle.USER_CURRENT) == 1;
+                    CMSettings.System.STATUS_BAR_NOTIF_COUNT, 1, UserHandle.USER_CURRENT) == 1;
             for (StatusBarIconView sbiv : mIconViews) {
                 sbiv.mShowNotificationCount = showIconCount;
                 sbiv.set(sbiv.mIcon, true);
-- 
cgit v1.1


From 92c7930b198715284a6230639ee1aa2551c56bad Mon Sep 17 00:00:00 2001
From: "inky@build01" <jenkins@cyanogenmod.com>
Date: Sat, 24 Dec 2016 17:27:13 -0800
Subject: Automatic translation import

Change-Id: Id213522b9303ea0bde8b5620cf88fbdb36414015
Ticket: -
---
 core/res/res/values-sk/cm_strings.xml              |  2 +-
 core/res/res/values-zh-rTW/cm_strings.xml          |  4 ++--
 packages/SystemUI/res/values-zh-rTW/cm_strings.xml | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/res/res/values-sk/cm_strings.xml b/core/res/res/values-sk/cm_strings.xml
index fd847e2..6748dbb 100644
--- a/core/res/res/values-sk/cm_strings.xml
+++ b/core/res/res/values-sk/cm_strings.xml
@@ -132,7 +132,7 @@
   <string name="app_ops_record_audio">nahrať zvuk</string>
   <string name="app_ops_send_mms">odoslať správu MMS</string>
   <string name="app_ops_send_sms">odoslať správu SMS</string>
-  <string name="app_ops_start_at_bootup">spustiť pri štaťte</string>
+  <string name="app_ops_start_at_bootup">spustiť pri štarte</string>
   <string name="app_ops_toast_window">zobraziť vyskakovacie oznámenia</string>
   <string name="app_ops_toggle_bluetooth">prepnúť bluetooth</string>
   <string name="app_ops_toggle_mobile_data">prepnúť mobilné dáta</string>
diff --git a/core/res/res/values-zh-rTW/cm_strings.xml b/core/res/res/values-zh-rTW/cm_strings.xml
index e9fb31c..a2fce55 100644
--- a/core/res/res/values-zh-rTW/cm_strings.xml
+++ b/core/res/res/values-zh-rTW/cm_strings.xml
@@ -46,7 +46,7 @@
   <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">重新啟動</string>
   <!-- label for current user in phone options dialog -->
-  <string name="global_action_current_user">現在</string>
+  <string name="global_action_current_user">目前</string>
   <!-- Reboot menu -->
   <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">重新啟動</string>
@@ -180,7 +180,7 @@
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s </xliff:g> 正被防止啟動。按一下即可進行身份驗證並啟動應用程式。</string>
   <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">電池完全充滿</string>
-  <string name="notify_battery_fully_charged_text">請將裝置與充電線拔除，以提高電池壽命。</string>
+  <string name="notify_battery_fully_charged_text">請將裝置與充電線拔除即可提高電池壽命。</string>
   <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
          whether they want to allow the application to do this. -->
   <string name="permlab_resetBatteryStats">重設電池統計資訊</string>
diff --git a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
index 382aa3c..b85480b 100644
--- a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
@@ -70,7 +70,7 @@
   <string name="qs_tile_edit_header_instruction">按住瓷磚即可重新排列</string>
   <string name="quick_settings_edit_label">編輯瓷磚</string>
   <string name="quick_settings_cannot_delete_edit_tile">無法刪除編輯瓷磚</string>
-  <string name="qs_tiles_reset_confirmation">將快速設定瓷磚還原至預設配置？</string>
+  <string name="qs_tiles_reset_confirmation">是否將快速設定瓷磚還原至預設配置？</string>
   <string name="quick_settings_tile_reset_to_default">還原至預設布局</string>
   <string name="quick_settings_title_header">標題</string>
   <string name="quick_settings_title_tiles">瓷磚</string>
@@ -175,7 +175,7 @@
   <string name="dynamic_qs_tile_ime_selector_label">輸入法選擇器</string>
   <string name="dynamic_qs_tile_su_label">Root 權限</string>
   <string name="dynamic_qs_tile_themes_label">主題</string>
-  <string name="quick_settings_title_advanced_location">定位模式</string>
+  <string name="quick_settings_title_advanced_location">三角定位</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">位置回報：節約耗電量</string>
   <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -191,16 +191,16 @@
   <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">高精確度</string>
   <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_changed_battery_saving">定位服務已更改為省電模式。</string>
+  <string name="accessibility_quick_settings_location_changed_battery_saving">位置回報已更改為省電模式。</string>
   <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_changed_gps_only">定位服務已更改為僅感應器模式。</string>
+  <string name="accessibility_quick_settings_location_changed_gps_only">位置回報已更改為僅感應器模式。</string>
   <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_changed_high_accuracy">定位服務已更改為高精確度模式。</string>
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">位置回報已更改為高精確度模式。</string>
   <string name="quick_settings_tiles_category_system">系統瓷磚</string>
   <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">新增瓷磚</string>
   <!-- Hotspot dialog message -->
-  <string name="hotspot_apm_message">飛航模式啟用時無法連線行動網路，請停用飛航模式後再嘗試。</string>
+  <string name="hotspot_apm_message">飛航模式啟用時無法連線行動網路，請停用飛航模式後再試一次。</string>
   <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">手電筒已經開啟</string>
   <string name="quick_settings_tile_flashlight_not_summary">點擊關閉</string>
-- 
cgit v1.1


From 1671d53a441673620a7aeadd93f94a99fb68ebf0 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Thu, 29 Dec 2016 12:28:19 +0800
Subject: Revert "Update ADB status bar icon"

Bring in the new icon when it's done.

This reverts commit 5ead120b6274841fe4a4c7552c44383e611478a7.

Change-Id: I92ebb56b2bff9c03868002f6ef12ae017d197e7e
---
 core/res/res/drawable-nodpi/stat_sys_adb.xml | 41 +++++++++++++---------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/core/res/res/drawable-nodpi/stat_sys_adb.xml b/core/res/res/drawable-nodpi/stat_sys_adb.xml
index 9dd9497..8cc9961 100644
--- a/core/res/res/drawable-nodpi/stat_sys_adb.xml
+++ b/core/res/res/drawable-nodpi/stat_sys_adb.xml
@@ -1,11 +1,11 @@
 <!--
-    Copyright (c) 2015 The CyanogenMod Project
+Copyright (C) 2014 The Android Open Source Project
 
-    Licensed under the Apache License, Version 2.0 (the "License");
+   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
+         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,
@@ -14,26 +14,23 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M21.3,6.6L21,6.9c0,1-3.8,1.7-9,1.7S3,7.9,3,6.9L2.7,6.6C2.1,7.6,2,10.7,2,12.5
-c0,1.8,0.1,4.9,0.7,5.8l0,0C3.2,19.3,7.2,20,12,20c4.8,0,8.8-0.7,9.3-1.7l0,0c0.6-1,0.7-4.1,0.7-5.8C22,10.7,21.9,7.6,21.3,6.6z
-M7,17c-1.7,0-3-1.3-3-3s1.3-3,3-3c1.7,0,3,1.3,3,3S8.7,17,7,17z
-M17,17c-1.7,0-3-1.3-3-3c0-1.7,1.3-3,3-3c1.7,0,3,1.3,3,3 C20,15.7,18.7,17,17,17z" />
+        android:width="24.0dp"
+        android:height="24.0dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="#BBFFFFFF"
-        android:pathData="M21.4,6.9c0,1-4.2,1.9-9.4,1.9S2.6,7.9,2.6,6.9S6.8,5,12,5S21.4,5.8,21.4,6.9z" />
+        android:pathData="M8.4,5.3c-0.2,0.0 -0.4,-0.2 -0.5,-0.4L7.1,1.6C7.0,1.4 7.2,1.1 7.4,1.0C7.7,0.9 8.0,1.1 8.0,1.4l0.8,3.3c0.1,0.3 -0.1,0.5 -0.4,0.6C8.5,5.3 8.4,5.3 8.4,5.3z"
+        android:fillColor="#FFFFFF"/>
     <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M19.7,6.5c-0.1,0.3-0.5,0.5-0.8,0.3c-0.3-0.1-0.5-0.5-0.3-0.8l1.3-3.1c0.1-0.3,0.5-0.5,0.8-0.3
-C20.9,2.7,21.1,3,21,3.4L19.7,6.5z" />
+        android:pathData="M15.6,5.3c0.0,0.0 -0.1,0.0 -0.1,0.0c-0.3,-0.1 -0.4,-0.3 -0.4,-0.6L16.0,1.4C16.0,1.1 16.3,0.9 16.6,1.0c0.3,0.1 0.4,0.3 0.4,0.6l-0.8,3.3C16.1,5.1 15.9,5.3 15.6,5.3z"
+        android:fillColor="#FFFFFF"/>
     <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M4.3,6.5C4.5,6.8,4.8,7,5.1,6.8C5.5,6.7,5.6,6.3,5.5,6L4.2,2.9C4.1,2.6,3.7,2.4,3.4,2.5
-C3.1,2.7,2.9,3,3,3.4L4.3,6.5z" />
+        android:pathData="M18.6,5.4c-0.1,-0.1 -0.2,-0.1 -0.3,-0.2c0.2,0.2 0.3,0.3 0.3,0.5c0.0,0.9 -2.9,1.7 -6.6,1.7S5.4,6.7 5.4,5.7c0.0,-0.2 0.1,-0.3 0.3,-0.5C5.6,5.3 5.5,5.4 5.4,5.4C5.0,5.9 4.0,8.0 4.0,12.0s1.0,6.1 1.4,6.6C5.9,19.0 8.0,20.0 12.0,20.0s6.1,-1.0 6.6,-1.4C19.0,18.1 20.0,16.0 20.0,12.0S19.0,5.9 18.6,5.4zM8.0,13.0c-0.6,0.0 -1.0,-0.4 -1.0,-1.0c0.0,-0.6 0.4,-1.0 1.0,-1.0s1.0,0.4 1.0,1.0C9.0,12.6 8.6,13.0 8.0,13.0zM16.0,13.0c-0.6,0.0 -1.0,-0.4 -1.0,-1.0c0.0,-0.6 0.4,-1.0 1.0,-1.0s1.0,0.4 1.0,1.0C17.0,12.6 16.6,13.0 16.0,13.0z"
+        android:fillColor="#FFFFFF"/>
+   <path
+        android:pathData="M5.35,5.7
+                          a 6.6 1.75 0 1 1 13.25 0
+                          a 6.6 1.75 0 1 1 -13.25 0
+                          z" 
+        android:fillColor="#BBFFFFFF" />
 </vector>
-- 
cgit v1.1


From 9395d02b1769419fd875143ced9ec7ae823b4c97 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Thu, 29 Dec 2016 18:21:23 +0800
Subject: Revert "Add CM PlatLogo (1/2)"

As part of the rebrand to LineageOS.

This reverts commit aed50cbe3c3dbe175dac695764df586d8dda14c9.

Change-Id: I7ee6125f6c8d4ec8e57e5a1673bf2e095a11cb76
---
 .../com/android/internal/app/PlatLogoActivity.java |   9 +-
 core/res/res/drawable-nodpi/platlogo_cm.xml        |  55 -----------
 core/res/res/values/cm_symbols.xml                 |   3 -
 packages/SystemUI/res/drawable/cid.xml             |  33 -------
 packages/SystemUI/res/layout/cmland.xml            | 104 ---------------------
 .../src/com/android/systemui/egg/CMLand.java       |  43 ---------
 .../src/com/android/systemui/egg/MLand.java        |  13 +--
 .../com/android/systemui/egg/MLandActivity.java    |  10 +-
 8 files changed, 4 insertions(+), 266 deletions(-)
 delete mode 100644 core/res/res/drawable-nodpi/platlogo_cm.xml
 delete mode 100644 packages/SystemUI/res/drawable/cid.xml
 delete mode 100644 packages/SystemUI/res/layout/cmland.xml
 delete mode 100644 packages/SystemUI/src/com/android/systemui/egg/CMLand.java

diff --git a/core/java/com/android/internal/app/PlatLogoActivity.java b/core/java/com/android/internal/app/PlatLogoActivity.java
index efe88ff..2595fe0 100644
--- a/core/java/com/android/internal/app/PlatLogoActivity.java
+++ b/core/java/com/android/internal/app/PlatLogoActivity.java
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2010 The Android Open Source Project
- * Copyright (C) 2014-2015 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,13 +57,10 @@ public class PlatLogoActivity extends Activity {
     int mKeyCount;
     PathInterpolator mInterpolator = new PathInterpolator(0f, 0f, 0.5f, 1f);
 
-    private boolean mIsCM;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mIsCM = getIntent().hasExtra("is_cm");
         mLayout = new FrameLayout(this);
         setContentView(mLayout);
     }
@@ -157,7 +153,6 @@ public class PlatLogoActivity extends Activity {
                                             .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
                                                     | Intent.FLAG_ACTIVITY_CLEAR_TASK
                                                     | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
-                                            .putExtra("is_cm", mIsCM)
                                             .addCategory("com.android.internal.category.PLATLOGO"));
                                 } catch (ActivityNotFoundException ex) {
                                     Log.e("PlatLogoActivity", "No more eggs.");
@@ -207,9 +202,7 @@ public class PlatLogoActivity extends Activity {
     }
 
     public void showMarshmallow(View im) {
-        final Drawable fg = getDrawable(mIsCM
-                ? com.android.internal.R.drawable.platlogo_cm
-                : com.android.internal.R.drawable.platlogo);
+        final Drawable fg = getDrawable(com.android.internal.R.drawable.platlogo);
         fg.setBounds(0, 0, im.getWidth(), im.getHeight());
         fg.setAlpha(0);
         im.getOverlay().add(fg);
diff --git a/core/res/res/drawable-nodpi/platlogo_cm.xml b/core/res/res/drawable-nodpi/platlogo_cm.xml
deleted file mode 100644
index b863c27..0000000
--- a/core/res/res/drawable-nodpi/platlogo_cm.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="48.0"
-    android:viewportHeight="48.0">
-
-    <path
-        android:name="body"
-        android:fillColor="#FFFFFF"
-        android:pathData="M24,12L24,12L24,12L24,12L24,12c7.7,0,14,1.2,14.9,2.6c0,0,0,0,0,0c1,1.5,1.1,6.5,1.1,9.4s-0.1,7.8-1.1,9.4
-c0,0,0,0,0,0C38,34.8,31.7,36,24,36l0,0l0,0l0,0l0,0l0,0l0,0l0,0l0,0c-7.7,0-14-1.2-14.9-2.6c0,0,0,0,0,0C8.1,31.8,8,26.9,8,24
-s0.1-7.8,1.1-9.4c0,0,0,0,0,0C10,13.2,16.3,12,24,12L24,12L24,12L24,12L24,12z" />
-    <path
-        android:name="top"
-        android:fillColor="#EBEBEB"
-        android:pathData="M39,15c0,1.7-6.7,3-15,3S9,16.7,9,15s6.7-3,15-3S39,13.3,39,15z" />
-    <path
-        android:name="r_ant"
-        android:fillColor="#FFFFFF"
-        android:pathData="M35,15c-0.1,0-0.3,0-0.4-0.1c-0.5-0.2-0.8-0.8-0.5-1.3l2-5c0.2-0.5,0.8-0.8,1.3-0.5
-c0.5,0.2,0.8,0.8,0.5,1.3l-2,5C35.7,14.8,35.3,15,35,15z" />
-    <path
-        android:name="l_ant"
-        android:fillColor="#FFFFFF"
-        android:pathData="M13,15c0.1,0,0.3,0,0.4-0.1c0.5-0.2,0.8-0.8,0.5-1.3l-2-5c-0.2-0.5-0.8-0.8-1.3-0.5
-c-0.5,0.2-0.8,0.8-0.5,1.3l2,5C12.3,14.8,12.7,15,13,15z" />
-    <path
-        android:name="smile"
-        android:fillColor="#EBEBEB"
-        android:pathData="M22,32C22,32,22,32.1,22,32c0,0.9,0.6,1.5,1.4,1.5h1.1c0.8,0,1.5-0.7,1.5-1.5c0,0,0-0.1,0-0.1H22z" />
-    <path
-        android:name="l_eye"
-        android:fillColor="#EBEBEB"
-        android:pathData="M16,20c-2.8,0-5,2.2-5,5c0,2.8,2.2,5,5,5c2.8,0,5-2.2,5-5C21,22.2,18.8,20,16,20z" />
-    <path
-        android:name="r_eye"
-        android:fillColor="#EBEBEB"
-        android:pathData="M32,20c-2.8,0-5,2.2-5,5c0,2.8,2.2,5,5,5c2.8,0,5-2.2,5-5C37,22.2,34.8,20,32,20z" />
-</vector>
diff --git a/core/res/res/values/cm_symbols.xml b/core/res/res/values/cm_symbols.xml
index a56e5ac..19a4672 100644
--- a/core/res/res/values/cm_symbols.xml
+++ b/core/res/res/values/cm_symbols.xml
@@ -101,9 +101,6 @@
     <!-- Advanced settings switch -->
     <java-symbol type="string" name="lock_to_app_toast_no_navbar" />
 
-    <!-- PlatLogo -->
-    <java-symbol type="drawable" name="platlogo_cm" />
-
     <!-- Automatic brightness enhancements -->
     <java-symbol type="integer" name="config_autoBrightnessBrighteningLightFastDebounce"/>
 
diff --git a/packages/SystemUI/res/drawable/cid.xml b/packages/SystemUI/res/drawable/cid.xml
deleted file mode 100644
index 614a050..0000000
--- a/packages/SystemUI/res/drawable/cid.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
-
-    <group>
-        <path
-            android:name="torso"
-            android:pathData="M35.616,28.128l-4.185-11.17c-0.37-0.966-1.233-1.561-2.11-1.862c-0.638-0.219-1.94-0.47-4.366-0.59h-1.91 c-2.427,0.12-3.729,0.371-4.367,0.59c-0.877,0.301-1.74,0.896-2.11,1.862l-4.185,11.17c-0.496,1.122,0.396,1.59,1.148,1.385 c0.809-0.221,1.518-0.506,2.084-1.866c0.309-0.742,2.818-7.124,2.818-7.124l-1.542,27.45c0,0,0.603,0,2.095,0 c0.967,0,2.209-1.01,2.419-3.358l0.931-12.818h0.709h0.104h0.562h0.241h0.005h0.085h0.005h0.241h0.562h0.104h0.709l0.931,12.818 c0.21,2.348,1.452,3.358,2.419,3.358c1.492,0,2.095,0,2.095,0l-1.542-27.45c0,0,2.509,6.382,2.818,7.124  c0.566,1.36,1.275,1.645,2.084,1.866C35.221,29.718,36.112,29.25,35.616,28.128Z M24,25.331c-1.817,0-3.295-1.478-3.295-3.295  c0-1.817,1.478-3.295,3.295-3.295c1.817,0,3.295,1.478,3.295,3.295C27.295,23.853,25.817,25.331,24,25.331z M26.616,22.036  c0,1.443-1.174,2.616-2.616,2.616c-1.443,0-2.616-1.174-2.616-2.616c0-1.442,1.174-2.616,2.616-2.616  C25.442,19.42,26.616,20.593,26.616,22.036z"
-            android:fillColor="#FFFFFF" />
-        <path
-            android:name="head"
-            android:pathData="M29.081,3.012l0.962-2.35c0.096-0.235-0.016-0.503-0.251-0.599c-0.235-0.096-0.503,0.016-0.599,0.251l-0.997,2.435 c-1.1-0.252-2.503-0.348-4.18-0.348v0.006h0V2.4c-0.219,0-0.432,0.002-0.642,0.006h-0.001c-1.396,0.023-2.581,0.124-3.537,0.343 l-0.997-2.435c-0.096-0.235-0.364-0.347-0.599-0.251c-0.235,0.096-0.347,0.364-0.251,0.599l0.962,2.35 c-1.277,0.483-1.955,1.3-1.955,2.612v2.752V9.09v0.784c0,2.411,2.284,3.151,6.377,3.218v0.004h0.254 c0.128,0.001,0.258,0.002,0.389,0.002v-0.002h0v0.002c0.131,0,0.261-0.001,0.389-0.002h0.018c4.242-0.042,6.613-0.764,6.613-3.221  V9.09V8.376V5.624C31.037,4.311,30.358,3.495,29.081,3.012Z M20.407,9.78c-1.16,0-2.1-0.94-2.1-2.1c0-1.16,0.94-2.1,2.1-2.1  c1.16,0,2.1,0.94,2.1,2.1C22.507,8.84,21.567,9.78,20.407,9.78z M24.237,11.303h-0.443c-0.326,0-0.591-0.264-0.591-0.591  c0-0.012,0.003-0.024,0.004-0.036h1.617c0.001,0.012,0.004,0.023,0.004,0.036C24.828,11.039,24.563,11.303,24.237,11.303z M27.625,9.78c-1.16,0-2.1-0.94-2.1-2.1c0-1.16,0.94-2.1,2.1-2.1c1.16,0,2.1,0.94,2.1,2.1C29.724,8.84,28.784,9.78,27.625,9.78z"
-            android:fillColor="#FFFFFF" />
-    </group>
-</vector>
diff --git a/packages/SystemUI/res/layout/cmland.xml b/packages/SystemUI/res/layout/cmland.xml
deleted file mode 100644
index 3c4e561..0000000
--- a/packages/SystemUI/res/layout/cmland.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 The Android Open Source Project
-     Copyright (C) 2014-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-        >
-    <com.android.systemui.egg.CMLand
-            android:id="@+id/world"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-    </com.android.systemui.egg.CMLand>
-    <FrameLayout
-            android:id="@+id/welcome"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone"
-            android:background="#a0000000"
-            android:clickable="true"
-            >
-        <FrameLayout
-            android:id="@+id/play_button"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
-            android:layout_gravity="center"
-            android:clickable="true"
-            android:background="@drawable/ripplebg"
-            android:focusable="true"
-            android:onClick="startButtonPressed"
-            >
-            <ImageView
-                android:id="@+id/play_button_image"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:scaleType="fitCenter"
-                android:layout_gravity="center"
-                android:tint="#000000"
-                android:src="@drawable/play"
-                />
-            <TextView
-                android:id="@+id/play_button_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:alpha="0"
-                android:textSize="40dp"
-                android:textColor="#000000"
-                />
-        </FrameLayout>
-    </FrameLayout>
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top|center_horizontal"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:id="@+id/player_setup"
-        >
-        <ImageButton
-            style="@android:style/Widget.Material.Button.Borderless"
-            android:id="@+id/player_minus_button"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:padding="10dp"
-            android:scaleType="centerInside"
-            android:onClick="playerMinus"
-            android:src="@drawable/minus"
-            />
-        <LinearLayout
-            android:id="@+id/scores"
-            android:layout_width="wrap_content"
-            android:layout_height="64dp"
-            android:padding="12dp"
-            android:orientation="horizontal"
-            android:clipToPadding="false"
-            >
-        </LinearLayout>
-        <ImageButton
-            style="@android:style/Widget.Material.Button.Borderless"
-            android:id="@+id/player_plus_button"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:padding="10dp"
-            android:scaleType="centerInside"
-            android:onClick="playerPlus"
-            android:src="@drawable/plus"
-            />
-    </LinearLayout>
-</FrameLayout>
diff --git a/packages/SystemUI/src/com/android/systemui/egg/CMLand.java b/packages/SystemUI/src/com/android/systemui/egg/CMLand.java
deleted file mode 100644
index 6020b45..0000000
--- a/packages/SystemUI/src/com/android/systemui/egg/CMLand.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2014-2015 The CyanogenMod Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.systemui.egg;
-
-import com.android.systemui.R;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-public class CMLand extends MLand {
-    public static final String TAG = "CMLand";
-
-    public CMLand(Context context) {
-        this(context, null);
-    }
-
-    public CMLand(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public CMLand(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    @Override
-    protected int getEggPlayer() {
-        return R.drawable.cid;
-    }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/egg/MLand.java b/packages/SystemUI/src/com/android/systemui/egg/MLand.java
index 1b22e04..b84777b 100644
--- a/packages/SystemUI/src/com/android/systemui/egg/MLand.java
+++ b/packages/SystemUI/src/com/android/systemui/egg/MLand.java
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
- * Copyright (C) 2014-2015 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -211,8 +210,6 @@ public class MLand extends FrameLayout {
         // we assume everything will be laid out left|top
         setLayoutDirection(LAYOUT_DIRECTION_LTR);
 
-        Player.eggPlayer = getEggPlayer();
-
         setupPlayers(DEFAULT_PLAYERS);
 
         MetricsLogger.count(getContext(), "egg_mland_create", 1);
@@ -1010,7 +1007,7 @@ public class MLand extends FrameLayout {
         public void step(long t_ms, long dt_ms, float t, float dt);
     }
 
-    protected static class Player extends ImageView implements GameView {
+    private static class Player extends ImageView implements GameView {
         public float dv;
         public int color;
         private MLand mLand;
@@ -1020,8 +1017,6 @@ public class MLand extends FrameLayout {
         private int mScore;
         private TextView mScoreField;
 
-        protected static int eggPlayer;
-
         private final int[] sColors = new int[] {
                 //0xFF78C557,
                 0xFFDB4437,
@@ -1093,7 +1088,7 @@ public class MLand extends FrameLayout {
         public Player(Context context) {
             super(context);
 
-            setBackgroundResource(eggPlayer);
+            setBackgroundResource(R.drawable.android);
             getBackground().setTintMode(PorterDuff.Mode.SRC_ATOP);
             color = sColors[(sNextColor++%sColors.length)];
             getBackground().setTint(color);
@@ -1443,8 +1438,4 @@ public class MLand extends FrameLayout {
             v = z = 0;
         }
     }
-
-    protected int getEggPlayer() {
-        return R.drawable.android;
-    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/egg/MLandActivity.java b/packages/SystemUI/src/com/android/systemui/egg/MLandActivity.java
index 6fd7387..cdda45f 100644
--- a/packages/SystemUI/src/com/android/systemui/egg/MLandActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/egg/MLandActivity.java
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
- * Copyright (C) 2014-2015 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,14 +29,7 @@ public class MLandActivity extends Activity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        final boolean isCM = getIntent().getBooleanExtra("is_cm", false);
-        if (isCM) {
-            setContentView(R.layout.cmland);
-            mLand = (CMLand) findViewById(R.id.world);
-        } else {
-            setContentView(R.layout.mland);
-            mLand = (MLand) findViewById(R.id.world);
-        }
+        setContentView(R.layout.mland);
         mLand = (MLand) findViewById(R.id.world);
         mLand.setScoreFieldHolder((ViewGroup) findViewById(R.id.scores));
         final View welcome = findViewById(R.id.welcome);
-- 
cgit v1.1


From bacaf11977c5ef8d6ba7434ec03886e83ca738f9 Mon Sep 17 00:00:00 2001
From: Michael W <baddaemon87@gmail.com>
Date: Fri, 23 Dec 2016 21:59:41 +0100
Subject: Telephony: Don't crash for too long baseband version

Add a check and truncate the baseband version when it's longer than
the allowed value for a SystemProperty (currently 91)

Change-Id: I845b331650eb4446aa251e48d7594ecb10146d54
Reference: BugDumps 13-20161216-22 L#22
---
 telephony/java/android/telephony/TelephonyManager.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 5ec6950..1f63a22 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -4692,6 +4692,12 @@ public class TelephonyManager {
         if (SubscriptionManager.isValidPhoneId(phoneId)) {
             String prop = TelephonyProperties.PROPERTY_BASEBAND_VERSION +
                     ((phoneId == 0) ? "" : Integer.toString(phoneId));
+            if (version != null && version.length() > SystemProperties.PROP_VALUE_MAX) {
+                Log.e(TAG, "setBasebandVersionForPhone(): version string '" + version +
+                        "' too long! (" + version.length() +
+                        " > " + SystemProperties.PROP_VALUE_MAX + ")");
+                version = version.substring(0, SystemProperties.PROP_VALUE_MAX);
+            }
             SystemProperties.set(prop, version);
         }
     }
-- 
cgit v1.1


From b46cca45eb057fb81c92393e69d7e5f78edab257 Mon Sep 17 00:00:00 2001
From: Joey Rizzoli <joey@lineageos.it>
Date: Fri, 30 Dec 2016 23:20:13 +0100
Subject: base: Switch to LineageOS ADB icon

Credit: @vazguard

Change-Id: I8362cb30fa3ca3d10798e4723458e127d3dab327
Signed-off-by: Joey Rizzoli <joey@lineageos.it>
---
 core/res/res/drawable-nodpi/stat_sys_adb.xml | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/core/res/res/drawable-nodpi/stat_sys_adb.xml b/core/res/res/drawable-nodpi/stat_sys_adb.xml
index 8cc9961..d72d801 100644
--- a/core/res/res/drawable-nodpi/stat_sys_adb.xml
+++ b/core/res/res/drawable-nodpi/stat_sys_adb.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright (C) 2014 The Android Open Source Project
+Copyright (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.
@@ -19,18 +19,8 @@ Copyright (C) 2014 The Android Open Source Project
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:pathData="M8.4,5.3c-0.2,0.0 -0.4,-0.2 -0.5,-0.4L7.1,1.6C7.0,1.4 7.2,1.1 7.4,1.0C7.7,0.9 8.0,1.1 8.0,1.4l0.8,3.3c0.1,0.3 -0.1,0.5 -0.4,0.6C8.5,5.3 8.4,5.3 8.4,5.3z"
-        android:fillColor="#FFFFFF"/>
-    <path
-        android:pathData="M15.6,5.3c0.0,0.0 -0.1,0.0 -0.1,0.0c-0.3,-0.1 -0.4,-0.3 -0.4,-0.6L16.0,1.4C16.0,1.1 16.3,0.9 16.6,1.0c0.3,0.1 0.4,0.3 0.4,0.6l-0.8,3.3C16.1,5.1 15.9,5.3 15.6,5.3z"
-        android:fillColor="#FFFFFF"/>
-    <path
-        android:pathData="M18.6,5.4c-0.1,-0.1 -0.2,-0.1 -0.3,-0.2c0.2,0.2 0.3,0.3 0.3,0.5c0.0,0.9 -2.9,1.7 -6.6,1.7S5.4,6.7 5.4,5.7c0.0,-0.2 0.1,-0.3 0.3,-0.5C5.6,5.3 5.5,5.4 5.4,5.4C5.0,5.9 4.0,8.0 4.0,12.0s1.0,6.1 1.4,6.6C5.9,19.0 8.0,20.0 12.0,20.0s6.1,-1.0 6.6,-1.4C19.0,18.1 20.0,16.0 20.0,12.0S19.0,5.9 18.6,5.4zM8.0,13.0c-0.6,0.0 -1.0,-0.4 -1.0,-1.0c0.0,-0.6 0.4,-1.0 1.0,-1.0s1.0,0.4 1.0,1.0C9.0,12.6 8.6,13.0 8.0,13.0zM16.0,13.0c-0.6,0.0 -1.0,-0.4 -1.0,-1.0c0.0,-0.6 0.4,-1.0 1.0,-1.0s1.0,0.4 1.0,1.0C17.0,12.6 16.6,13.0 16.0,13.0z"
-        android:fillColor="#FFFFFF"/>
-   <path
-        android:pathData="M5.35,5.7
-                          a 6.6 1.75 0 1 1 13.25 0
-                          a 6.6 1.75 0 1 1 -13.25 0
-                          z" 
-        android:fillColor="#BBFFFFFF" />
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,6 C15.3,6,18,8.7,18,12 S15.3,18,12,18 S6,15.3,6,12 S8.7,6,12,6 M12,4
+C7.6,4,4,7.6,4,12 S7.6,20,12,20 S20,16.4,20,12 S16.4,4,12,4 Z M12,9
+C10.3,9,9,10.3,9,12 S10.3,15,12,15 S15,13.7,15,12 S13.7,9,12,9 Z" />
 </vector>
-- 
cgit v1.1


From 3fd8d51368342a0fe224c4a0161766e61c8c0512 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Tue, 24 Jan 2017 09:33:25 +0000
Subject: Revert "Add overlay option for
 Settings.System.ACCELEROMETER_ROTATION_ANGLES"

The default of 11 (90, 270 and 360 degrees) is perfectly fine.
Thus, this overlay is pretty useless.

Only 1 device currently uses this (and not due to any major issue),
so we aren't losing anything by removing this overlay.

This reverts commit 936c4bfa7c64ce4403d519d0f0df72523da1ec21.

Change-Id: I7eb81d00af1672638689daddd1e78c7e12b21c4d
---
 packages/SettingsProvider/res/values/defaults.xml                  | 7 -------
 .../src/com/android/providers/settings/DatabaseHelper.java         | 3 ---
 2 files changed, 10 deletions(-)

diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index 72f30f3..7a14241 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -29,13 +29,6 @@
     <bool name="def_auto_time">true</bool>
     <bool name="def_auto_time_zone">true</bool>
     <bool name="def_accelerometer_rotation">true</bool>
-    <!-- Bitmask of allowed display rotation angles:
-           ROTATION_0_MODE: 1
-           ROTATION_90_MODE: 2
-           ROTATION_180_MODE: 4
-           ROTATION_270_MODE: 8
-         Default to 0, 90, 270. -->
-    <integer name="def_accelerometer_rotation_angles">11</integer>
     <!-- Default screen brightness, from 0 to 255.  102 is 40%. -->
     <integer name="def_screen_brightness">102</integer>
     <bool name="def_screen_brightness_automatic_mode">false</bool>
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index e4b2409..42c1aa7 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2593,9 +2593,6 @@ class DatabaseHelper extends SQLiteOpenHelper {
             loadBooleanSetting(stmt, Settings.System.ACCELEROMETER_ROTATION,
                     R.bool.def_accelerometer_rotation);
 
-            loadIntegerSetting(stmt, Settings.System.ACCELEROMETER_ROTATION_ANGLES,
-                    R.integer.def_accelerometer_rotation_angles);
-
             loadDefaultHapticSettings(stmt);
 
             loadBooleanSetting(stmt, Settings.System.NOTIFICATION_LIGHT_PULSE,
-- 
cgit v1.1


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

Change-Id: Ib115f3813214bfffb935cf522d0e31e8c95be4de
---
 core/res/res/values-as-rIN/strings.xml             | 31 --------
 core/res/res/values-ast-rES/strings.xml            | 31 --------
 core/res/res/values-bg/cm_strings.xml              |  8 +-
 core/res/res/values-br-rFR/strings.xml             | 31 --------
 core/res/res/values-csb-rPL/strings.xml            | 31 --------
 core/res/res/values-cy/strings.xml                 | 31 --------
 core/res/res/values-en-rPT/strings.xml             | 31 --------
 core/res/res/values-eo/strings.xml                 | 31 --------
 core/res/res/values-es-rCO/strings.xml             | 31 --------
 core/res/res/values-es-rMX/strings.xml             | 31 --------
 core/res/res/values-frp-rIT/strings.xml            | 31 --------
 core/res/res/values-fy-rNL/strings.xml             | 31 --------
 core/res/res/values-ga-rIE/strings.xml             | 31 --------
 core/res/res/values-gd-rGB/strings.xml             | 31 --------
 core/res/res/values-ku/strings.xml                 | 31 --------
 core/res/res/values-lb/strings.xml                 | 32 +-------
 core/res/res/values-nb/cm_strings.xml              |  2 +-
 core/res/res/values-oc-rFR/strings.xml             | 31 --------
 core/res/res/values-or-rIN/strings.xml             | 31 --------
 core/res/res/values-ro/cm_strings.xml              |  4 +
 core/res/res/values-ug/strings.xml                 | 31 --------
 core/res/res/values-zh-rCN/cm_strings.xml          | 32 ++++----
 core/res/res/values-zh-rTW/cm_strings.xml          | 44 +++++------
 packages/DocumentsUI/res/values-lb/strings.xml     |  6 ++
 packages/Keyguard/res/values-as-rIN/strings.xml    |  2 -
 packages/Keyguard/res/values-ast-rES/strings.xml   |  2 -
 packages/Keyguard/res/values-br-rFR/strings.xml    |  2 -
 packages/Keyguard/res/values-csb-rPL/strings.xml   |  2 -
 packages/Keyguard/res/values-cy/strings.xml        |  2 -
 packages/Keyguard/res/values-en-rPT/strings.xml    |  2 -
 packages/Keyguard/res/values-eo/strings.xml        |  2 -
 packages/Keyguard/res/values-es-rCO/strings.xml    |  2 -
 packages/Keyguard/res/values-es-rMX/strings.xml    |  2 -
 packages/Keyguard/res/values-frp-rIT/strings.xml   |  2 -
 packages/Keyguard/res/values-fy-rNL/strings.xml    |  2 -
 packages/Keyguard/res/values-ga-rIE/strings.xml    |  2 -
 packages/Keyguard/res/values-gd-rGB/strings.xml    |  2 -
 packages/Keyguard/res/values-gl-rES/cm_strings.xml |  4 +
 packages/Keyguard/res/values-ku/strings.xml        |  2 -
 packages/Keyguard/res/values-lb/strings.xml        |  2 -
 packages/Keyguard/res/values-oc-rFR/strings.xml    |  2 -
 packages/Keyguard/res/values-or-rIN/strings.xml    |  2 -
 packages/Keyguard/res/values-ro/cm_strings.xml     |  6 ++
 packages/Keyguard/res/values-ug/strings.xml        |  2 -
 packages/Keyguard/res/values-zh-rCN/cm_strings.xml |  2 +-
 packages/SettingsLib/res/values-as-rIN/arrays.xml  |  2 -
 packages/SettingsLib/res/values-ast-rES/arrays.xml |  2 -
 packages/SettingsLib/res/values-br-rFR/arrays.xml  |  2 -
 packages/SettingsLib/res/values-csb-rPL/arrays.xml |  2 -
 packages/SettingsLib/res/values-cy/arrays.xml      |  2 -
 packages/SettingsLib/res/values-en-rPT/arrays.xml  |  2 -
 packages/SettingsLib/res/values-eo/arrays.xml      |  2 -
 packages/SettingsLib/res/values-es-rCO/arrays.xml  |  2 -
 packages/SettingsLib/res/values-es-rMX/arrays.xml  |  2 -
 packages/SettingsLib/res/values-frp-rIT/arrays.xml |  2 -
 packages/SettingsLib/res/values-fy-rNL/arrays.xml  |  2 -
 packages/SettingsLib/res/values-ga-rIE/arrays.xml  |  2 -
 packages/SettingsLib/res/values-gd-rGB/arrays.xml  |  2 -
 packages/SettingsLib/res/values-ku/arrays.xml      |  2 -
 packages/SettingsLib/res/values-lb/arrays.xml      |  2 -
 packages/SettingsLib/res/values-oc-rFR/arrays.xml  |  2 -
 packages/SettingsLib/res/values-or-rIN/arrays.xml  |  2 -
 packages/SettingsLib/res/values-ug/arrays.xml      |  2 -
 .../SettingsLib/res/values-zh-rTW/cm_strings.xml   |  2 +-
 packages/SystemUI/res/values-as-rIN/strings.xml    |  1 -
 packages/SystemUI/res/values-ast-rES/strings.xml   |  1 -
 packages/SystemUI/res/values-br-rFR/strings.xml    |  1 -
 packages/SystemUI/res/values-cs/cm_strings.xml     |  1 +
 packages/SystemUI/res/values-csb-rPL/strings.xml   |  1 -
 packages/SystemUI/res/values-cy/strings.xml        |  1 -
 packages/SystemUI/res/values-en-rPT/strings.xml    |  1 -
 packages/SystemUI/res/values-eo/strings.xml        |  1 -
 packages/SystemUI/res/values-es-rCO/strings.xml    |  1 -
 packages/SystemUI/res/values-es-rMX/strings.xml    |  1 -
 packages/SystemUI/res/values-fi/cm_strings.xml     |  1 +
 packages/SystemUI/res/values-frp-rIT/strings.xml   |  1 -
 packages/SystemUI/res/values-fy-rNL/strings.xml    |  1 -
 packages/SystemUI/res/values-ga-rIE/strings.xml    |  1 -
 packages/SystemUI/res/values-gd-rGB/strings.xml    |  1 -
 packages/SystemUI/res/values-ku/strings.xml        |  1 -
 packages/SystemUI/res/values-lb/strings.xml        |  1 -
 packages/SystemUI/res/values-nb/cm_strings.xml     |  6 +-
 packages/SystemUI/res/values-oc-rFR/strings.xml    |  1 -
 packages/SystemUI/res/values-or-rIN/strings.xml    |  1 -
 packages/SystemUI/res/values-ro/cm_strings.xml     | 21 ++++++
 packages/SystemUI/res/values-ug/strings.xml        |  1 -
 packages/SystemUI/res/values-zh-rCN/cm_strings.xml |  4 +-
 packages/SystemUI/res/values-zh-rTW/cm_strings.xml | 86 +++++++++++-----------
 88 files changed, 137 insertions(+), 741 deletions(-)

diff --git a/core/res/res/values-as-rIN/strings.xml b/core/res/res/values-as-rIN/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-as-rIN/strings.xml
+++ b/core/res/res/values-as-rIN/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-ast-rES/strings.xml b/core/res/res/values-ast-rES/strings.xml
index e1b3d01..f2abe83 100644
--- a/core/res/res/values-ast-rES/strings.xml
+++ b/core/res/res/values-ast-rES/strings.xml
@@ -78,7 +78,6 @@
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <string name="defaultMsisdnAlphaTag">MSISDN1</string>
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <string name="mmiError">Hebo un fallu de conexón o\'l códigu MMI nun ye válidu.</string>
@@ -186,7 +185,6 @@
   <string name="peerTtyModeVco">El preséu solicitó\'l mou TTY VCO.</string>
   <string name="peerTtyModeOff">El preséu solicitó\'l mou TTY OFF.</string>
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassVoice">Voz</string>
   <!-- Example: Service was enabled for: Voice, Data -->
@@ -204,7 +202,6 @@
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <string name="serviceClassPAD">PAD</string>
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <string name="roamingText0">Indicador d\'itinerancia activáu</string>
   <string name="roamingText1">Indicador d\'itinerancia desactiváu</string>
@@ -224,9 +221,7 @@
   <string name="wfcRegErrorTitle">Llamaes Wifi</string>
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <string name="wfcSpnFormat">%s</string>
   <!-- Template for showing operator name for data connection while WFC is active -->
@@ -247,7 +242,6 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <string name="cfTemplateNotForwarded"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Non esviada</string>
   <!-- Displayed when the call forwarding query was forwarded. -->
@@ -259,13 +253,11 @@
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegisteredTime"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Non esviada</string>
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <string name="fcComplete">Códigu de función completu</string>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <string name="fcError">Hebo un fallu de conexón o\'l códigu de la función nun ye válidu.</string>
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <string name="httpErrorOk">Aceutar</string>
   <!-- Displayed when a web request failed with a generic network error. -->
@@ -299,14 +291,12 @@
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <string name="httpErrorTooManyRequests">Tán procesándose abondes solicitúes. Vuelvi a intentalo dempués.</string>
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <string name="notification_title">Error d\'aniciu de sesión de <xliff:g id="account" example="foo@gmail.com">%1$s</xliff:g></string>
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <string name="contentServiceSync">Sincronización</string>
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
@@ -322,7 +312,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="default">Escosó l\'espaciu d\'almacenamientu del teléfonu. Desanicia dalgunos ficheros pa lliberar espaciu.</string>
   <!-- SSL CA cert notification -->
-  <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">Ye dable que la rede tea supervisada</string>
@@ -339,7 +328,6 @@
          [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_managed">Por <xliff:g id="MANAGING_DOMAIN">%s</xliff:g></string>
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <string name="work_profile_deleted">Perfil de trabayu desaniciáu</string>
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
@@ -355,7 +343,6 @@
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <string name="work_profile_deleted_description_dpm_wipe">El to perfil de trabayu yá nun ta disponible nesti preséu.</string>
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <string name="factory_reset_warning">Van desaniciase los datos del preséu</string>
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
@@ -365,7 +352,6 @@
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">Yo</string>
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="tablet">Opciones de la tablet</string>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -1060,7 +1046,6 @@
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <string name="policydesc_disableKeyguardFeatures">Evita l\'usu de dalgunes funciones de bloquéu de pantalla.</string>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <string-array name="phoneTypes">
     <item>Casa</item>
@@ -1073,7 +1058,6 @@
     <item>Personalizar</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <string-array name="emailAddressTypes">
     <item>Casa</item>
@@ -1082,7 +1066,6 @@
     <item>Personalizar</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <string-array name="postalAddressTypes">
     <item>Casa</item>
@@ -1091,7 +1074,6 @@
     <item>Personalizar</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <string-array name="imAddressTypes">
     <item>Casa</item>
@@ -1100,7 +1082,6 @@
     <item>Personalizar</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <string-array name="organizationTypes">
     <item>Trabayu</item>
@@ -1108,7 +1089,6 @@
     <item>Personalizar</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <string-array name="imProtocols">
     <item>AIM</item>
@@ -1291,7 +1271,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <string name="lockscreen_carrier_default">Ensin serviciu</string>
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
@@ -1484,7 +1463,6 @@
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">Área pa eslizar</string>
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_symbol_key">\?123</string>
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
@@ -1719,7 +1697,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">desaniciar</string>
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">Guetar</string>
@@ -1923,13 +1900,11 @@
          activity chooser. See the "Select an action" title. -->
   <string name="noApplications">Nenguna aplicación pue facer esta aición.</string>
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_application">Detúvose l\'aplicación <xliff:g id="APPLICATION">%1$s</xliff:g>.</string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_process">Detúvose\'l procesu <xliff:g id="PROCESS">%1$s</xliff:g>.</string>
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_application">L\'aplicación <xliff:g id="APPLICATION">%2$s</xliff:g> nun respuende.\n\n¿Quies zarrala?</string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -2034,7 +2009,6 @@
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_notification">Volume de notificaciones</string>
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <string name="ringtone_default">Tonu predetermináu</string>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
@@ -2095,7 +2069,6 @@
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <string name="select_character">Inxertar carácter</string>
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <string name="sms_control_title">Unviando mensaxes SMS\u2026</string>
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
@@ -2105,7 +2078,6 @@
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">Refugar</string>
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_short_code_confirm_message">&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; quier unviar un mensaxe a &lt;b&gt;<xliff:g id="DEST_ADDRESS">%2$s</xliff:g>&lt;/b&gt;.</string>
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
@@ -2125,7 +2097,6 @@
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_never_allow">Nun permitir enxamás</string>
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_removed_title">Tarxeta SIM desaniciada</string>
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
@@ -2237,7 +2208,6 @@
   <string name="fast_scroll_numeric_alphabet"> 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="candidates_style"><u>candidatos</u></string>
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <string name="ext_media_checking_notification_title">Tresnando\'l mediu <xliff:g id="name" example="SD card">%s</xliff:g></string>
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
@@ -2345,7 +2315,6 @@
   <string name="ime_action_default">Executar</string>
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <string name="dial_number_using">Marcar númberu\ncon <xliff:g id="NUMBER">%s</xliff:g></string>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
diff --git a/core/res/res/values-bg/cm_strings.xml b/core/res/res/values-bg/cm_strings.xml
index 8b94d24..3c8ce39 100644
--- a/core/res/res/values-bg/cm_strings.xml
+++ b/core/res/res/values-bg/cm_strings.xml
@@ -93,10 +93,10 @@
   <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">Активира или деактивира Защитен режим</string>
   <string name="permdesc_changePrivacyGuardState">Разрешава на приложението да променя статута на поверителност на друго приложение. Когато едно приложение се използва с защита на поверителността, не може да има достъп до персонални данни, като контакти, регистри с повиквания или съобщения.</string>
-  <string name="privacy_guard_notification">Защитен режим e активен</string>
-  <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s </xliff:g> няма да можете да получите достъп до лични данни</string>
+  <string name="privacy_guard_notification">Активиран е защитен режим</string>
+  <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s </xliff:g> няма достъп до лични данни</string>
   <string name="privacy_guard_dialog_title">Защитен режим</string>
-  <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s </xliff:g> бих искал да <xliff:g id="op">%2$s </xliff:g>.</string>
+  <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s </xliff:g> иска да <xliff:g id="op">%2$s </xliff:g>.</string>
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Запомни избора ми</string>
   <!-- App ops requests -->
@@ -135,7 +135,7 @@
   <string name="app_ops_start_at_bootup">изпълнение при включване</string>
   <string name="app_ops_toast_window">показвай изкачащи уведомления</string>
   <string name="app_ops_toggle_bluetooth">активиране/деактивиране Bluetooth</string>
-  <string name="app_ops_toggle_mobile_data">Превключване клетъчен данни</string>
+  <string name="app_ops_toggle_mobile_data">Включване / Изключване на мобилни данни</string>
   <string name="app_ops_toggle_nfc">активиране/деактивиране NFC</string>
   <string name="app_ops_toggle_wifi">активирай/деактивирай Wi-Fi</string>
   <string name="app_ops_use_alarm_volume">контрол на силата на алармата</string>
diff --git a/core/res/res/values-br-rFR/strings.xml b/core/res/res/values-br-rFR/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-br-rFR/strings.xml
+++ b/core/res/res/values-br-rFR/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-csb-rPL/strings.xml b/core/res/res/values-csb-rPL/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-csb-rPL/strings.xml
+++ b/core/res/res/values-csb-rPL/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-cy/strings.xml b/core/res/res/values-cy/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-cy/strings.xml
+++ b/core/res/res/values-cy/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-en-rPT/strings.xml b/core/res/res/values-en-rPT/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-en-rPT/strings.xml
+++ b/core/res/res/values-en-rPT/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-eo/strings.xml b/core/res/res/values-eo/strings.xml
index 67cf790..e4a6a8c 100644
--- a/core/res/res/values-eo/strings.xml
+++ b/core/res/res/values-eo/strings.xml
@@ -63,7 +63,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -117,7 +116,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -127,14 +125,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <string name="wfcSpnFormat">%s</string>
   <!-- Template for showing operator name for data connection while WFC is active -->
@@ -151,18 +146,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -180,13 +172,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -195,7 +185,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -208,7 +197,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -219,14 +207,12 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">Mi</string>
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -599,22 +585,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <string name="phoneTypeCustom">Propra</string>
@@ -722,7 +702,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -835,7 +814,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -967,7 +945,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">forigi</string>
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">Serĉi</string>
@@ -1100,11 +1077,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1155,7 +1130,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1177,7 +1151,6 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
@@ -1185,7 +1158,6 @@
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">Malpermesi</string>
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1198,7 +1170,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1261,7 +1232,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1321,7 +1291,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-es-rCO/strings.xml b/core/res/res/values-es-rCO/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-es-rCO/strings.xml
+++ b/core/res/res/values-es-rCO/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-es-rMX/strings.xml b/core/res/res/values-es-rMX/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-es-rMX/strings.xml
+++ b/core/res/res/values-es-rMX/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-frp-rIT/strings.xml b/core/res/res/values-frp-rIT/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-frp-rIT/strings.xml
+++ b/core/res/res/values-frp-rIT/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-fy-rNL/strings.xml b/core/res/res/values-fy-rNL/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-fy-rNL/strings.xml
+++ b/core/res/res/values-fy-rNL/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-ga-rIE/strings.xml b/core/res/res/values-ga-rIE/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-ga-rIE/strings.xml
+++ b/core/res/res/values-ga-rIE/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-gd-rGB/strings.xml b/core/res/res/values-gd-rGB/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-gd-rGB/strings.xml
+++ b/core/res/res/values-gd-rGB/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-ku/strings.xml b/core/res/res/values-ku/strings.xml
index fc74ec6..3837084 100644
--- a/core/res/res/values-ku/strings.xml
+++ b/core/res/res/values-ku/strings.xml
@@ -58,7 +58,6 @@
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <string name="defaultMsisdnAlphaTag">MSISDN1</string>
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <string name="mmiError">کێشه‌ی په‌یوه‌ندی هه‌یه‌ یان کۆدی MMI ناڕاستە.</string>
@@ -160,7 +159,6 @@
   <string name="RestrictedOnAll">هه‌موو خزمەتگوزارییەکانی ده‌نگ، داتا و کورتەنامە به‌ستراون.</string>
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassVoice">ده‌نگ</string>
   <!-- Example: Service was enabled for: Voice, Data -->
@@ -178,7 +176,6 @@
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <string name="serviceClassPAD">نەزانراو</string>
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <string name="roamingText0">دیارخه‌ری ڕۆمینگ هەڵکراوە</string>
   <string name="roamingText1">دیارخه‌ری ڕۆمینگ کوژاوه‌ته‌وه‌</string>
@@ -197,9 +194,7 @@
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -214,7 +209,6 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <string name="cfTemplateNotForwarded"><xliff:g id="bearer_service_code">{0}</xliff:g>: پەیوەندی ئاراستە نەکراوە</string>
   <!-- Displayed when the call forwarding query was forwarded. -->
@@ -226,13 +220,11 @@
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegisteredTime"><xliff:g id="bearer_service_code">{0}</xliff:g>: پەیوەندی  ئاراستە نەکراوە</string>
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <string name="fcComplete">کۆدی تایبەت ته‌واو بوو.</string>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <string name="fcError">کێشه‌ی گرێدان هه‌یه‌ یان کۆدی تایبەت ناڕاسته‌.</string>
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <string name="httpErrorOk">باشه‌</string>
   <!-- Displayed when a web request failed with a generic network error. -->
@@ -266,14 +258,12 @@
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <string name="httpErrorTooManyRequests">داواکاریی زۆر خراوه‌ته‌ ڕوو. دواتر هه‌وڵبده‌وه‌.</string>
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <string name="notification_title">هه‌ڵه‌ له‌ چوونه‌ژووره‌وه‌ بۆ <xliff:g id="account" example="foo@gmail.com">%1$s</xliff:g></string>
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <string name="contentServiceSync">هاوکاتگەری</string>
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
@@ -287,7 +277,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="default">بیرگه‌ی تەلەفۆن پڕە. هه‌ندێک فایل بسڕه‌وه‌ بۆ ئازادکردنی بۆشایی.</string>
   <!-- SSL CA cert notification -->
-  <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>
@@ -303,7 +292,6 @@
          [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_managed">له‌لایه‌ن <xliff:g id="managing_domain">%s</xliff:g></string>
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -314,14 +302,12 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">من</string>
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="tablet">بژارده‌کانی تابلێت</string>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -965,7 +951,6 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <string-array name="phoneTypes">
     <item>ماڵ</item>
@@ -978,7 +963,6 @@
     <item>دروستکراو</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <string-array name="emailAddressTypes">
     <item>ماڵ</item>
@@ -987,7 +971,6 @@
     <item>دروستکراو</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <string-array name="postalAddressTypes">
     <item>ماڵ</item>
@@ -996,7 +979,6 @@
     <item>دروستکراو</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <string-array name="imAddressTypes">
     <item>ماڵ</item>
@@ -1005,7 +987,6 @@
     <item>دروستکراو</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <string-array name="organizationTypes">
     <item>کار</item>
@@ -1013,7 +994,6 @@
     <item>دروستکراو</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <string-array name="imProtocols">
     <item>ئامانج</item>
@@ -1196,7 +1176,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <string name="lockscreen_carrier_default">خزمەتگوزاری نیە.</string>
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
@@ -1412,7 +1391,6 @@
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">ناوچەی لادان.</string>
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_symbol_key">\?123</string>
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
@@ -1644,7 +1622,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">سڕینەوە</string>
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">گەڕان</string>
@@ -1833,13 +1810,11 @@
          activity chooser. See the "Select an action" title. -->
   <string name="noApplications">‌هیچ بەرنامەیەک ناتوانێت ڕۆڵی ئەم چالاکیە ببینێت.</string>
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_application">بەداخەوە, <xliff:g id="application">%1$s</xliff:g>وەستا.</string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_process">بەداخەوە پرۆسەکە <xliff:g id="process">%1$s</xliff:g> وەستا.</string>
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_application"><xliff:g id="بەرنامە">%2$s</xliff:g> وەڵام نادانتەوە.\n\nئەتەوێت دایخەیت?</string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1938,7 +1913,6 @@
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_notification">ده‌نگی تێبینی</string>
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <string name="ringtone_default">زەنگی بنەڕەتی</string>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
@@ -1992,7 +1966,6 @@
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <string name="select_character">تێخستنی نووسە</string>
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <string name="sms_control_title">ناردنی کورتە نامە</string>
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
@@ -2002,7 +1975,6 @@
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">نکوڵی</string>
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_short_code_confirm_message">وlt;bوgt;<xliff:g id="app_name">%1$s</xliff:g>وlt;/bوgt; داخوازی ناردنی کورتە نامەی بۆ وlt;bوgt;<xliff:g id="dest_address">%2$s</xliff:g>وlt;/bوgt;.</string>
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
@@ -2020,7 +1992,6 @@
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_never_allow">هەرگیز ڕێگە مەدە</string>
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_removed_title">سیمکارتەکە دەرکرا</string>
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
@@ -2122,7 +2093,6 @@
   <string name="fast_scroll_numeric_alphabet">\u00200123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="candidates_style"><u>دەستنیشانکراوەکان</u></string>
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -2190,7 +2160,6 @@
   <string name="ime_action_default">بەجێهێنان</string>
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <string name="dial_number_using">ژمارە بگرە\nبە بەکارهێنانی <xliff:g id="number" example="555">%s</xliff:g></string>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
diff --git a/core/res/res/values-lb/strings.xml b/core/res/res/values-lb/strings.xml
index a6416ed..1224366 100644
--- a/core/res/res/values-lb/strings.xml
+++ b/core/res/res/values-lb/strings.xml
@@ -71,7 +71,6 @@
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <string name="defaultMsisdnAlphaTag">MSISDN1</string>
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <string name="mmiError">Connectiounsproblem oder ongëltegen MMI-Code.</string>
@@ -179,7 +178,6 @@
   <string name="peerTtyModeVco">Peer huet TTY-Modus \"VCO\" ugefrot</string>
   <string name="peerTtyModeOff">Peer huet TTY-Modus \"Aus\" ugefrot</string>
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassVoice">Stëmm</string>
   <!-- Example: Service was enabled for: Voice, Data -->
@@ -197,7 +195,6 @@
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <string name="serviceClassPAD">PAD</string>
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <string name="roamingText0">Roaming-Anzeig un</string>
   <string name="roamingText1">Roaming-Anzeig aus</string>
@@ -214,11 +211,10 @@
   <string name="roamingText12">Roaming-Banner Aus</string>
   <string name="roamingTextSearching">E Service gëtt gesicht</string>
   <!-- Displayed when WFC registration fails -->
+  <string name="wfcRegErrorTitle">WLAN-Uriff</string>
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -233,7 +229,6 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <string name="cfTemplateNotForwarded"><xliff:g id="bearer_service_code">{0}</xliff:g>: Net weidergeleet</string>
   <!-- Displayed when the call forwarding query was forwarded. -->
@@ -245,13 +240,11 @@
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegisteredTime"><xliff:g id="bearer_service_code">{0}</xliff:g>: Net weidergeleet</string>
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <string name="fcComplete">Funktiounscode ofgeschloss.</string>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <string name="fcError">Connectiounsproblem oder ongëltege Funktiounscode.</string>
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <string name="httpErrorOk">OK</string>
   <!-- Displayed when a web request failed with a generic network error. -->
@@ -285,14 +278,12 @@
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <string name="httpErrorTooManyRequests">Et ginn ze vill Ufroe beaarbecht. Probéier méi spéit nees.</string>
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <string name="notification_title">Feeler bei der Umeldung fir <xliff:g id="account" example="foo@gmail.com">%1$s</xliff:g></string>
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <string name="contentServiceSync">Sync</string>
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
@@ -308,7 +299,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="default">Den Telefonsspäicher ass voll. Läsch Dateien, fir Späicherplaz fräizeginn.</string>
   <!-- SSL CA cert notification -->
-  <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>
@@ -325,7 +315,6 @@
          [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_managed">Vu(n) <xliff:g id="managing_domain">%s</xliff:g></string>
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <string name="work_profile_deleted">Aarbechtsprofil geläscht</string>
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
@@ -339,7 +328,6 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <string name="factory_reset_warning">Däin Apparat gëtt geläscht</string>
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
@@ -348,7 +336,6 @@
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">Ech</string>
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="tablet">Tabletoptiounen</string>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -985,7 +972,6 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <string-array name="phoneTypes">
     <item>Doheem</item>
@@ -998,7 +984,6 @@
     <item>Personaliséiert</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <string-array name="emailAddressTypes">
     <item>Doheem</item>
@@ -1007,7 +992,6 @@
     <item>Personaliséiert</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <string-array name="postalAddressTypes">
     <item>Doheem</item>
@@ -1016,7 +1000,6 @@
     <item>Personaliséiert</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <string-array name="imAddressTypes">
     <item>Doheem</item>
@@ -1025,7 +1008,6 @@
     <item>Personaliséiert</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <string-array name="organizationTypes">
     <item>Aarbecht</item>
@@ -1033,7 +1015,6 @@
     <item>Personaliséiert</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <string-array name="imProtocols">
     <item>AIM</item>
@@ -1216,7 +1197,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <string name="lockscreen_carrier_default">Kee Service.</string>
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
@@ -1408,7 +1388,6 @@ Kontaktéier däi Provider fir eng aner SIM-Kaart ze kréien.</string>
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">Beräich fir Fangerbeweegung.</string>
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_symbol_key">\?123</string>
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
@@ -1631,7 +1610,6 @@ Kontaktéier däi Provider fir eng aner SIM-Kaart ze kréien.</string>
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">läschen</string>
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">Sichen</string>
@@ -1835,13 +1813,11 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
          activity chooser. See the "Select an action" title. -->
   <string name="noApplications">Dës Aktioun ka vu kenger App duerchgefouert ginn.</string>
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_application">Leider huet <xliff:g id="application">%1$s</xliff:g> opgehale mat Funktionéieren.</string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_process">Leider gouf de Prozess <xliff:g id="process">%1$s</xliff:g> gestoppt.</string>
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_application"><xliff:g id="application">%2$s</xliff:g> äntwert net.\n\nWëlls de d\'App zoumaachen?</string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1937,7 +1913,6 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_notification">Notifikatiounslautstäerkt</string>
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <string name="ringtone_default">Standardschelltoun</string>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
@@ -1992,7 +1967,6 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <string name="select_character">Zeechen aginn</string>
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <string name="sms_control_title">SMS-Messagë gi geschéckt</string>
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
@@ -2002,7 +1976,6 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">Verweigeren</string>
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_short_code_confirm_message">&lt;b&gt;<xliff:g id="app_name">%1$s</xliff:g>&lt;/b&gt; wëll e Message un &lt;b&gt;<xliff:g id="dest_address">%2$s</xliff:g>&lt;/b&gt; schécken.</string>
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
@@ -2022,7 +1995,6 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_never_allow">Ni erlaben</string>
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_removed_title">SIM-Kaart erausgeholl</string>
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
@@ -2130,7 +2102,6 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <string name="fast_scroll_numeric_alphabet">\u00200123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="candidates_style"><u>Kandidaten</u></string>
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -2199,7 +2170,6 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <string name="ime_action_default">Ausféieren</string>
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <string name="dial_number_using">Nummer\nmat <xliff:g id="number" example="555">%s</xliff:g> auswielen</string>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
diff --git a/core/res/res/values-nb/cm_strings.xml b/core/res/res/values-nb/cm_strings.xml
index d1cfdaf..d531a6a 100644
--- a/core/res/res/values-nb/cm_strings.xml
+++ b/core/res/res/values-nb/cm_strings.xml
@@ -120,7 +120,7 @@
   <string name="app_ops_modify_settings">oppdatere systeminnstillinger</string>
   <string name="app_ops_mute_unmute_microphone">Demp/fjern demping av mikrofonen</string>
   <string name="app_ops_play_audio">spille av lyd</string>
-  <string name="app_ops_post_notification">legge inn en melding</string>
+  <string name="app_ops_post_notification">legge inn en varsel</string>
   <string name="app_ops_project_media">Prosjekt media</string>
   <string name="app_ops_read_calendar">lese kalenderen</string>
   <string name="app_ops_read_call_log">lese i samtaleloggen</string>
diff --git a/core/res/res/values-oc-rFR/strings.xml b/core/res/res/values-oc-rFR/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-oc-rFR/strings.xml
+++ b/core/res/res/values-oc-rFR/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-or-rIN/strings.xml b/core/res/res/values-or-rIN/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-or-rIN/strings.xml
+++ b/core/res/res/values-or-rIN/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <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] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-ro/cm_strings.xml b/core/res/res/values-ro/cm_strings.xml
index 1587713..57a3f1b 100644
--- a/core/res/res/values-ro/cm_strings.xml
+++ b/core/res/res/values-ro/cm_strings.xml
@@ -87,6 +87,7 @@
   <string name="silent_mode_priority">Prioritate</string>
   <string name="silent_mode_none">Nimic</string>
   <!-- Wifi Hotspot disabled due to subscription change -->
+  <string name="subscription_change_disabled_wifi_ap">Hotspot-ul Wi-Fi a fost dezactivat din cauza schimbării abonării SIM</string>
   <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Oprește Wi-Fi</string>
   <!-- Privacy Guard -->
@@ -176,6 +177,7 @@
          with spaces on either side. [CHAR LIMIT=3] -->
   <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Lansarea activității blocată</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> este protejat de la lansare. Atingeți pentru a vă autentifica și pentru a lansa aplicația.</string>
   <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Acumulator încărcat complet</string>
   <string name="notify_battery_fully_charged_text">Deconectați aparatul de la încărcător pentru a îmbunătăți longevitatea bateriei.</string>
@@ -186,4 +188,6 @@
          whether they want to allow the application to do this. -->
   <string name="permdesc_resetBatteryStats">Permite unei aplicații să reseteze datele curente de utilizare a bateriei.</string>
   <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Cardurile SIM s-au modificat</string>
+  <string name="uicc_hot_swapped_event_text">Atingeți pentru a seta preferințele implicite ale cardului SIM</string>
 </resources>
diff --git a/core/res/res/values-ug/strings.xml b/core/res/res/values-ug/strings.xml
index 1ca6003..b6dee8c 100644
--- a/core/res/res/values-ug/strings.xml
+++ b/core/res/res/values-ug/strings.xml
@@ -60,7 +60,6 @@
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <string name="defaultMsisdnAlphaTag">MSISDN1</string>
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <string name="mmiError">باغلىنىشتا مەسىلە كۆرۈلدى ياكى MMI كودى خاتا.</string>
@@ -158,7 +157,6 @@
   <string name="RestrictedOnAll">بارلىق ئاۋاز/سانلىق مەلۇمات/قىسقا ئۇچۇر مۇلازىمىتى توختىتىلدى.</string>
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassVoice">ئاۋاز</string>
   <!-- Example: Service was enabled for: Voice, Data -->
@@ -176,7 +174,6 @@
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <string name="serviceClassPAD">PAD</string>
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <string name="roamingText0">كەزمە كۆرسەتكۈچ ئوچۇق</string>
   <string name="roamingText1">كەزمە كۆرسەتكۈچ تاقاق</string>
@@ -195,9 +192,7 @@
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -212,7 +207,6 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <string name="cfTemplateNotForwarded"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>:ئۇلاپ يۆتكىيەلمىدى</string>
   <!-- Displayed when the call forwarding query was forwarded. -->
@@ -224,13 +218,11 @@
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegisteredTime"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>:ئۇلاپ يۆتكىيەلمىدى</string>
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <string name="fcComplete">ئىقتىدار كودى تاماملاندى.</string>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <string name="fcError">باغلىنىشتا مەسىلە كۆرۈلدى ياكى ئىقتىدار كودى ئىناۋەتسىز.</string>
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <string name="httpErrorOk">جەزملە</string>
   <!-- Displayed when a web request failed with a generic network error. -->
@@ -264,14 +256,12 @@
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <string name="httpErrorTooManyRequests">بىر تەرەپ قىلىۋاتقان ئىلتىماس بەك كۆپ. سەل تۇرۇپ قايتا سىناڭ.</string>
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <string name="notification_title"><xliff:g id="ACCOUNT">%1$s</xliff:g> نىڭ تىزىمغا كىرىش خاتالىقى</string>
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <string name="contentServiceSync">قەدەمداش</string>
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
@@ -285,7 +275,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="default">تېلېفون ساقلىغۇچىسى توشتى. بەزى ھۆججەتلەرنى ئۆچۈرۈپ بوشلۇق بىكارلاڭ.</string>
   <!-- SSL CA cert notification -->
-  <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>
@@ -301,7 +290,6 @@
          [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_managed"><xliff:g id="MANAGING_DOMAIN">%s</xliff:g> نازارىتىدە</string>
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -312,14 +300,12 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">مەن</string>
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="tablet">تاختا كومپيۇتېر تاللانمىلار</string>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -897,7 +883,6 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <string-array name="phoneTypes">
     <item>ئۆي</item>
@@ -910,7 +895,6 @@
     <item>ئىختىيارىي</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <string-array name="emailAddressTypes">
     <item>ئۆي</item>
@@ -919,7 +903,6 @@
     <item>ئىختىيارىي</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <string-array name="postalAddressTypes">
     <item>ئۆي</item>
@@ -928,7 +911,6 @@
     <item>ئىختىيارىي</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <string-array name="imAddressTypes">
     <item>ئۆي</item>
@@ -937,7 +919,6 @@
     <item>ئىختىيارىي</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <string-array name="organizationTypes">
     <item>ئىش</item>
@@ -945,7 +926,6 @@
     <item>ئىختىيارىي</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <string-array name="imProtocols">
     <item>AIM</item>
@@ -1128,7 +1108,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <string name="lockscreen_carrier_default">مۇلازىمەت يوق</string>
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
@@ -1307,7 +1286,6 @@
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">سۈرۈش دائىرىسى</string>
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_symbol_key">\?123</string>
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
@@ -1528,7 +1506,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">ئۆچۈر</string>
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">ئىزدە</string>
@@ -1714,13 +1691,11 @@
          activity chooser. See the "Select an action" title. -->
   <string name="noApplications">بۇ مەشغۇلاتنى ئىجرا قىلىدىغان ئەپ يوق.</string>
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_application">ناھايىتى ئەپسۇس، <xliff:g id="APPLICATION">%1$s</xliff:g> توختىدى.</string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_process">ناھايىتى ئەپسۇس، <xliff:g id="PROCESS">%1$s</xliff:g> جەريان توختىدى.</string>
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_application"><xliff:g id="APPLICATION">%2$s</xliff:g> ئىنكاس يوق.\n\nئۇنى تاقامسىز؟</string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1814,7 +1789,6 @@
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_notification">ئۇقتۇرۇش ئاۋازى</string>
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <string name="ringtone_default">كۆڭۈلدىكى قوڭغۇراق ئاۋازى</string>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
@@ -1866,7 +1840,6 @@
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <string name="select_character">ھەرپ قىستۇر</string>
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <string name="sms_control_title">قىسقا ئۇچۇر يوللاۋاتىدۇ</string>
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
@@ -1876,7 +1849,6 @@
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">رەت قىل</string>
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_short_code_confirm_message">بىر ئۇچۇرنى &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; ئۆزى &lt;b&gt;<xliff:g id="DEST_ADDRESS">%2$s</xliff:g>&lt;/b&gt; غا يوللىماقچى.</string>
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
@@ -1894,7 +1866,6 @@
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_never_allow">ھەرگىز يول قويما</string>
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_removed_title">SIM كارتا چىقىرىۋېتىلدى</string>
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
@@ -1996,7 +1967,6 @@
   <string name="fast_scroll_numeric_alphabet"> 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="candidates_style"><u>"نامزات"</u></string>
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -2064,7 +2034,6 @@
   <string name="ime_action_default">ئىجرا قىل</string>
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <string name="dial_number_using"><xliff:g id="NUMBER">%s</xliff:g> دا نومۇر بۇرا</string>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
diff --git a/core/res/res/values-zh-rCN/cm_strings.xml b/core/res/res/values-zh-rCN/cm_strings.xml
index 6f522d1..ec8af28 100644
--- a/core/res/res/values-zh-rCN/cm_strings.xml
+++ b/core/res/res/values-zh-rCN/cm_strings.xml
@@ -32,13 +32,13 @@
   <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">与设备安全信息相关的权限。</string>
   <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permlab_readPhoneBlacklist">读取手机黑名单</string>
+  <string name="permlab_readPhoneBlacklist">读取号码黑名单</string>
   <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permdesc_readPhoneBlacklist">允许应用读取有关被阻止来电或信息的电话号码的信息。</string>
+  <string name="permdesc_readPhoneBlacklist">允许应用读取有关已阻止来电或信息的电话号码信息。</string>
   <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permlab_changePhoneBlacklist">更改手机黑名单</string>
+  <string name="permlab_changePhoneBlacklist">更改号码黑名单</string>
   <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permdesc_changePhoneBlacklist">允许应用更改被阻止来电或信息的电话号码。</string>
+  <string name="permdesc_changePhoneBlacklist">允许应用更改阻止来电或信息的电话号码。</string>
   <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">设置锁屏壁纸</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -76,13 +76,13 @@
   <string name="adb_active_generic_notification_message">触摸以禁用调试。</string>
   <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
-  <string name="adb_active_custom_tile_both">USB &amp; 网络</string>
+  <string name="adb_active_custom_tile_both">USB 和网络</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">网络</string>
   <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">拦截应用启动</string>
   <!-- stylus gestures support -->
-  <string name="stylus_app_not_installed">%s 尚未被安装</string>
+  <string name="stylus_app_not_installed">%s 尚未安装</string>
   <!-- Zen mode buttons -->
   <string name="silent_mode_priority">优先级</string>
   <string name="silent_mode_none">无</string>
@@ -92,7 +92,7 @@
   <string name="notify_turn_wifi_off_title">关闭 Wi-Fi</string>
   <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">启用或禁用隐私防护</string>
-  <string name="permdesc_changePrivacyGuardState">允许应用更改其他应用是否启用隐私防护。当一个应用运行时启用了隐私防护，它将不能访问个人数据，如联系人、通话记录、短信。</string>
+  <string name="permdesc_changePrivacyGuardState">允许应用更改其他应用是否启用隐私防护。当一个应用以启用隐私防护运行时，它将不能访问如联系人、通话记录、短信等个人数据。</string>
   <string name="privacy_guard_notification">隐私防护激活</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> 将不能访问个人数据</string>
   <string name="privacy_guard_dialog_title">隐私防护</string>
@@ -101,7 +101,7 @@
   <string name="permission_remember_choice">记住我的选择</string>
   <!-- App ops requests -->
   <string name="app_ops_access_camera">存取相机</string>
-  <string name="app_ops_access_location">访问你的地理位置信息</string>
+  <string name="app_ops_access_location">访问您的位置信息</string>
   <string name="app_ops_access_notifications">读取通知</string>
   <string name="app_ops_activate_vpn">激活一个 VPN</string>
   <string name="app_ops_auto_start">开机自启动</string>
@@ -113,21 +113,21 @@
   <string name="app_ops_get_usage_stats">获取应用使用情况统计</string>
   <string name="app_ops_keep_device_awake">保持设备唤醒</string>
   <string name="app_ops_make_phone_call">拨打电话</string>
-  <string name="app_ops_modify_calendar">更新你的日历</string>
+  <string name="app_ops_modify_calendar">更新您的日历</string>
   <string name="app_ops_modify_call_log">更新通话记录</string>
   <string name="app_ops_modify_clipboard">修改剪贴板</string>
-  <string name="app_ops_modify_contacts">更新你的联系人</string>
+  <string name="app_ops_modify_contacts">更新您的联系人</string>
   <string name="app_ops_modify_settings">更新系统设置</string>
   <string name="app_ops_mute_unmute_microphone">麦克风静音 / 解除静音</string>
   <string name="app_ops_play_audio">播放音频</string>
   <string name="app_ops_post_notification">发出通知</string>
   <string name="app_ops_project_media">放映媒体</string>
-  <string name="app_ops_read_calendar">读取你的日历</string>
-  <string name="app_ops_read_call_log">读取你的通话记录</string>
-  <string name="app_ops_read_clipboard">读取你的剪贴板</string>
-  <string name="app_ops_read_contacts">读取你的联系人</string>
-  <string name="app_ops_read_mms">读取你的彩信</string>
-  <string name="app_ops_read_sms">读取你的短信</string>
+  <string name="app_ops_read_calendar">读取您的日历</string>
+  <string name="app_ops_read_call_log">读取您的通话记录</string>
+  <string name="app_ops_read_clipboard">读取您的剪贴板</string>
+  <string name="app_ops_read_contacts">读取您的联系人</string>
+  <string name="app_ops_read_mms">读取您的彩信</string>
+  <string name="app_ops_read_sms">读取您的短信</string>
   <string name="app_ops_receive_sms">接收短信</string>
   <string name="app_ops_record_audio">录音</string>
   <string name="app_ops_send_mms">发送彩信</string>
diff --git a/core/res/res/values-zh-rTW/cm_strings.xml b/core/res/res/values-zh-rTW/cm_strings.xml
index a2fce55..2edcb8a 100644
--- a/core/res/res/values-zh-rTW/cm_strings.xml
+++ b/core/res/res/values-zh-rTW/cm_strings.xml
@@ -18,7 +18,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- label for item that screenshots in phone options dialog -->
-  <string name="global_action_screenshot">螢幕截圖</string>
+  <string name="global_action_screenshot">螢幕擷取</string>
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">接收受保護的簡訊</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -36,13 +36,13 @@
   <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">允許應用程式讀取關於被封鎖來電或訊息的電話號碼的資訊。</string>
   <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permlab_changePhoneBlacklist">更改手機黑名單</string>
+  <string name="permlab_changePhoneBlacklist">變更手機黑名單</string>
   <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permdesc_changePhoneBlacklist">允許應用程式更改被封鎖來電或訊息的電話號碼。</string>
+  <string name="permdesc_changePhoneBlacklist">允許應用程式變更被封鎖來電或訊息的電話號碼。</string>
   <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">設定鎖定螢幕桌布</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permdesc_setKeyguardWallpaper">允許應用程式更改鎖定螢幕桌布。</string>
+  <string name="permdesc_setKeyguardWallpaper">允許應用程式變更鎖定畫面桌布。</string>
   <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">重新啟動</string>
   <!-- label for current user in phone options dialog -->
@@ -55,7 +55,7 @@
   <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
   <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
-  <string name="reboot_download">Download</string>
+  <string name="reboot_download">下載</string>
   <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">軟體重新啟動</string>
   <!-- Title of dialog to confirm rebooting. -->
@@ -65,7 +65,7 @@
   <string name="reboot_confirm" product="tablet">您的平板電腦將會重新啟動。</string>
   <string name="reboot_confirm" product="default">您的手機將會重新啟動。</string>
   <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
-  <string name="reboot_progress">正在重新啟動\u2026</string>
+  <string name="reboot_progress">重新啟動中\u2026</string>
   <!-- Long-press back kill application -->
   <string name="app_killed_message">已終止應用程式</string>
   <!-- ADB over network notification -->
@@ -84,10 +84,10 @@
   <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">未安裝 %s</string>
   <!-- Zen mode buttons -->
-  <string name="silent_mode_priority">優先度</string>
+  <string name="silent_mode_priority">優先權</string>
   <string name="silent_mode_none">無</string>
   <!-- Wifi Hotspot disabled due to subscription change -->
-  <string name="subscription_change_disabled_wifi_ap">由於 SIM 卡資訊更改，已停用 Wi-Fi 熱點</string>
+  <string name="subscription_change_disabled_wifi_ap">由於 SIM 卡資訊變更，已停用 Wi-Fi 熱點</string>
   <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">關閉 Wi-Fi</string>
   <!-- Privacy Guard -->
@@ -103,7 +103,7 @@
   <string name="app_ops_access_camera">存取相機</string>
   <string name="app_ops_access_location">存取您的位置</string>
   <string name="app_ops_access_notifications">讀取您的通知</string>
-  <string name="app_ops_activate_vpn">啟動 VPN</string>
+  <string name="app_ops_activate_vpn">啟用一個 VPN</string>
   <string name="app_ops_auto_start">開機時啟動</string>
   <string name="app_ops_delete_call_log">刪除您的通話紀錄</string>
   <string name="app_ops_delete_contacts">刪除您的聯絡人</string>
@@ -127,16 +127,16 @@
   <string name="app_ops_read_clipboard">讀取剪貼簿</string>
   <string name="app_ops_read_contacts">讀取您的聯絡人資料</string>
   <string name="app_ops_read_mms">讀取您的多媒體簡訊</string>
-  <string name="app_ops_read_sms">讀取您的簡訊</string>
-  <string name="app_ops_receive_sms">接收簡訊</string>
+  <string name="app_ops_read_sms">讀取您的簡訊訊息</string>
+  <string name="app_ops_receive_sms">接收簡訊訊息</string>
   <string name="app_ops_record_audio">錄製音訊</string>
   <string name="app_ops_send_mms">傳送多媒體訊息</string>
-  <string name="app_ops_send_sms">傳送簡訊</string>
+  <string name="app_ops_send_sms">傳送簡訊訊息</string>
   <string name="app_ops_start_at_bootup">開機時啟動</string>
-  <string name="app_ops_toast_window">顯示彈出信息</string>
+  <string name="app_ops_toast_window">顯示提示訊息</string>
   <string name="app_ops_toggle_bluetooth">切換至藍牙</string>
   <string name="app_ops_toggle_mobile_data">切換至行動數據</string>
-  <string name="app_ops_toggle_nfc">開關 NFC</string>
+  <string name="app_ops_toggle_nfc">切換至 NFC</string>
   <string name="app_ops_toggle_wifi">切換至 Wi-Fi</string>
   <string name="app_ops_use_alarm_volume">控制鬧鐘音量</string>
   <string name="app_ops_use_audio_focus">控制音訊焦點</string>
@@ -146,17 +146,17 @@
   <string name="app_ops_use_media_volume">控制媒體音量</string>
   <string name="app_ops_use_notification_volume">控制通知音量</string>
   <string name="app_ops_use_ring_volume">控制鈴聲音量</string>
-  <string name="app_ops_use_vibrate">使用觸控震動</string>
+  <string name="app_ops_use_vibrate">使用觸覺回饋</string>
   <string name="app_ops_use_voice_volume">控制語音通話音量</string>
   <string name="app_ops_write_mms">撰寫多媒體訊息</string>
-  <string name="app_ops_write_sms">撰寫簡訊</string>
+  <string name="app_ops_write_sms">撰寫簡訊訊息</string>
   <string name="app_ops_use_fingerprint">使用指紋</string>
   <string name="app_ops_add_voicemail">新增語音信箱</string>
   <string name="app_ops_read_phone_state">存取電話狀態</string>
   <string name="app_ops_scan_wifi">掃描 Wi-Fi 網路</string>
-  <string name="app_ops_change_wallpaper">更改桌布</string>
+  <string name="app_ops_change_wallpaper">變更桌布</string>
   <string name="app_ops_assist_structure">使用協助工具</string>
-  <string name="app_ops_assist_screenshot">螢幕截圖</string>
+  <string name="app_ops_assist_screenshot">螢幕擷取畫面</string>
   <string name="app_ops_use_body_sensors">使用人體感應器</string>
   <string name="app_ops_read_cell_broadcasts">讀取區域廣播</string>
   <string name="app_ops_mock_location">模擬所在位置</string>
@@ -164,10 +164,10 @@
   <string name="app_ops_write_external_storage">寫入外部儲存空間</string>
   <string name="app_ops_turn_on_screen">開啟螢幕</string>
   <string name="app_ops_get_accounts">取得裝置帳號</string>
-  <string name="app_ops_wifi_change">更改 Wi-Fi 狀態</string>
+  <string name="app_ops_wifi_change">變更 Wi-Fi 狀態</string>
   <string name="app_ops_su">取得 Root 權限</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <string name="lock_to_app_toast_no_navbar">要解鎖此螢幕，觸摸並按住返回鍵。</string>
+  <string name="lock_to_app_toast_no_navbar">要解鎖此畫面，請輕觸並按住 [返回] 鍵。</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">沒有已連接的裝置</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> 個已連接裝置</string>
@@ -188,6 +188,6 @@
          whether they want to allow the application to do this. -->
   <string name="permdesc_resetBatteryStats">允許應用程式重設目前低電量的電池使用資料。</string>
   <!-- Uicc hotswapped event configuration needed notification -->
-  <string name="uicc_hot_swapped_event_title">SIM 卡已更改</string>
-  <string name="uicc_hot_swapped_event_text">輕觸即可設定 SIM卡 預設首選項</string>
+  <string name="uicc_hot_swapped_event_title">SIM 卡已變更</string>
+  <string name="uicc_hot_swapped_event_text">輕觸即可設定 SIM卡 預設偏好</string>
 </resources>
diff --git a/packages/DocumentsUI/res/values-lb/strings.xml b/packages/DocumentsUI/res/values-lb/strings.xml
index 5bcd64f..3d6545d 100644
--- a/packages/DocumentsUI/res/values-lb/strings.xml
+++ b/packages/DocumentsUI/res/values-lb/strings.xml
@@ -42,6 +42,7 @@
   <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
   <string name="menu_delete">Läschen</string>
   <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <string name="menu_select_all">Alles auswielen</string>
   <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
   <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
   <string name="menu_advanced_show" product="nosdcard">Interne Späicher uweisen</string>
@@ -56,7 +57,9 @@
   <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
   <string name="menu_file_size_hide">Fichiersgréisst verstoppen</string>
   <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <string name="button_select">Auswielen</string>
   <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <string name="button_copy">Kopéieren</string>
   <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
   <string name="sort_name">No Numm</string>
   <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
@@ -94,11 +97,14 @@
   <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
   <string name="share_via">Deelen iwwer</string>
   <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <string name="copy_notification_title">Fichiere gi kopéiert</string>
   <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <string name="copy_remaining"><xliff:g id="duration" example="3 minutes">%s</xliff:g> iwwreg</string>
   <!-- Toast shown when a file copy is kicked off -->
   <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
   <!-- Title of the copy error notification [CHAR LIMIT=48] -->
   <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
   <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <string name="retry">Nees probéieren</string>
   <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
 </resources>
diff --git a/packages/Keyguard/res/values-as-rIN/strings.xml b/packages/Keyguard/res/values-as-rIN/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-as-rIN/strings.xml
+++ b/packages/Keyguard/res/values-as-rIN/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-ast-rES/strings.xml b/packages/Keyguard/res/values-ast-rES/strings.xml
index 37a1824..c268778 100644
--- a/packages/Keyguard/res/values-ast-rES/strings.xml
+++ b/packages/Keyguard/res/values-ast-rES/strings.xml
@@ -60,7 +60,6 @@
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">Empobina al menú pa desbloquiar la pantalla.</string>
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">Bloquiada pa la rede</string>
   <!-- Shown when there is no SIM card. -->
@@ -102,7 +101,6 @@
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_next_alarm">Próxima alarma afitada a les <xliff:g id="alarm" example="Fri 8:30 AM">%1$s</xliff:g></string>
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">Desaniciar</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-br-rFR/strings.xml b/packages/Keyguard/res/values-br-rFR/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-br-rFR/strings.xml
+++ b/packages/Keyguard/res/values-br-rFR/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-csb-rPL/strings.xml b/packages/Keyguard/res/values-csb-rPL/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-csb-rPL/strings.xml
+++ b/packages/Keyguard/res/values-csb-rPL/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-cy/strings.xml b/packages/Keyguard/res/values-cy/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-cy/strings.xml
+++ b/packages/Keyguard/res/values-cy/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-en-rPT/strings.xml b/packages/Keyguard/res/values-en-rPT/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-en-rPT/strings.xml
+++ b/packages/Keyguard/res/values-en-rPT/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-eo/strings.xml b/packages/Keyguard/res/values-eo/strings.xml
index 798b667..170dcac 100644
--- a/packages/Keyguard/res/values-eo/strings.xml
+++ b/packages/Keyguard/res/values-eo/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">Forigi</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-es-rCO/strings.xml b/packages/Keyguard/res/values-es-rCO/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-es-rCO/strings.xml
+++ b/packages/Keyguard/res/values-es-rCO/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-es-rMX/strings.xml b/packages/Keyguard/res/values-es-rMX/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-es-rMX/strings.xml
+++ b/packages/Keyguard/res/values-es-rMX/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-frp-rIT/strings.xml b/packages/Keyguard/res/values-frp-rIT/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-frp-rIT/strings.xml
+++ b/packages/Keyguard/res/values-frp-rIT/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-fy-rNL/strings.xml b/packages/Keyguard/res/values-fy-rNL/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-fy-rNL/strings.xml
+++ b/packages/Keyguard/res/values-fy-rNL/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-ga-rIE/strings.xml b/packages/Keyguard/res/values-ga-rIE/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-ga-rIE/strings.xml
+++ b/packages/Keyguard/res/values-ga-rIE/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-gd-rGB/strings.xml b/packages/Keyguard/res/values-gd-rGB/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-gd-rGB/strings.xml
+++ b/packages/Keyguard/res/values-gd-rGB/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-gl-rES/cm_strings.xml b/packages/Keyguard/res/values-gl-rES/cm_strings.xml
index 4221609..314940a 100644
--- a/packages/Keyguard/res/values-gl-rES/cm_strings.xml
+++ b/packages/Keyguard/res/values-gl-rES/cm_strings.xml
@@ -21,6 +21,10 @@
   <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Esta tarxeta non é válida.</string>
   <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">Introduce o código PIN. Tienes <xliff:g id="number">%d</xliff:g> intento restante antes de ter que comunicarte con a tua operadora para desbloquear o dispositivo.</item>
+    <item quantity="other">Introduce o código PIN. Tienes <xliff:g id="number">%d</xliff:g> intentos restantes.</item>
+  </plurals>
   <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Erro: O dato introducido é máis curto có mínimo esixido</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ku/strings.xml b/packages/Keyguard/res/values-ku/strings.xml
index 5861ec9..336eff9 100644
--- a/packages/Keyguard/res/values-ku/strings.xml
+++ b/packages/Keyguard/res/values-ku/strings.xml
@@ -56,7 +56,6 @@
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">دەست بنێ بە پێڕستدا بۆ کردنه‌وه‌.</string>
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">تۆڕی نێت داخرا</string>
   <!-- Shown when there is no SIM card. -->
@@ -98,7 +97,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">سڕینه‌وه‌</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-lb/strings.xml b/packages/Keyguard/res/values-lb/strings.xml
index 2ee72e8..0763983 100644
--- a/packages/Keyguard/res/values-lb/strings.xml
+++ b/packages/Keyguard/res/values-lb/strings.xml
@@ -60,7 +60,6 @@
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">Menü drécke fir z\'entspären.</string>
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">Netzwierk gespaart</string>
   <!-- Shown when there is no SIM card. -->
@@ -106,7 +105,6 @@ Kontaktéier däi Provider fir eng aner SIM-Kaart ze kréien.</string>
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_next_alarm">Nächste Wecker gesat fir <xliff:g id="alarm" example="Fri 8:30 AM">%1$s</xliff:g></string>
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">Läschen</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-oc-rFR/strings.xml b/packages/Keyguard/res/values-oc-rFR/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-oc-rFR/strings.xml
+++ b/packages/Keyguard/res/values-oc-rFR/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-or-rIN/strings.xml b/packages/Keyguard/res/values-or-rIN/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-or-rIN/strings.xml
+++ b/packages/Keyguard/res/values-or-rIN/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-ro/cm_strings.xml b/packages/Keyguard/res/values-ro/cm_strings.xml
index c9a5723..4cfd544 100644
--- a/packages/Keyguard/res/values-ro/cm_strings.xml
+++ b/packages/Keyguard/res/values-ro/cm_strings.xml
@@ -17,9 +17,15 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">Cardul SIM este Perso blocat</string>
   <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Cartelă SIM incorectă.</string>
   <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">Introduceţi PIN-ul pentru SIM, mai aveţi <xliff:g id="number">%d</xliff:g> încercare rămasă înainte de a trebui să contactaţi compania de rețea mobilă pentru a debloca dispozitivul.</item>
+    <item quantity="few">Introduceţi PIN-ul pentru SIM, mai aveţi <xliff:g id="number">%d</xliff:g> (de) încercări rămase.</item>
+    <item quantity="other">Introduceţi PIN-ul pentru SIM, mai aveţi <xliff:g id="number">%d</xliff:g> (de) încercări rămase.</item>
+  </plurals>
   <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Eroare: Introducere mai scurtă decât lungimea minimă</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ug/strings.xml b/packages/Keyguard/res/values-ug/strings.xml
index 232d6dc..6ad14ee 100644
--- a/packages/Keyguard/res/values-ug/strings.xml
+++ b/packages/Keyguard/res/values-ug/strings.xml
@@ -56,7 +56,6 @@
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">Menu نى بېسىپ قۇلۇپنى ئېچىڭ.</string>
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">تور قۇلۇپلانغان</string>
   <!-- Shown when there is no SIM card. -->
@@ -97,7 +96,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">ئۆچۈر</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-zh-rCN/cm_strings.xml b/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
index 6f94967..948efc1 100644
--- a/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
+++ b/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
@@ -22,7 +22,7 @@
   <string name="lockscreen_sim_error_message_short">无效的 SIM 卡。</string>
   <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
-    <item quantity="other">输入 SIM 卡 PIN。您还有 <xliff:g id="number">%d</xliff:g> 次尝试机会；若超出此次数，则必须联系运营商以解锁 SIM 卡。</item>
+    <item quantity="other">请输入 SIM 卡 PIN。您还有 <xliff:g id="number">%d</xliff:g> 次尝试机会。若超出此次数，则必须为解锁 SIM 卡求助运营商。</item>
   </plurals>
   <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">错误：输入长度小于最小长度</string>
diff --git a/packages/SettingsLib/res/values-as-rIN/arrays.xml b/packages/SettingsLib/res/values-as-rIN/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-as-rIN/arrays.xml
+++ b/packages/SettingsLib/res/values-as-rIN/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-ast-rES/arrays.xml b/packages/SettingsLib/res/values-ast-rES/arrays.xml
index 944d2b2..1d95ab1 100644
--- a/packages/SettingsLib/res/values-ast-rES/arrays.xml
+++ b/packages/SettingsLib/res/values-ast-rES/arrays.xml
@@ -21,7 +21,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
@@ -50,7 +49,6 @@
     <item>Desactivando mala conexón 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. -->
diff --git a/packages/SettingsLib/res/values-br-rFR/arrays.xml b/packages/SettingsLib/res/values-br-rFR/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-br-rFR/arrays.xml
+++ b/packages/SettingsLib/res/values-br-rFR/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-csb-rPL/arrays.xml b/packages/SettingsLib/res/values-csb-rPL/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-csb-rPL/arrays.xml
+++ b/packages/SettingsLib/res/values-csb-rPL/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-cy/arrays.xml b/packages/SettingsLib/res/values-cy/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-cy/arrays.xml
+++ b/packages/SettingsLib/res/values-cy/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-en-rPT/arrays.xml b/packages/SettingsLib/res/values-en-rPT/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-en-rPT/arrays.xml
+++ b/packages/SettingsLib/res/values-en-rPT/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-eo/arrays.xml b/packages/SettingsLib/res/values-eo/arrays.xml
index 024e633..f60a34d 100644
--- a/packages/SettingsLib/res/values-eo/arrays.xml
+++ b/packages/SettingsLib/res/values-eo/arrays.xml
@@ -21,7 +21,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
@@ -50,7 +49,6 @@
     <item>Temporarily avoiding poor connection</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. -->
diff --git a/packages/SettingsLib/res/values-es-rCO/arrays.xml b/packages/SettingsLib/res/values-es-rCO/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-es-rCO/arrays.xml
+++ b/packages/SettingsLib/res/values-es-rCO/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-es-rMX/arrays.xml b/packages/SettingsLib/res/values-es-rMX/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-es-rMX/arrays.xml
+++ b/packages/SettingsLib/res/values-es-rMX/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-frp-rIT/arrays.xml b/packages/SettingsLib/res/values-frp-rIT/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-frp-rIT/arrays.xml
+++ b/packages/SettingsLib/res/values-frp-rIT/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-fy-rNL/arrays.xml b/packages/SettingsLib/res/values-fy-rNL/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-fy-rNL/arrays.xml
+++ b/packages/SettingsLib/res/values-fy-rNL/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-ga-rIE/arrays.xml b/packages/SettingsLib/res/values-ga-rIE/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-ga-rIE/arrays.xml
+++ b/packages/SettingsLib/res/values-ga-rIE/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-gd-rGB/arrays.xml b/packages/SettingsLib/res/values-gd-rGB/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-gd-rGB/arrays.xml
+++ b/packages/SettingsLib/res/values-gd-rGB/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-ku/arrays.xml b/packages/SettingsLib/res/values-ku/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-ku/arrays.xml
+++ b/packages/SettingsLib/res/values-ku/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-lb/arrays.xml b/packages/SettingsLib/res/values-lb/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-lb/arrays.xml
+++ b/packages/SettingsLib/res/values-lb/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-oc-rFR/arrays.xml b/packages/SettingsLib/res/values-oc-rFR/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-oc-rFR/arrays.xml
+++ b/packages/SettingsLib/res/values-oc-rFR/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-or-rIN/arrays.xml b/packages/SettingsLib/res/values-or-rIN/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-or-rIN/arrays.xml
+++ b/packages/SettingsLib/res/values-or-rIN/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-ug/arrays.xml b/packages/SettingsLib/res/values-ug/arrays.xml
index f954c2b..e4f82d3 100644
--- a/packages/SettingsLib/res/values-ug/arrays.xml
+++ b/packages/SettingsLib/res/values-ug/arrays.xml
@@ -21,7 +21,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- 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. -->
@@ -50,6 +49,5 @@
     <item>Temporarily avoiding poor connection</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-zh-rTW/cm_strings.xml b/packages/SettingsLib/res/values-zh-rTW/cm_strings.xml
index 964e5f4..478d992 100644
--- a/packages/SettingsLib/res/values-zh-rTW/cm_strings.xml
+++ b/packages/SettingsLib/res/values-zh-rTW/cm_strings.xml
@@ -23,5 +23,5 @@
   <string name="picker_activities">活動</string>
   <string name="select_custom_app_title">選取自訂應用程式</string>
   <string name="select_custom_activity_title">選取自訂活動</string>
-  <string name="lockscreen_targets_message">鎖定螢幕捷徑</string>
+  <string name="lockscreen_targets_message">鎖定畫面捷徑</string>
 </resources>
diff --git a/packages/SystemUI/res/values-as-rIN/strings.xml b/packages/SystemUI/res/values-as-rIN/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-as-rIN/strings.xml
+++ b/packages/SystemUI/res/values-as-rIN/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-ast-rES/strings.xml b/packages/SystemUI/res/values-ast-rES/strings.xml
index 12b0b8c..3b9cdb0 100644
--- a/packages/SystemUI/res/values-ast-rES/strings.xml
+++ b/packages/SystemUI/res/values-ast-rES/strings.xml
@@ -653,7 +653,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <string name="keyguard_indication_charging_time_slowly">Carga lenta (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> pa completar la carga)</string>
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <string name="accessibility_multi_user_switch_switcher">Camudar usuariu</string>
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
diff --git a/packages/SystemUI/res/values-br-rFR/strings.xml b/packages/SystemUI/res/values-br-rFR/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-br-rFR/strings.xml
+++ b/packages/SystemUI/res/values-br-rFR/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-cs/cm_strings.xml b/packages/SystemUI/res/values-cs/cm_strings.xml
index 4a0fc63..7f16da9 100644
--- a/packages/SystemUI/res/values-cs/cm_strings.xml
+++ b/packages/SystemUI/res/values-cs/cm_strings.xml
@@ -174,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Další budík</string>
   <string name="dynamic_qs_tile_ime_selector_label">Výběr IME</string>
   <string name="dynamic_qs_tile_su_label">Root přístup</string>
+  <string name="dynamic_qs_tile_themes_label">Motivy</string>
   <string name="quick_settings_title_advanced_location">Třístavové nastavení určení polohy</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Zjištění polohy: úsporný režim.</string>
diff --git a/packages/SystemUI/res/values-csb-rPL/strings.xml b/packages/SystemUI/res/values-csb-rPL/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-csb-rPL/strings.xml
+++ b/packages/SystemUI/res/values-csb-rPL/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-cy/strings.xml b/packages/SystemUI/res/values-cy/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-cy/strings.xml
+++ b/packages/SystemUI/res/values-cy/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-en-rPT/strings.xml b/packages/SystemUI/res/values-en-rPT/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-en-rPT/strings.xml
+++ b/packages/SystemUI/res/values-en-rPT/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-eo/strings.xml b/packages/SystemUI/res/values-eo/strings.xml
index 2f749ba..8041df8 100644
--- a/packages/SystemUI/res/values-eo/strings.xml
+++ b/packages/SystemUI/res/values-eo/strings.xml
@@ -367,7 +367,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-es-rCO/strings.xml b/packages/SystemUI/res/values-es-rCO/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-es-rCO/strings.xml
+++ b/packages/SystemUI/res/values-es-rCO/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-es-rMX/strings.xml b/packages/SystemUI/res/values-es-rMX/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-es-rMX/strings.xml
+++ b/packages/SystemUI/res/values-es-rMX/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-fi/cm_strings.xml b/packages/SystemUI/res/values-fi/cm_strings.xml
index c6e454d..becd5cb 100644
--- a/packages/SystemUI/res/values-fi/cm_strings.xml
+++ b/packages/SystemUI/res/values-fi/cm_strings.xml
@@ -174,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Seuraava hälytys</string>
   <string name="dynamic_qs_tile_ime_selector_label">Syöttötavan valitsin</string>
   <string name="dynamic_qs_tile_su_label">Root-oikeudet</string>
+  <string name="dynamic_qs_tile_themes_label">Teemat</string>
   <string name="quick_settings_title_advanced_location">Sijainnin lisäasetukset</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Sijainnin raportointi: virransäästötila.</string>
diff --git a/packages/SystemUI/res/values-frp-rIT/strings.xml b/packages/SystemUI/res/values-frp-rIT/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-frp-rIT/strings.xml
+++ b/packages/SystemUI/res/values-frp-rIT/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-fy-rNL/strings.xml b/packages/SystemUI/res/values-fy-rNL/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-fy-rNL/strings.xml
+++ b/packages/SystemUI/res/values-fy-rNL/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-ga-rIE/strings.xml b/packages/SystemUI/res/values-ga-rIE/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-ga-rIE/strings.xml
+++ b/packages/SystemUI/res/values-ga-rIE/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-gd-rGB/strings.xml b/packages/SystemUI/res/values-gd-rGB/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-gd-rGB/strings.xml
+++ b/packages/SystemUI/res/values-gd-rGB/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-ku/strings.xml b/packages/SystemUI/res/values-ku/strings.xml
index 4799c13..87d89bb 100644
--- a/packages/SystemUI/res/values-ku/strings.xml
+++ b/packages/SystemUI/res/values-ku/strings.xml
@@ -535,7 +535,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-lb/strings.xml b/packages/SystemUI/res/values-lb/strings.xml
index 9505026..0217846 100644
--- a/packages/SystemUI/res/values-lb/strings.xml
+++ b/packages/SystemUI/res/values-lb/strings.xml
@@ -609,7 +609,6 @@ iwwerwaacht sinn</string>
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <string name="keyguard_indication_charging_time_slowly">Gëtt lues opgelueden (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> bis e voll ass)</string>
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <string name="accessibility_multi_user_switch_switcher">Benotzer wiesselen</string>
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
diff --git a/packages/SystemUI/res/values-nb/cm_strings.xml b/packages/SystemUI/res/values-nb/cm_strings.xml
index ebef919..4a9478f 100644
--- a/packages/SystemUI/res/values-nb/cm_strings.xml
+++ b/packages/SystemUI/res/values-nb/cm_strings.xml
@@ -86,7 +86,7 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">System profiler</string>
   <string name="quick_settings_profiles_off">Profiler deaktivert</string>
-  <string name="quick_settings_heads_up_label">Flytende notifikasjoner</string>
+  <string name="quick_settings_heads_up_label">Flytende varsler</string>
   <string name="quick_settings_battery_saver_label">Batterisparing</string>
   <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
   <string name="quick_settings_battery_saver_label_charging">Batterisparing (lading)</string>
@@ -150,9 +150,9 @@
   <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient skjerm er skrudd på.</string>
   <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_heads_up_off">Heads up notifikasjoner er av.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Heads up varsler er av.</string>
   <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_heads_up_on">Heads up notifikasjoner er på.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Heads up varsler er på.</string>
   <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Heads-up ble deaktivert.</string>
   <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
diff --git a/packages/SystemUI/res/values-oc-rFR/strings.xml b/packages/SystemUI/res/values-oc-rFR/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-oc-rFR/strings.xml
+++ b/packages/SystemUI/res/values-oc-rFR/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-or-rIN/strings.xml b/packages/SystemUI/res/values-or-rIN/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-or-rIN/strings.xml
+++ b/packages/SystemUI/res/values-or-rIN/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-ro/cm_strings.xml b/packages/SystemUI/res/values-ro/cm_strings.xml
index 2ef4e1d..47f93a8 100644
--- a/packages/SystemUI/res/values-ro/cm_strings.xml
+++ b/packages/SystemUI/res/values-ro/cm_strings.xml
@@ -29,6 +29,7 @@
   <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Glisați dreapta pentru %1$s</string>
   <string name="right_shortcut_hint">Glisați stânga pentru %1$s</string>
+  <string name="lockscreen_message">Apăsaţi o pictogramă din stânga sau dreapta pentru a realoca o comandă rapidă pe ecranul de blocare.</string>
   <string name="lockscreen_default_target">Implicit</string>
   <string name="select_application">Selectați aplicația</string>
   <string name="lockscreen_choose_action_title">Alege acțiunea</string>
@@ -53,6 +54,7 @@
   <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Dezinstalați</string>
   <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">Luminozitate lumină</string>
   <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profiluri oprit.</string>
   <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -64,6 +66,7 @@
   <string name="quick_settings_compass_init">Inițializare\u2026</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Setări de lumină</string>
+  <string name="led_notification_text">Lumină LED activată de setări</string>
   <string name="qs_tile_edit_header_instruction">Apăsați și țineți apăsate chenarele pentru a rearanja</string>
   <string name="quick_settings_edit_label">Editare chenare</string>
   <string name="quick_settings_cannot_delete_edit_tile">Nu se poate șterge chenarul Editare</string>
@@ -75,6 +78,7 @@
   <string name="quick_settings_title_show_brightness_slider">Arată glisorul de luminozitate</string>
   <string name="quick_settings_title_enlarge_first_row">Mărește primul rând</string>
   <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">Aceasta ține în vizualizare ecranul până îl deblocați. Apăsați și țineți apăsat butonul Înapoi pentru a debloca.</string>
   <string name="quick_settings_custom_tile_detail_title">Chenar personalizat</string>
   <string name="quick_settings_remove">Eliminare chenar</string>
   <string name="quick_settings_network_adb_label">ADB prin rețea</string>
@@ -85,6 +89,7 @@
   <string name="quick_settings_heads_up_label">Atenționare</string>
   <string name="quick_settings_battery_saver_label">Economizor baterie</string>
   <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Economizor de baterie (încărcare)</string>
   <string name="quick_settings_caffeine_label">Cofeină</string>
   <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Sincronizare oprită.</string>
@@ -133,17 +138,25 @@
   <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Blocare ecran pornit.</string>
   <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_off">Ecran de blocare dezactivat.</string>
   <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_on">Ecran de blocare activat.</string>
   <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Afișare ambientală oprită.</string>
   <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Afișare ambientală pornită.</string>
   <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">Afișaj ambiental dezactivat.</string>
   <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">Afișaj ambiental activat.</string>
   <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">Heads-up oprit.</string>
   <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">Heads-up pornit.</string>
   <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_off">Heads-up a fost oprit.</string>
   <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_on">Heads-up a fost pornit.</string>
   <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Cofeină oprit.</string>
   <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -161,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Următoarea alarmă</string>
   <string name="dynamic_qs_tile_ime_selector_label">Selector IME</string>
   <string name="dynamic_qs_tile_su_label">Acces root</string>
+  <string name="dynamic_qs_tile_themes_label">Teme</string>
   <string name="quick_settings_title_advanced_location">Starea celor 3 moduri de locație</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Raportarea locației: mod economisire baterie.</string>
@@ -197,10 +211,17 @@
     <item quantity="other">%1$d clienți</item>
   </plurals>
   <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Nu există date SIM</string>
   <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Procent baterie <xliff:g id="number">%d</xliff:g> andocată.</string>
   <!-- Play queue -->
+  <string name="play_queue_extention">Afișare coadă de redare</string>
   <!-- Path data for portrait battery -->
   <!-- Path data for landscape battery -->
   <!-- Path data for circle battery -->
   <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Glisați în jos pentru a extinde</string>
+  <string name="swipe_left_hint">Glisați stânga pentru a <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Glisați dreapta pentru notificări</string>
 </resources>
diff --git a/packages/SystemUI/res/values-ug/strings.xml b/packages/SystemUI/res/values-ug/strings.xml
index 6c4dac3..95d4f4d 100644
--- a/packages/SystemUI/res/values-ug/strings.xml
+++ b/packages/SystemUI/res/values-ug/strings.xml
@@ -493,7 +493,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-zh-rCN/cm_strings.xml b/packages/SystemUI/res/values-zh-rCN/cm_strings.xml
index 525300b..0b882eb 100644
--- a/packages/SystemUI/res/values-zh-rCN/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rCN/cm_strings.xml
@@ -42,7 +42,7 @@
   <string name="navbar_back_button">返回键</string>
   <string name="navbar_empty_button">空白键</string>
   <string name="navbar_menu_conditional_button">菜单键 (自动隐藏)</string>
-  <string name="navbar_menu_always_button">菜单键 (总是显示)</string>
+  <string name="navbar_menu_always_button">菜单键 (始终显示)</string>
   <string name="navbar_menu_big_button">菜单键</string>
   <string name="accessibility_dpad_left">光标左移</string>
   <string name="accessibility_dpad_right">光标右移</string>
@@ -62,7 +62,7 @@
   <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">情景模式已关闭。</string>
   <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_profiles_changed">情景模式已修改为<xliff:g id="profile" example="Default">%s</xliff:g>。</string>
+  <string name="accessibility_quick_settings_profiles_changed">情景模式已更改为<xliff:g id="profile" example="Default">%s</xliff:g>。</string>
   <string name="quick_settings_compass_init">正在初始化\u2026</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">指示灯设置</string>
diff --git a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
index b85480b..16560d7 100644
--- a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
@@ -29,14 +29,14 @@
   <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">向右滑動即可%1$s</string>
   <string name="right_shortcut_hint">向左滑動即可%1$s</string>
-  <string name="lockscreen_message">輕觸左側或右側的圖示即可設定鎖定螢幕捷徑</string>
+  <string name="lockscreen_message">輕觸左側或右側的圖示即可設定鎖定畫面捷徑</string>
   <string name="lockscreen_default_target">預設</string>
-  <string name="select_application">選取應用程式</string>
-  <string name="lockscreen_choose_action_title">選取操作</string>
+  <string name="select_application">選擇應用程式</string>
+  <string name="lockscreen_choose_action_title">選擇動作</string>
   <string name="lockscreen_none_target">無</string>
   <!-- Dialog title for navigation bar button selection -->
-  <string name="navbar_dialog_title">選擇要指定的操作</string>
-  <string name="navbar_home_button">主螢幕鍵</string>
+  <string name="navbar_dialog_title">選擇要指定的動作</string>
+  <string name="navbar_home_button">主畫面鍵</string>
   <string name="navbar_recent_button">多工鍵</string>
   <string name="navbar_search_button">搜尋鍵</string>
   <string name="navbar_back_button">返回鍵</string>
@@ -62,25 +62,25 @@
   <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">設定檔已關閉</string>
   <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_profiles_changed">設定檔已更改為<xliff:g id="profile" example="Default">%s</xliff:g>。</string>
-  <string name="quick_settings_compass_init">正在初始化\u2026</string>
+  <string name="accessibility_quick_settings_profiles_changed">設定檔已變更為<xliff:g id="profile" example="Default">%s</xliff:g>。</string>
+  <string name="quick_settings_compass_init">初始化中\u2026</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">指示燈設定</string>
   <string name="led_notification_text">已透過設定啟用 LED 指示燈</string>
-  <string name="qs_tile_edit_header_instruction">按住瓷磚即可重新排列</string>
-  <string name="quick_settings_edit_label">編輯瓷磚</string>
-  <string name="quick_settings_cannot_delete_edit_tile">無法刪除編輯瓷磚</string>
-  <string name="qs_tiles_reset_confirmation">是否將快速設定瓷磚還原至預設配置？</string>
+  <string name="qs_tile_edit_header_instruction">按住圖塊即可重新排列</string>
+  <string name="quick_settings_edit_label">編輯圖塊</string>
+  <string name="quick_settings_cannot_delete_edit_tile">無法刪除編輯圖塊</string>
+  <string name="qs_tiles_reset_confirmation">將快速設定圖塊還原至預設配置？</string>
   <string name="quick_settings_tile_reset_to_default">還原至預設布局</string>
   <string name="quick_settings_title_header">標題</string>
-  <string name="quick_settings_title_tiles">瓷磚</string>
+  <string name="quick_settings_title_tiles">圖塊</string>
   <string name="quick_settings_title_show_weather">顯示天氣資訊</string>
-  <string name="quick_settings_title_show_brightness_slider">顯示亮度滑桿</string>
+  <string name="quick_settings_title_show_brightness_slider">顯示亮度滑動條</string>
   <string name="quick_settings_title_enlarge_first_row">擴大首行</string>
   <!-- Screen pinning dialog description (for devices without navbar) -->
-  <string name="screen_pinning_description_no_navbar">此功能會固定螢幕顯示直到您取消固定。觸控並長按返回鍵即可解除固定。</string>
-  <string name="quick_settings_custom_tile_detail_title">自訂瓷磚</string>
-  <string name="quick_settings_remove">移除瓷磚</string>
+  <string name="screen_pinning_description_no_navbar">此功能會固定螢幕顯示直到您取消固定。觸控並長按 [返回] 鍵即可解除固定。</string>
+  <string name="quick_settings_custom_tile_detail_title">自訂圖塊</string>
+  <string name="quick_settings_remove">移除圖塊</string>
   <string name="quick_settings_network_adb_label">網路 ADB</string>
   <string name="quick_settings_compass_label">指南針</string>
   <string name="quick_settings_nfc_label">NFC</string>
@@ -92,25 +92,25 @@
   <string name="quick_settings_battery_saver_label_charging">省電模式 (充電中)</string>
   <string name="quick_settings_caffeine_label">暫停休眠</string>
   <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_sync_off">同步關閉</string>
+  <string name="accessibility_quick_settings_sync_off">同步處理關閉</string>
   <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_sync_on">同步開啟</string>
+  <string name="accessibility_quick_settings_sync_on">同步處理開啟</string>
   <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_sync_changed_off">同步已關閉</string>
+  <string name="accessibility_quick_settings_sync_changed_off">同步處理已關閉</string>
   <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_sync_changed_on">同步已開啟</string>
-  <string name="quick_settings_sync_label">同步</string>
+  <string name="accessibility_quick_settings_sync_changed_on">同步處理已開啟</string>
+  <string name="quick_settings_sync_label">同步處理</string>
   <string name="quick_settings_volume_panel_label">音量面板</string>
   <string name="quick_settings_usb_tether_label">USB 網路共享</string>
   <string name="quick_settings_screen_timeout_detail_title">螢幕逾時</string>
-  <string name="quick_settings_lockscreen_label">鎖定螢幕</string>
+  <string name="quick_settings_lockscreen_label">鎖定畫面</string>
   <string name="quick_settings_ambient_display_label">環境顯示</string>
-  <string name="quick_settings_lockscreen_label_enforced">強制執行鎖定螢幕</string>
+  <string name="quick_settings_lockscreen_label_enforced">強制執行鎖定畫面</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">已由設定檔停用</string>
   <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">螢幕逾時：<xliff:g id="timeout" example="30 seconds">%s</xliff:g></string>
   <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_screen_timeout_changed">螢幕逾時即可更改為 <xliff:g id="timeout" example="30 seconds">%s</xliff:g></string>
+  <string name="accessibility_quick_settings_screen_timeout_changed">螢幕逾時即可變更為 <xliff:g id="timeout" example="30 seconds">%s</xliff:g></string>
   <string name="qs_tile_performance">電池模式</string>
   <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">電池模式：省電模式。</string>
@@ -123,24 +123,24 @@
   <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">電池模式：快速模式。</string>
   <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">電池模式已更改為省電模式。</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">電池模式已變更為省電模式。</string>
   <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_bal">電池模式已更改為平衡模式。</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_bal">電池模式已變更為平衡模式。</string>
   <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_perf">電池模式已更改為高效能模式。</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">電池模式已變更為高效能模式。</string>
   <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">電池模式已更改為效率模式。</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">電池模式已變更為效率模式。</string>
   <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">電池模式已更改為快速模式。</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">電池模式已變更為快速模式。</string>
   <string name="quick_settings_performance_profile_detail_title">電池模式</string>
   <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_lock_screen_off">鎖定螢幕關閉</string>
+  <string name="accessibility_quick_settings_lock_screen_off">鎖定畫面關閉</string>
   <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_lock_screen_on">鎖定螢幕開啟</string>
+  <string name="accessibility_quick_settings_lock_screen_on">鎖定畫面開啟</string>
   <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_lock_screen_changed_off">鎖定螢幕已關閉</string>
+  <string name="accessibility_quick_settings_lock_screen_changed_off">鎖定畫面已關閉</string>
   <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_lock_screen_changed_on">鎖定螢幕已開啟</string>
+  <string name="accessibility_quick_settings_lock_screen_changed_on">鎖定畫面已開啟</string>
   <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">環境顯示關閉</string>
   <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -170,40 +170,40 @@
   <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">省電模式已開啟</string>
   <!-- Dynamic tiles -->
-  <string name="quick_settings_dynamic_tile_detail_title">動態磚</string>
+  <string name="quick_settings_dynamic_tile_detail_title">動態圖塊</string>
   <string name="dynamic_qs_tile_next_alarm_label">下一個鬧鐘</string>
   <string name="dynamic_qs_tile_ime_selector_label">輸入法選擇器</string>
   <string name="dynamic_qs_tile_su_label">Root 權限</string>
   <string name="dynamic_qs_tile_themes_label">主題</string>
   <string name="quick_settings_title_advanced_location">三角定位</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_battery_saving">位置回報：節約耗電量</string>
+  <string name="accessibility_quick_settings_location_battery_saving">位置回報：省電模式。</string>
   <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_gps_only">位置回報：僅限裝置</string>
+  <string name="accessibility_quick_settings_location_gps_only">位置回報：僅限感應器模式。</string>
   <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_high_accuracy">位置回報：高精確度</string>
+  <string name="accessibility_quick_settings_location_high_accuracy">位置回報：高精確度模式。</string>
   <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">定位模式</string>
   <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_location_battery_saving_label">節約耗電量</string>
+  <string name="quick_settings_location_battery_saving_label">省電模式</string>
   <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">僅限裝置</string>
   <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">高精確度</string>
   <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_changed_battery_saving">位置回報已更改為省電模式。</string>
+  <string name="accessibility_quick_settings_location_changed_battery_saving">位置回報已變更為省電模式。</string>
   <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_changed_gps_only">位置回報已更改為僅感應器模式。</string>
+  <string name="accessibility_quick_settings_location_changed_gps_only">位置回報已變更為僅限感應器模式。</string>
   <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_changed_high_accuracy">位置回報已更改為高精確度模式。</string>
-  <string name="quick_settings_tiles_category_system">系統瓷磚</string>
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">位置回報已變更為高精確度模式。</string>
+  <string name="quick_settings_tiles_category_system">系統圖塊</string>
   <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">新增瓷磚</string>
   <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">飛航模式啟用時無法連線行動網路，請停用飛航模式後再試一次。</string>
   <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">手電筒已經開啟</string>
-  <string name="quick_settings_tile_flashlight_not_summary">點擊關閉</string>
+  <string name="quick_settings_tile_flashlight_not_summary">輕觸即可關閉</string>
   <!-- Wi-Fi hotspot label when enabled -->
   <plurals name="wifi_hotspot_connected_clients_label">
     <item quantity="other">%1$d 客戶端</item>
-- 
cgit v1.1


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

Change-Id: Id277710144095d2411baed890eeff40899482491
---
 core/res/res/values-bg/cm_strings.xml              | 18 +++++++++---------
 core/res/res/values-es-rUS/cm_strings.xml          |  1 -
 core/res/res/values-ja/cm_strings.xml              |  2 +-
 packages/SystemUI/res/values-bg/cm_strings.xml     |  6 +++---
 packages/SystemUI/res/values-es-rUS/cm_strings.xml |  5 +++++
 packages/SystemUI/res/values-es/cm_strings.xml     |  5 +++++
 packages/SystemUI/res/values-tr/cm_strings.xml     |  5 +++++
 packages/SystemUI/res/values-zh-rTW/cm_strings.xml |  2 +-
 8 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/core/res/res/values-bg/cm_strings.xml b/core/res/res/values-bg/cm_strings.xml
index 3c8ce39..212ba59 100644
--- a/core/res/res/values-bg/cm_strings.xml
+++ b/core/res/res/values-bg/cm_strings.xml
@@ -34,7 +34,7 @@
   <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">Прочетете списъка с блокирани контакти</string>
   <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permdesc_readPhoneBlacklist">Разрешава на приложението да прочетете информацията за телефонни номера, които са блокирани за входящи повиквания или съобщения.</string>
+  <string name="permdesc_readPhoneBlacklist">Разрешава на приложението да чете информацията от списъка с контакти, които са блокирани за входящи повиквания или съобщения.</string>
   <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">Промяна на списъка с блокирани контакти</string>
   <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -42,7 +42,7 @@
   <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">Задаване на тапет за заключен екран</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permdesc_setKeyguardWallpaper">Разрешава на едно приложение да променя тапета на заключения екран.</string>
+  <string name="permdesc_setKeyguardWallpaper">Разрешава на приложението да променя тапета на екрана за заключване.</string>
   <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Рестартиране</string>
   <!-- label for current user in phone options dialog -->
@@ -87,7 +87,7 @@
   <string name="silent_mode_priority">Приоритет</string>
   <string name="silent_mode_none">Без</string>
   <!-- Wifi Hotspot disabled due to subscription change -->
-  <string name="subscription_change_disabled_wifi_ap">Изключена Wi-Fi точка за достъп, поради промяна в абонаментна на СИМ</string>
+  <string name="subscription_change_disabled_wifi_ap">Изключена Wi-Fi точка за достъп, поради промяна в СИМ абонамента</string>
   <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Изключете Wi-Fi</string>
   <!-- Privacy Guard -->
@@ -102,10 +102,10 @@
   <!-- App ops requests -->
   <string name="app_ops_access_camera">достъп до камерата</string>
   <string name="app_ops_access_location">достъп до вашето местоположение</string>
-  <string name="app_ops_access_notifications">прочети своите известия</string>
+  <string name="app_ops_access_notifications">прочети известията</string>
   <string name="app_ops_activate_vpn">активиране на VPN</string>
   <string name="app_ops_auto_start">изпълнение при включване</string>
-  <string name="app_ops_delete_call_log">изтриване на дневника за повиквания</string>
+  <string name="app_ops_delete_call_log">изтриване на списъка с обаждания</string>
   <string name="app_ops_delete_contacts">Изтриване на контакти</string>
   <string name="app_ops_delete_mms">Изтриване на MMS съобщенията</string>
   <string name="app_ops_delete_sms">Изтриване на SMS съобщенията</string>
@@ -114,7 +114,7 @@
   <string name="app_ops_keep_device_awake">Задръж устройството будно</string>
   <string name="app_ops_make_phone_call">осъществете телефонно повикване</string>
   <string name="app_ops_modify_calendar">актуализиране на вашият календар</string>
-  <string name="app_ops_modify_call_log">актуализация на дневника за повиквания</string>
+  <string name="app_ops_modify_call_log">актуализация на списъка с обаждания</string>
   <string name="app_ops_modify_clipboard">промяна на клипборда</string>
   <string name="app_ops_modify_contacts">актуализиране на вашите контакти</string>
   <string name="app_ops_modify_settings">актуализиране на системните настройки</string>
@@ -134,13 +134,13 @@
   <string name="app_ops_send_sms">Изпращане на SMS съобщение</string>
   <string name="app_ops_start_at_bootup">изпълнение при включване</string>
   <string name="app_ops_toast_window">показвай изкачащи уведомления</string>
-  <string name="app_ops_toggle_bluetooth">активиране/деактивиране Bluetooth</string>
+  <string name="app_ops_toggle_bluetooth">активиране/деактивиране Блутуут</string>
   <string name="app_ops_toggle_mobile_data">Включване / Изключване на мобилни данни</string>
   <string name="app_ops_toggle_nfc">активиране/деактивиране NFC</string>
   <string name="app_ops_toggle_wifi">активирай/деактивирай Wi-Fi</string>
   <string name="app_ops_use_alarm_volume">контрол на силата на алармата</string>
   <string name="app_ops_use_audio_focus">контрол на силата на звука</string>
-  <string name="app_ops_use_bluetooth_volume">контрол на силата на Bluetooth</string>
+  <string name="app_ops_use_bluetooth_volume">контрол на силата на Блутуут</string>
   <string name="app_ops_use_master_volume">главен контрол на звука</string>
   <string name="app_ops_use_media_buttons">Използвайте мултимедийните бутони</string>
   <string name="app_ops_use_media_volume">контрол на звука за мултимедия</string>
@@ -176,7 +176,7 @@
   <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
          with spaces on either side. [CHAR LIMIT=3] -->
   <!-- Protected Apps Notification -->
-  <string name="notify_package_component_protected_title">Старта на приложението блокиран</string>
+  <string name="notify_package_component_protected_title">Старта на приложението е блокиран</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> е блокиран. Докосни за да потвърдиш старта на приложението.</string>
   <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Батерията е напълно заредена</string>
diff --git a/core/res/res/values-es-rUS/cm_strings.xml b/core/res/res/values-es-rUS/cm_strings.xml
index 74e70ab..f9f93b1 100644
--- a/core/res/res/values-es-rUS/cm_strings.xml
+++ b/core/res/res/values-es-rUS/cm_strings.xml
@@ -18,7 +18,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- label for item that screenshots in phone options dialog -->
-  <string name="global_action_screenshot">Captura de pantalla</string>
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">recibir SMS protegidos</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
diff --git a/core/res/res/values-ja/cm_strings.xml b/core/res/res/values-ja/cm_strings.xml
index 7157ab2..8902282 100644
--- a/core/res/res/values-ja/cm_strings.xml
+++ b/core/res/res/values-ja/cm_strings.xml
@@ -65,7 +65,7 @@
   <string name="reboot_confirm" product="tablet">タブレットは再起動します。</string>
   <string name="reboot_confirm" product="default">携帯電話は再起動します。</string>
   <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
-  <string name="reboot_progress">再起動中\u2026</string>
+  <string name="reboot_progress">再起動中...</string>
   <!-- Long-press back kill application -->
   <string name="app_killed_message">アプリを終了しました。</string>
   <!-- ADB over network notification -->
diff --git a/packages/SystemUI/res/values-bg/cm_strings.xml b/packages/SystemUI/res/values-bg/cm_strings.xml
index 18cc9ba..d86244b 100644
--- a/packages/SystemUI/res/values-bg/cm_strings.xml
+++ b/packages/SystemUI/res/values-bg/cm_strings.xml
@@ -65,7 +65,7 @@
   <string name="accessibility_quick_settings_profiles_changed">Профила е сменен с <xliff:g id="profile" example="Default">%s </xliff:g>.</string>
   <string name="quick_settings_compass_init">Стартиране на\u2026</string>
   <!-- Lights settings, LED notification -->
-  <string name="led_notification_title">Настройки на светлината</string>
+  <string name="led_notification_title">Светлинни настройки</string>
   <string name="led_notification_text">Светлинните индикации са разрешени от настройките</string>
   <string name="qs_tile_edit_header_instruction">Натиснете и задръжте плочка за да я пренаредите или премахнете</string>
   <string name="quick_settings_edit_label">Редактиране на плочки</string>
@@ -138,9 +138,9 @@
   <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Включване на заключване на екран.</string>
   <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_lock_screen_changed_off">Заключване екран е изключено.</string>
+  <string name="accessibility_quick_settings_lock_screen_changed_off">Заключване на екрана е изключено.</string>
   <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_lock_screen_changed_on">Заключване екран е включено.</string>
+  <string name="accessibility_quick_settings_lock_screen_changed_on">Заключване на екрана е изключено.</string>
   <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Активен дисплей е изключен.</string>
   <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
diff --git a/packages/SystemUI/res/values-es-rUS/cm_strings.xml b/packages/SystemUI/res/values-es-rUS/cm_strings.xml
index a193b19..43f3f98 100644
--- a/packages/SystemUI/res/values-es-rUS/cm_strings.xml
+++ b/packages/SystemUI/res/values-es-rUS/cm_strings.xml
@@ -174,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Próxima alarma</string>
   <string name="dynamic_qs_tile_ime_selector_label">Selector IME</string>
   <string name="dynamic_qs_tile_su_label">Acceso a raíz</string>
+  <string name="dynamic_qs_tile_themes_label">Temas</string>
   <string name="quick_settings_title_advanced_location">Localización trizona</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Informes de ubicación: modo de ahorro de batería.</string>
@@ -218,4 +219,8 @@
   <!-- Path data for landscape battery -->
   <!-- Path data for circle battery -->
   <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Deslizar hacia abajo para ampliar</string>
+  <string name="swipe_left_hint">Deslizar a la izquierda para <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Deslizar a la derecha para las notificaciones</string>
 </resources>
diff --git a/packages/SystemUI/res/values-es/cm_strings.xml b/packages/SystemUI/res/values-es/cm_strings.xml
index a9b7a8d..b342faf 100644
--- a/packages/SystemUI/res/values-es/cm_strings.xml
+++ b/packages/SystemUI/res/values-es/cm_strings.xml
@@ -174,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Próxima alarma</string>
   <string name="dynamic_qs_tile_ime_selector_label">Selector IME</string>
   <string name="dynamic_qs_tile_su_label">Acceso administrativo</string>
+  <string name="dynamic_qs_tile_themes_label">Temas</string>
   <string name="quick_settings_title_advanced_location">Ubicación por triangulación</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Informes de ubicación: modo de ahorro de batería.</string>
@@ -218,4 +219,8 @@
   <!-- Path data for landscape battery -->
   <!-- Path data for circle battery -->
   <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Desliza hacia abajo para expandir</string>
+  <string name="swipe_left_hint">Desliza hacia la izquierda para <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Desliza hacia la derecha para ver las notificaciones</string>
 </resources>
diff --git a/packages/SystemUI/res/values-tr/cm_strings.xml b/packages/SystemUI/res/values-tr/cm_strings.xml
index a126402..ae49a53 100644
--- a/packages/SystemUI/res/values-tr/cm_strings.xml
+++ b/packages/SystemUI/res/values-tr/cm_strings.xml
@@ -174,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Sonraki alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME seçici</string>
   <string name="dynamic_qs_tile_su_label">Root erişimi</string>
+  <string name="dynamic_qs_tile_themes_label">Temalar</string>
   <string name="quick_settings_title_advanced_location">3-durumlu konum</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Konum bildirimi: pil tasarruf modu.</string>
@@ -218,4 +219,8 @@
   <!-- Path data for landscape battery -->
   <!-- Path data for circle battery -->
   <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Genişletmek için aşağı sürükleyin</string>
+  <string name="swipe_left_hint"><xliff:g id="app_name">%1$s</xliff:g> için sola sürükleyin</string>
+  <string name="swipe_right_hint">Bildirimleri açmak için sağa kaydırın</string>
 </resources>
diff --git a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
index 16560d7..0a902a2 100644
--- a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
@@ -219,7 +219,7 @@
   <!-- Path data for circle battery -->
   <!-- Weather string format in keyguard -->
   <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
-  <string name="expand_hint">向下滑動即可以展開</string>
+  <string name="expand_hint">向下滑動即可展開</string>
   <string name="swipe_left_hint">向左滑動即可 <xliff:g id="app_name">%1$s</xliff:g></string>
   <string name="swipe_right_hint">向右滑動即可查看通知</string>
 </resources>
-- 
cgit v1.1


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

Change-Id: Ifa3700c8e74716373712ebb84270eecbc3d94f45
---
 core/res/res/values-es-rUS/cm_strings.xml      | 3 ++-
 packages/SystemUI/res/values-ja/cm_strings.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/res/res/values-es-rUS/cm_strings.xml b/core/res/res/values-es-rUS/cm_strings.xml
index f9f93b1..45762b1 100644
--- a/core/res/res/values-es-rUS/cm_strings.xml
+++ b/core/res/res/values-es-rUS/cm_strings.xml
@@ -18,6 +18,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- label for item that screenshots in phone options dialog -->
+  <string name="global_action_screenshot">Captura de pantalla</string>
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">recibir SMS protegidos</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -116,7 +117,7 @@
   <string name="app_ops_modify_call_log">actualizar el registro de llamadas</string>
   <string name="app_ops_modify_clipboard">modificar el portapapeles</string>
   <string name="app_ops_modify_contacts">actualizar tus contactos</string>
-  <string name="app_ops_modify_settings">actualizar configuración del sistema</string>
+  <string name="app_ops_modify_settings">actualizar ajustes del sistema</string>
   <string name="app_ops_mute_unmute_microphone">silenciar / activar el micrófono</string>
   <string name="app_ops_play_audio">reproducir el audio</string>
   <string name="app_ops_post_notification">publicar una notificación</string>
diff --git a/packages/SystemUI/res/values-ja/cm_strings.xml b/packages/SystemUI/res/values-ja/cm_strings.xml
index a8e2279..8f28f93 100644
--- a/packages/SystemUI/res/values-ja/cm_strings.xml
+++ b/packages/SystemUI/res/values-ja/cm_strings.xml
@@ -63,7 +63,7 @@
   <string name="accessibility_quick_settings_profiles_changed_off">プロファイルがOFFになりました。</string>
   <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">プロファイルが<xliff:g id="profile" example="Default">%s</xliff:g>に変更されました。</string>
-  <string name="quick_settings_compass_init">初期化中\u2026</string>
+  <string name="quick_settings_compass_init">初期化中...</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">ライトの設定</string>
   <string name="led_notification_text">LEDライトが設定によって有効になっています</string>
-- 
cgit v1.1


From 012f0762275df7125358e8db352834af60495b43 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Mon, 31 Oct 2016 14:33:49 -0600
Subject: Public volumes belong to a single user.

When a public (vfat) device is inserted, it's strongly associated
with the current foreground user, and no other users should be able
to access it, since otherwise that would be a cross-user data leak.

To use the device under a different user, switch users and then
eject/remount the device.

Test: verified user isolation of USB drive
Bug: 32523490
Change-Id: I590c791996f1fea8d78f625dc942d149f1f41614
(cherry picked from commit 8b38d083c42e2706e1ff5a1410fa61d1f5dea3f5)
(cherry picked from commit 47e62b7fe6807a274ba760a8fecfd624fe792da9)
---
 .../src/com/android/externalstorage/ExternalStorageProvider.java | 3 ++-
 services/core/java/com/android/server/MountService.java          | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index 46b73d8..f72832a 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -135,7 +135,8 @@ public class ExternalStorageProvider extends DocumentsProvider {
                     final VolumeInfo privateVol = mStorageManager.findPrivateForEmulated(volume);
                     title = mStorageManager.getBestVolumeDescription(privateVol);
                 }
-            } else if (volume.getType() == VolumeInfo.TYPE_PUBLIC) {
+            } else if (volume.getType() == VolumeInfo.TYPE_PUBLIC
+                    && volume.getMountUserId() == userId) {
                 rootId = volume.getFsUuid();
                 title = mStorageManager.getBestVolumeDescription(volume);
             } else {
diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java
index d539201..60d7428 100644
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -169,6 +169,11 @@ class MountService extends IMountService.Stub
         }
 
         @Override
+        public void onSwitchUser(int userHandle) {
+            mMountService.mCurrentUserId = userHandle;
+        }
+
+        @Override
         public void onStartUser(int userHandle) {
             mMountService.onStartUser(userHandle);
         }
@@ -307,6 +312,8 @@ class MountService extends IMountService.Stub
     @GuardedBy("mLock")
     private String mMoveTargetUuid;
 
+    private volatile int mCurrentUserId = UserHandle.USER_OWNER;
+
     private VolumeInfo findVolumeByIdOrThrow(String id) {
         synchronized (mLock) {
             final VolumeInfo vol = mVolumes.get(id);
@@ -1193,7 +1200,7 @@ class MountService extends IMountService.Stub
                 vol.mountFlags |= VolumeInfo.MOUNT_FLAG_VISIBLE;
             }
 
-            vol.mountUserId = UserHandle.USER_OWNER;
+            vol.mountUserId = mCurrentUserId;
             mHandler.obtainMessage(H_VOLUME_MOUNT, vol).sendToTarget();
 
         } else if (vol.type == VolumeInfo.TYPE_PRIVATE) {
-- 
cgit v1.1


From ef8dca814466776553100c5c51d16f7026eb8c88 Mon Sep 17 00:00:00 2001
From: Hugo Benichi <hugobenichi@google.com>
Date: Wed, 2 Mar 2016 13:31:52 +0900
Subject: Do not crash on malformed DHCP packets.

This fixes possible crashes with malformed DHCP packets.
It is part of Android Security Bulletin of January 2017 and
mitigates CVE CVE-2017-0389.

Squash of:

Author: Lorenzo Colitti <lorenzo@google.com>
Date:   Wed Mar 02 13:31:52 2016 +0900
    Don't crash if we get a DHCP packet with the wrong port.
    This should only happen if we get a packet in the small time
    window between binding the packet socket and programming the
    BPF filter on it.
    Bug: 26696823
    Change-Id: I481f1bc74bbaeb9646d96e1841d2a69acdb47d62

Author: Hugo Benichi <hugobenichi@google.com>
Date:   Wed Oct 05 18:33:21 2016 +0900
    Catch runtime exceptions when parsing DHCP packets
    This patch adds a try catch all to DHCP packet parsing so that
    DhcpClient does not choke on malformed packets, brinding down with it
    the whole framework.
    Test: added new unit tests catching the issue fixed in this patch.
    Bug: 31850211
    Change-Id: I3c50a149fed6b2cbc4f40bb4f0e5bb2b56859b44

Author: Hugo Benichi <hugobenichi@google.com>
Date:   Wed Oct 05 21:07:19 2016 +0900
    Reject DHCP packets with no magic cookie
    This patch adds an explicit check in the DHCP packet parser for
    rejecting packets without a magic cookie, instead of relying on the
    top-level try-catch-all in the parser.
    This allows to add to DHCP error metrics this specific error.
    It also allows to add two poor man's fuzzing tests that tries to find
    additional gaps in the DHCP packet parser by
     - trying to parse all subslices of a valid offer packet.
     - trying to parse random byte arrays.
    Test: covered by previously introduced malformed DHCP packet unit tests
          + additional fuzzing tests.
    Bug: 31850211
    Change-Id: If53c9ba9df78d7604ec018c9d67c237ae59c4833

Change-Id: Ic5a8fa4feb46cca325cb5c47616ee63b22d2e7c8
mh0rst: Backported to cm-13.0.
---
 services/net/java/android/net/dhcp/DhcpPacket.java |  27 ++-
 .../src/android/net/dhcp/DhcpPacketTest.java       | 189 +++++++++++++++++----
 2 files changed, 181 insertions(+), 35 deletions(-)

diff --git a/services/net/java/android/net/dhcp/DhcpPacket.java b/services/net/java/android/net/dhcp/DhcpPacket.java
index f97df83..820a03d 100644
--- a/services/net/java/android/net/dhcp/DhcpPacket.java
+++ b/services/net/java/android/net/dhcp/DhcpPacket.java
@@ -6,6 +6,7 @@ import android.net.NetworkUtils;
 import android.os.Build;
 import android.os.SystemProperties;
 import android.system.OsConstants;
+import com.android.internal.annotations.VisibleForTesting;
 
 import java.io.UnsupportedEncodingException;
 import java.net.Inet4Address;
@@ -13,9 +14,8 @@ import java.net.UnknownHostException;
 import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.nio.charset.StandardCharsets;
 import java.nio.ShortBuffer;
-
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -701,7 +701,8 @@ abstract class DhcpPacket {
      * A subset of the optional parameters are parsed and are stored
      * in object fields.
      */
-    public static DhcpPacket decodeFullPacket(ByteBuffer packet, int pktType) throws ParseException
+    @VisibleForTesting
+    static DhcpPacket decodeFullPacket(ByteBuffer packet, int pktType) throws ParseException
     {
         // bootp parameters
         int transactionId;
@@ -809,7 +810,11 @@ abstract class DhcpPacket {
             // server-to-server packets, e.g. for relays.
             if (!isPacketToOrFromClient(udpSrcPort, udpDstPort) &&
                 !isPacketServerToServer(udpSrcPort, udpDstPort)) {
-                return null;
+                // This should almost never happen because we use SO_ATTACH_FILTER on the packet
+                // socket to drop packets that don't have the right source ports. However, it's
+                // possible that a packet arrives between when the socket is bound and when the
+                // filter is set. http://b/26696823 .
+                throw new ParseException("Unexpected UDP ports %d->%d", udpSrcPort, udpDstPort);
             }
         }
 
@@ -860,8 +865,12 @@ abstract class DhcpPacket {
                         + 64    // skip server host name (64 chars)
                         + 128); // skip boot file name (128 chars)
 
-        int dhcpMagicCookie = packet.getInt();
+        // Ensure this is a DHCP packet with a magic cookie, and not BOOTP. http://b/31850211
+        if (packet.remaining() < 4) {
+            throw new ParseException("DHCP packet without a magic cookie");
+        }
 
+        int dhcpMagicCookie = packet.getInt();
         if (dhcpMagicCookie != DHCP_MAGIC_COOKIE) {
             throw new ParseException("Bad magic cookie 0x%08x, should be 0x%08x", dhcpMagicCookie,
                     DHCP_MAGIC_COOKIE);
@@ -1049,7 +1058,13 @@ abstract class DhcpPacket {
     public static DhcpPacket decodeFullPacket(byte[] packet, int length, int pktType)
             throws ParseException {
         ByteBuffer buffer = ByteBuffer.wrap(packet, 0, length).order(ByteOrder.BIG_ENDIAN);
-        return decodeFullPacket(buffer, pktType);
+        try {
+            return decodeFullPacket(buffer, pktType);
+        } catch (ParseException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new ParseException("DHCP parsing error: %s", e.getMessage());
+        }
     }
 
     /**
diff --git a/services/tests/servicestests/src/android/net/dhcp/DhcpPacketTest.java b/services/tests/servicestests/src/android/net/dhcp/DhcpPacketTest.java
index 7e60bf1..2639e26 100644
--- a/services/tests/servicestests/src/android/net/dhcp/DhcpPacketTest.java
+++ b/services/tests/servicestests/src/android/net/dhcp/DhcpPacketTest.java
@@ -16,23 +16,19 @@
 
 package android.net.dhcp;
 
-import android.net.NetworkUtils;
 import android.net.DhcpResults;
 import android.net.LinkAddress;
+import android.net.NetworkUtils;
 import android.system.OsConstants;
 import android.test.suitebuilder.annotation.SmallTest;
 import com.android.internal.util.HexDump;
-
 import java.net.Inet4Address;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
-
 import junit.framework.TestCase;
-import libcore.util.HexEncoding;
 
 import static android.net.dhcp.DhcpPacket.*;
 
-
 public class DhcpPacketTest extends TestCase {
 
     private static Inet4Address SERVER_ADDR = v4Address("192.0.2.1");
@@ -278,7 +274,7 @@ public class DhcpPacketTest extends TestCase {
         // TODO: Turn all of these into golden files. This will probably require modifying
         // Android.mk appropriately, making this into an AndroidTestCase, and adding code to read
         // the golden files from the test APK's assets via mContext.getAssets().
-        final ByteBuffer packet = ByteBuffer.wrap(HexEncoding.decode((
+        final ByteBuffer packet = ByteBuffer.wrap(HexDump.hexStringToByteArray(
             // IP header.
             "451001480000000080118849c0a89003c0a89ff7" +
             // UDP header.
@@ -297,8 +293,7 @@ public class DhcpPacketTest extends TestCase {
             "0000000000000000000000000000000000000000000000000000000000000000" +
             // Options
             "638253633501023604c0a89003330400001c200104fffff0000304c0a89ffe06080808080808080404" +
-            "3a0400000e103b040000189cff00000000000000000000"
-        ).toCharArray(), false));
+            "3a0400000e103b040000189cff00000000000000000000"));
 
         DhcpPacket offerPacket = DhcpPacket.decodeFullPacket(packet, ENCAP_L3);
         assertTrue(offerPacket instanceof DhcpOfferPacket);  // Implicitly checks it's non-null.
@@ -309,7 +304,7 @@ public class DhcpPacketTest extends TestCase {
 
     @SmallTest
     public void testOffer2() throws Exception {
-        final ByteBuffer packet = ByteBuffer.wrap(HexEncoding.decode((
+        final ByteBuffer packet = ByteBuffer.wrap(HexDump.hexStringToByteArray(
             // IP header.
             "450001518d0600004011144dc0a82b01c0a82bf7" +
             // UDP header.
@@ -328,8 +323,7 @@ public class DhcpPacketTest extends TestCase {
             "0000000000000000000000000000000000000000000000000000000000000000" +
             // Options
             "638253633501023604c0a82b01330400000e103a04000007083b0400000c4e0104ffffff00" +
-            "1c04c0a82bff0304c0a82b010604c0a82b012b0f414e44524f49445f4d455445524544ff"
-        ).toCharArray(), false));
+            "1c04c0a82bff0304c0a82b010604c0a82b012b0f414e44524f49445f4d455445524544ff"));
 
         assertEquals(337, packet.limit());
         DhcpPacket offerPacket = DhcpPacket.decodeFullPacket(packet, ENCAP_L3);
@@ -341,8 +335,119 @@ public class DhcpPacketTest extends TestCase {
     }
 
     @SmallTest
+    public void testBadIpPacket() throws Exception {
+        final byte[] packet = HexDump.hexStringToByteArray(
+            // IP header.
+            "450001518d0600004011144dc0a82b01c0a82bf7");
+
+        try {
+            DhcpPacket offerPacket = DhcpPacket.decodeFullPacket(packet, packet.length, ENCAP_L3);
+            fail("Dhcp packet parsing should have failed");
+        } catch (DhcpPacket.ParseException expected) {}
+    }
+
+    @SmallTest
+    public void testBadDhcpPacket() throws Exception {
+        final byte[] packet = HexDump.hexStringToByteArray(
+            // IP header.
+            "450001518d0600004011144dc0a82b01c0a82bf7" +
+            // UDP header.
+            "00430044013d9ac7" +
+            // BOOTP header.
+            "02010600dfc23d1f0002000000000000c0a82bf7c0a82b0100000000");
+
+        try {
+            DhcpPacket offerPacket = DhcpPacket.decodeFullPacket(packet, packet.length, ENCAP_L3);
+            fail("Dhcp packet parsing should have failed");
+        } catch (DhcpPacket.ParseException expected) {}
+    }
+
+    @SmallTest
+    public void testBadTruncatedOffer() throws Exception {
+        final byte[] packet = HexDump.hexStringToByteArray(
+            // IP header.
+            "450001518d0600004011144dc0a82b01c0a82bf7" +
+            // UDP header.
+            "00430044013d9ac7" +
+            // BOOTP header.
+            "02010600dfc23d1f0002000000000000c0a82bf7c0a82b0100000000" +
+            // MAC address.
+            "30766ff2a90c00000000000000000000" +
+            // Server name.
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            // File, missing one byte
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            "00000000000000000000000000000000000000000000000000000000000000");
+
+        try {
+            DhcpPacket offerPacket = DhcpPacket.decodeFullPacket(packet, packet.length, ENCAP_L3);
+            fail("Dhcp packet parsing should have failed");
+        } catch (DhcpPacket.ParseException expected) {}
+    }
+
+    @SmallTest
+    public void testBadOfferWithoutACookie() throws Exception {
+        final byte[] packet = HexDump.hexStringToByteArray(
+            // IP header.
+            "450001518d0600004011144dc0a82b01c0a82bf7" +
+            // UDP header.
+            "00430044013d9ac7" +
+            // BOOTP header.
+            "02010600dfc23d1f0002000000000000c0a82bf7c0a82b0100000000" +
+            // MAC address.
+            "30766ff2a90c00000000000000000000" +
+            // Server name.
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            // File.
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            "0000000000000000000000000000000000000000000000000000000000000000"
+            // No options
+            );
+
+        try {
+            DhcpPacket offerPacket = DhcpPacket.decodeFullPacket(packet, packet.length, ENCAP_L3);
+            fail("Dhcp packet parsing should have failed");
+        } catch (DhcpPacket.ParseException expected) {}
+    }
+
+    @SmallTest
+    public void testOfferWithBadCookie() throws Exception {
+        final byte[] packet = HexDump.hexStringToByteArray(
+            // IP header.
+            "450001518d0600004011144dc0a82b01c0a82bf7" +
+            // UDP header.
+            "00430044013d9ac7" +
+            // BOOTP header.
+            "02010600dfc23d1f0002000000000000c0a82bf7c0a82b0100000000" +
+            // MAC address.
+            "30766ff2a90c00000000000000000000" +
+            // Server name.
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            // File.
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            // Bad cookie
+            "DEADBEEF3501023604c0a82b01330400000e103a04000007083b0400000c4e0104ffffff00" +
+            "1c04c0a82bff0304c0a82b010604c0a82b012b0f414e44524f49445f4d455445524544ff");
+
+        try {
+            DhcpPacket offerPacket = DhcpPacket.decodeFullPacket(packet, packet.length, ENCAP_L3);
+            fail("Dhcp packet parsing should have failed");
+        } catch (DhcpPacket.ParseException expected) {}
+    }
+
+    @SmallTest
     public void testBadHwaddrLength() throws Exception {
-        final ByteBuffer packet = ByteBuffer.wrap(HexEncoding.decode((
+        final ByteBuffer packet = ByteBuffer.wrap(HexDump.hexStringToByteArray(
             // IP header.
             "450001518d0600004011144dc0a82b01c0a82bf7" +
             // UDP header.
@@ -361,8 +466,7 @@ public class DhcpPacketTest extends TestCase {
             "0000000000000000000000000000000000000000000000000000000000000000" +
             // Options
             "638253633501023604c0a82b01330400000e103a04000007083b0400000c4e0104ffffff00" +
-            "1c04c0a82bff0304c0a82b010604c0a82b012b0f414e44524f49445f4d455445524544ff"
-        ).toCharArray(), false));
+            "1c04c0a82bff0304c0a82b010604c0a82b012b0f414e44524f49445f4d455445524544ff"));
         String expectedClientMac = "30766FF2A90C";
 
         final int hwAddrLenOffset = 20 + 8 + 2;
@@ -419,7 +523,7 @@ public class DhcpPacketTest extends TestCase {
         //    store any information in the overloaded fields).
         //
         // For now, we just check that it parses correctly.
-        final ByteBuffer packet = ByteBuffer.wrap(HexEncoding.decode((
+        final ByteBuffer packet = ByteBuffer.wrap(HexDump.hexStringToByteArray(
             // Ethernet header.
             "b4cef6000000e80462236e300800" +
             // IP header.
@@ -440,8 +544,7 @@ public class DhcpPacketTest extends TestCase {
             "0000000000000000000000000000000000000000000000000000000000000000" +
             // Options
             "638253633501023604010101010104ffff000033040000a8c03401030304ac1101010604ac110101" +
-            "0000000000000000000000000000000000000000000000ff000000"
-        ).toCharArray(), false));
+            "0000000000000000000000000000000000000000000000ff000000"));
 
         DhcpPacket offerPacket = DhcpPacket.decodeFullPacket(packet, ENCAP_L2);
         assertTrue(offerPacket instanceof DhcpOfferPacket);
@@ -452,7 +555,7 @@ public class DhcpPacketTest extends TestCase {
 
     @SmallTest
     public void testBug2111() throws Exception {
-        final ByteBuffer packet = ByteBuffer.wrap(HexEncoding.decode((
+        final ByteBuffer packet = ByteBuffer.wrap(HexDump.hexStringToByteArray(
             // IP header.
             "4500014c00000000ff119beac3eaf3880a3f5d04" +
             // UDP header. TODO: fix invalid checksum (due to MAC address obfuscation).
@@ -471,8 +574,7 @@ public class DhcpPacketTest extends TestCase {
             "0000000000000000000000000000000000000000000000000000000000000000" +
             // Options.
             "638253633501023604c00002fe33040000bfc60104fffff00003040a3f50010608c0000201c0000202" +
-            "0f0f646f6d61696e3132332e636f2e756b0000000000ff00000000"
-        ).toCharArray(), false));
+            "0f0f646f6d61696e3132332e636f2e756b0000000000ff00000000"));
 
         DhcpPacket offerPacket = DhcpPacket.decodeFullPacket(packet, ENCAP_L3);
         assertTrue(offerPacket instanceof DhcpOfferPacket);
@@ -483,7 +585,7 @@ public class DhcpPacketTest extends TestCase {
 
     @SmallTest
     public void testBug2136() throws Exception {
-        final ByteBuffer packet = ByteBuffer.wrap(HexEncoding.decode((
+        final ByteBuffer packet = ByteBuffer.wrap(HexDump.hexStringToByteArray(
             // Ethernet header.
             "bcf5ac000000d0c7890000000800" +
             // IP header.
@@ -504,8 +606,7 @@ public class DhcpPacketTest extends TestCase {
             "0000000000000000000000000000000000000000000000000000000000000000" +
             // Options.
             "6382536335010236040a20ff80330400001c200104fffff00003040a20900106089458413494584135" +
-            "0f0b6c616e63732e61632e756b000000000000000000ff00000000"
-        ).toCharArray(), false));
+            "0f0b6c616e63732e61632e756b000000000000000000ff00000000"));
 
         DhcpPacket offerPacket = DhcpPacket.decodeFullPacket(packet, ENCAP_L2);
         assertTrue(offerPacket instanceof DhcpOfferPacket);
@@ -517,7 +618,7 @@ public class DhcpPacketTest extends TestCase {
 
     @SmallTest
     public void testUdpServerAnySourcePort() throws Exception {
-        final ByteBuffer packet = ByteBuffer.wrap(HexEncoding.decode((
+        final ByteBuffer packet = ByteBuffer.wrap(HexDump.hexStringToByteArray(
             // Ethernet header.
             "9cd917000000001c2e0000000800" +
             // IP header.
@@ -539,8 +640,7 @@ public class DhcpPacketTest extends TestCase {
             "0000000000000000000000000000000000000000000000000000000000000000" +
             // Options.
             "6382536335010236040a0169fc3304000151800104ffff000003040a0fc817060cd1818003d1819403" +
-            "d18180060f0777766d2e6564751c040a0fffffff000000"
-        ).toCharArray(), false));
+            "d18180060f0777766d2e6564751c040a0fffffff000000"));
 
         DhcpPacket offerPacket = DhcpPacket.decodeFullPacket(packet, ENCAP_L2);
         assertTrue(offerPacket instanceof DhcpOfferPacket);
@@ -552,8 +652,40 @@ public class DhcpPacketTest extends TestCase {
     }
 
     @SmallTest
+    public void testUdpInvalidDstPort() throws Exception {
+        final ByteBuffer packet = ByteBuffer.wrap(HexDump.hexStringToByteArray(
+            // Ethernet header.
+            "9cd917000000001c2e0000000800" +
+            // IP header.
+            "45a00148000040003d115087d18194fb0a0f7af2" +
+            // UDP header. TODO: fix invalid checksum (due to MAC address obfuscation).
+            // NOTE: The destination port is a non-DHCP port.
+            "0043aaaa01341268" +
+            // BOOTP header.
+            "02010600d628ba8200000000000000000a0f7af2000000000a0fc818" +
+            // MAC address.
+            "9cd91700000000000000000000000000" +
+            // Server name.
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            // File.
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            "0000000000000000000000000000000000000000000000000000000000000000" +
+            // Options.
+            "6382536335010236040a0169fc3304000151800104ffff000003040a0fc817060cd1818003d1819403" +
+            "d18180060f0777766d2e6564751c040a0fffffff000000"));
+
+        try {
+            DhcpPacket.decodeFullPacket(packet, ENCAP_L2);
+            fail("Packet with invalid dst port did not throw ParseException");
+        } catch (ParseException expected) {}
+    }
+
+    @SmallTest
     public void testMultipleRouters() throws Exception {
-        final ByteBuffer packet = ByteBuffer.wrap(HexEncoding.decode((
+        final ByteBuffer packet = ByteBuffer.wrap(HexDump.hexStringToByteArray(
             // Ethernet header.
             "fc3d93000000" + "081735000000" + "0800" +
             // IP header.
@@ -574,8 +706,7 @@ public class DhcpPacketTest extends TestCase {
             "0000000000000000000000000000000000000000000000000000000000000000" +
             // Options.
             "638253633501023604c0abbd023304000070803a04000038403b04000062700104ffffff00" +
-            "0308c0a8bd01ffffff0006080808080808080404ff000000000000"
-        ).toCharArray(), false));
+            "0308c0a8bd01ffffff0006080808080808080404ff000000000000"));
 
         DhcpPacket offerPacket = DhcpPacket.decodeFullPacket(packet, ENCAP_L2);
         assertTrue(offerPacket instanceof DhcpOfferPacket);
-- 
cgit v1.1


From 26ff86c566c81a37209a80652ab533153aead79e Mon Sep 17 00:00:00 2001
From: Sungsoo <sungsoo@google.com>
Date: Thu, 13 Oct 2016 12:24:16 +0900
Subject: DO NOT MERGE) ExifInterface: Provide backward compatibility

ExifInterface.saveAttribute() didn't throw UnsupportedOperationException
before. Use IOException instead of UnsupportedOperationException for
backward compatibility.

Bug: 30936376, Bug: 32068647, Bug: 31319086
Change-Id: Iacc7b4d91d49edd7bece8f2e738a633a91025eca
(cherry picked from commit 7ce9243087b04bce719e1f3d10a14b9b26b8ea81)
---
 media/java/android/media/ExifInterface.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index bb75547..2c7160f 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -1374,8 +1374,7 @@ public class ExifInterface {
      */
     public void saveAttributes() throws IOException {
         if (!mIsSupportedFile) {
-            throw new UnsupportedOperationException(
-                    "ExifInterface only supports saving attributes on JPEG formats.");
+            throw new IOException("ExifInterface only supports saving attributes on JPEG formats.");
         }
         // Keep the thumbnail in memory
         mThumbnailBytes = getThumbnail();
-- 
cgit v1.1


From 7551899e52da74feabc308fd610ef3757695f885 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Mon, 7 Nov 2016 16:22:48 +0000
Subject: Zygote : Block SIGCHLD during fork.

Fix merge conflict into mnc-mr2-release
We close the android logging related sockets prior as late as possible
before every fork to avoid having to whitelist them. If one of the
zygote's children dies after this point (but prior to the fork), we can
end up reopening the logging sockets from the SIGCHLD signal handler.

To prevent this from happening, block SIGCHLD during this critical
section.

Bug: 32693692
Test: Manual

(cherry picked from commit e9a525829a354c92983a35455ccab16d1b0d3892)

Zygote: Unblock SIGCHLD in the parent after fork.

Follow up to change e9a525829a354c92983a. Allows the zygote to
receive SIGCHLD again and prevents the zygote from getting into a
zombie state if it's killed.

Contributed-By: rhed_jao <rhed_jao@htc.com>
Bug: 32693692
Test: manual

(cherry picked from commit 1480dc3e97b661f5bfa3a5c2fbce72385b8d2be6)

Change-Id: If89903a29c84dfc9b056f9e19618046874bba689
---
 core/jni/com_android_internal_os_Zygote.cpp | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index 4f90bd9..8686444 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -465,6 +465,20 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
   SetForkLoad(true);
 #endif
 
+  sigset_t sigchld;
+  sigemptyset(&sigchld);
+  sigaddset(&sigchld, SIGCHLD);
+
+  // Temporarily block SIGCHLD during forks. The SIGCHLD handler might
+  // log, which would result in the logging FDs we close being reopened.
+  // This would cause failures because the FDs are not whitelisted.
+  //
+  // Note that the zygote process is single threaded at this point.
+  if (sigprocmask(SIG_BLOCK, &sigchld, NULL) == -1) {
+    ALOGE("sigprocmask(SIG_SETMASK, { SIGCHLD }) failed: %s", strerror(errno));
+    RuntimeAbort(env, __LINE__, "Call to sigprocmask(SIG_BLOCK, { SIGCHLD }) failed.");
+  }
+
   // Close any logging related FDs before we start evaluating the list of
   // file descriptors.
   __android_log_close();
@@ -496,6 +510,11 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
       RuntimeAbort(env, __LINE__, "Unable to reopen whitelisted descriptors.");
     }
 
+    if (sigprocmask(SIG_UNBLOCK, &sigchld, NULL) == -1) {
+      ALOGE("sigprocmask(SIG_SETMASK, { SIGCHLD }) failed: %s", strerror(errno));
+      RuntimeAbort(env, __LINE__, "Call to sigprocmask(SIG_UNBLOCK, { SIGCHLD }) failed.");
+    }
+
     // Keep capabilities across UID change, unless we're staying root.
     if (uid != 0) {
       EnableKeepCapabilities(env);
@@ -628,11 +647,11 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
   } else if (pid > 0) {
     // the parent process
 
-#ifdef ENABLE_SCHED_BOOST
-    // unset scheduler knob
-    SetForkLoad(false);
-#endif
-
+    // We blocked SIGCHLD prior to a fork, we unblock it here.
+    if (sigprocmask(SIG_UNBLOCK, &sigchld, NULL) == -1) {
+      ALOGE("sigprocmask(SIG_SETMASK, { SIGCHLD }) failed: %s", strerror(errno));
+      RuntimeAbort(env, __LINE__, "Call to sigprocmask(SIG_UNBLOCK, { SIGCHLD }) failed.");
+    }
   }
   return pid;
 }
-- 
cgit v1.1


From be484200b616e4eee4a8a8f10e663f9306df0b3a Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Fri, 23 Sep 2016 09:07:11 +0100
Subject: Zygote: Additional whitelists for runtime overlay / other static
 resources.

Partially cherry picked from commit 1c15c635785c64a.

These files are safe to reopen for the same reason that files in
/system/framework are. They're regular files and will not change after
the first zygote fork.

Bug: 32618130

Change-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f
(cherry picked from commit 4e8ba1d73eee1311bb78144be43862b393548d5d)
---
 core/jni/fd_utils-inl.h | 44 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/core/jni/fd_utils-inl.h b/core/jni/fd_utils-inl.h
index f245a7f..30fccf8 100644
--- a/core/jni/fd_utils-inl.h
+++ b/core/jni/fd_utils-inl.h
@@ -248,9 +248,22 @@ class FileDescriptorInfo {
     is_sock(false) {
   }
 
+  static bool StartsWith(const std::string& str, const std::string& prefix) {
+    return str.compare(0, prefix.size(), prefix) == 0;
+  }
+
+  static bool EndsWith(const std::string& str, const std::string& suffix) {
+    if (suffix.size() > str.size()) {
+      return false;
+    }
+
+    return str.compare(str.size() - suffix.size(), suffix.size(), suffix) == 0;
+  }
+
   // Returns true iff. a given path is whitelisted. A path is whitelisted
   // if it belongs to the whitelist (see kPathWhitelist) or if it's a path
-  // under /system/framework that ends with ".jar".
+  // under /system/framework that ends with ".jar" or if it is a system
+  // framework overlay.
   static bool IsWhitelisted(const std::string& path) {
     for (size_t i = 0; i < (sizeof(kPathWhitelist) / sizeof(kPathWhitelist[0])); ++i) {
       if (kPathWhitelist[i] == path) {
@@ -260,10 +273,35 @@ class FileDescriptorInfo {
 
     static const std::string kFrameworksPrefix = "/system/framework/";
     static const std::string kJarSuffix = ".jar";
-    if (path.compare(0, kFrameworksPrefix.size(), kFrameworksPrefix) == 0 &&
-        path.compare(path.size() - kJarSuffix.size(), kJarSuffix.size(), kJarSuffix) == 0) {
+    if (StartsWith(path, kFrameworksPrefix) && EndsWith(path, kJarSuffix)) {
       return true;
     }
+
+    // Whitelist files needed for Runtime Resource Overlay, like these:
+    // /system/vendor/overlay/framework-res.apk
+    // /system/vendor/overlay-subdir/pg/framework-res.apk
+    // /data/resource-cache/system@vendor@overlay@framework-res.apk@idmap
+    // /data/resource-cache/system@vendor@overlay-subdir@pg@framework-res.apk@idmap
+    // See AssetManager.cpp for more details on overlay-subdir.
+    static const std::string kOverlayDir = "/system/vendor/overlay/";
+    static const std::string kVendorOverlayDir = "/vendor/overlay";
+    static const std::string kOverlaySubdir = "/system/vendor/overlay-subdir/";
+    static const std::string kApkSuffix = ".apk";
+
+    if ((StartsWith(path, kOverlayDir) || StartsWith(path, kOverlaySubdir)
+         || StartsWith(path, kVendorOverlayDir))
+        && EndsWith(path, kApkSuffix)
+        && path.find("/../") == std::string::npos) {
+      return true;
+    }
+
+    static const std::string kOverlayIdmapPrefix = "/data/resource-cache/";
+    static const std::string kOverlayIdmapSuffix = ".apk@idmap";
+    if (StartsWith(path, kOverlayIdmapPrefix) && EndsWith(path, kOverlayIdmapSuffix)
+        && path.find("/../") == std::string::npos) {
+      return true;
+    }
+
     return false;
   }
 
-- 
cgit v1.1


From 5a1319ce573a9273404e2ded4bce1459008dd048 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Mon, 7 Nov 2016 19:59:29 +0000
Subject: Zygote: Additional whitelisting for legacy devices.

On M and below, we provide a blanket whitelist for all files under
"/vendor/zygote_whitelist". This path is whitelisted purely to allow
this patch to be applied easily on legacy devices and configurations.

Note that this does not amount to a loosening of our security policy
because whitelisted files are reopened anyway.

Bug: 32691930
Test: manual
Change-Id: If5b53f6f0a707f8d36603c09bfd3f72dbfbbbb99
(cherry picked from commit 5e2f7c6229d7191183888d685b57a7d0a2835fce)
---
 core/jni/fd_utils-inl.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/jni/fd_utils-inl.h b/core/jni/fd_utils-inl.h
index 30fccf8..6c4ca6b 100644
--- a/core/jni/fd_utils-inl.h
+++ b/core/jni/fd_utils-inl.h
@@ -302,6 +302,12 @@ class FileDescriptorInfo {
       return true;
     }
 
+    // All regular files that are placed under this path are whitelisted automatically.
+    static const std::string kZygoteWhitelistPath = "/vendor/zygote_whitelist/";
+    if (StartsWith(path, kZygoteWhitelistPath) && path.find("/../") == std::string::npos) {
+      return true;
+    }
+
     return false;
   }
 
-- 
cgit v1.1


From bbec1eb03e8ea93910c369304c2335c5f736f967 Mon Sep 17 00:00:00 2001
From: "neo.chae" <neo.chae@lge.com>
Date: Tue, 1 Nov 2016 00:02:38 +0900
Subject: Fix idmap leak in zygote process

Fix a idmap leak in AssetManager::addSystemOverlays.
And, The fix could also prevent fd leak of idmap.

Test: none
Bug: 32691930

Signed-off-by: Hyangseok Chae <neo.chae@lge.com>

(cherry picked from commit 6a742a38509693f8b39ee9a5ad2803fca12688bf)

Change-Id: Idc4af77db2b0cb739bd6b009b6af0f9123be1aac
(cherry picked from commit 0244ca8d10dfc27e14f481fe649b89f7638c48eb)
---
 libs/androidfw/AssetManager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/androidfw/AssetManager.cpp b/libs/androidfw/AssetManager.cpp
index 1add6c3..e6e4563 100644
--- a/libs/androidfw/AssetManager.cpp
+++ b/libs/androidfw/AssetManager.cpp
@@ -1006,6 +1006,7 @@ void AssetManager::addSystemOverlays(const char* pathOverlaysList,
             sharedRes->add(oass, oidmap, offset + 1, false, oap.pkgIdOverride);
             const_cast<AssetManager*>(this)->mAssetPaths.add(oap);
             const_cast<AssetManager*>(this)->mZipSet.addOverlay(targetPackagePath, oap);
+            delete oidmap;
         }
     }
     fclose(fin);
-- 
cgit v1.1


From 4ba10939b7c05e4cf44d053ee8fa37a703c19e9b Mon Sep 17 00:00:00 2001
From: Hugo Benichi <hugobenichi@google.com>
Date: Thu, 10 Nov 2016 10:31:31 +0900
Subject: resolve merge conflicts of 89aa6fb to mnc-dr-dev

Change-Id: I9e4e538081600be6a8199060bcb0d4040c071a22
(cherry picked from commit a0cfb157ecf69c948e37db5a9df6cb8a8102874c)
---
 services/net/java/android/net/dhcp/DhcpClient.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/services/net/java/android/net/dhcp/DhcpClient.java b/services/net/java/android/net/dhcp/DhcpClient.java
index c9efc69..ac0c6a3 100644
--- a/services/net/java/android/net/dhcp/DhcpClient.java
+++ b/services/net/java/android/net/dhcp/DhcpClient.java
@@ -43,6 +43,7 @@ import android.os.SystemClock;
 import android.system.ErrnoException;
 import android.system.Os;
 import android.system.PacketSocketAddress;
+import android.util.EventLog;
 import android.util.Log;
 import android.util.TimeUtils;
 
@@ -372,6 +373,14 @@ public class DhcpClient extends BaseDhcpStateMachine {
                     if (PACKET_DBG) {
                         Log.d(TAG, HexDump.dumpHexString(mPacket, 0, length));
                     }
+                } catch (Exception e) {
+                    // SafetyNet logging for b/31850211
+                    int snetTagId = 0x534e4554;
+                    String bugId = "31850211";
+                    int uid = -1;
+                    String data = e.getClass().getName();
+                    EventLog.writeEvent(snetTagId, bugId, uid, data);
+                    Log.e(TAG, "Failed to parse DHCP packet", e);
                 }
             }
             maybeLog("Receive thread stopped");
-- 
cgit v1.1