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

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

diff --git a/res/values-as-rIN/arrays.xml b/res/values-as-rIN/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-as-rIN/arrays.xml
+++ b/res/values-as-rIN/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-as-rIN/strings.xml b/res/values-as-rIN/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-as-rIN/strings.xml
+++ b/res/values-as-rIN/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-ast-rES/arrays.xml b/res/values-ast-rES/arrays.xml
index 3179cdf..82f0dab 100644
--- a/res/values-ast-rES/arrays.xml
+++ b/res/values-ast-rES/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <string-array name="timezone_filters">
     <!-- The next level of the time zoner picker should show time zones from the Americas. -->
@@ -119,10 +120,11 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <string-array name="wifi_status">
     <!-- Status message of Wi-Fi when it is idle. -->
-    <item/>
+    <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
     <item>Guetando...</item>
     <!-- Status message of Wi-Fi when it is connecting. -->
@@ -147,10 +149,11 @@
     <item>Inhabilitando conexón inestable temporalmente...</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <string-array name="wifi_status_with_ssid">
     <!-- Status message of Wi-Fi when it is idle. -->
-    <item/>
+    <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
     <item>Guetando...</item>
     <!-- Status message of Wi-Fi when it is connecting to a network. -->
@@ -175,12 +178,15 @@
     <item>Inhabilitando conexón inestable temporalmente...</item>
   </string-array>
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <string-array name="wifi_eap_method">
     <!-- Do not translate. -->
@@ -246,6 +252,7 @@
     <item>Siempre visible</item>
   </string-array>
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <string-array name="wifi_signal">
     <item>Mala</item>
@@ -273,6 +280,7 @@
     <item>Enxamás</item>
   </string-array>
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <string-array name="wifi_sleep_policy_values">
     <!-- Do not translate. -->
@@ -703,8 +711,10 @@
   </string-array>
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <string-array name="vpn_types_long">
     <item>Rede privada virtual PPTP</item>
@@ -715,6 +725,7 @@
     <item>Rede privada virtual IPSec con certificaos y autenticación híbrida</item>
   </string-array>
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <string-array name="vpn_states">
     <!-- Status message when VPN is disconnected. -->
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 8bb657e..5ad1e33 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -30,6 +30,7 @@
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <string name="dlg_switch">Camudar</string>
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <string name="device_info_default">Desconocíu</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
@@ -42,6 +43,7 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <string name="show_dev_already">Nun hai necesidá, yá yes un desendolcador.</string>
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <string name="header_category_wireless_networks">Conexones inalámbriques y redes</string>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
@@ -208,6 +210,7 @@
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <string name="bluetooth_disable_profile_message">Va inhabilitase&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;de&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;.</string>
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <string name="bluetooth_device">Preséu Bluetooth ensin nome</string>
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
@@ -529,6 +532,7 @@
   <!-- mobile network settings screen, setting option summary text -->
   <string name="sum_carrier_select">Esbillar un operador de rede</string>
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <string name="date_and_time_settings_title">Data y hora</string>
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
@@ -578,6 +582,7 @@
          [CHAR LIMIT=20] -->
   <string name="time_picker_title">Hora</string>
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <string name="lock_after_timeout">Bloquiar automáticamente</string>
   <!-- Security settings screen, setting option summary to change screen timeout -->
@@ -621,6 +626,7 @@
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <string name="security_passwords_title">Contraseñes</string>
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <string name="security_settings_fingerprint_preference_title">Buelga dixital</string>
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
@@ -637,6 +643,7 @@
     <item quantity="other">Configuráronsese <xliff:g id="count">%1$d</xliff:g> buelgues dixitales</item>
   </plurals>
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <string name="security_settings_fingerprint_enroll_onboard_title">Configuración de buelga dixital</string>
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
@@ -802,12 +809,15 @@
   <!-- Image button description to switch input method -->
   <string name="crypt_keeper_switch_input_method">Camudar métodu d\'entrada</string>
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <string name="lock_settings_picker_title">Escoyer bloquéu de pantalla</string>
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <string name="lock_settings_picker_fingerprint_message">Escoyer el métodu secundariu de bloquéu de pantalla</string>
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_launch_picker_title">Bloquéu de pantalla</string>
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
@@ -819,6 +829,7 @@
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_off_title">Ensin seguridá</string>
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_none_title">Eslizar</string>
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
@@ -993,6 +1004,7 @@
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <string name="bluetooth_pairing_shares_phonebook">Permitir que <xliff:g id="device_name">%1$s</xliff:g> acceda a los contautos y al historial de llamaes</string>
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <string name="bluetooth_connecting_error_message">Nun pudo afitase conexón con <xliff:g id="device_name">%1$s</xliff:g>.</string>
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
@@ -1156,6 +1168,7 @@
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <string name="nsd_quick_toggle_summary">Permitir que les aplicaciones d\'otros preseos puedan ver les aplicaciones d\'esti preséu</string>
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <string name="wifi_quick_toggle_title">Wi-Fi</string>
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
@@ -1251,6 +1264,7 @@
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <string name="wifi_setup_wps">Configuración automática (WPS)</string>
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <string name="wifi_show_advanced">Opciones avanzaes</string>
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
@@ -1376,6 +1390,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <string name="wifi_connect_failed_message" product="default">El teléfonu nun pudo coneutase a esta rede Wi‑Fi.</string>
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <string name="wifi_saved_access_points_titlebar">Redes guardaes</string>
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
@@ -1543,6 +1558,7 @@
   </string-array>
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <string name="home_settings">Aniciu</string>
   <string name="display_settings_title">Pantalla</string>
@@ -1651,6 +1667,7 @@
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <string name="search_settings_summary">Alministrar historial y configuración de gueta</string>
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <string name="display_settings">Pantalla</string>
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
@@ -1922,7 +1939,9 @@
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <string name="sd_mount" product="default">Activar tarxeta SD</string>
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <string name="sd_format" product="nosdcard">Desaniciar almacenamientu USB</string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
@@ -1947,7 +1966,9 @@
   <!-- SD card eject confirmation dialog  -->
   <string name="dlg_confirm_unmount_text" product="default">Si desactives la tarxeta SD, van parase dalgunes aplicaciones que tas usando y nun van tar disponibles hasta que vuelvas activala.</string>
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <string name="dlg_error_unmount_text" product="nosdcard">Nun pudo desmontase l\'almacenamientu USB. Inténtalo dempués.</string>
   <!-- SD card eject error dialog text   -->
@@ -2167,6 +2188,7 @@
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <string name="menu_cancel">Descartar</string>
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <string name="error_apn_empty">El APN nun pue quedar baleru.</string>
@@ -2394,6 +2416,7 @@
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <string name="location_sources_heading">Fontes de llocalización</string>
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <string name="about_settings" product="tablet">Información de la tablet</string>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
@@ -2409,15 +2432,19 @@
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <string name="regulatory_information">Información regulatoria</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <string name="copyright_title">Derechos d\'autor</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <string name="license_title">Llicencia</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <string name="terms_title">Términos y condiciones</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <string name="wallpaper_attributions">Fondos de pantalla</string>
@@ -2428,6 +2455,7 @@
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <string name="settings_manual_activity_unavailable">Hebo un fallu al cargar el manual.</string>
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <string name="settings_license_activity_title">Llicencies de códigu abiertu</string>
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
@@ -2538,6 +2566,7 @@
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <string name="activity_not_found">L\'aplicación nun ta instalada nel teléfonu.</string>
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <string name="manageapplications_settings_title">Alministrar aplicaciones</string>
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
@@ -2694,6 +2723,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <string name="dlg_cancel">Encaboxar</string>
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <string name="app_not_found_dlg_text"> Nun s\'atopó l\'aplicación na llista d\'aplicaciones instalaes.</string>
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
@@ -2759,6 +2789,7 @@
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <string name="force_stop_dlg_text">Si se detién una aplicación, ye dable que nun funcione correcho.</string>
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <string name="move_app_failed_dlg_text">Nun pudo movese l\'aplicación. <xliff:g id="reason">%1$s</xliff:g></string>
   <!-- Manage applications, application installation location title -->
@@ -2779,6 +2810,7 @@
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <string name="app_disable_notifications_dlg_text">Si desactives les notificaciones d\'esta aplicación, ye dable que nun recibas anovamientos y alertes importantes.</string>
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <string name="app_ops_settings">Operaciones de l\'aplicación</string>
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
@@ -2878,6 +2910,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <string name="runningservicedetails_stop_dlg_text" product="default">Si detienes esti serviciu, ye dable que dalgunes funciones del teléfonu dexen de funcionar correcho hasta que reanicies el preséu.</string>
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <string name="language_settings">Llingua y tecláu</string>
   <!-- Title of Language and keyboard settings screen -->
@@ -2928,6 +2961,7 @@
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <string name="vibrate_input_devices_summary">Redireicionar vibración al controlador de videoxuegu cuando tea coneutáu</string>
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_dialog_title">Esbilla un tipu de tecláu</string>
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
@@ -2937,9 +2971,11 @@
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <string name="keyboard_layout_default_label">Predetermináu</string>
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_picker_title">Diseños de tecláu</string>
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <string name="user_dict_settings_title">Diccionariu personal</string>
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
@@ -3170,6 +3206,7 @@
   <!-- label for usage time -->
   <string name="usage_time_label">Tiempu d\'usu</string>
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <string name="accessibility_settings">Accesibilidá</string>
   <!-- Settings title for accessibility settings screen -->
@@ -3338,6 +3375,7 @@
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <string name="settings_button">Axustes</string>
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <string name="print_settings">Impresión</string>
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
@@ -3393,6 +3431,7 @@
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_hidden_utterance">Cuadru de gueta anubríu</string>
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <string name="power_usage_summary_title">Batería</string>
   <!-- Activity title summary for App Fuel Gauge summary -->
@@ -3601,6 +3640,7 @@
   <string name="battery_saver_turn_on_automatically_never">Enxamás</string>
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <string name="process_stats_summary_title">Estadístiques de procesos</string>
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
@@ -3684,6 +3724,7 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <string name="menu_proc_stats_type_cached">En caché</string>
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <string name="voice_input_output_settings">Entrada y salida de voz</string>
   <!-- Main voice input/output settings screen title -->
@@ -3695,6 +3736,7 @@
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <string name="voice_category">Voz</string>
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <string name="voice_input_settings">Axustes d\'entrada de voz</string>
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
@@ -3720,6 +3762,7 @@
         entrada de voz en to nome. Remanez de l\'aplicación <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>.
         ¿Quies habilitar l\'usu d\'esti serviciu?</string>
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <string name="tts_settings">Configuración síntesis voz</string>
   <!-- TTS option item name in the main settings screen -->
@@ -3894,6 +3937,7 @@
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <string name="credentials_settings_not_available">Les credenciales nun tán disponibles pa esti usuariu</string>
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <string name="credentials_unlock_hint">Escribi la contraseña del almacenamientu de credenciales.</string>
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
@@ -3921,6 +3965,7 @@
   <!-- Sound settings screen, setting option summary text -->
   <string name="emergency_tone_summary">Afitar comportamientu al facer una llamada d\'emerxencia</string>
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <string name="privacy_settings">Copia de seguranza</string>
   <!-- Privacy settings activity title -->
@@ -3955,11 +4000,13 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <string name="local_backup_password_toast_validation_failure">Fallu al afitar contraseña de seguranza</string>
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <string name="backup_erase_dialog_message">¿Quies dexar de facer copies de seguranza de les contraseñes Wi-Fi, de los marcadores y d\'otros axustes y datos d\'aplicaciones, arriendes de desaniciar toles copies de los sirvidores de Google?</string>
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <string name="device_admin_settings_title">Axustes d\'alministración de preseos</string>
   <!-- Label for screen showing the active device policy -->
@@ -4130,6 +4177,7 @@
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <string name="sync_automatically">Sincronizar datos aplicaciones autom.</string>
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <string name="sync_enabled">Sincronización activa</string>
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
@@ -4617,6 +4665,7 @@
   <string name="selinux_status_permissive">Permisivu</string>
   <string name="selinux_status_enforcing">Obligatoriu</string>
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">Pue que la rede tea supervisada</string>
@@ -4631,6 +4680,7 @@
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <string name="ssl_ca_cert_settings_button">Comprobar credenciales de confianza</string>
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <string name="user_settings_title">Usuarios</string>
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
@@ -4767,6 +4817,7 @@
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <string name="global_font_change_title">Camudar tamañu de fonte</string>
   <!-- NFC payment settings -->
+  <skip></skip>
   <string name="nfc_payment_settings_title">Tocar y pagar</string>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <string name="nfc_payment_how_it_works">Cómo funciona</string>
@@ -4799,6 +4850,7 @@
   <string name="nfc_payment_set_default">¿Quies usar <xliff:g id="app">%1$s</xliff:g> siempre con Tocar y pagar?</string>
   <string name="nfc_payment_set_default_instead_of">¿Quies usar <xliff:g id="app">%1$s</xliff:g> siempre en cuenta de <xliff:g id="app">%2$s</xliff:g> con Tocar y pagar?</string>
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <string name="restriction_settings_title">Restricciones</string>
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
@@ -4808,6 +4860,7 @@
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <string name="app_notifications_switch_label">Amosar notificaciones</string>
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <string name="help_label">Ayuda &amp; comentarios</string>
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
@@ -4928,6 +4981,7 @@
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <string name="user_image_photo_selector">Esbillar semeya</string>
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <string name="sim_setup_wizard_title">Tarxetes SIM</string>
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-br-rFR/arrays.xml b/res/values-br-rFR/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-br-rFR/arrays.xml
+++ b/res/values-br-rFR/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-br-rFR/strings.xml b/res/values-br-rFR/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-br-rFR/strings.xml
+++ b/res/values-br-rFR/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-csb-rPL/arrays.xml b/res/values-csb-rPL/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-csb-rPL/arrays.xml
+++ b/res/values-csb-rPL/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-csb-rPL/strings.xml b/res/values-csb-rPL/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-csb-rPL/strings.xml
+++ b/res/values-csb-rPL/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-cy/arrays.xml b/res/values-cy/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-cy/arrays.xml
+++ b/res/values-cy/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-en-rPT/arrays.xml b/res/values-en-rPT/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-en-rPT/arrays.xml
+++ b/res/values-en-rPT/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-en-rPT/strings.xml b/res/values-en-rPT/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-en-rPT/strings.xml
+++ b/res/values-en-rPT/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-eo/arrays.xml b/res/values-eo/arrays.xml
index 2731296..f090536 100644
--- a/res/values-eo/arrays.xml
+++ b/res/values-eo/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <string-array name="timezone_filters">
     <!-- The next level of the time zoner picker should show time zones from the Americas. -->
@@ -102,16 +103,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -136,6 +142,7 @@
     <item>Never time out</item>
   </string-array>
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <string-array name="wifi_sleep_policy_entries">
@@ -157,6 +164,7 @@
     <item>Neniam</item>
   </string-array>
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <string-array name="wifi_sleep_policy_values">
     <!-- Do not translate. -->
@@ -346,10 +354,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index 6d2c217..6293304 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -25,12 +25,14 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <string name="device_info_default">Nekonata</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -122,6 +124,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -294,6 +297,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -323,6 +327,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -347,6 +352,7 @@
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <string name="security_passwords_title">Pasvortoj</string>
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -354,6 +360,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -432,16 +439,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -533,6 +544,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -629,6 +641,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -684,6 +697,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -756,6 +770,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -871,6 +886,7 @@
   </string-array>
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -931,6 +947,7 @@
   <string name="search_settings">Serĉi</string>
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1076,7 +1093,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1090,7 +1109,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1219,6 +1240,7 @@
   <string name="menu_save">Konservi</string>
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1339,6 +1361,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1347,18 +1370,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1419,6 +1447,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1507,6 +1536,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <string name="dlg_cancel">Nuligi</string>
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1540,6 +1570,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1551,6 +1582,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1611,6 +1643,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1641,13 +1674,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1780,6 +1816,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <string name="accessibility_settings">Alirebleco</string>
   <!-- Settings title for accessibility settings screen -->
@@ -1873,6 +1910,7 @@
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <string name="settings_button">Agordoj</string>
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1908,6 +1946,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -2018,6 +2057,7 @@
   <string name="battery_saver_turn_on_automatically_never">Neniam</string>
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -2067,12 +2107,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -2089,6 +2131,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2186,6 +2229,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2200,6 +2244,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2219,10 +2264,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2337,6 +2384,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2605,6 +2653,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2613,6 +2662,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <string name="user_settings_title">Uzantoj</string>
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
@@ -2692,6 +2742,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2709,11 +2760,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2792,6 +2845,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-es-rCO/arrays.xml b/res/values-es-rCO/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-es-rCO/arrays.xml
+++ b/res/values-es-rCO/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-es-rCO/strings.xml b/res/values-es-rCO/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-es-rCO/strings.xml
+++ b/res/values-es-rCO/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-es-rMX/arrays.xml b/res/values-es-rMX/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-es-rMX/arrays.xml
+++ b/res/values-es-rMX/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-es-rMX/strings.xml b/res/values-es-rMX/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-es-rMX/strings.xml
+++ b/res/values-es-rMX/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-frp-rIT/arrays.xml b/res/values-frp-rIT/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-frp-rIT/arrays.xml
+++ b/res/values-frp-rIT/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-frp-rIT/strings.xml b/res/values-frp-rIT/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-frp-rIT/strings.xml
+++ b/res/values-frp-rIT/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-fy-rNL/arrays.xml b/res/values-fy-rNL/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-fy-rNL/arrays.xml
+++ b/res/values-fy-rNL/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-fy-rNL/strings.xml b/res/values-fy-rNL/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-fy-rNL/strings.xml
+++ b/res/values-fy-rNL/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-ga-rIE/arrays.xml b/res/values-ga-rIE/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-ga-rIE/arrays.xml
+++ b/res/values-ga-rIE/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-ga-rIE/strings.xml b/res/values-ga-rIE/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-ga-rIE/strings.xml
+++ b/res/values-ga-rIE/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-gd-rGB/arrays.xml b/res/values-gd-rGB/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-gd-rGB/arrays.xml
+++ b/res/values-gd-rGB/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-gd-rGB/strings.xml b/res/values-gd-rGB/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-gd-rGB/strings.xml
+++ b/res/values-gd-rGB/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-ku/arrays.xml b/res/values-ku/arrays.xml
index 0177dc3..aff892d 100644
--- a/res/values-ku/arrays.xml
+++ b/res/values-ku/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <string-array name="timezone_filters">
     <!-- The next level of the time zoner picker should show time zones from the Americas. -->
@@ -119,10 +120,11 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <string-array name="wifi_status">
     <!-- Status message of Wi-Fi when it is idle. -->
-    <item/>
+    <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
     <item>گه‌ڕان\u2026</item>
     <!-- Status message of Wi-Fi when it is connecting. -->
@@ -147,10 +149,11 @@
     <item>دورخستنه‌وه‌ی په‌یوه‌ندی کز</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <string-array name="wifi_status_with_ssid">
     <!-- Status message of Wi-Fi when it is idle. -->
-    <item/>
+    <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
     <item>گه‌ڕان\u2026</item>
     <!-- Status message of Wi-Fi when it is connecting to a network. -->
@@ -175,12 +178,15 @@
     <item>دورخستنه‌وه‌ی تۆڕی کز</item>
   </string-array>
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <string-array name="wifi_eap_method">
     <!-- Do not translate. -->
@@ -239,6 +245,7 @@
     <item>هه‌رگیز کات ته‌واو نه‌بێت</item>
   </string-array>
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <string-array name="wifi_signal">
     <item>کز</item>
@@ -266,6 +273,7 @@
     <item>هه‌رگیز</item>
   </string-array>
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <string-array name="wifi_sleep_policy_values">
     <!-- Do not translate. -->
@@ -655,8 +663,10 @@
   </string-array>
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <string-array name="vpn_types_long">
     <item>PPTP VPN</item>
@@ -667,6 +677,7 @@
     <item>IPSec VPN with certificates and hybrid authentication</item>
   </string-array>
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <string-array name="vpn_states">
     <!-- Status message when VPN is disconnected. -->
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index a58ac91..a6f99d9 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -28,6 +28,7 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <string name="device_info_default">نەناسراو</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
@@ -36,6 +37,7 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <string name="show_dev_already">پێویست ناکا، پێشتر گه‌شه‌ پێده‌ری.</string>
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -189,6 +191,7 @@
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <string name="bluetooth_disable_profile_message">ئه‌مه‌ وlt;brوgt;وlt;bوgt;<xliff:g id="profile_name">%1$s</xliff:g>وlt;/bوgt;وlt;brوgt;وlt;brوgt;From:وlt;brوgt;وlt;bوgt;<xliff:g id="device_name">%2$s</xliff:g>وlt;/bوgt; له‌کارده‌خات.</string>
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <string name="bluetooth_device">بلوتوسه‌ بێناوه‌کان</string>
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
@@ -486,6 +489,7 @@
   <!-- mobile network settings screen, setting option summary text -->
   <string name="sum_carrier_select">هه‌ڵسوڕێنه‌ری هێڵه‌که‌ت هه‌ڵبژێره‌</string>
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <string name="date_and_time_settings_title">ڕۆژ وamp; کات</string>
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
@@ -531,6 +535,7 @@
          [CHAR LIMIT=20] -->
   <string name="time_picker_title">کات</string>
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <string name="lock_after_timeout">قفڵکردنی خۆکاری</string>
   <!-- Security settings screen, setting option summary to change screen timeout -->
@@ -567,6 +572,7 @@
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <string name="security_passwords_title">وشه‌ نهێنییه‌کان</string>
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -574,6 +580,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -672,11 +679,14 @@
   <!-- Image button description to switch input method -->
   <string name="crypt_keeper_switch_input_method">گۆڕینی ته‌خته‌کلیل</string>
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <string name="lock_settings_picker_title">ده‌ستنیشانکردنی قوفڵی ڕوونما</string>
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_launch_picker_title">قوفڵی ڕوونما</string>
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
@@ -688,6 +698,7 @@
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_off_title">هیچ</string>
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <string name="unlock_set_unlock_none_summary">پاراستنی نیه‌</string>
@@ -846,6 +857,7 @@
   <string name="bluetooth_display_passkey_pin_msg">جووت لەگەڵ :<xliff:g id="bold1">وlt;brوgt;وlt;bوgt;</xliff:g><xliff:g id="device_name">%1$s</xliff:g><xliff:g id="end_bold1">وlt;/bوgt;وlt;brوgt;وlt;brوgt;</xliff:g>بنوسە لەسەری:<xliff:g id="bold2">وlt;brوgt;وlt;bوgt;</xliff:g><xliff:g id="passkey">%2$s</xliff:g><xliff:g id="end_bold2">وlt;/bوgt;</xliff:g>,وە لێبدە بۆ ئەوەی بگەڕێتەوە.</string>
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <string name="bluetooth_preference_scan_title">پشکنین بۆ ئامێرەکان</string>
@@ -989,6 +1001,7 @@
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <string name="nsd_quick_toggle_summary">ڕێگە بە بەرنامەکانی ناو ئامێرێکی دیکە بدە کە بەرنامەکانی ناو ئامێری من ببینێت</string>
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <string name="wifi_quick_toggle_title">Wi\u2011Fi</string>
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
@@ -1075,6 +1088,7 @@
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <string name="wifi_setup_wps">دامه‌زراندنی خۆکارانه‌(WPS)</string>
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <string name="wifi_wps_setup_title">دامه‌زراندنی Wi\u2011Fi پارێزراو</string>
@@ -1185,6 +1199,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <string name="wifi_connect_failed_message" product="default">مۆبایل نەیتوانی گرێبدات بە تۆڕی وای\u2011فای.</string>
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <string name="wifi_advanced_titlebar">ڕێکبەندەکانی پەرەسەندوی وای\u2011فای</string>
@@ -1334,6 +1349,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <string name="home_settings">ماڵەوە</string>
   <string name="display_settings_title">شاشە</string>
@@ -1437,6 +1453,7 @@
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <string name="search_settings_summary">به‌ڕێوه‌بردنی گه‌ڕان و مێژوو</string>
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <string name="display_settings">پیشاندان</string>
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
@@ -1687,7 +1704,9 @@
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <string name="sd_mount" product="default">به‌ستنه‌وه‌ی بیرگه‌ی SD</string>
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <string name="sd_format" product="nosdcard">سڕینەوەی بیرگەی USB</string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
@@ -1712,7 +1731,9 @@
   <!-- SD card eject confirmation dialog  -->
   <string name="dlg_confirm_unmount_text" product="default">ئەگەر کارتی بیرگە دەربکەی لەوانەیە هەندێ لە بەرنامەکانت بوەستن وە نەکەونە کار تاکو دوبارە دایدەنێی.</string>
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1888,6 +1909,7 @@
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <string name="menu_cancel">ڕەتکردنەوە</string>
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -2074,6 +2096,7 @@
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <string name="location_sources_heading">سەرچاوەی دۆزینەوەی شوێنەکەت</string>
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <string name="about_settings" product="tablet">ده‌رباره‌ی بیرگه‌</string>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
@@ -2088,21 +2111,26 @@
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <string name="regulatory_information">زانیاری ڕێک</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <string name="copyright_title">مافی له‌به‌رگرتنه‌وه‌</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <string name="license_title">مۆڵه‌ت</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <string name="terms_title">زاراوه‌ و مه‌رجه‌کان</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <string name="settings_license_activity_title">کردنەوەی مۆڵەتی سەرچاوە</string>
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
@@ -2202,6 +2230,7 @@
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <string name="activity_not_found">بەرنامەکە دانەمەزراوە لەسەر تەلەفۆنەکەت.</string>
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <string name="manageapplications_settings_title">ڕێکخستنی بەرنامەکان</string>
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
@@ -2356,6 +2385,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <string name="dlg_cancel">هەڵوەشاندنەوە</string>
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -2419,6 +2449,7 @@
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <string name="force_stop_dlg_text">ئەگەر هێز بکەی بۆ وەستاندن. لەوە دەچێت تێکبچێت.</string>
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <string name="app_install_location_title">شوێنی دابەزاندنی خوازراو</string>
@@ -2436,6 +2467,7 @@
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <string name="app_disable_notifications_dlg_text">ئەگەر ئاگەداریەکەنی ئەم بەرنامەیە لەکار بخەی.لەوانەیە ئاگەدارکردنەوەی گرنگت لەدەست بچێ سەبارەت بە بەرنامەکە</string>
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <string name="app_ops_settings">کارەکانی بەرنامەکە</string>
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
@@ -2538,6 +2570,7 @@
 شێوازی تەلەفۆنەکە لەوە دەچێت لە کاربکەوێت تاوەکو ئەکوژێتەوە
 وە دوبارە هەوڵبدەرەوە.</string>
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <string name="language_settings">زمانەکان</string>
   <!-- Title of Language and keyboard settings screen -->
@@ -2593,6 +2626,7 @@
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <string name="vibrate_input_devices_summary">لەرەلەر بگوازەوە بۆ دەسکەکە .کاتێ بەسترایەوە</string>
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_dialog_title">شێوازی کیبۆرد هەڵبژێرە</string>
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
@@ -2602,9 +2636,11 @@
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <string name="keyboard_layout_default_label">بنێڕه‌ت</string>
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_picker_title">گه‌ڵاڵه‌به‌ندی تەختەکلیل</string>
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <string name="user_dict_settings_title">فەرهەنگی کەسی</string>
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
@@ -2816,6 +2852,7 @@
   <!-- label for usage time -->
   <string name="usage_time_label">کاتی به‌کارهێنان</string>
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <string name="accessibility_settings">توانای ده‌ستپێگه‌شتن</string>
   <!-- Settings title for accessibility settings screen -->
@@ -2963,6 +3000,7 @@
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <string name="settings_button">ڕێکخستنه‌کان</string>
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <string name="print_settings">چاپکردن</string>
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
@@ -3020,6 +3058,7 @@
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_hidden_utterance">گەڕان بۆ سندوقی شاراوە</string>
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <string name="power_usage_summary_title">باتری</string>
   <!-- Activity title summary for App Fuel Gauge summary -->
@@ -3194,6 +3233,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <string name="process_stats_summary_title">ئاماری پرۆسە</string>
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
@@ -3260,6 +3300,7 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <string name="menu_proc_stats_type_cached">حەشار درا</string>
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <string name="voice_input_output_settings">دەنگ لەناو وamp; دەرەوە</string>
   <!-- Main voice input/output settings screen title -->
@@ -3271,6 +3312,7 @@
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <string name="voice_category">قسە</string>
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -3287,6 +3329,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <string name="tts_settings">دەق-بۆ-ڕێکخستنی قسە</string>
   <!-- TTS option item name in the main settings screen -->
@@ -3462,6 +3505,7 @@
   <string name="credential_storage_type_software">تەنها نەرمەکاڵا</string>
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <string name="credentials_unlock_hint">ئەبێت تێپەڕەوشە بنوسیت بۆ بیرگە.</string>
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
@@ -3488,6 +3532,7 @@
   <!-- Sound settings screen, setting option summary text -->
   <string name="emergency_tone_summary">دانانی کرداری كۆمەڵە كاتێك تەلەفۆن كردنێكى بارى ناكاو دا دەنێرێت</string>
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <string name="privacy_settings">پاڵپشت و ڕێکخستنەوە</string>
   <!-- Privacy settings activity title -->
@@ -3521,12 +3566,14 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <string name="local_backup_password_toast_validation_failure">هەڵوەشانەوەی تێپەڕەوشەی پاشەکەوتی پاشەکەوت</string>
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <string name="backup_erase_dialog_message">گەڕانەوەى Wi\u2011Fi  وشەى نهێنيت ڕا بگرە، پەڕتووك نيشانەكەر، دانانەوەى ديكە، و زانياريى بەرنامە، كۆ هەموو وێنە
  لەسەر سێرڤەرى گووگل لەناودەبات دات?</string>
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <string name="device_admin_settings_title">ڕێکخستنی بەڕێوەبەرایەتی ئامیر</string>
   <!-- Label for screen showing the active device policy -->
@@ -3690,6 +3737,7 @@
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <string name="sync_automatically">خۆکارانە-ناردنی داتای بەرنامە</string>
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <string name="sync_enabled">ناردن لەکارە</string>
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
@@ -4128,6 +4176,7 @@
   <string name="selinux_status_permissive">شل</string>
   <string name="selinux_status_enforcing">سەپاندن</string>
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">لەوانەیە تۆڕ چاودێری کرابێت</string>
@@ -4142,6 +4191,7 @@
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <string name="ssl_ca_cert_settings_button">پشکنینی بەڵگەی باوەڕپێکراو.</string>
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <string name="user_settings_title">بەکارهێنەر</string>
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
@@ -4246,6 +4296,7 @@
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <string name="global_font_change_title">گوڕینی جۆره‌پیت قەبارە</string>
   <!-- NFC payment settings -->
+  <skip></skip>
   <string name="nfc_payment_settings_title">لێدان وamp; پێدان</string>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
@@ -4265,6 +4316,7 @@
          preferred payment application -->
   <string name="nfc_payment_set_default_label">كۆمەڵە وەك بژاردەت?</string>
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <string name="restriction_settings_title">سنووردارەکان</string>
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
@@ -4274,6 +4326,7 @@
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <string name="app_notifications_switch_label">نیشاندانی تێبینیەکان</string>
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -4369,6 +4422,7 @@
   <string name="user_image_choose_photo" msgid="3746334626214970837">هه‌ڵبژاردنی وینه‌یه‌ک له‌ پێشەنگا</string>
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-lb/arrays.xml b/res/values-lb/arrays.xml
index 6c656f1..6cd02a6 100644
--- a/res/values-lb/arrays.xml
+++ b/res/values-lb/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <string-array name="timezone_filters">
     <!-- The next level of the time zoner picker should show time zones from the Americas. -->
@@ -119,10 +120,11 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <string-array name="wifi_status">
     <!-- Status message of Wi-Fi when it is idle. -->
-    <item/>
+    <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
     <item>Scan leeft\u2026</item>
     <!-- Status message of Wi-Fi when it is connecting. -->
@@ -147,10 +149,11 @@
     <item>Schlecht Internetconnectioun gëtt temporär ignoréiert</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <string-array name="wifi_status_with_ssid">
     <!-- Status message of Wi-Fi when it is idle. -->
-    <item/>
+    <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
     <item>Scan leeft\u2026</item>
     <!-- Status message of Wi-Fi when it is connecting to a network. -->
@@ -175,12 +178,15 @@
     <item>Schlecht Internetconnectioun gëtt temporär ignoréiert</item>
   </string-array>
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <string-array name="wifi_eap_method">
     <!-- Do not translate. -->
@@ -239,6 +245,7 @@
     <item>Keen Timeout</item>
   </string-array>
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <string-array name="wifi_signal">
     <item>Schwaach</item>
@@ -266,6 +273,7 @@
     <item>Ni</item>
   </string-array>
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <string-array name="wifi_sleep_policy_values">
     <!-- Do not translate. -->
@@ -696,8 +704,10 @@
   </string-array>
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <string-array name="vpn_types_long">
     <item>PPTP VPN</item>
@@ -708,6 +718,7 @@
     <item>IPSec-VPN mat Zertifikaten an Hybrid-Authentifizéierung</item>
   </string-array>
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <string-array name="vpn_states">
     <!-- Status message when VPN is disconnected. -->
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index a75eacf..8321f63 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -30,6 +30,7 @@
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <string name="dlg_switch">Wiesselen</string>
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <string name="device_info_default">Onbekannt</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
@@ -42,6 +43,7 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <string name="show_dev_already">Net néideg, du bass schonn en Entwéckler.</string>
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <string name="header_category_wireless_networks">Kabellos an Netzwierker</string>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
@@ -211,6 +213,7 @@
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <string name="bluetooth_disable_profile_message">Dëse Profil gëtt desaktivéiert:&lt;br&gt;&lt;b&gt;<xliff:g id="profile_name">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Vu(n):&lt;br&gt;&lt;b&gt;<xliff:g id="device_name">%2$s</xliff:g>&lt;/b&gt;</string>
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <string name="bluetooth_device">Onbenannte Bluetooth-Apparat</string>
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
@@ -520,6 +523,7 @@
   <!-- mobile network settings screen, setting option summary text -->
   <string name="sum_carrier_select">Netzwierkprovider auswielen</string>
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <string name="date_and_time_settings_title">Datum an Zäit</string>
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
@@ -569,6 +573,7 @@
          [CHAR LIMIT=20] -->
   <string name="time_picker_title">Zäit</string>
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <string name="lock_after_timeout">Automatesch spären</string>
   <!-- Security settings screen, setting option summary to change screen timeout -->
@@ -608,6 +613,7 @@
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <string name="security_passwords_title">Passwierder</string>
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -615,6 +621,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -720,11 +727,14 @@
   <!-- Image button description to switch input method -->
   <string name="crypt_keeper_switch_input_method">Method fir anzeginn wiesselen</string>
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <string name="lock_settings_picker_title">Schiermspär auswielen</string>
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_launch_picker_title">Schiermspär</string>
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
@@ -736,6 +746,7 @@
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_off_title">Ouni</string>
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_none_title">Wëschen</string>
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
@@ -901,6 +912,7 @@
   <string name="bluetooth_display_passkey_pin_msg">Gëff fir eng Koppelung mat <xliff:g id="bold1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="device_name">%1$s</xliff:g><xliff:g id="end_bold1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> <xliff:g id="bold2">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="passkey">%2$s</xliff:g><xliff:g id="end_bold2">&lt;/b&gt;</xliff:g> an, an dréck duerno d\'Bestätegungstast.</string>
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <string name="bluetooth_preference_scan_title">Apparater sichen</string>
@@ -1057,6 +1069,7 @@
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <string name="nsd_quick_toggle_summary">Erlaabt Appen op aneren Apparater fir Appen op dësem Apparat z\'entdecken</string>
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <string name="wifi_quick_toggle_title">WLAN</string>
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
@@ -1156,6 +1169,7 @@
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <string name="wifi_setup_wps">Automatesch Astellungen (WPS)</string>
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <string name="wifi_show_advanced">Erweidert Optiounen</string>
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
@@ -1275,6 +1289,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <string name="wifi_connect_failed_message" product="default">Den Telefon konnt net mam WLAN-Netzwierk connectéieren.</string>
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <string name="wifi_saved_access_points_titlebar">Gespäichert Netzwierker</string>
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
@@ -1429,6 +1444,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <string name="home_settings">Heem</string>
   <string name="display_settings_title">Usiicht</string>
@@ -1534,6 +1550,7 @@
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <string name="search_settings_summary">Geréier d\'Sich-Astellungen an den Historique</string>
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <string name="display_settings">Usiicht</string>
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
@@ -1795,7 +1812,9 @@
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <string name="sd_mount" product="default">SD-Kaart abannen</string>
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <string name="sd_format" product="nosdcard">USB-Späicher läschen</string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
@@ -1820,7 +1839,9 @@
   <!-- SD card eject confirmation dialog  -->
   <string name="dlg_confirm_unmount_text" product="default">Wann s du d\'SD-Kaart trenns, gi verschidden Appen déi s du benotz gestoppt a kéinten ophale mat funktionéiere bis du d\'SD-Kaart nees verbënns.</string>
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1996,6 +2017,7 @@
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <string name="menu_cancel">Verwerfen</string>
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -2195,6 +2217,7 @@
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <string name="location_sources_heading">Standuertquellen</string>
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <string name="about_settings" product="tablet">Iwwer den Tablet</string>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
@@ -2209,15 +2232,19 @@
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <string name="regulatory_information">Reguléierungsinformatiounen</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <string name="copyright_title">Auteursrecht</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <string name="license_title">Lizenz</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <string name="terms_title">Geschäftsbedéngungen</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <string name="webview_license_title">System-WebView-Lizenz</string>
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
@@ -2227,6 +2254,7 @@
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <string name="settings_license_activity_title">Open-Source-Lizenzen</string>
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
@@ -2328,6 +2356,7 @@
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <string name="activity_not_found">D\'App ass net op dengem Telefon installéiert.</string>
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <string name="manageapplications_settings_title">Appe geréieren</string>
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
@@ -2485,6 +2514,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <string name="dlg_cancel">Ofbriechen</string>
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -2544,6 +2574,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <string name="force_stop_dlg_text">Wann s du eng App stopps kéint se sech onerwënscht verhalen.</string>
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <string name="app_install_location_title">Preferréiert Installatiounsplaz</string>
@@ -2561,6 +2592,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <string name="app_disable_notifications_dlg_text">Wann s du d\'Notifikatioune fir dës App ausschalts kéints du wichteg Warnungen an Aktualiséierunge verpassen.</string>
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <string name="app_ops_settings">App-Virgäng</string>
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
@@ -2664,6 +2696,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <string name="runningservicedetails_stop_dlg_text" product="default">Wann s du dëse Service stopps kéinte verschidde Funktiounen um Telefon ophale mat funktionéiere bis de den Telefon ausschalts an nei uschalts.</string>
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <string name="language_settings">Sprooch an Agab</string>
   <!-- Title of Language and keyboard settings screen -->
@@ -2714,6 +2747,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <string name="vibrate_input_devices_summary">Vibratioun op de Spillcontroller ëmleede wann ugeschloss.</string>
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_dialog_title">Tastatur-Layout auswielen</string>
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
@@ -2723,9 +2757,11 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <string name="keyboard_layout_default_label">Standard</string>
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_picker_title">Tastaturlayouten</string>
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <string name="user_dict_settings_title">Perséinlechen Dictionnaire</string>
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
@@ -2956,6 +2992,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- label for usage time -->
   <string name="usage_time_label">Benotzungszäit</string>
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <string name="accessibility_settings">Accessibilitéit</string>
   <!-- Settings title for accessibility settings screen -->
@@ -3121,6 +3158,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <string name="settings_button">Astellungen</string>
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <string name="print_settings">Drécken</string>
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
@@ -3176,6 +3214,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_hidden_utterance">Sichkëscht verstoppt</string>
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <string name="power_usage_summary_title">Akku</string>
   <!-- Activity title summary for App Fuel Gauge summary -->
@@ -3385,6 +3424,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <string name="battery_saver_turn_on_automatically_pct">bei %1$s Akku</string>
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <string name="process_stats_summary_title">Prozess-Statistiken</string>
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
@@ -3462,6 +3502,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <string name="menu_proc_stats_type_cached">Am Tëschespäicher</string>
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <string name="voice_input_output_settings">Stëmm-Agab an -Ausgab</string>
   <!-- Main voice input/output settings screen title -->
@@ -3473,6 +3514,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <string name="voice_category">Sprooch</string>
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <string name="voice_input_settings">Astellunge fir d\'Sproochagab</string>
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
@@ -3495,6 +3537,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
          message when the user selects to enable a service. -->
   <string name="voice_interaction_security_warning">Dëse Sproochagabservice ka Sproochagaben all Moment iwwerwaachen an Appen, déi Sproochbefehler ënnerstëtzen, fir dech steieren. E gëtt vun der App <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> bereetgestallt. Wëlls du dëse Service aktivéieren?</string>
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <string name="tts_settings">Astellunge vun der Sproochausgab</string>
   <!-- TTS option item name in the main settings screen -->
@@ -3668,6 +3711,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <string name="credentials_settings_not_available">Zouganksdate fir dëse Benotzer sinn net disponibel</string>
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <string name="credentials_unlock_hint">Gëff d\'Passuwert fir den Umeldungsinformatiounsspäicher an.</string>
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
@@ -3695,6 +3739,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Sound settings screen, setting option summary text -->
   <string name="emergency_tone_summary">Definéier d\'Behuele wann en Noutruff ofgesat gëtt</string>
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <string name="privacy_settings">Sécheren an zrécksetzen</string>
   <!-- Privacy settings activity title -->
@@ -3730,11 +3775,13 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <string name="local_backup_password_toast_validation_failure">Feeler beim setze vum Sécherungspasswuert</string>
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <string name="backup_erase_dialog_message">D\'Sécherung vun App-Daten, WLAN-Passwierder an aner Astellunge stoppen an all d\'Kopien op de Google-Servere läschen?</string>
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <string name="device_admin_settings_title">Apparatverwaltungsastellungen</string>
   <!-- Label for screen showing the active device policy -->
@@ -3904,6 +3951,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <string name="sync_automatically">App-Daten automatesch synchroniséieren</string>
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <string name="sync_enabled">Sync ass UN</string>
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
@@ -4374,6 +4422,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <string name="selinux_status_permissive">Moderat</string>
   <string name="selinux_status_enforcing">Strikt</string>
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">D\'Netzwierk kéint iwwerwaacht sinn</string>
@@ -4388,6 +4437,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <string name="ssl_ca_cert_settings_button">Vertrauenswierdeg Zouganksdaten iwwerpréiwen</string>
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <string name="user_settings_title">Benotzer</string>
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
@@ -4512,6 +4562,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <string name="global_font_change_title">Schrëftgréisst änneren</string>
   <!-- NFC payment settings -->
+  <skip></skip>
   <string name="nfc_payment_settings_title">Drécken a bezuelen</string>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
@@ -4532,6 +4583,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
          preferred payment application -->
   <string name="nfc_payment_set_default_label">Als deng Preferenz setzen?</string>
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <string name="restriction_settings_title">Aschränkungen</string>
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
@@ -4541,6 +4593,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <string name="app_notifications_switch_label">Notifikatiounen uweisen</string>
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <string name="help_label">Hëllef a Feedback</string>
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
@@ -4659,6 +4712,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <string name="user_image_photo_selector">Foto auswielen</string>
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <string name="sim_setup_wizard_title">SIM-Kaarten</string>
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-oc-rFR/arrays.xml b/res/values-oc-rFR/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-oc-rFR/arrays.xml
+++ b/res/values-oc-rFR/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-oc-rFR/strings.xml b/res/values-oc-rFR/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-oc-rFR/strings.xml
+++ b/res/values-oc-rFR/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-or-rIN/arrays.xml b/res/values-or-rIN/arrays.xml
index 4acb887..c45c818 100644
--- a/res/values-or-rIN/arrays.xml
+++ b/res/values-or-rIN/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -38,16 +39,21 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
@@ -59,11 +65,13 @@
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
@@ -126,10 +134,13 @@
   <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
   <!-- Values for user content ratings for restricted users -->
diff --git a/res/values-or-rIN/strings.xml b/res/values-or-rIN/strings.xml
index 2216f6c..d06c54e 100644
--- a/res/values-or-rIN/strings.xml
+++ b/res/values-or-rIN/strings.xml
@@ -23,11 +23,13 @@
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -114,6 +116,7 @@
   <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
   <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
@@ -278,6 +281,7 @@
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
   <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
@@ -306,6 +310,7 @@
   <!-- Title string shown above TimePicker, letting a user select system time
          [CHAR LIMIT=20] -->
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
@@ -328,6 +333,7 @@
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -335,6 +341,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -409,16 +416,20 @@
   <!-- Informational text when encryption fails -->
   <!-- Image button description to switch input method -->
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
@@ -506,6 +517,7 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -596,6 +608,7 @@
   <!-- Used in the 1st-level settings screen to turn on NSD -->
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
   <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
@@ -650,6 +663,7 @@
   <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -717,6 +731,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
@@ -826,6 +841,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <!-- Sound settings screen heading -->
   <!-- Sound settings screen, setting option summary text -->
@@ -883,6 +899,7 @@
   <!-- Main Settings screen, setting option name to go into search settings -->
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
   <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
@@ -1022,7 +1039,9 @@
   <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
@@ -1036,7 +1055,9 @@
   <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
   <!-- SD card eject confirmation dialog  -->
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1159,6 +1180,7 @@
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1279,6 +1301,7 @@
   <!-- [CHAR LIMIT=none] Description text for location access switch -->
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
@@ -1287,18 +1310,23 @@
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
   <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
@@ -1359,6 +1387,7 @@
          too many incorrect attempts [CHAR LIMIT=120]-->
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
@@ -1441,6 +1470,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -1473,6 +1503,7 @@
   <!-- Manage applications, text for move error messages -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <!-- Manage applications. application installation location summary -->
@@ -1484,6 +1515,7 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
   <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
@@ -1539,6 +1571,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <!-- Title of Language and keyboard settings screen -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
@@ -1566,13 +1599,16 @@
   <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
   <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
@@ -1698,6 +1734,7 @@
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
@@ -1786,6 +1823,7 @@
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
   <!-- Title for a warning message about security implications of enabling a print service,
@@ -1815,6 +1853,7 @@
   <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <!-- Activity title summary for App Fuel Gauge summary -->
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
@@ -1924,6 +1963,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
   <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
@@ -1969,12 +2009,14 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <!-- Main voice input/output settings screen title -->
   <!-- Title of voice search settings list item within voice input/output settings -->
   <!-- Title of keyboard settings list item within voice input/output settings -->
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -1991,6 +2033,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <!-- TTS option item name in the main settings screen -->
   <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
@@ -2086,6 +2129,7 @@
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
   <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
@@ -2100,6 +2144,7 @@
   <!-- Sound settings screen, setting check box label -->
   <!-- Sound settings screen, setting option summary text -->
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <!-- Privacy settings activity title -->
   <!-- Backup section title -->
@@ -2119,10 +2164,12 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <!-- Label for screen showing the active device policy -->
   <!-- Label for button to remove the active device admin -->
@@ -2231,6 +2278,7 @@
   <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
   <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
@@ -2483,6 +2531,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
@@ -2491,6 +2540,7 @@
   <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
@@ -2560,6 +2610,7 @@
   <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <!-- NFC payment settings -->
+  <skip></skip>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
   <!-- Header text that can be clicked on to change the default payment app -->
@@ -2576,11 +2627,13 @@
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
   <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -2658,6 +2711,7 @@
   <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-ug/arrays.xml b/res/values-ug/arrays.xml
index 471bc29..da28810 100644
--- a/res/values-ug/arrays.xml
+++ b/res/values-ug/arrays.xml
@@ -22,6 +22,7 @@
   <!-- Choices for timezone picker first level.
          These values will be used as search terms for TimeZone displayName
          strings. -->
+  <skip></skip>
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
   <string-array name="timezone_filters">
     <!-- The next level of the time zoner picker should show time zones from the Americas. -->
@@ -119,10 +120,11 @@
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <string-array name="wifi_status">
     <!-- Status message of Wi-Fi when it is idle. -->
-    <item/>
+    <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
     <item>تەكشۈرۈۋاتىدۇ…</item>
     <!-- Status message of Wi-Fi when it is connecting. -->
@@ -147,10 +149,11 @@
     <item>سىگنال ناچار باغلىنىشنى ۋاقىتلىق تاقايدۇ</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <string-array name="wifi_status_with_ssid">
     <!-- Status message of Wi-Fi when it is idle. -->
-    <item/>
+    <item></item>
     <!-- Status message of Wi-Fi when it is scanning. -->
     <item>تەكشۈرۈۋاتىدۇ…</item>
     <!-- Status message of Wi-Fi when it is connecting to a network. -->
@@ -175,12 +178,15 @@
     <item>سىگنال ناچار باغلىنىشنى ۋاقىتلىق تاقايدۇ</item>
   </string-array>
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
   <!-- Match this with the constants in AccessPoint. -->
+  <skip></skip>
   <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
   <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the constants in WifiDialog. -->
+  <skip></skip>
   <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
   <string-array name="wifi_eap_method">
     <!-- Do not translate. -->
@@ -239,6 +245,7 @@
     <item>ھەرگىز ۋاقىت ھالقىمايدۇ</item>
   </string-array>
   <!-- Match this with drawable.wifi_signal. -->
+  <skip></skip>
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <string-array name="wifi_signal">
     <item>ناچار</item>
@@ -266,6 +273,7 @@
     <item>ھەرگىز</item>
   </string-array>
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <skip></skip>
   <!-- Do not translate. -->
   <string-array name="wifi_sleep_policy_values">
     <!-- Do not translate. -->
@@ -649,8 +657,10 @@
   </string-array>
   <!-- Values for app process limit preference. -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
   <!-- Match this with the constants in VpnProfile. -->
+  <skip></skip>
   <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
   <string-array name="vpn_types_long">
     <item>PPTP VPN</item>
@@ -661,6 +671,7 @@
     <item>گۇۋاھنامەلىك ھەمدە ئارىلاش سالاھىيەت دەلىللەيدىغان IPSec VPN</item>
   </string-array>
   <!-- Match this with the constants in LegacyVpnInfo. -->
+  <skip></skip>
   <!-- Status for a VPN network. [CHAR LIMIT=100] -->
   <string-array name="vpn_states">
     <!-- Status message when VPN is disconnected. -->
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index b20fdea..07c9843 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -29,6 +29,7 @@
   <string name="dlg_close">تاقاش</string>
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
+  <skip></skip>
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <string name="device_info_default">يوچۇن</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
@@ -40,6 +41,7 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <string name="show_dev_already">ھاجەتسىز، سىز ئاللىبۇرۇن ئىجادكار ھالىتىدە.</string>
   <!-- Category headings in left-pane header menu -->
+  <skip></skip>
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
@@ -193,6 +195,7 @@
   <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
   <string name="bluetooth_disable_profile_message">بۇ مەشغۇلات چەكلەيدۇ: &lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ئورنى:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;</string>
   <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <string name="bluetooth_unknown"></string>
   <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
   <string name="bluetooth_device">ئاتسىز كۆكچىش ئۈسكۈنە</string>
   <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
@@ -490,6 +493,7 @@
   <!-- mobile network settings screen, setting option summary text -->
   <string name="sum_carrier_select">تور مۇلازىمەت تەمىنلىگۈچىنى تاللاڭ</string>
   <!-- Date and time settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <string name="date_and_time_settings_title">چىسلا ۋە ۋاقىت</string>
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
@@ -535,6 +539,7 @@
          [CHAR LIMIT=20] -->
   <string name="time_picker_title">ۋاقىت</string>
   <!-- Security Settings -->
+  <skip></skip>
   <!-- Security settings screen, setting option name to change screen timeout -->
   <string name="lock_after_timeout">ئۆزلۈكىدىن قۇلۇپلا</string>
   <!-- Security settings screen, setting option summary to change screen timeout -->
@@ -571,6 +576,7 @@
   <!-- In the security screen, the header title for settings related to  Passwords-->
   <string name="security_passwords_title">ئىم</string>
   <!-- Fingerprint enrollment and settings -->
+  <skip></skip>
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
@@ -578,6 +584,7 @@
   <!-- switch for allowing fingerprint to be used for keyguard -->
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
   <!-- message shown in summary field when no fingerprints are registered -->
+  <string name="security_settings_fingerprint_preference_summary_none"></string>
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
@@ -676,11 +683,14 @@
   <!-- Image button description to switch input method -->
   <string name="crypt_keeper_switch_input_method">كىرگۈزگۈچ ئالماشتۇر</string>
   <!-- Unlock Picker Settings -->
+  <skip></skip>
   <!-- Security Picker -->
+  <skip></skip>
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <string name="lock_settings_picker_title">ئېكران قۇلۇپىنى تاللاڭ</string>
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
   <!--  Main Security lock settings -->
+  <skip></skip>
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_launch_picker_title">ئېكران قۇلۇپلا</string>
   <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
@@ -692,6 +702,7 @@
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_off_title">يوق</string>
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_off_summary"></string>
   <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
   <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
   <string name="unlock_set_unlock_none_summary">بىخەتەرلىك تەدبىرى يوق</string>
@@ -843,6 +854,7 @@
   <string name="bluetooth_display_passkey_pin_msg"><xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> بىلەن جۈپلەشتە <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> نى كىرگۈزۈڭ، ئاندىن Return ياكى Enter نى بېسىڭ.</string>
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
   <!-- Title for BT error dialogs. -->
+  <string name="bluetooth_error_title"></string>
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <string name="bluetooth_preference_scan_title">ئۈسكۈنە تەكشۈرۈۋاتىدۇ</string>
@@ -986,6 +998,7 @@
   <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
   <string name="nsd_quick_toggle_summary">باشقا ئۈسكۈنىدىكى ئەپنىڭ بۇ ئۈسكۈنىدىكى ئەپنى بايقىشىغا يول قويىدۇ</string>
   <!-- Wi-Fi Settings -->
+  <skip></skip>
   <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
   <string name="wifi_quick_toggle_title">Wi‑Fi</string>
   <!-- Used in the 1st-level settings screen as the turn-on summary -->
@@ -1072,6 +1085,7 @@
   <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
   <string name="wifi_setup_wps">ئاپتوماتىك تەڭشەك (WPS)</string>
   <!-- Dialog for Access Points -->
+  <skip></skip>
   <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
   <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
   <string name="wifi_wps_setup_title">Wi-Fi قوغداش تەڭشىكى</string>
@@ -1182,6 +1196,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <string name="wifi_connect_failed_message" product="default">تېلېفون بۇ Wi-Fi تورىغا باغلىنالمايدۇ.</string>
   <!-- Wi-Fi Advanced Settings -->
+  <skip></skip>
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <string name="wifi_advanced_titlebar">ئالىي WiFi</string>
@@ -1331,6 +1346,7 @@
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
+  <skip></skip>
   <!-- Main Settings screen setting option name to go into the display settings screen -->
   <string name="home_settings">باش بەت</string>
   <string name="display_settings_title">ئېكران</string>
@@ -1434,6 +1450,7 @@
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <string name="search_settings_summary">ئىزدەش تەڭشىكى ۋە تارىخ خاتىرىنى باشقۇرۇش</string>
   <!-- Display settings -->
+  <skip></skip>
   <!-- Sound & display settings screen, section header for settings related to display -->
   <string name="display_settings">ئېكران</string>
   <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
@@ -1679,7 +1696,9 @@
   <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
   <string name="sd_mount" product="default">SD كارتىنى ئېگەرلە</string>
   <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="nosdcard"></string>
   <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <string name="sd_mount_summary" product="default"></string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
   <string name="sd_format" product="nosdcard">بۇ USB ساقلىغۇچنى ئۆچۈرىدۇ</string>
   <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
@@ -1704,7 +1723,9 @@
   <!-- SD card eject confirmation dialog  -->
   <string name="dlg_confirm_unmount_text" product="default">ئەگەر SD كارتىنى ئېگەرسىزلىسىڭىز، ئىشلىتىلىۋاتقان بەزى ئەپلەر ئىشتىن توختايدۇ ھەم SD كارتىنى قايتا ئىگەرلىمىگۈچە ئىشلەتكىلى بولماسلىقى مۇمكىن.</string>
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <string name="dlg_error_unmount_title" product="nosdcard"></string>
   <!-- SD card eject error dialog title   -->
+  <string name="dlg_error_unmount_title" product="default"></string>
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
   <!-- SD card eject error dialog text   -->
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1880,6 +1901,7 @@
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <string name="menu_cancel">تاشلىۋەت</string>
   <!-- APN error dialog title -->
+  <string name="error_title"></string>
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -2065,6 +2087,7 @@
   <!-- [CHAR LIMIT=45] Section heading for location sources -->
   <string name="location_sources_heading">ئورۇن مەنبەلىرى</string>
   <!-- About -->
+  <skip></skip>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
   <string name="about_settings" product="tablet">تاختا كومپيۇتېر ھەققىدە</string>
   <!-- Main settings screen, setting title for the user to go into the About phone screen -->
@@ -2079,21 +2102,26 @@
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <string name="regulatory_information">باشقۇرۇش ئۇچۇرى</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see copyright-related info -->
   <string name="copyright_title">نەشر ھوقوقى</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info -->
   <string name="license_title">ئىجازەت</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see terms and conditions -->
   <string name="terms_title">ماددا ۋە شەرتلەر</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <skip></skip>
   <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions -->
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <!-- Phone Manual -->
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
+  <skip></skip>
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <string name="settings_license_activity_title">ئوچۇق كودلۇق ئىجازەتنامە</string>
   <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
@@ -2193,6 +2221,7 @@
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <string name="activity_not_found">ئەپ تېلېفونىڭىزغا  ئورنىتىلمىغان.</string>
   <!-- Applications Settings -->
+  <skip></skip>
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <string name="manageapplications_settings_title">ئەپ باشقۇرۇش</string>
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
@@ -2341,6 +2370,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <string name="dlg_cancel">ۋاز كەچ</string>
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_title"></string>
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
   <!-- Manage applications, factory reset dialog title for system applications. -->
@@ -2398,6 +2428,7 @@
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <string name="force_stop_dlg_text">ئەپ مەجبۇرىي توختىتىلسا نورمالسىزلىق كەلتۈرۈپ چىقىرىشى مۇمكىن.</string>
   <!-- Manage applications, text for dialog when moving an app -->
+  <string name="move_app_failed_dlg_title"></string>
   <!-- Manage applications, text for dialog moving an app -->
   <!-- Manage applications, application installation location title -->
   <string name="app_install_location_title">ئالدىن بەلگىلەنگەن ئورنىتىدىغان ئورۇن</string>
@@ -2415,6 +2446,7 @@
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
   <string name="app_disable_notifications_dlg_text">ئەگەر بۇ ئەپنىڭ ئۇقتۇرۇشىنى تاقىسىڭىز، مۇھىم ئاگاھلاندۇرۇش ۋە يېڭىلاشلاردىن بىخەۋەر قېلىشىڭىز مۇمكىن.</string>
   <!-- App Ops Settings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
   <string name="app_ops_settings">ئەپ مەشغۇلاتى</string>
   <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
@@ -2506,6 +2538,7 @@
   <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
   <string name="runningservicedetails_stop_dlg_text" product="default">ئەگەر بۇ مۇلازىمەتنى توختاتسىڭىز، تاختا كومپيۇتېرىڭىزدىكى بەزى ئىقتىدارلار ئۇنى تاقاپ قايتا ئاچقۇچە خىزمەتتىن توختىشى مۇمكىن.</string>
   <!-- Language Settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
   <string name="language_settings">تىل ۋە كىرگۈزۈش </string>
   <!-- Title of Language and keyboard settings screen -->
@@ -2556,6 +2589,7 @@
   <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
   <string name="vibrate_input_devices_summary">باغلانغاندىن كېيىن تىترەتكۈچ ئويۇن تىزگىنەككە قايتا نىشانلايدۇ.</string>
   <!-- Keyboard Layout Preference Dialog -->
+  <skip></skip>
   <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_dialog_title">ھەرپتاختا ئورۇنلاشتۇرۇلۇشىنى تاللاڭ</string>
   <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
@@ -2565,9 +2599,11 @@
   <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
   <string name="keyboard_layout_default_label">كۆڭۈلدىكى</string>
   <!-- Keyboard Layout Picker -->
+  <skip></skip>
   <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_picker_title">ھەرپتاختا ئورۇنلاشتۇرۇلۇشى</string>
   <!-- User dictionary settings -->
+  <skip></skip>
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <string name="user_dict_settings_title">شەخسىي لۇغەت</string>
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
@@ -2777,6 +2813,7 @@
   <!-- label for usage time -->
   <string name="usage_time_label">ئىشلىتىش ۋاقتى</string>
   <!-- Accessibility settings -->
+  <skip></skip>
   <!-- Settings title in main settings screen for accessibility settings -->
   <string name="accessibility_settings">قوشۇمچە ئىقتىدار</string>
   <!-- Settings title for accessibility settings screen -->
@@ -2919,6 +2956,7 @@
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
   <string name="settings_button">تەڭشەكلەر</string>
   <!-- Printing settings -->
+  <skip></skip>
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <string name="print_settings">بېسىش</string>
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
@@ -2973,6 +3011,7 @@
   <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_hidden_utterance">ئىزدەش قۇتىسى يوشۇرۇلدى</string>
   <!-- App Fuel Gauge strings -->
+  <skip></skip>
   <!-- Activity title for App Fuel Gauge summary -->
   <string name="power_usage_summary_title">توكدان</string>
   <!-- Activity title summary for App Fuel Gauge summary -->
@@ -3147,6 +3186,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
+  <skip></skip>
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
   <string name="process_stats_summary_title">جەريان سىتاتىستىكىسى</string>
   <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
@@ -3213,6 +3253,7 @@
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
   <string name="menu_proc_stats_type_cached">غەملەنگەن</string>
   <!-- Voice input/output settings -->
+  <skip></skip>
   <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
   <string name="voice_input_output_settings">تاۋۇش كىرگۈزۈش ۋە چىقىرىش</string>
   <!-- Main voice input/output settings screen title -->
@@ -3224,6 +3265,7 @@
   <!-- Title for the 'voice input' category of voice input/output settings -->
   <string name="voice_category">تاۋۇش</string>
   <!-- Voice input settings -->
+  <skip></skip>
   <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
   <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
   <!-- [CHAR LIMIT=50] The text for the settings section in which users select
@@ -3240,6 +3282,7 @@
          voice interaction service, displayed as a dialog
          message when the user selects to enable a service. -->
   <!-- Text-To-Speech (TTS) settings -->
+  <skip></skip>
   <!-- Name of the TTS package as listed by the package manager. -->
   <string name="tts_settings">تېكىستتىن تاۋۇشقا تەڭشىكى</string>
   <!-- TTS option item name in the main settings screen -->
@@ -3410,6 +3453,7 @@
   <string name="credential_storage_type_software">يۇمشاق دېتاللا</string>
   <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
   <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <string name="credentials_unlock"></string>
   <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
   <string name="credentials_unlock_hint">ئىسپاتلىق ساقلىغۇچ ئۈچۈن ئىم كىرگۈزۈڭ.</string>
   <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
@@ -3436,6 +3480,7 @@
   <!-- Sound settings screen, setting option summary text -->
   <string name="emergency_tone_summary">جىددىي چاقىرغاندىكى ھەرىكەت تەڭشىكى</string>
   <!-- Backup and reset Settings screen -->
+  <skip></skip>
   <!-- Backup and reset settings menu title -->
   <string name="privacy_settings">زاپاسلاش ۋە ئەسلىگە قايتۇرۇش</string>
   <!-- Privacy settings activity title -->
@@ -3469,11 +3514,13 @@
   <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
   <string name="local_backup_password_toast_validation_failure">زاپاسلاش ئىم تەڭشىيەلمىدى</string>
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <string name="backup_erase_dialog_message">سىز Wi-Fi ئىم، خەتكۈچلەر، باشقا تەڭشەكلەر ۋە ئەپ سانلىق مەلۇماتلىرىڭىزنى زاپاسلاشنى توختىتىپ، Google مۇلازىمېتىردىكى بارلىق قوشۇمچە نۇسخىسىنى ئۆچۈرەمسىز؟</string>
   <!-- Dialog title for confirmation to erase full backup data from server -->
   <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
   <!-- Device admin settings screen -->
+  <skip></skip>
   <!-- Device admin settings activity title -->
   <string name="device_admin_settings_title">ئۈسكۈنە باشقۇرۇش تەڭشىكى</string>
   <!-- Label for screen showing the active device policy -->
@@ -3635,6 +3682,7 @@
   <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
   <string name="sync_automatically">ئەپ سانلىق مەلۇماتىنى ئۆزلۈكىدىن قەدەمداشلا</string>
   <!-- Sync status messages on Accounts & Synchronization settings -->
+  <skip></skip>
   <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
   <string name="sync_enabled">قەدەمداش ئوچۇق</string>
   <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
@@ -4066,6 +4114,7 @@
   <string name="selinux_status_permissive">ئىجازەت</string>
   <string name="selinux_status_enforcing">ئىجرا قىلىنىۋاتىدۇ</string>
   <!-- Notification of installed CA Certs -->
+  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">تور نازارەت قىلىنغان بولۇشى مۇمكىن</string>
@@ -4080,6 +4129,7 @@
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <string name="ssl_ca_cert_settings_button">ئىشەنچلىك گۇۋاھنامىلەرنى تەكشۈر</string>
   <!-- User settings -->
+  <skip></skip>
   <!-- User settings screen title [CHAR LIMIT=25] -->
   <string name="user_settings_title">ئىشلەتكۈچىلەر</string>
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
@@ -4184,6 +4234,7 @@
   <!-- Warning message title for global font change [CHAR LIMIT=40] -->
   <string name="global_font_change_title">خەت نۇسخا چوڭلۇقى ئۆزگەرت</string>
   <!-- NFC payment settings -->
+  <skip></skip>
   <string name="nfc_payment_settings_title">چېكىش ۋە چىقىم</string>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
   <!-- String shown when there are no NFC payment applications installed -->
@@ -4203,6 +4254,7 @@
          preferred payment application -->
   <string name="nfc_payment_set_default_label">مايىللىقىڭىزغا تەڭشەمدۇ؟</string>
   <!-- Restrictions settings -->
+  <skip></skip>
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <string name="restriction_settings_title">چەكلىمەلەر</string>
   <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
@@ -4212,6 +4264,7 @@
   <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
   <string name="app_notifications_switch_label">ئۇقتۇرۇشنى كۆرسەت</string>
   <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <skip></skip>
   <!-- Help menu label [CHAR LIMIT=20] -->
   <!-- Help URI, Default [DO NOT TRANSLATE] -->
   <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
@@ -4306,6 +4359,7 @@
   <string name="user_image_choose_photo" msgid="3746334626214970837">رەسىم يىغقۇچتىن سۈرەت تاللاڭ</string>
   <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
   <!-- Text to display in regulatory info screen (from device overlay). -->
+  <string name="regulatory_info_text"></string>
   <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
   <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index a1c5ac7..fa85ff2 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
   <plurals name="show_device_id_countdown_cm">
-    <item quantity="other">您只需完成剩餘的 <xliff:g id="step_count">%1$d</xliff:g> 個步驟，即可查詢裝置 ID。</item>
+    <item quantity="other">您僅需完成剩餘的 <xliff:g id="step_count">%1$d</xliff:g> 個步驟，即可查詢裝置 ID。</item>
   </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
   <string name="show_device_id_copied_cm">裝置 ID：[<xliff:g id="device_id">%1$s</xliff:g>] 已複製到剪貼簿</string>
@@ -102,7 +102,7 @@
   <string name="profile_remove_current_profile">無法刪除目前的設定檔</string>
   <string name="profile_app_group_category_title">覆蓋通知</string>
   <string name="profile_app_group_item_instructions">新增或移除群組</string>
-  <string name="profile_app_group_item_instructions_summary">添加或刪除覆蓋通知應用程式到此設定檔</string>
+  <string name="profile_app_group_item_instructions_summary">新增或刪除覆蓋通知應用程式到此設定檔</string>
   <!-- Profile mode options. -->
   <string name="profile_entries_on">開啟</string>
   <string name="profile_entries_off">關閉</string>
@@ -234,7 +234,7 @@
   <string name="navigation_bar_left_title">左撇子模式</string>
   <string name="navigation_bar_left_summary">橫向模式下將導航列置於螢幕左側</string>
   <string name="navigation_bar_title">按鍵與配置</string>
-  <string name="navigation_bar_help_text">要開始編輯，請輕觸編輯圖示來解鎖導航列的編輯功能。\n\n您可以輕觸一個圖示來變更它的捷徑，或長按一個圖示以變更它的外觀。\n\n輕觸「儲存」以確認您的變更，或「還原預設值」以重設外觀為預設設定。</string>
+  <string name="navigation_bar_help_text">要開始編輯，請輕觸編輯圖示來解鎖導航列的編輯功能。\n\n您可以輕觸一個圖示來更改它的捷徑，或長按一個圖示即可更改它的外觀。\n\n輕觸「儲存」即可確認您的更改，或「還原預設值」即可重設外觀為預設設定。</string>
   <string name="navigation_restore_button_text">還原\n預設</string>
   <string name="navigation_edit_button_text">編輯</string>
   <string name="navigation_save_button_text">儲存</string>
@@ -285,7 +285,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">指示燈設定</string>
   <string name="led_notification_text">已透過設定啟用 LED 指示燈</string>
-  <string name="notification_light_no_apps_summary">若要控制個別應用程式，在功能列中啟動 \'%1$s\' 和 \'\u002b\'</string>
+  <string name="notification_light_no_apps_summary">若要控制個別應用程式，請啟動「%1$s」然後按下選單列中的「\u002b」</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android 偵錯</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -359,15 +359,15 @@
   <string name="app_ops_summaries_assist_structure">協助結構</string>
   <string name="app_ops_summaries_assist_screenshot">協助螢幕截圖</string>
   <string name="app_ops_summaries_read_phone_state">讀取手機狀態</string>
-  <string name="app_ops_summaries_add_voicemail">新增語音郵件</string>
+  <string name="app_ops_summaries_add_voicemail">新增語音信箱</string>
   <string name="app_ops_summaries_use_sip">使用 SIP</string>
   <string name="app_ops_summaries_make_call">撥打電話</string>
   <string name="app_ops_summaries_use_fingerprint">使用指紋</string>
   <string name="app_ops_summaries_use_body_sensors">使用人體感應器</string>
   <string name="app_ops_summaries_read_cell_broadcasts">讀取區域廣播</string>
   <string name="app_ops_summaries_mock_location">模擬位置</string>
-  <string name="app_ops_summaries_read_external_storage">讀取外部存儲空間</string>
-  <string name="app_ops_summaries_write_external_storage">寫到外部存儲空間</string>
+  <string name="app_ops_summaries_read_external_storage">讀取外部儲存空間</string>
+  <string name="app_ops_summaries_write_external_storage">寫入外部儲存空間</string>
   <string name="app_ops_summaries_turn_screen_on">開啟螢幕</string>
   <string name="app_ops_summaries_get_accounts">取得帳戶</string>
   <string name="app_ops_summaries_toggle_wifi">切換至 Wi-Fi</string>
@@ -436,8 +436,8 @@
   <string name="app_ops_labels_use_body_sensors">使用人體感應器</string>
   <string name="app_ops_labels_read_cell_broadcasts">讀取區域廣播</string>
   <string name="app_ops_labels_mock_location">模擬位置</string>
-  <string name="app_ops_labels_read_external_storage">讀取外部存儲空間</string>
-  <string name="app_ops_labels_write_external_storage">寫到外部存儲空間</string>
+  <string name="app_ops_labels_read_external_storage">讀取外部儲存空間</string>
+  <string name="app_ops_labels_write_external_storage">寫入外部儲存空間</string>
   <string name="app_ops_labels_turn_screen_on">開啟螢幕</string>
   <string name="app_ops_labels_get_accounts">取得帳戶</string>
   <string name="app_ops_labels_toggle_wifi">切換至 Wi-Fi</string>
@@ -529,7 +529,7 @@
   <!-- Settings main menu entry -->
   <string name="gesture_settings_title">手勢</string>
   <!-- Power menu -->
-  <string name="power_menu_title">電源功能表</string>
+  <string name="power_menu_title">電源選單</string>
   <string name="power_menu_reboot_title">重新啟動選單</string>
   <string name="power_menu_screenshot_title">螢幕截圖</string>
   <string name="power_menu_airplane_title">飛航模式</string>
@@ -674,7 +674,7 @@
   <string name="increasing_ring_ramp_up_time_title">漸強時間</string>
   <!-- LTO download data over wi-fi only -->
   <string name="lto_download_data_wifi_only">GPS 輔助資料已下載</string>
-  <string name="lto_download_data_wifi_only_on">透過任何網絡</string>
+  <string name="lto_download_data_wifi_only_on">透過任何網路</string>
   <string name="lto_download_data_wifi_only_off">僅透過 Wi\u2011Fi 網路</string>
   <string name="volume_keys_control_ring_stream_title">控制鈴聲音量</string>
   <string name="volume_keys_control_ring_stream_summary_on">音量鍵控制鈴聲音量</string>
@@ -750,7 +750,7 @@
   <string name="privacy_guard_help_title">說明</string>
   <string name="privacy_guard_reset_title">重設</string>
   <string name="privacy_guard_reset_text">重設權限？</string>
-  <string name="privacy_guard_help_text">在此畫面您只要輕觸應用程式即可選擇是否對其啟用隱私守衛。被選取的應用程式將不能存取您的個人資料，例如聯絡人、訊息或通話記錄。長按應用程式可開啟其應用程式資訊畫面。\n\n內建應用程式預設不會顯示，但是可從選單中開啟顯示。</string>
+  <string name="privacy_guard_help_text">在此螢幕您只要輕觸應用程式即可選擇是否對其啟用隱私守衛。被選取的應用程式將不能存取您的個人資料，例如聯絡人、訊息或通話記錄。長按應用程式可開啟其應用程式資訊螢幕。\n\n內建應用程式預設不會顯示，但是可從選單中開啟顯示。</string>
   <string name="privacy_guard_manager_show_system_apps">顯示系統應用程式</string>
   <string name="privacy_guard_advanced_settings_title">進階</string>
   <string name="privacy_guard_notification_title">顯示通知</string>
@@ -785,7 +785,7 @@
   <string name="notification_ringtone_title_cm">通知鈴聲</string>
   <!-- Advanced reboot options -->
   <string name="advanced_reboot_title">進階重新啟動</string>
-  <string name="advanced_reboot_summary">當解鎖後，加入重啟進入 recovery 或 bootloader 或進行軟重啟的選項至電源選單</string>
+  <string name="advanced_reboot_summary">當解鎖後，加入重新啟動進入 Recovery、Bootloader 或進行軟體重新啟動的選項至電源選單</string>
   <string name="category_interface">介面</string>
   <!-- Expanded desktop -->
   <string name="power_menu_expanded_desktop">延伸桌面</string>
@@ -818,7 +818,7 @@
   <string name="blacklist_edit_dialog_title">更改已封鎖的電話號碼</string>
   <string name="blacklist_prefs">設定</string>
   <string name="blacklist_button_delete">刪除</string>
-  <string name="blacklist_empty_text">您沒有任何已封鎖的號碼，輕觸新增 (+) 按鍵加入號碼。</string>
+  <string name="blacklist_empty_text">您沒有任何已封鎖的號碼，輕觸新增 (+) 按鍵新增號碼。</string>
   <string name="blacklist_disabled_empty_text">為了防止某些電話號碼打電話或傳簡訊給您，請啟用已封鎖來電者名單功能。</string>
   <string name="blacklist_summary_disabled">已停用</string>
   <string name="blacklist_summary">您將不會收到任何在已封鎖來電者名單上的電話號碼的來電或簡訊</string>
@@ -970,12 +970,12 @@
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <string name="master_clear_desc_cm" product="tablet">該操作將從您的平板電腦<b>內部存儲裝置</b>清除所有資料，其中包括：\n\n <li>您的裝置帳戶</li>\n<li>系統和應用程式的資料及設定</li> \n <li>已下載的應用程式</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
-  <string name="master_clear_desc_cm" product="default">該操作將從您的手機<b>內部存儲裝置</b>清除所有資料，其中包括：\n\n <li>您的裝置帳戶</li>\n<li>系統和應用程式的資料及設定</li> \n <li>已下載的應用程式</li></string>
+  <string name="master_clear_desc_cm" product="default">該操作將從您的手機<b>內部儲存空間</b>清除所有資料，其中包括：\n\n <li>您的裝置帳戶</li>\n<li>系統和應用程式的資料及設定</li> \n <li>已下載的應用程式</li></string>
   <!-- Factory reset strings -->
   <string name="factory_reset_instructions_title">個人資料和應用程式</string>
   <string name="factory_reset_instructions_summary">這將移除在此裝置上您所有帳戶、應用程式、應用程式資料及系統設定</string>
   <string name="factory_reset_personal_content">個人內容</string>
-  <string name="factory_reset_erase_stored_content">移除存儲內容</string>
+  <string name="factory_reset_erase_stored_content">移除儲存空間</string>
   <string name="factory_reset_erase_stored_content_summary">移除音樂、照片、影片及其他儲存在此裝置上的使用者資料</string>
   <string name="factory_reset_erase_stored_content_summary_forced">移除音樂、照片、影片及其他儲存在此裝置上的使用者資料。\n\n<b>由於裝置加密，無法儲存內容。</b></string>
   <string name="factory_reset_erase_sd_card">格式化SD卡</string>
-- 
cgit v1.1