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

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

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