Automatic translation import

Change-Id: Ib115f3813214bfffb935cf522d0e31e8c95be4de

88 files changed, 137 insertions, 741 deletions

diff --git a/core/res/res/values-as-rIN/strings.xml b/core/res/res/values-as-rIN/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-as-rIN/strings.xml
+++ b/core/res/res/values-as-rIN/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-ast-rES/strings.xml b/core/res/res/values-ast-rES/strings.xml
index e1b3d01..f2abe83 100644
--- a/core/res/res/values-ast-rES/strings.xml
+++ b/core/res/res/values-ast-rES/strings.xml
@@ -78,7 +78,6 @@
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <string name="defaultMsisdnAlphaTag">MSISDN1</string>
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <string name="mmiError">Hebo un fallu de conexón o\'l códigu MMI nun ye válidu.</string>
@@ -186,7 +185,6 @@
   <string name="peerTtyModeVco">El preséu solicitó\'l mou TTY VCO.</string>
   <string name="peerTtyModeOff">El preséu solicitó\'l mou TTY OFF.</string>
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassVoice">Voz</string>
   <!-- Example: Service was enabled for: Voice, Data -->
@@ -204,7 +202,6 @@
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <string name="serviceClassPAD">PAD</string>
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <string name="roamingText0">Indicador d\'itinerancia activáu</string>
   <string name="roamingText1">Indicador d\'itinerancia desactiváu</string>
@@ -224,9 +221,7 @@
   <string name="wfcRegErrorTitle">Llamaes Wifi</string>
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <string name="wfcSpnFormat">%s</string>
   <!-- Template for showing operator name for data connection while WFC is active -->
@@ -247,7 +242,6 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <string name="cfTemplateNotForwarded"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Non esviada</string>
   <!-- Displayed when the call forwarding query was forwarded. -->
@@ -259,13 +253,11 @@
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegisteredTime"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Non esviada</string>
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <string name="fcComplete">Códigu de función completu</string>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <string name="fcError">Hebo un fallu de conexón o\'l códigu de la función nun ye válidu.</string>
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <string name="httpErrorOk">Aceutar</string>
   <!-- Displayed when a web request failed with a generic network error. -->
@@ -299,14 +291,12 @@
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <string name="httpErrorTooManyRequests">Tán procesándose abondes solicitúes. Vuelvi a intentalo dempués.</string>
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <string name="notification_title">Error d\'aniciu de sesión de <xliff:g id="account" example="foo@gmail.com">%1$s</xliff:g></string>
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <string name="contentServiceSync">Sincronización</string>
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
@@ -322,7 +312,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="default">Escosó l\'espaciu d\'almacenamientu del teléfonu. Desanicia dalgunos ficheros pa lliberar espaciu.</string>
   <!-- SSL CA cert notification -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">Ye dable que la rede tea supervisada</string>
@@ -339,7 +328,6 @@
          [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_managed">Por <xliff:g id="MANAGING_DOMAIN">%s</xliff:g></string>
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <string name="work_profile_deleted">Perfil de trabayu desaniciáu</string>
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
@@ -355,7 +343,6 @@
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <string name="work_profile_deleted_description_dpm_wipe">El to perfil de trabayu yá nun ta disponible nesti preséu.</string>
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <string name="factory_reset_warning">Van desaniciase los datos del preséu</string>
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
@@ -365,7 +352,6 @@
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">Yo</string>
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="tablet">Opciones de la tablet</string>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -1060,7 +1046,6 @@
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <string name="policydesc_disableKeyguardFeatures">Evita l\'usu de dalgunes funciones de bloquéu de pantalla.</string>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <string-array name="phoneTypes">
     <item>Casa</item>
@@ -1073,7 +1058,6 @@
     <item>Personalizar</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <string-array name="emailAddressTypes">
     <item>Casa</item>
@@ -1082,7 +1066,6 @@
     <item>Personalizar</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <string-array name="postalAddressTypes">
     <item>Casa</item>
@@ -1091,7 +1074,6 @@
     <item>Personalizar</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <string-array name="imAddressTypes">
     <item>Casa</item>
@@ -1100,7 +1082,6 @@
     <item>Personalizar</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <string-array name="organizationTypes">
     <item>Trabayu</item>
@@ -1108,7 +1089,6 @@
     <item>Personalizar</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <string-array name="imProtocols">
     <item>AIM</item>
@@ -1291,7 +1271,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <string name="lockscreen_carrier_default">Ensin serviciu</string>
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
@@ -1484,7 +1463,6 @@
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">Área pa eslizar</string>
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_symbol_key">\?123</string>
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
@@ -1719,7 +1697,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">desaniciar</string>
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">Guetar</string>
@@ -1923,13 +1900,11 @@
          activity chooser. See the "Select an action" title. -->
   <string name="noApplications">Nenguna aplicación pue facer esta aición.</string>
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_application">Detúvose l\'aplicación <xliff:g id="APPLICATION">%1$s</xliff:g>.</string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_process">Detúvose\'l procesu <xliff:g id="PROCESS">%1$s</xliff:g>.</string>
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_application">L\'aplicación <xliff:g id="APPLICATION">%2$s</xliff:g> nun respuende.\n\n¿Quies zarrala?</string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -2034,7 +2009,6 @@
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_notification">Volume de notificaciones</string>
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <string name="ringtone_default">Tonu predetermináu</string>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
@@ -2095,7 +2069,6 @@
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <string name="select_character">Inxertar carácter</string>
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <string name="sms_control_title">Unviando mensaxes SMS\u2026</string>
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
@@ -2105,7 +2078,6 @@
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">Refugar</string>
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_short_code_confirm_message">&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; quier unviar un mensaxe a &lt;b&gt;<xliff:g id="DEST_ADDRESS">%2$s</xliff:g>&lt;/b&gt;.</string>
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
@@ -2125,7 +2097,6 @@
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_never_allow">Nun permitir enxamás</string>
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_removed_title">Tarxeta SIM desaniciada</string>
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
@@ -2237,7 +2208,6 @@
   <string name="fast_scroll_numeric_alphabet"> 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="candidates_style"><u>candidatos</u></string>
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <string name="ext_media_checking_notification_title">Tresnando\'l mediu <xliff:g id="name" example="SD card">%s</xliff:g></string>
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
@@ -2345,7 +2315,6 @@
   <string name="ime_action_default">Executar</string>
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <string name="dial_number_using">Marcar númberu\ncon <xliff:g id="NUMBER">%s</xliff:g></string>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
diff --git a/core/res/res/values-bg/cm_strings.xml b/core/res/res/values-bg/cm_strings.xml
index 8b94d24..3c8ce39 100644
--- a/core/res/res/values-bg/cm_strings.xml
+++ b/core/res/res/values-bg/cm_strings.xml
@@ -93,10 +93,10 @@
   <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">Активира или деактивира Защитен режим</string>
   <string name="permdesc_changePrivacyGuardState">Разрешава на приложението да променя статута на поверителност на друго приложение. Когато едно приложение се използва с защита на поверителността, не може да има достъп до персонални данни, като контакти, регистри с повиквания или съобщения.</string>
-  <string name="privacy_guard_notification">Защитен режим e активен</string>
-  <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s </xliff:g> няма да можете да получите достъп до лични данни</string>
+  <string name="privacy_guard_notification">Активиран е защитен режим</string>
+  <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s </xliff:g> няма достъп до лични данни</string>
   <string name="privacy_guard_dialog_title">Защитен режим</string>
-  <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s </xliff:g> бих искал да <xliff:g id="op">%2$s </xliff:g>.</string>
+  <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s </xliff:g> иска да <xliff:g id="op">%2$s </xliff:g>.</string>
   <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Запомни избора ми</string>
   <!-- App ops requests -->
@@ -135,7 +135,7 @@
   <string name="app_ops_start_at_bootup">изпълнение при включване</string>
   <string name="app_ops_toast_window">показвай изкачащи уведомления</string>
   <string name="app_ops_toggle_bluetooth">активиране/деактивиране Bluetooth</string>
-  <string name="app_ops_toggle_mobile_data">Превключване клетъчен данни</string>
+  <string name="app_ops_toggle_mobile_data">Включване / Изключване на мобилни данни</string>
   <string name="app_ops_toggle_nfc">активиране/деактивиране NFC</string>
   <string name="app_ops_toggle_wifi">активирай/деактивирай Wi-Fi</string>
   <string name="app_ops_use_alarm_volume">контрол на силата на алармата</string>
diff --git a/core/res/res/values-br-rFR/strings.xml b/core/res/res/values-br-rFR/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-br-rFR/strings.xml
+++ b/core/res/res/values-br-rFR/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-csb-rPL/strings.xml b/core/res/res/values-csb-rPL/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-csb-rPL/strings.xml
+++ b/core/res/res/values-csb-rPL/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-cy/strings.xml b/core/res/res/values-cy/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-cy/strings.xml
+++ b/core/res/res/values-cy/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-en-rPT/strings.xml b/core/res/res/values-en-rPT/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-en-rPT/strings.xml
+++ b/core/res/res/values-en-rPT/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-eo/strings.xml b/core/res/res/values-eo/strings.xml
index 67cf790..e4a6a8c 100644
--- a/core/res/res/values-eo/strings.xml
+++ b/core/res/res/values-eo/strings.xml
@@ -63,7 +63,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -117,7 +116,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -127,14 +125,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <string name="wfcSpnFormat">%s</string>
   <!-- Template for showing operator name for data connection while WFC is active -->
@@ -151,18 +146,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -180,13 +172,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -195,7 +185,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -208,7 +197,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -219,14 +207,12 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">Mi</string>
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -599,22 +585,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <string name="phoneTypeCustom">Propra</string>
@@ -722,7 +702,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -835,7 +814,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -967,7 +945,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">forigi</string>
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">Serĉi</string>
@@ -1100,11 +1077,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1155,7 +1130,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1177,7 +1151,6 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
@@ -1185,7 +1158,6 @@
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">Malpermesi</string>
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1198,7 +1170,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1261,7 +1232,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1321,7 +1291,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-es-rCO/strings.xml b/core/res/res/values-es-rCO/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-es-rCO/strings.xml
+++ b/core/res/res/values-es-rCO/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-es-rMX/strings.xml b/core/res/res/values-es-rMX/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-es-rMX/strings.xml
+++ b/core/res/res/values-es-rMX/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-frp-rIT/strings.xml b/core/res/res/values-frp-rIT/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-frp-rIT/strings.xml
+++ b/core/res/res/values-frp-rIT/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-fy-rNL/strings.xml b/core/res/res/values-fy-rNL/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-fy-rNL/strings.xml
+++ b/core/res/res/values-fy-rNL/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-ga-rIE/strings.xml b/core/res/res/values-ga-rIE/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-ga-rIE/strings.xml
+++ b/core/res/res/values-ga-rIE/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-gd-rGB/strings.xml b/core/res/res/values-gd-rGB/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-gd-rGB/strings.xml
+++ b/core/res/res/values-gd-rGB/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-ku/strings.xml b/core/res/res/values-ku/strings.xml
index fc74ec6..3837084 100644
--- a/core/res/res/values-ku/strings.xml
+++ b/core/res/res/values-ku/strings.xml
@@ -58,7 +58,6 @@
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <string name="defaultMsisdnAlphaTag">MSISDN1</string>
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <string name="mmiError">کێشه‌ی په‌یوه‌ندی هه‌یه‌ یان کۆدی MMI ناڕاستە.</string>
@@ -160,7 +159,6 @@
   <string name="RestrictedOnAll">هه‌موو خزمەتگوزارییەکانی ده‌نگ، داتا و کورتەنامە به‌ستراون.</string>
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassVoice">ده‌نگ</string>
   <!-- Example: Service was enabled for: Voice, Data -->
@@ -178,7 +176,6 @@
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <string name="serviceClassPAD">نەزانراو</string>
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <string name="roamingText0">دیارخه‌ری ڕۆمینگ هەڵکراوە</string>
   <string name="roamingText1">دیارخه‌ری ڕۆمینگ کوژاوه‌ته‌وه‌</string>
@@ -197,9 +194,7 @@
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -214,7 +209,6 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <string name="cfTemplateNotForwarded"><xliff:g id="bearer_service_code">{0}</xliff:g>: پەیوەندی ئاراستە نەکراوە</string>
   <!-- Displayed when the call forwarding query was forwarded. -->
@@ -226,13 +220,11 @@
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegisteredTime"><xliff:g id="bearer_service_code">{0}</xliff:g>: پەیوەندی  ئاراستە نەکراوە</string>
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <string name="fcComplete">کۆدی تایبەت ته‌واو بوو.</string>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <string name="fcError">کێشه‌ی گرێدان هه‌یه‌ یان کۆدی تایبەت ناڕاسته‌.</string>
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <string name="httpErrorOk">باشه‌</string>
   <!-- Displayed when a web request failed with a generic network error. -->
@@ -266,14 +258,12 @@
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <string name="httpErrorTooManyRequests">داواکاریی زۆر خراوه‌ته‌ ڕوو. دواتر هه‌وڵبده‌وه‌.</string>
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <string name="notification_title">هه‌ڵه‌ له‌ چوونه‌ژووره‌وه‌ بۆ <xliff:g id="account" example="foo@gmail.com">%1$s</xliff:g></string>
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <string name="contentServiceSync">هاوکاتگەری</string>
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
@@ -287,7 +277,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="default">بیرگه‌ی تەلەفۆن پڕە. هه‌ندێک فایل بسڕه‌وه‌ بۆ ئازادکردنی بۆشایی.</string>
   <!-- SSL CA cert notification -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">له‌وانه‌یه‌ تۆڕه‌که‌ چاودێری کرابێت</string>
@@ -303,7 +292,6 @@
          [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_managed">له‌لایه‌ن <xliff:g id="managing_domain">%s</xliff:g></string>
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -314,14 +302,12 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">من</string>
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="tablet">بژارده‌کانی تابلێت</string>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -965,7 +951,6 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <string-array name="phoneTypes">
     <item>ماڵ</item>
@@ -978,7 +963,6 @@
     <item>دروستکراو</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <string-array name="emailAddressTypes">
     <item>ماڵ</item>
@@ -987,7 +971,6 @@
     <item>دروستکراو</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <string-array name="postalAddressTypes">
     <item>ماڵ</item>
@@ -996,7 +979,6 @@
     <item>دروستکراو</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <string-array name="imAddressTypes">
     <item>ماڵ</item>
@@ -1005,7 +987,6 @@
     <item>دروستکراو</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <string-array name="organizationTypes">
     <item>کار</item>
@@ -1013,7 +994,6 @@
     <item>دروستکراو</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <string-array name="imProtocols">
     <item>ئامانج</item>
@@ -1196,7 +1176,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <string name="lockscreen_carrier_default">خزمەتگوزاری نیە.</string>
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
@@ -1412,7 +1391,6 @@
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">ناوچەی لادان.</string>
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_symbol_key">\?123</string>
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
@@ -1644,7 +1622,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">سڕینەوە</string>
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">گەڕان</string>
@@ -1833,13 +1810,11 @@
          activity chooser. See the "Select an action" title. -->
   <string name="noApplications">‌هیچ بەرنامەیەک ناتوانێت ڕۆڵی ئەم چالاکیە ببینێت.</string>
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_application">بەداخەوە, <xliff:g id="application">%1$s</xliff:g>وەستا.</string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_process">بەداخەوە پرۆسەکە <xliff:g id="process">%1$s</xliff:g> وەستا.</string>
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_application"><xliff:g id="بەرنامە">%2$s</xliff:g> وەڵام نادانتەوە.\n\nئەتەوێت دایخەیت?</string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1938,7 +1913,6 @@
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_notification">ده‌نگی تێبینی</string>
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <string name="ringtone_default">زەنگی بنەڕەتی</string>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
@@ -1992,7 +1966,6 @@
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <string name="select_character">تێخستنی نووسە</string>
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <string name="sms_control_title">ناردنی کورتە نامە</string>
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
@@ -2002,7 +1975,6 @@
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">نکوڵی</string>
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_short_code_confirm_message">وlt;bوgt;<xliff:g id="app_name">%1$s</xliff:g>وlt;/bوgt; داخوازی ناردنی کورتە نامەی بۆ وlt;bوgt;<xliff:g id="dest_address">%2$s</xliff:g>وlt;/bوgt;.</string>
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
@@ -2020,7 +1992,6 @@
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_never_allow">هەرگیز ڕێگە مەدە</string>
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_removed_title">سیمکارتەکە دەرکرا</string>
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
@@ -2122,7 +2093,6 @@
   <string name="fast_scroll_numeric_alphabet">\u00200123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="candidates_style"><u>دەستنیشانکراوەکان</u></string>
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -2190,7 +2160,6 @@
   <string name="ime_action_default">بەجێهێنان</string>
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <string name="dial_number_using">ژمارە بگرە\nبە بەکارهێنانی <xliff:g id="number" example="555">%s</xliff:g></string>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
diff --git a/core/res/res/values-lb/strings.xml b/core/res/res/values-lb/strings.xml
index a6416ed..1224366 100644
--- a/core/res/res/values-lb/strings.xml
+++ b/core/res/res/values-lb/strings.xml
@@ -71,7 +71,6 @@
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <string name="defaultMsisdnAlphaTag">MSISDN1</string>
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <string name="mmiError">Connectiounsproblem oder ongëltegen MMI-Code.</string>
@@ -179,7 +178,6 @@
   <string name="peerTtyModeVco">Peer huet TTY-Modus \"VCO\" ugefrot</string>
   <string name="peerTtyModeOff">Peer huet TTY-Modus \"Aus\" ugefrot</string>
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassVoice">Stëmm</string>
   <!-- Example: Service was enabled for: Voice, Data -->
@@ -197,7 +195,6 @@
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <string name="serviceClassPAD">PAD</string>
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <string name="roamingText0">Roaming-Anzeig un</string>
   <string name="roamingText1">Roaming-Anzeig aus</string>
@@ -214,11 +211,10 @@
   <string name="roamingText12">Roaming-Banner Aus</string>
   <string name="roamingTextSearching">E Service gëtt gesicht</string>
   <!-- Displayed when WFC registration fails -->
+  <string name="wfcRegErrorTitle">WLAN-Uriff</string>
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -233,7 +229,6 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <string name="cfTemplateNotForwarded"><xliff:g id="bearer_service_code">{0}</xliff:g>: Net weidergeleet</string>
   <!-- Displayed when the call forwarding query was forwarded. -->
@@ -245,13 +240,11 @@
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegisteredTime"><xliff:g id="bearer_service_code">{0}</xliff:g>: Net weidergeleet</string>
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <string name="fcComplete">Funktiounscode ofgeschloss.</string>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <string name="fcError">Connectiounsproblem oder ongëltege Funktiounscode.</string>
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <string name="httpErrorOk">OK</string>
   <!-- Displayed when a web request failed with a generic network error. -->
@@ -285,14 +278,12 @@
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <string name="httpErrorTooManyRequests">Et ginn ze vill Ufroe beaarbecht. Probéier méi spéit nees.</string>
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <string name="notification_title">Feeler bei der Umeldung fir <xliff:g id="account" example="foo@gmail.com">%1$s</xliff:g></string>
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <string name="contentServiceSync">Sync</string>
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
@@ -308,7 +299,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="default">Den Telefonsspäicher ass voll. Läsch Dateien, fir Späicherplaz fräizeginn.</string>
   <!-- SSL CA cert notification -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">D\'Netzwierk kéint iwwerwaacht sinn</string>
@@ -325,7 +315,6 @@
          [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_managed">Vu(n) <xliff:g id="managing_domain">%s</xliff:g></string>
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <string name="work_profile_deleted">Aarbechtsprofil geläscht</string>
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
@@ -339,7 +328,6 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <string name="factory_reset_warning">Däin Apparat gëtt geläscht</string>
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
@@ -348,7 +336,6 @@
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">Ech</string>
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="tablet">Tabletoptiounen</string>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -985,7 +972,6 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <string-array name="phoneTypes">
     <item>Doheem</item>
@@ -998,7 +984,6 @@
     <item>Personaliséiert</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <string-array name="emailAddressTypes">
     <item>Doheem</item>
@@ -1007,7 +992,6 @@
     <item>Personaliséiert</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <string-array name="postalAddressTypes">
     <item>Doheem</item>
@@ -1016,7 +1000,6 @@
     <item>Personaliséiert</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <string-array name="imAddressTypes">
     <item>Doheem</item>
@@ -1025,7 +1008,6 @@
     <item>Personaliséiert</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <string-array name="organizationTypes">
     <item>Aarbecht</item>
@@ -1033,7 +1015,6 @@
     <item>Personaliséiert</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <string-array name="imProtocols">
     <item>AIM</item>
@@ -1216,7 +1197,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <string name="lockscreen_carrier_default">Kee Service.</string>
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
@@ -1408,7 +1388,6 @@ Kontaktéier däi Provider fir eng aner SIM-Kaart ze kréien.</string>
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">Beräich fir Fangerbeweegung.</string>
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_symbol_key">\?123</string>
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
@@ -1631,7 +1610,6 @@ Kontaktéier däi Provider fir eng aner SIM-Kaart ze kréien.</string>
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">läschen</string>
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">Sichen</string>
@@ -1835,13 +1813,11 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
          activity chooser. See the "Select an action" title. -->
   <string name="noApplications">Dës Aktioun ka vu kenger App duerchgefouert ginn.</string>
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_application">Leider huet <xliff:g id="application">%1$s</xliff:g> opgehale mat Funktionéieren.</string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_process">Leider gouf de Prozess <xliff:g id="process">%1$s</xliff:g> gestoppt.</string>
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_application"><xliff:g id="application">%2$s</xliff:g> äntwert net.\n\nWëlls de d\'App zoumaachen?</string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1937,7 +1913,6 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_notification">Notifikatiounslautstäerkt</string>
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <string name="ringtone_default">Standardschelltoun</string>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
@@ -1992,7 +1967,6 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <string name="select_character">Zeechen aginn</string>
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <string name="sms_control_title">SMS-Messagë gi geschéckt</string>
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
@@ -2002,7 +1976,6 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">Verweigeren</string>
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_short_code_confirm_message">&lt;b&gt;<xliff:g id="app_name">%1$s</xliff:g>&lt;/b&gt; wëll e Message un &lt;b&gt;<xliff:g id="dest_address">%2$s</xliff:g>&lt;/b&gt; schécken.</string>
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
@@ -2022,7 +1995,6 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_never_allow">Ni erlaben</string>
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_removed_title">SIM-Kaart erausgeholl</string>
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
@@ -2130,7 +2102,6 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <string name="fast_scroll_numeric_alphabet">\u00200123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="candidates_style"><u>Kandidaten</u></string>
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -2199,7 +2170,6 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <string name="ime_action_default">Ausféieren</string>
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <string name="dial_number_using">Nummer\nmat <xliff:g id="number" example="555">%s</xliff:g> auswielen</string>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
diff --git a/core/res/res/values-nb/cm_strings.xml b/core/res/res/values-nb/cm_strings.xml
index d1cfdaf..d531a6a 100644
--- a/core/res/res/values-nb/cm_strings.xml
+++ b/core/res/res/values-nb/cm_strings.xml
@@ -120,7 +120,7 @@
   <string name="app_ops_modify_settings">oppdatere systeminnstillinger</string>
   <string name="app_ops_mute_unmute_microphone">Demp/fjern demping av mikrofonen</string>
   <string name="app_ops_play_audio">spille av lyd</string>
-  <string name="app_ops_post_notification">legge inn en melding</string>
+  <string name="app_ops_post_notification">legge inn en varsel</string>
   <string name="app_ops_project_media">Prosjekt media</string>
   <string name="app_ops_read_calendar">lese kalenderen</string>
   <string name="app_ops_read_call_log">lese i samtaleloggen</string>
diff --git a/core/res/res/values-oc-rFR/strings.xml b/core/res/res/values-oc-rFR/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-oc-rFR/strings.xml
+++ b/core/res/res/values-oc-rFR/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-or-rIN/strings.xml b/core/res/res/values-or-rIN/strings.xml
index b4c9596..3acd9fd 100644
--- a/core/res/res/values-or-rIN/strings.xml
+++ b/core/res/res/values-or-rIN/strings.xml
@@ -48,7 +48,6 @@
   <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <!-- Displayed when the user dialed an MMI code whose function
@@ -99,7 +98,6 @@
   <!-- Displayed to tell the user that all service is blocked by access control. -->
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, Data -->
   <!-- Example: Service was enabled for: Voice, FAX -->
@@ -109,14 +107,11 @@
   <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -131,18 +126,15 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <!-- Displayed when the call forwarding query was forwarded. -->
   <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <!-- Displayed when a web request failed with a generic network error. -->
   <!-- Displayed when a web request failed because the URL could not be found. -->
@@ -160,13 +152,11 @@
   <!-- Displayed when a request failed because the file wasn't found. -->
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
@@ -175,7 +165,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <!-- SSL CA cert notification -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
@@ -188,7 +177,6 @@
          i.e. "Network may be monitored". This indicates who is doing the monitoring.
          [CHAR LIMIT=100]-->
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -199,13 +187,11 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -567,22 +553,16 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <!-- Custom phone number type -->
   <!-- Home phone number type -->
@@ -674,7 +654,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <!-- when pattern lock is enabled, tell them about the emergency dial -->
@@ -782,7 +761,6 @@
   <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <!-- Label for ALT modifier key.  Must be short to fit on key! -->
@@ -905,7 +883,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
@@ -1012,11 +989,9 @@
   <!-- Text to display when there are no activities found to display in the
          activity chooser. See the "Select an action" title. -->
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1067,7 +1042,6 @@
   <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
@@ -1089,13 +1063,11 @@
   <!-- default application in case name can not be found -->
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
@@ -1106,7 +1078,6 @@
   <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
@@ -1167,7 +1138,6 @@
   <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -1223,7 +1193,6 @@
   <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
diff --git a/core/res/res/values-ro/cm_strings.xml b/core/res/res/values-ro/cm_strings.xml
index 1587713..57a3f1b 100644
--- a/core/res/res/values-ro/cm_strings.xml
+++ b/core/res/res/values-ro/cm_strings.xml
@@ -87,6 +87,7 @@
   <string name="silent_mode_priority">Prioritate</string>
   <string name="silent_mode_none">Nimic</string>
   <!-- Wifi Hotspot disabled due to subscription change -->
+  <string name="subscription_change_disabled_wifi_ap">Hotspot-ul Wi-Fi a fost dezactivat din cauza schimbării abonării SIM</string>
   <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Oprește Wi-Fi</string>
   <!-- Privacy Guard -->
@@ -176,6 +177,7 @@
          with spaces on either side. [CHAR LIMIT=3] -->
   <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Lansarea activității blocată</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> este protejat de la lansare. Atingeți pentru a vă autentifica și pentru a lansa aplicația.</string>
   <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Acumulator încărcat complet</string>
   <string name="notify_battery_fully_charged_text">Deconectați aparatul de la încărcător pentru a îmbunătăți longevitatea bateriei.</string>
@@ -186,4 +188,6 @@
          whether they want to allow the application to do this. -->
   <string name="permdesc_resetBatteryStats">Permite unei aplicații să reseteze datele curente de utilizare a bateriei.</string>
   <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Cardurile SIM s-au modificat</string>
+  <string name="uicc_hot_swapped_event_text">Atingeți pentru a seta preferințele implicite ale cardului SIM</string>
 </resources>
diff --git a/core/res/res/values-ug/strings.xml b/core/res/res/values-ug/strings.xml
index 1ca6003..b6dee8c 100644
--- a/core/res/res/values-ug/strings.xml
+++ b/core/res/res/values-ug/strings.xml
@@ -60,7 +60,6 @@
   <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <string name="defaultMsisdnAlphaTag">MSISDN1</string>
   <!-- For GsmMmiCode.java -->
-  <skip></skip>
   <!-- Displayed when the user dialed an MMI code whose function
          could not be performed. This will be displayed in a toast. -->
   <string name="mmiError">باغلىنىشتا مەسىلە كۆرۈلدى ياكى MMI كودى خاتا.</string>
@@ -158,7 +157,6 @@
   <string name="RestrictedOnAll">بارلىق ئاۋاز/سانلىق مەلۇمات/قىسقا ئۇچۇر مۇلازىمىتى توختىتىلدى.</string>
   <!-- Displayed to tell the user that peer changed TTY mode -->
   <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
-  <skip></skip>
   <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassVoice">ئاۋاز</string>
   <!-- Example: Service was enabled for: Voice, Data -->
@@ -176,7 +174,6 @@
   <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <string name="serviceClassPAD">PAD</string>
   <!-- CDMA Roaming Indicator Strings (non ERI)-->
-  <skip></skip>
   <!-- Default roaming indicator text -->
   <string name="roamingText0">كەزمە كۆرسەتكۈچ ئوچۇق</string>
   <string name="roamingText1">كەزمە كۆرسەتكۈچ تاقاق</string>
@@ -195,9 +192,7 @@
   <!-- Displayed when WFC registration fails -->
   <!-- WFC Operator Error Codes -->
   <!-- WFC Operator Error Messages showed as alerts -->
-  <string-array name="wfcOperatorErrorAlertMessages"></string-array>
   <!-- WFC Operator Error Messages showed as notifications -->
-  <string-array name="wfcOperatorErrorNotificationMessages"></string-array>
   <!-- Template for showing cellular network operator name while WFC is active -->
   <!-- Template for showing operator name for data connection while WFC is active -->
   <!-- WFC, summary for Disabled -->
@@ -212,7 +207,6 @@
         cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
         has been set but forwarding is not on.
     -->
-  <skip></skip>
   <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <string name="cfTemplateNotForwarded"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>:ئۇلاپ يۆتكىيەلمىدى</string>
   <!-- Displayed when the call forwarding query was forwarded. -->
@@ -224,13 +218,11 @@
   <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegisteredTime"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>:ئۇلاپ يۆتكىيەلمىدى</string>
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <string name="fcComplete">ئىقتىدار كودى تاماملاندى.</string>
   <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <string name="fcError">باغلىنىشتا مەسىلە كۆرۈلدى ياكى ئىقتىدار كودى ئىناۋەتسىز.</string>
   <!-- android.net.http Error strings -->
-  <skip></skip>
   <!-- Displayed when a web request was successful. -->
   <string name="httpErrorOk">جەزملە</string>
   <!-- Displayed when a web request failed with a generic network error. -->
@@ -264,14 +256,12 @@
   <!-- Displayed when a request failed because there are too many requests right now. -->
   <string name="httpErrorTooManyRequests">بىر تەرەپ قىلىۋاتقان ئىلتىماس بەك كۆپ. سەل تۇرۇپ قايتا سىناڭ.</string>
   <!-- Account notifications -->
-  <skip></skip>
   <!-- A notification is shown when the AccountManager is unable to
     supply an auth token without prompting the user to re-enter the
     password.  This is the text that will scroll through the
     notification bar (will be seen by the user as he uses another application). -->
   <string name="notification_title"><xliff:g id="ACCOUNT">%1$s</xliff:g> نىڭ تىزىمغا كىرىش خاتالىقى</string>
   <!-- Sync notifications -->
-  <skip></skip>
   <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <string name="contentServiceSync">قەدەمداش</string>
   <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
@@ -285,7 +275,6 @@
   <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="default">تېلېفون ساقلىغۇچىسى توشتى. بەزى ھۆججەتلەرنى ئۆچۈرۈپ بوشلۇق بىكارلاڭ.</string>
   <!-- SSL CA cert notification -->
-  <skip></skip>
   <!-- Shows up when there is a user SSL CA Cert installed on the
          device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">تور نازارەت قىلىنغان بولۇشى مۇمكىن</string>
@@ -301,7 +290,6 @@
          [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_managed"><xliff:g id="MANAGING_DOMAIN">%s</xliff:g> نازارىتىدە</string>
   <!-- Work profile deleted notification-->
-  <skip></skip>
   <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
          i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
@@ -312,14 +300,12 @@
   <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
         This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
   <!-- Factory reset warning dialog strings-->
-  <skip></skip>
   <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <!-- Text message in the factory reset warning dialog. This says that the the device admin app
          is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">مەن</string>
   <!-- Power Dialog -->
-  <skip></skip>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="tablet">تاختا كومپيۇتېر تاللانمىلار</string>
   <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
@@ -897,7 +883,6 @@
   <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
   <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <string-array name="phoneTypes">
     <item>ئۆي</item>
@@ -910,7 +895,6 @@
     <item>ئىختىيارىي</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <string-array name="emailAddressTypes">
     <item>ئۆي</item>
@@ -919,7 +903,6 @@
     <item>ئىختىيارىي</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <string-array name="postalAddressTypes">
     <item>ئۆي</item>
@@ -928,7 +911,6 @@
     <item>ئىختىيارىي</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <string-array name="imAddressTypes">
     <item>ئۆي</item>
@@ -937,7 +919,6 @@
     <item>ئىختىيارىي</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <string-array name="organizationTypes">
     <item>ئىش</item>
@@ -945,7 +926,6 @@
     <item>ئىختىيارىي</item>
   </string-array>
   <!-- The order of these is important, don't reorder without changing Contacts.java -->
-  <skip></skip>
   <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <string-array name="imProtocols">
     <item>AIM</item>
@@ -1128,7 +1108,6 @@
   <!--
        *** touch based lock / unlock ***
                                           -->
-  <skip></skip>
   <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <string name="lockscreen_carrier_default">مۇلازىمەت يوق</string>
   <!-- Shown in the lock screen to tell the user that the screen is locked. -->
@@ -1307,7 +1286,6 @@
   <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">سۈرۈش دائىرىسى</string>
   <!-- Password keyboard strings. Used by LockScreen and Settings -->
-  <skip></skip>
   <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_symbol_key">\?123</string>
   <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
@@ -1528,7 +1506,6 @@
   <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">ئۆچۈر</string>
   <!-- Strings used for search bar -->
-  <skip></skip>
   <!-- This is the default button label in the system-wide search UI.
          It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">ئىزدە</string>
@@ -1714,13 +1691,11 @@
          activity chooser. See the "Select an action" title. -->
   <string name="noApplications">بۇ مەشغۇلاتنى ئىجرا قىلىدىغان ئەپ يوق.</string>
   <!-- Title of the alert when an application has crashed. -->
-  <string name="aerr_title"></string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_application">ناھايىتى ئەپسۇس، <xliff:g id="APPLICATION">%1$s</xliff:g> توختىدى.</string>
   <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_process">ناھايىتى ئەپسۇس، <xliff:g id="PROCESS">%1$s</xliff:g> جەريان توختىدى.</string>
   <!-- Title of the alert when an application is not responding. -->
-  <string name="anr_title"></string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_application"><xliff:g id="APPLICATION">%2$s</xliff:g> ئىنكاس يوق.\n\nئۇنى تاقامسىز؟</string>
   <!-- Text of the alert that is displayed when an application is not responding. -->
@@ -1814,7 +1789,6 @@
   <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_notification">ئۇقتۇرۇش ئاۋازى</string>
   <!-- Ringtone picker strings -->
-  <skip></skip>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <string name="ringtone_default">كۆڭۈلدىكى قوڭغۇراق ئاۋازى</string>
   <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
@@ -1866,7 +1840,6 @@
   <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <string name="select_character">ھەرپ قىستۇر</string>
   <!-- SMS per-application rate control Dialog -->
-  <skip></skip>
   <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <string name="sms_control_title">قىسقا ئۇچۇر يوللاۋاتىدۇ</string>
   <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
@@ -1876,7 +1849,6 @@
   <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">رەت قىل</string>
   <!-- SMS short code verification dialog. -->
-  <skip></skip>
   <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_short_code_confirm_message">بىر ئۇچۇرنى &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; ئۆزى &lt;b&gt;<xliff:g id="DEST_ADDRESS">%2$s</xliff:g>&lt;/b&gt; غا يوللىماقچى.</string>
   <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
@@ -1894,7 +1866,6 @@
   <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_never_allow">ھەرگىز يول قويما</string>
   <!-- SIM swap and device reboot Dialog -->
-  <skip></skip>
   <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_removed_title">SIM كارتا چىقىرىۋېتىلدى</string>
   <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
@@ -1996,7 +1967,6 @@
   <string name="fast_scroll_numeric_alphabet"> 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="candidates_style"><u>"نامزات"</u></string>
   <!-- External media notification strings -->
-  <skip></skip>
   <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
   <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
   <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
@@ -2064,7 +2034,6 @@
   <string name="ime_action_default">ئىجرا قىل</string>
   <!-- Strings for search suggestions. These are going here because they are referenced by both
          ContactsProvider and GoogleContactsProvider -->
-  <skip></skip>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <string name="dial_number_using"><xliff:g id="NUMBER">%s</xliff:g> دا نومۇر بۇرا</string>
   <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
diff --git a/core/res/res/values-zh-rCN/cm_strings.xml b/core/res/res/values-zh-rCN/cm_strings.xml
index 6f522d1..ec8af28 100644
--- a/core/res/res/values-zh-rCN/cm_strings.xml
+++ b/core/res/res/values-zh-rCN/cm_strings.xml
@@ -32,13 +32,13 @@
   <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">与设备安全信息相关的权限。</string>
   <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permlab_readPhoneBlacklist">读取手机黑名单</string>
+  <string name="permlab_readPhoneBlacklist">读取号码黑名单</string>
   <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permdesc_readPhoneBlacklist">允许应用读取有关被阻止来电或信息的电话号码的信息。</string>
+  <string name="permdesc_readPhoneBlacklist">允许应用读取有关已阻止来电或信息的电话号码信息。</string>
   <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permlab_changePhoneBlacklist">更改手机黑名单</string>
+  <string name="permlab_changePhoneBlacklist">更改号码黑名单</string>
   <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permdesc_changePhoneBlacklist">允许应用更改被阻止来电或信息的电话号码。</string>
+  <string name="permdesc_changePhoneBlacklist">允许应用更改阻止来电或信息的电话号码。</string>
   <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">设置锁屏壁纸</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -76,13 +76,13 @@
   <string name="adb_active_generic_notification_message">触摸以禁用调试。</string>
   <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
-  <string name="adb_active_custom_tile_both">USB &amp; 网络</string>
+  <string name="adb_active_custom_tile_both">USB 和网络</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">网络</string>
   <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">拦截应用启动</string>
   <!-- stylus gestures support -->
-  <string name="stylus_app_not_installed">%s 尚未被安装</string>
+  <string name="stylus_app_not_installed">%s 尚未安装</string>
   <!-- Zen mode buttons -->
   <string name="silent_mode_priority">优先级</string>
   <string name="silent_mode_none">无</string>
@@ -92,7 +92,7 @@
   <string name="notify_turn_wifi_off_title">关闭 Wi-Fi</string>
   <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">启用或禁用隐私防护</string>
-  <string name="permdesc_changePrivacyGuardState">允许应用更改其他应用是否启用隐私防护。当一个应用运行时启用了隐私防护，它将不能访问个人数据，如联系人、通话记录、短信。</string>
+  <string name="permdesc_changePrivacyGuardState">允许应用更改其他应用是否启用隐私防护。当一个应用以启用隐私防护运行时，它将不能访问如联系人、通话记录、短信等个人数据。</string>
   <string name="privacy_guard_notification">隐私防护激活</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> 将不能访问个人数据</string>
   <string name="privacy_guard_dialog_title">隐私防护</string>
@@ -101,7 +101,7 @@
   <string name="permission_remember_choice">记住我的选择</string>
   <!-- App ops requests -->
   <string name="app_ops_access_camera">存取相机</string>
-  <string name="app_ops_access_location">访问你的地理位置信息</string>
+  <string name="app_ops_access_location">访问您的位置信息</string>
   <string name="app_ops_access_notifications">读取通知</string>
   <string name="app_ops_activate_vpn">激活一个 VPN</string>
   <string name="app_ops_auto_start">开机自启动</string>
@@ -113,21 +113,21 @@
   <string name="app_ops_get_usage_stats">获取应用使用情况统计</string>
   <string name="app_ops_keep_device_awake">保持设备唤醒</string>
   <string name="app_ops_make_phone_call">拨打电话</string>
-  <string name="app_ops_modify_calendar">更新你的日历</string>
+  <string name="app_ops_modify_calendar">更新您的日历</string>
   <string name="app_ops_modify_call_log">更新通话记录</string>
   <string name="app_ops_modify_clipboard">修改剪贴板</string>
-  <string name="app_ops_modify_contacts">更新你的联系人</string>
+  <string name="app_ops_modify_contacts">更新您的联系人</string>
   <string name="app_ops_modify_settings">更新系统设置</string>
   <string name="app_ops_mute_unmute_microphone">麦克风静音 / 解除静音</string>
   <string name="app_ops_play_audio">播放音频</string>
   <string name="app_ops_post_notification">发出通知</string>
   <string name="app_ops_project_media">放映媒体</string>
-  <string name="app_ops_read_calendar">读取你的日历</string>
-  <string name="app_ops_read_call_log">读取你的通话记录</string>
-  <string name="app_ops_read_clipboard">读取你的剪贴板</string>
-  <string name="app_ops_read_contacts">读取你的联系人</string>
-  <string name="app_ops_read_mms">读取你的彩信</string>
-  <string name="app_ops_read_sms">读取你的短信</string>
+  <string name="app_ops_read_calendar">读取您的日历</string>
+  <string name="app_ops_read_call_log">读取您的通话记录</string>
+  <string name="app_ops_read_clipboard">读取您的剪贴板</string>
+  <string name="app_ops_read_contacts">读取您的联系人</string>
+  <string name="app_ops_read_mms">读取您的彩信</string>
+  <string name="app_ops_read_sms">读取您的短信</string>
   <string name="app_ops_receive_sms">接收短信</string>
   <string name="app_ops_record_audio">录音</string>
   <string name="app_ops_send_mms">发送彩信</string>
diff --git a/core/res/res/values-zh-rTW/cm_strings.xml b/core/res/res/values-zh-rTW/cm_strings.xml
index a2fce55..2edcb8a 100644
--- a/core/res/res/values-zh-rTW/cm_strings.xml
+++ b/core/res/res/values-zh-rTW/cm_strings.xml
@@ -18,7 +18,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- label for item that screenshots in phone options dialog -->
-  <string name="global_action_screenshot">螢幕截圖</string>
+  <string name="global_action_screenshot">螢幕擷取</string>
   <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">接收受保護的簡訊</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
@@ -36,13 +36,13 @@
   <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">允許應用程式讀取關於被封鎖來電或訊息的電話號碼的資訊。</string>
   <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permlab_changePhoneBlacklist">更改手機黑名單</string>
+  <string name="permlab_changePhoneBlacklist">變更手機黑名單</string>
   <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permdesc_changePhoneBlacklist">允許應用程式更改被封鎖來電或訊息的電話號碼。</string>
+  <string name="permdesc_changePhoneBlacklist">允許應用程式變更被封鎖來電或訊息的電話號碼。</string>
   <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">設定鎖定螢幕桌布</string>
   <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-  <string name="permdesc_setKeyguardWallpaper">允許應用程式更改鎖定螢幕桌布。</string>
+  <string name="permdesc_setKeyguardWallpaper">允許應用程式變更鎖定畫面桌布。</string>
   <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">重新啟動</string>
   <!-- label for current user in phone options dialog -->
@@ -55,7 +55,7 @@
   <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
   <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
-  <string name="reboot_download">Download</string>
+  <string name="reboot_download">下載</string>
   <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">軟體重新啟動</string>
   <!-- Title of dialog to confirm rebooting. -->
@@ -65,7 +65,7 @@
   <string name="reboot_confirm" product="tablet">您的平板電腦將會重新啟動。</string>
   <string name="reboot_confirm" product="default">您的手機將會重新啟動。</string>
   <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
-  <string name="reboot_progress">正在重新啟動\u2026</string>
+  <string name="reboot_progress">重新啟動中\u2026</string>
   <!-- Long-press back kill application -->
   <string name="app_killed_message">已終止應用程式</string>
   <!-- ADB over network notification -->
@@ -84,10 +84,10 @@
   <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">未安裝 %s</string>
   <!-- Zen mode buttons -->
-  <string name="silent_mode_priority">優先度</string>
+  <string name="silent_mode_priority">優先權</string>
   <string name="silent_mode_none">無</string>
   <!-- Wifi Hotspot disabled due to subscription change -->
-  <string name="subscription_change_disabled_wifi_ap">由於 SIM 卡資訊更改，已停用 Wi-Fi 熱點</string>
+  <string name="subscription_change_disabled_wifi_ap">由於 SIM 卡資訊變更，已停用 Wi-Fi 熱點</string>
   <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">關閉 Wi-Fi</string>
   <!-- Privacy Guard -->
@@ -103,7 +103,7 @@
   <string name="app_ops_access_camera">存取相機</string>
   <string name="app_ops_access_location">存取您的位置</string>
   <string name="app_ops_access_notifications">讀取您的通知</string>
-  <string name="app_ops_activate_vpn">啟動 VPN</string>
+  <string name="app_ops_activate_vpn">啟用一個 VPN</string>
   <string name="app_ops_auto_start">開機時啟動</string>
   <string name="app_ops_delete_call_log">刪除您的通話紀錄</string>
   <string name="app_ops_delete_contacts">刪除您的聯絡人</string>
@@ -127,16 +127,16 @@
   <string name="app_ops_read_clipboard">讀取剪貼簿</string>
   <string name="app_ops_read_contacts">讀取您的聯絡人資料</string>
   <string name="app_ops_read_mms">讀取您的多媒體簡訊</string>
-  <string name="app_ops_read_sms">讀取您的簡訊</string>
-  <string name="app_ops_receive_sms">接收簡訊</string>
+  <string name="app_ops_read_sms">讀取您的簡訊訊息</string>
+  <string name="app_ops_receive_sms">接收簡訊訊息</string>
   <string name="app_ops_record_audio">錄製音訊</string>
   <string name="app_ops_send_mms">傳送多媒體訊息</string>
-  <string name="app_ops_send_sms">傳送簡訊</string>
+  <string name="app_ops_send_sms">傳送簡訊訊息</string>
   <string name="app_ops_start_at_bootup">開機時啟動</string>
-  <string name="app_ops_toast_window">顯示彈出信息</string>
+  <string name="app_ops_toast_window">顯示提示訊息</string>
   <string name="app_ops_toggle_bluetooth">切換至藍牙</string>
   <string name="app_ops_toggle_mobile_data">切換至行動數據</string>
-  <string name="app_ops_toggle_nfc">開關 NFC</string>
+  <string name="app_ops_toggle_nfc">切換至 NFC</string>
   <string name="app_ops_toggle_wifi">切換至 Wi-Fi</string>
   <string name="app_ops_use_alarm_volume">控制鬧鐘音量</string>
   <string name="app_ops_use_audio_focus">控制音訊焦點</string>
@@ -146,17 +146,17 @@
   <string name="app_ops_use_media_volume">控制媒體音量</string>
   <string name="app_ops_use_notification_volume">控制通知音量</string>
   <string name="app_ops_use_ring_volume">控制鈴聲音量</string>
-  <string name="app_ops_use_vibrate">使用觸控震動</string>
+  <string name="app_ops_use_vibrate">使用觸覺回饋</string>
   <string name="app_ops_use_voice_volume">控制語音通話音量</string>
   <string name="app_ops_write_mms">撰寫多媒體訊息</string>
-  <string name="app_ops_write_sms">撰寫簡訊</string>
+  <string name="app_ops_write_sms">撰寫簡訊訊息</string>
   <string name="app_ops_use_fingerprint">使用指紋</string>
   <string name="app_ops_add_voicemail">新增語音信箱</string>
   <string name="app_ops_read_phone_state">存取電話狀態</string>
   <string name="app_ops_scan_wifi">掃描 Wi-Fi 網路</string>
-  <string name="app_ops_change_wallpaper">更改桌布</string>
+  <string name="app_ops_change_wallpaper">變更桌布</string>
   <string name="app_ops_assist_structure">使用協助工具</string>
-  <string name="app_ops_assist_screenshot">螢幕截圖</string>
+  <string name="app_ops_assist_screenshot">螢幕擷取畫面</string>
   <string name="app_ops_use_body_sensors">使用人體感應器</string>
   <string name="app_ops_read_cell_broadcasts">讀取區域廣播</string>
   <string name="app_ops_mock_location">模擬所在位置</string>
@@ -164,10 +164,10 @@
   <string name="app_ops_write_external_storage">寫入外部儲存空間</string>
   <string name="app_ops_turn_on_screen">開啟螢幕</string>
   <string name="app_ops_get_accounts">取得裝置帳號</string>
-  <string name="app_ops_wifi_change">更改 Wi-Fi 狀態</string>
+  <string name="app_ops_wifi_change">變更 Wi-Fi 狀態</string>
   <string name="app_ops_su">取得 Root 權限</string>
   <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
-  <string name="lock_to_app_toast_no_navbar">要解鎖此螢幕，觸摸並按住返回鍵。</string>
+  <string name="lock_to_app_toast_no_navbar">要解鎖此畫面，請輕觸並按住 [返回] 鍵。</string>
   <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">沒有已連接的裝置</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> 個已連接裝置</string>
@@ -188,6 +188,6 @@
          whether they want to allow the application to do this. -->
   <string name="permdesc_resetBatteryStats">允許應用程式重設目前低電量的電池使用資料。</string>
   <!-- Uicc hotswapped event configuration needed notification -->
-  <string name="uicc_hot_swapped_event_title">SIM 卡已更改</string>
-  <string name="uicc_hot_swapped_event_text">輕觸即可設定 SIM卡 預設首選項</string>
+  <string name="uicc_hot_swapped_event_title">SIM 卡已變更</string>
+  <string name="uicc_hot_swapped_event_text">輕觸即可設定 SIM卡 預設偏好</string>
 </resources>
diff --git a/packages/DocumentsUI/res/values-lb/strings.xml b/packages/DocumentsUI/res/values-lb/strings.xml
index 5bcd64f..3d6545d 100644
--- a/packages/DocumentsUI/res/values-lb/strings.xml
+++ b/packages/DocumentsUI/res/values-lb/strings.xml
@@ -42,6 +42,7 @@
   <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
   <string name="menu_delete">Läschen</string>
   <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <string name="menu_select_all">Alles auswielen</string>
   <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
   <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
   <string name="menu_advanced_show" product="nosdcard">Interne Späicher uweisen</string>
@@ -56,7 +57,9 @@
   <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
   <string name="menu_file_size_hide">Fichiersgréisst verstoppen</string>
   <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <string name="button_select">Auswielen</string>
   <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <string name="button_copy">Kopéieren</string>
   <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
   <string name="sort_name">No Numm</string>
   <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
@@ -94,11 +97,14 @@
   <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
   <string name="share_via">Deelen iwwer</string>
   <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <string name="copy_notification_title">Fichiere gi kopéiert</string>
   <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <string name="copy_remaining"><xliff:g id="duration" example="3 minutes">%s</xliff:g> iwwreg</string>
   <!-- Toast shown when a file copy is kicked off -->
   <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
   <!-- Title of the copy error notification [CHAR LIMIT=48] -->
   <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
   <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <string name="retry">Nees probéieren</string>
   <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
 </resources>
diff --git a/packages/Keyguard/res/values-as-rIN/strings.xml b/packages/Keyguard/res/values-as-rIN/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-as-rIN/strings.xml
+++ b/packages/Keyguard/res/values-as-rIN/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-ast-rES/strings.xml b/packages/Keyguard/res/values-ast-rES/strings.xml
index 37a1824..c268778 100644
--- a/packages/Keyguard/res/values-ast-rES/strings.xml
+++ b/packages/Keyguard/res/values-ast-rES/strings.xml
@@ -60,7 +60,6 @@
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">Empobina al menú pa desbloquiar la pantalla.</string>
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">Bloquiada pa la rede</string>
   <!-- Shown when there is no SIM card. -->
@@ -102,7 +101,6 @@
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_next_alarm">Próxima alarma afitada a les <xliff:g id="alarm" example="Fri 8:30 AM">%1$s</xliff:g></string>
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">Desaniciar</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-br-rFR/strings.xml b/packages/Keyguard/res/values-br-rFR/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-br-rFR/strings.xml
+++ b/packages/Keyguard/res/values-br-rFR/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-csb-rPL/strings.xml b/packages/Keyguard/res/values-csb-rPL/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-csb-rPL/strings.xml
+++ b/packages/Keyguard/res/values-csb-rPL/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-cy/strings.xml b/packages/Keyguard/res/values-cy/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-cy/strings.xml
+++ b/packages/Keyguard/res/values-cy/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-en-rPT/strings.xml b/packages/Keyguard/res/values-en-rPT/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-en-rPT/strings.xml
+++ b/packages/Keyguard/res/values-en-rPT/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-eo/strings.xml b/packages/Keyguard/res/values-eo/strings.xml
index 798b667..170dcac 100644
--- a/packages/Keyguard/res/values-eo/strings.xml
+++ b/packages/Keyguard/res/values-eo/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">Forigi</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-es-rCO/strings.xml b/packages/Keyguard/res/values-es-rCO/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-es-rCO/strings.xml
+++ b/packages/Keyguard/res/values-es-rCO/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-es-rMX/strings.xml b/packages/Keyguard/res/values-es-rMX/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-es-rMX/strings.xml
+++ b/packages/Keyguard/res/values-es-rMX/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-frp-rIT/strings.xml b/packages/Keyguard/res/values-frp-rIT/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-frp-rIT/strings.xml
+++ b/packages/Keyguard/res/values-frp-rIT/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-fy-rNL/strings.xml b/packages/Keyguard/res/values-fy-rNL/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-fy-rNL/strings.xml
+++ b/packages/Keyguard/res/values-fy-rNL/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-ga-rIE/strings.xml b/packages/Keyguard/res/values-ga-rIE/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-ga-rIE/strings.xml
+++ b/packages/Keyguard/res/values-ga-rIE/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-gd-rGB/strings.xml b/packages/Keyguard/res/values-gd-rGB/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-gd-rGB/strings.xml
+++ b/packages/Keyguard/res/values-gd-rGB/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-gl-rES/cm_strings.xml b/packages/Keyguard/res/values-gl-rES/cm_strings.xml
index 4221609..314940a 100644
--- a/packages/Keyguard/res/values-gl-rES/cm_strings.xml
+++ b/packages/Keyguard/res/values-gl-rES/cm_strings.xml
@@ -21,6 +21,10 @@
   <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Esta tarxeta non é válida.</string>
   <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">Introduce o código PIN. Tienes <xliff:g id="number">%d</xliff:g> intento restante antes de ter que comunicarte con a tua operadora para desbloquear o dispositivo.</item>
+    <item quantity="other">Introduce o código PIN. Tienes <xliff:g id="number">%d</xliff:g> intentos restantes.</item>
+  </plurals>
   <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Erro: O dato introducido é máis curto có mínimo esixido</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ku/strings.xml b/packages/Keyguard/res/values-ku/strings.xml
index 5861ec9..336eff9 100644
--- a/packages/Keyguard/res/values-ku/strings.xml
+++ b/packages/Keyguard/res/values-ku/strings.xml
@@ -56,7 +56,6 @@
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">دەست بنێ بە پێڕستدا بۆ کردنه‌وه‌.</string>
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">تۆڕی نێت داخرا</string>
   <!-- Shown when there is no SIM card. -->
@@ -98,7 +97,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">سڕینه‌وه‌</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-lb/strings.xml b/packages/Keyguard/res/values-lb/strings.xml
index 2ee72e8..0763983 100644
--- a/packages/Keyguard/res/values-lb/strings.xml
+++ b/packages/Keyguard/res/values-lb/strings.xml
@@ -60,7 +60,6 @@
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">Menü drécke fir z\'entspären.</string>
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">Netzwierk gespaart</string>
   <!-- Shown when there is no SIM card. -->
@@ -106,7 +105,6 @@ Kontaktéier däi Provider fir eng aner SIM-Kaart ze kréien.</string>
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_next_alarm">Nächste Wecker gesat fir <xliff:g id="alarm" example="Fri 8:30 AM">%1$s</xliff:g></string>
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">Läschen</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-oc-rFR/strings.xml b/packages/Keyguard/res/values-oc-rFR/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-oc-rFR/strings.xml
+++ b/packages/Keyguard/res/values-oc-rFR/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-or-rIN/strings.xml b/packages/Keyguard/res/values-or-rIN/strings.xml
index fb28fd3..b53b53e 100644
--- a/packages/Keyguard/res/values-or-rIN/strings.xml
+++ b/packages/Keyguard/res/values-or-rIN/strings.xml
@@ -45,7 +45,6 @@
          in the phone soon. -->
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <!-- Shown when there is no SIM card. -->
   <!-- Shown when there is no SIM card. -->
@@ -70,7 +69,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
diff --git a/packages/Keyguard/res/values-ro/cm_strings.xml b/packages/Keyguard/res/values-ro/cm_strings.xml
index c9a5723..4cfd544 100644
--- a/packages/Keyguard/res/values-ro/cm_strings.xml
+++ b/packages/Keyguard/res/values-ro/cm_strings.xml
@@ -17,9 +17,15 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">Cardul SIM este Perso blocat</string>
   <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Cartelă SIM incorectă.</string>
   <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">Introduceţi PIN-ul pentru SIM, mai aveţi <xliff:g id="number">%d</xliff:g> încercare rămasă înainte de a trebui să contactaţi compania de rețea mobilă pentru a debloca dispozitivul.</item>
+    <item quantity="few">Introduceţi PIN-ul pentru SIM, mai aveţi <xliff:g id="number">%d</xliff:g> (de) încercări rămase.</item>
+    <item quantity="other">Introduceţi PIN-ul pentru SIM, mai aveţi <xliff:g id="number">%d</xliff:g> (de) încercări rămase.</item>
+  </plurals>
   <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Eroare: Introducere mai scurtă decât lungimea minimă</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ug/strings.xml b/packages/Keyguard/res/values-ug/strings.xml
index 232d6dc..6ad14ee 100644
--- a/packages/Keyguard/res/values-ug/strings.xml
+++ b/packages/Keyguard/res/values-ug/strings.xml
@@ -56,7 +56,6 @@
   <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">Menu نى بېسىپ قۇلۇپنى ئېچىڭ.</string>
   <!-- SIM messages -->
-  <skip></skip>
   <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">تور قۇلۇپلانغان</string>
   <!-- Shown when there is no SIM card. -->
@@ -97,7 +96,6 @@
   <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <!-- KeyguardPinView - accessibility support -->
-  <skip></skip>
   <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">ئۆچۈر</string>
   <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
diff --git a/packages/Keyguard/res/values-zh-rCN/cm_strings.xml b/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
index 6f94967..948efc1 100644
--- a/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
+++ b/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
@@ -22,7 +22,7 @@
   <string name="lockscreen_sim_error_message_short">无效的 SIM 卡。</string>
   <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
-    <item quantity="other">输入 SIM 卡 PIN。您还有 <xliff:g id="number">%d</xliff:g> 次尝试机会；若超出此次数，则必须联系运营商以解锁 SIM 卡。</item>
+    <item quantity="other">请输入 SIM 卡 PIN。您还有 <xliff:g id="number">%d</xliff:g> 次尝试机会。若超出此次数，则必须为解锁 SIM 卡求助运营商。</item>
   </plurals>
   <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">错误：输入长度小于最小长度</string>
diff --git a/packages/SettingsLib/res/values-as-rIN/arrays.xml b/packages/SettingsLib/res/values-as-rIN/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-as-rIN/arrays.xml
+++ b/packages/SettingsLib/res/values-as-rIN/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-ast-rES/arrays.xml b/packages/SettingsLib/res/values-ast-rES/arrays.xml
index 944d2b2..1d95ab1 100644
--- a/packages/SettingsLib/res/values-ast-rES/arrays.xml
+++ b/packages/SettingsLib/res/values-ast-rES/arrays.xml
@@ -21,7 +21,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <string-array name="wifi_status">
     <!-- Status message of Wi-Fi when it is idle. -->
@@ -50,7 +49,6 @@
     <item>Desactivando mala conexón temporalmente</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <string-array name="wifi_status_with_ssid">
     <!-- Status message of Wi-Fi when it is idle. -->
diff --git a/packages/SettingsLib/res/values-br-rFR/arrays.xml b/packages/SettingsLib/res/values-br-rFR/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-br-rFR/arrays.xml
+++ b/packages/SettingsLib/res/values-br-rFR/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-csb-rPL/arrays.xml b/packages/SettingsLib/res/values-csb-rPL/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-csb-rPL/arrays.xml
+++ b/packages/SettingsLib/res/values-csb-rPL/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-cy/arrays.xml b/packages/SettingsLib/res/values-cy/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-cy/arrays.xml
+++ b/packages/SettingsLib/res/values-cy/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-en-rPT/arrays.xml b/packages/SettingsLib/res/values-en-rPT/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-en-rPT/arrays.xml
+++ b/packages/SettingsLib/res/values-en-rPT/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-eo/arrays.xml b/packages/SettingsLib/res/values-eo/arrays.xml
index 024e633..f60a34d 100644
--- a/packages/SettingsLib/res/values-eo/arrays.xml
+++ b/packages/SettingsLib/res/values-eo/arrays.xml
@@ -21,7 +21,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <string-array name="wifi_status">
     <!-- Status message of Wi-Fi when it is idle. -->
@@ -50,7 +49,6 @@
     <item>Temporarily avoiding poor connection</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
   <string-array name="wifi_status_with_ssid">
     <!-- Status message of Wi-Fi when it is idle. -->
diff --git a/packages/SettingsLib/res/values-es-rCO/arrays.xml b/packages/SettingsLib/res/values-es-rCO/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-es-rCO/arrays.xml
+++ b/packages/SettingsLib/res/values-es-rCO/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-es-rMX/arrays.xml b/packages/SettingsLib/res/values-es-rMX/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-es-rMX/arrays.xml
+++ b/packages/SettingsLib/res/values-es-rMX/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-frp-rIT/arrays.xml b/packages/SettingsLib/res/values-frp-rIT/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-frp-rIT/arrays.xml
+++ b/packages/SettingsLib/res/values-frp-rIT/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-fy-rNL/arrays.xml b/packages/SettingsLib/res/values-fy-rNL/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-fy-rNL/arrays.xml
+++ b/packages/SettingsLib/res/values-fy-rNL/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-ga-rIE/arrays.xml b/packages/SettingsLib/res/values-ga-rIE/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-ga-rIE/arrays.xml
+++ b/packages/SettingsLib/res/values-ga-rIE/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-gd-rGB/arrays.xml b/packages/SettingsLib/res/values-gd-rGB/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-gd-rGB/arrays.xml
+++ b/packages/SettingsLib/res/values-gd-rGB/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-ku/arrays.xml b/packages/SettingsLib/res/values-ku/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-ku/arrays.xml
+++ b/packages/SettingsLib/res/values-ku/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-lb/arrays.xml b/packages/SettingsLib/res/values-lb/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-lb/arrays.xml
+++ b/packages/SettingsLib/res/values-lb/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-oc-rFR/arrays.xml b/packages/SettingsLib/res/values-oc-rFR/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-oc-rFR/arrays.xml
+++ b/packages/SettingsLib/res/values-oc-rFR/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-or-rIN/arrays.xml b/packages/SettingsLib/res/values-or-rIN/arrays.xml
index cfe3657..c46bb71 100644
--- a/packages/SettingsLib/res/values-or-rIN/arrays.xml
+++ b/packages/SettingsLib/res/values-or-rIN/arrays.xml
@@ -21,9 +21,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-ug/arrays.xml b/packages/SettingsLib/res/values-ug/arrays.xml
index f954c2b..e4f82d3 100644
--- a/packages/SettingsLib/res/values-ug/arrays.xml
+++ b/packages/SettingsLib/res/values-ug/arrays.xml
@@ -21,7 +21,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is unknown. -->
   <string-array name="wifi_status">
     <!-- Status message of Wi-Fi when it is idle. -->
@@ -50,6 +49,5 @@
     <item>Temporarily avoiding poor connection</item>
   </string-array>
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
-  <skip></skip>
   <!-- Wi-Fi settings. The status messages when the network is known. -->
 </resources>
diff --git a/packages/SettingsLib/res/values-zh-rTW/cm_strings.xml b/packages/SettingsLib/res/values-zh-rTW/cm_strings.xml
index 964e5f4..478d992 100644
--- a/packages/SettingsLib/res/values-zh-rTW/cm_strings.xml
+++ b/packages/SettingsLib/res/values-zh-rTW/cm_strings.xml
@@ -23,5 +23,5 @@
   <string name="picker_activities">活動</string>
   <string name="select_custom_app_title">選取自訂應用程式</string>
   <string name="select_custom_activity_title">選取自訂活動</string>
-  <string name="lockscreen_targets_message">鎖定螢幕捷徑</string>
+  <string name="lockscreen_targets_message">鎖定畫面捷徑</string>
 </resources>
diff --git a/packages/SystemUI/res/values-as-rIN/strings.xml b/packages/SystemUI/res/values-as-rIN/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-as-rIN/strings.xml
+++ b/packages/SystemUI/res/values-as-rIN/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-ast-rES/strings.xml b/packages/SystemUI/res/values-ast-rES/strings.xml
index 12b0b8c..3b9cdb0 100644
--- a/packages/SystemUI/res/values-ast-rES/strings.xml
+++ b/packages/SystemUI/res/values-ast-rES/strings.xml
@@ -653,7 +653,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <string name="keyguard_indication_charging_time_slowly">Carga lenta (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> pa completar la carga)</string>
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <string name="accessibility_multi_user_switch_switcher">Camudar usuariu</string>
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
diff --git a/packages/SystemUI/res/values-br-rFR/strings.xml b/packages/SystemUI/res/values-br-rFR/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-br-rFR/strings.xml
+++ b/packages/SystemUI/res/values-br-rFR/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-cs/cm_strings.xml b/packages/SystemUI/res/values-cs/cm_strings.xml
index 4a0fc63..7f16da9 100644
--- a/packages/SystemUI/res/values-cs/cm_strings.xml
+++ b/packages/SystemUI/res/values-cs/cm_strings.xml
@@ -174,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Další budík</string>
   <string name="dynamic_qs_tile_ime_selector_label">Výběr IME</string>
   <string name="dynamic_qs_tile_su_label">Root přístup</string>
+  <string name="dynamic_qs_tile_themes_label">Motivy</string>
   <string name="quick_settings_title_advanced_location">Třístavové nastavení určení polohy</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Zjištění polohy: úsporný režim.</string>
diff --git a/packages/SystemUI/res/values-csb-rPL/strings.xml b/packages/SystemUI/res/values-csb-rPL/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-csb-rPL/strings.xml
+++ b/packages/SystemUI/res/values-csb-rPL/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-cy/strings.xml b/packages/SystemUI/res/values-cy/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-cy/strings.xml
+++ b/packages/SystemUI/res/values-cy/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-en-rPT/strings.xml b/packages/SystemUI/res/values-en-rPT/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-en-rPT/strings.xml
+++ b/packages/SystemUI/res/values-en-rPT/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-eo/strings.xml b/packages/SystemUI/res/values-eo/strings.xml
index 2f749ba..8041df8 100644
--- a/packages/SystemUI/res/values-eo/strings.xml
+++ b/packages/SystemUI/res/values-eo/strings.xml
@@ -367,7 +367,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-es-rCO/strings.xml b/packages/SystemUI/res/values-es-rCO/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-es-rCO/strings.xml
+++ b/packages/SystemUI/res/values-es-rCO/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-es-rMX/strings.xml b/packages/SystemUI/res/values-es-rMX/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-es-rMX/strings.xml
+++ b/packages/SystemUI/res/values-es-rMX/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-fi/cm_strings.xml b/packages/SystemUI/res/values-fi/cm_strings.xml
index c6e454d..becd5cb 100644
--- a/packages/SystemUI/res/values-fi/cm_strings.xml
+++ b/packages/SystemUI/res/values-fi/cm_strings.xml
@@ -174,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Seuraava hälytys</string>
   <string name="dynamic_qs_tile_ime_selector_label">Syöttötavan valitsin</string>
   <string name="dynamic_qs_tile_su_label">Root-oikeudet</string>
+  <string name="dynamic_qs_tile_themes_label">Teemat</string>
   <string name="quick_settings_title_advanced_location">Sijainnin lisäasetukset</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Sijainnin raportointi: virransäästötila.</string>
diff --git a/packages/SystemUI/res/values-frp-rIT/strings.xml b/packages/SystemUI/res/values-frp-rIT/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-frp-rIT/strings.xml
+++ b/packages/SystemUI/res/values-frp-rIT/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-fy-rNL/strings.xml b/packages/SystemUI/res/values-fy-rNL/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-fy-rNL/strings.xml
+++ b/packages/SystemUI/res/values-fy-rNL/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-ga-rIE/strings.xml b/packages/SystemUI/res/values-ga-rIE/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-ga-rIE/strings.xml
+++ b/packages/SystemUI/res/values-ga-rIE/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-gd-rGB/strings.xml b/packages/SystemUI/res/values-gd-rGB/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-gd-rGB/strings.xml
+++ b/packages/SystemUI/res/values-gd-rGB/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-ku/strings.xml b/packages/SystemUI/res/values-ku/strings.xml
index 4799c13..87d89bb 100644
--- a/packages/SystemUI/res/values-ku/strings.xml
+++ b/packages/SystemUI/res/values-ku/strings.xml
@@ -535,7 +535,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-lb/strings.xml b/packages/SystemUI/res/values-lb/strings.xml
index 9505026..0217846 100644
--- a/packages/SystemUI/res/values-lb/strings.xml
+++ b/packages/SystemUI/res/values-lb/strings.xml
@@ -609,7 +609,6 @@ iwwerwaacht sinn</string>
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <string name="keyguard_indication_charging_time_slowly">Gëtt lues opgelueden (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> bis e voll ass)</string>
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <string name="accessibility_multi_user_switch_switcher">Benotzer wiesselen</string>
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
diff --git a/packages/SystemUI/res/values-nb/cm_strings.xml b/packages/SystemUI/res/values-nb/cm_strings.xml
index ebef919..4a9478f 100644
--- a/packages/SystemUI/res/values-nb/cm_strings.xml
+++ b/packages/SystemUI/res/values-nb/cm_strings.xml
@@ -86,7 +86,7 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">System profiler</string>
   <string name="quick_settings_profiles_off">Profiler deaktivert</string>
-  <string name="quick_settings_heads_up_label">Flytende notifikasjoner</string>
+  <string name="quick_settings_heads_up_label">Flytende varsler</string>
   <string name="quick_settings_battery_saver_label">Batterisparing</string>
   <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
   <string name="quick_settings_battery_saver_label_charging">Batterisparing (lading)</string>
@@ -150,9 +150,9 @@
   <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient skjerm er skrudd på.</string>
   <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_heads_up_off">Heads up notifikasjoner er av.</string>
+  <string name="accessibility_quick_settings_heads_up_off">Heads up varsler er av.</string>
   <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_heads_up_on">Heads up notifikasjoner er på.</string>
+  <string name="accessibility_quick_settings_heads_up_on">Heads up varsler er på.</string>
   <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Heads-up ble deaktivert.</string>
   <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
diff --git a/packages/SystemUI/res/values-oc-rFR/strings.xml b/packages/SystemUI/res/values-oc-rFR/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-oc-rFR/strings.xml
+++ b/packages/SystemUI/res/values-oc-rFR/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-or-rIN/strings.xml b/packages/SystemUI/res/values-or-rIN/strings.xml
index bf55d92..7758366 100644
--- a/packages/SystemUI/res/values-or-rIN/strings.xml
+++ b/packages/SystemUI/res/values-or-rIN/strings.xml
@@ -350,7 +350,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-ro/cm_strings.xml b/packages/SystemUI/res/values-ro/cm_strings.xml
index 2ef4e1d..47f93a8 100644
--- a/packages/SystemUI/res/values-ro/cm_strings.xml
+++ b/packages/SystemUI/res/values-ro/cm_strings.xml
@@ -29,6 +29,7 @@
   <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Glisați dreapta pentru %1$s</string>
   <string name="right_shortcut_hint">Glisați stânga pentru %1$s</string>
+  <string name="lockscreen_message">Apăsaţi o pictogramă din stânga sau dreapta pentru a realoca o comandă rapidă pe ecranul de blocare.</string>
   <string name="lockscreen_default_target">Implicit</string>
   <string name="select_application">Selectați aplicația</string>
   <string name="lockscreen_choose_action_title">Alege acțiunea</string>
@@ -53,6 +54,7 @@
   <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Dezinstalați</string>
   <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">Luminozitate lumină</string>
   <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profiluri oprit.</string>
   <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -64,6 +66,7 @@
   <string name="quick_settings_compass_init">Inițializare\u2026</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Setări de lumină</string>
+  <string name="led_notification_text">Lumină LED activată de setări</string>
   <string name="qs_tile_edit_header_instruction">Apăsați și țineți apăsate chenarele pentru a rearanja</string>
   <string name="quick_settings_edit_label">Editare chenare</string>
   <string name="quick_settings_cannot_delete_edit_tile">Nu se poate șterge chenarul Editare</string>
@@ -75,6 +78,7 @@
   <string name="quick_settings_title_show_brightness_slider">Arată glisorul de luminozitate</string>
   <string name="quick_settings_title_enlarge_first_row">Mărește primul rând</string>
   <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">Aceasta ține în vizualizare ecranul până îl deblocați. Apăsați și țineți apăsat butonul Înapoi pentru a debloca.</string>
   <string name="quick_settings_custom_tile_detail_title">Chenar personalizat</string>
   <string name="quick_settings_remove">Eliminare chenar</string>
   <string name="quick_settings_network_adb_label">ADB prin rețea</string>
@@ -85,6 +89,7 @@
   <string name="quick_settings_heads_up_label">Atenționare</string>
   <string name="quick_settings_battery_saver_label">Economizor baterie</string>
   <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Economizor de baterie (încărcare)</string>
   <string name="quick_settings_caffeine_label">Cofeină</string>
   <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Sincronizare oprită.</string>
@@ -133,17 +138,25 @@
   <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Blocare ecran pornit.</string>
   <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_off">Ecran de blocare dezactivat.</string>
   <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_on">Ecran de blocare activat.</string>
   <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Afișare ambientală oprită.</string>
   <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Afișare ambientală pornită.</string>
   <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">Afișaj ambiental dezactivat.</string>
   <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">Afișaj ambiental activat.</string>
   <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">Heads-up oprit.</string>
   <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">Heads-up pornit.</string>
   <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_off">Heads-up a fost oprit.</string>
   <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_on">Heads-up a fost pornit.</string>
   <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Cofeină oprit.</string>
   <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -161,6 +174,7 @@
   <string name="dynamic_qs_tile_next_alarm_label">Următoarea alarmă</string>
   <string name="dynamic_qs_tile_ime_selector_label">Selector IME</string>
   <string name="dynamic_qs_tile_su_label">Acces root</string>
+  <string name="dynamic_qs_tile_themes_label">Teme</string>
   <string name="quick_settings_title_advanced_location">Starea celor 3 moduri de locație</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Raportarea locației: mod economisire baterie.</string>
@@ -197,10 +211,17 @@
     <item quantity="other">%1$d clienți</item>
   </plurals>
   <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Nu există date SIM</string>
   <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Procent baterie <xliff:g id="number">%d</xliff:g> andocată.</string>
   <!-- Play queue -->
+  <string name="play_queue_extention">Afișare coadă de redare</string>
   <!-- Path data for portrait battery -->
   <!-- Path data for landscape battery -->
   <!-- Path data for circle battery -->
   <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Glisați în jos pentru a extinde</string>
+  <string name="swipe_left_hint">Glisați stânga pentru a <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Glisați dreapta pentru notificări</string>
 </resources>
diff --git a/packages/SystemUI/res/values-ug/strings.xml b/packages/SystemUI/res/values-ug/strings.xml
index 6c4dac3..95d4f4d 100644
--- a/packages/SystemUI/res/values-ug/strings.xml
+++ b/packages/SystemUI/res/values-ug/strings.xml
@@ -493,7 +493,6 @@
   <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
   <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
   <!-- Related to user switcher -->
-  <skip></skip>
   <!-- Accessibility label for the button that opens the user switcher. -->
   <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <!-- Accessibility label for the user icon on the lock screen. -->
diff --git a/packages/SystemUI/res/values-zh-rCN/cm_strings.xml b/packages/SystemUI/res/values-zh-rCN/cm_strings.xml
index 525300b..0b882eb 100644
--- a/packages/SystemUI/res/values-zh-rCN/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rCN/cm_strings.xml
@@ -42,7 +42,7 @@
   <string name="navbar_back_button">返回键</string>
   <string name="navbar_empty_button">空白键</string>
   <string name="navbar_menu_conditional_button">菜单键 (自动隐藏)</string>
-  <string name="navbar_menu_always_button">菜单键 (总是显示)</string>
+  <string name="navbar_menu_always_button">菜单键 (始终显示)</string>
   <string name="navbar_menu_big_button">菜单键</string>
   <string name="accessibility_dpad_left">光标左移</string>
   <string name="accessibility_dpad_right">光标右移</string>
@@ -62,7 +62,7 @@
   <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">情景模式已关闭。</string>
   <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_profiles_changed">情景模式已修改为<xliff:g id="profile" example="Default">%s</xliff:g>。</string>
+  <string name="accessibility_quick_settings_profiles_changed">情景模式已更改为<xliff:g id="profile" example="Default">%s</xliff:g>。</string>
   <string name="quick_settings_compass_init">正在初始化\u2026</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">指示灯设置</string>
diff --git a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
index b85480b..16560d7 100644
--- a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
@@ -29,14 +29,14 @@
   <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">向右滑動即可%1$s</string>
   <string name="right_shortcut_hint">向左滑動即可%1$s</string>
-  <string name="lockscreen_message">輕觸左側或右側的圖示即可設定鎖定螢幕捷徑</string>
+  <string name="lockscreen_message">輕觸左側或右側的圖示即可設定鎖定畫面捷徑</string>
   <string name="lockscreen_default_target">預設</string>
-  <string name="select_application">選取應用程式</string>
-  <string name="lockscreen_choose_action_title">選取操作</string>
+  <string name="select_application">選擇應用程式</string>
+  <string name="lockscreen_choose_action_title">選擇動作</string>
   <string name="lockscreen_none_target">無</string>
   <!-- Dialog title for navigation bar button selection -->
-  <string name="navbar_dialog_title">選擇要指定的操作</string>
-  <string name="navbar_home_button">主螢幕鍵</string>
+  <string name="navbar_dialog_title">選擇要指定的動作</string>
+  <string name="navbar_home_button">主畫面鍵</string>
   <string name="navbar_recent_button">多工鍵</string>
   <string name="navbar_search_button">搜尋鍵</string>
   <string name="navbar_back_button">返回鍵</string>
@@ -62,25 +62,25 @@
   <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">設定檔已關閉</string>
   <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_profiles_changed">設定檔已更改為<xliff:g id="profile" example="Default">%s</xliff:g>。</string>
-  <string name="quick_settings_compass_init">正在初始化\u2026</string>
+  <string name="accessibility_quick_settings_profiles_changed">設定檔已變更為<xliff:g id="profile" example="Default">%s</xliff:g>。</string>
+  <string name="quick_settings_compass_init">初始化中\u2026</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">指示燈設定</string>
   <string name="led_notification_text">已透過設定啟用 LED 指示燈</string>
-  <string name="qs_tile_edit_header_instruction">按住瓷磚即可重新排列</string>
-  <string name="quick_settings_edit_label">編輯瓷磚</string>
-  <string name="quick_settings_cannot_delete_edit_tile">無法刪除編輯瓷磚</string>
-  <string name="qs_tiles_reset_confirmation">是否將快速設定瓷磚還原至預設配置？</string>
+  <string name="qs_tile_edit_header_instruction">按住圖塊即可重新排列</string>
+  <string name="quick_settings_edit_label">編輯圖塊</string>
+  <string name="quick_settings_cannot_delete_edit_tile">無法刪除編輯圖塊</string>
+  <string name="qs_tiles_reset_confirmation">將快速設定圖塊還原至預設配置？</string>
   <string name="quick_settings_tile_reset_to_default">還原至預設布局</string>
   <string name="quick_settings_title_header">標題</string>
-  <string name="quick_settings_title_tiles">瓷磚</string>
+  <string name="quick_settings_title_tiles">圖塊</string>
   <string name="quick_settings_title_show_weather">顯示天氣資訊</string>
-  <string name="quick_settings_title_show_brightness_slider">顯示亮度滑桿</string>
+  <string name="quick_settings_title_show_brightness_slider">顯示亮度滑動條</string>
   <string name="quick_settings_title_enlarge_first_row">擴大首行</string>
   <!-- Screen pinning dialog description (for devices without navbar) -->
-  <string name="screen_pinning_description_no_navbar">此功能會固定螢幕顯示直到您取消固定。觸控並長按返回鍵即可解除固定。</string>
-  <string name="quick_settings_custom_tile_detail_title">自訂瓷磚</string>
-  <string name="quick_settings_remove">移除瓷磚</string>
+  <string name="screen_pinning_description_no_navbar">此功能會固定螢幕顯示直到您取消固定。觸控並長按 [返回] 鍵即可解除固定。</string>
+  <string name="quick_settings_custom_tile_detail_title">自訂圖塊</string>
+  <string name="quick_settings_remove">移除圖塊</string>
   <string name="quick_settings_network_adb_label">網路 ADB</string>
   <string name="quick_settings_compass_label">指南針</string>
   <string name="quick_settings_nfc_label">NFC</string>
@@ -92,25 +92,25 @@
   <string name="quick_settings_battery_saver_label_charging">省電模式 (充電中)</string>
   <string name="quick_settings_caffeine_label">暫停休眠</string>
   <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_sync_off">同步關閉</string>
+  <string name="accessibility_quick_settings_sync_off">同步處理關閉</string>
   <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_sync_on">同步開啟</string>
+  <string name="accessibility_quick_settings_sync_on">同步處理開啟</string>
   <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_sync_changed_off">同步已關閉</string>
+  <string name="accessibility_quick_settings_sync_changed_off">同步處理已關閉</string>
   <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_sync_changed_on">同步已開啟</string>
-  <string name="quick_settings_sync_label">同步</string>
+  <string name="accessibility_quick_settings_sync_changed_on">同步處理已開啟</string>
+  <string name="quick_settings_sync_label">同步處理</string>
   <string name="quick_settings_volume_panel_label">音量面板</string>
   <string name="quick_settings_usb_tether_label">USB 網路共享</string>
   <string name="quick_settings_screen_timeout_detail_title">螢幕逾時</string>
-  <string name="quick_settings_lockscreen_label">鎖定螢幕</string>
+  <string name="quick_settings_lockscreen_label">鎖定畫面</string>
   <string name="quick_settings_ambient_display_label">環境顯示</string>
-  <string name="quick_settings_lockscreen_label_enforced">強制執行鎖定螢幕</string>
+  <string name="quick_settings_lockscreen_label_enforced">強制執行鎖定畫面</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">已由設定檔停用</string>
   <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">螢幕逾時：<xliff:g id="timeout" example="30 seconds">%s</xliff:g></string>
   <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_screen_timeout_changed">螢幕逾時即可更改為 <xliff:g id="timeout" example="30 seconds">%s</xliff:g></string>
+  <string name="accessibility_quick_settings_screen_timeout_changed">螢幕逾時即可變更為 <xliff:g id="timeout" example="30 seconds">%s</xliff:g></string>
   <string name="qs_tile_performance">電池模式</string>
   <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">電池模式：省電模式。</string>
@@ -123,24 +123,24 @@
   <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">電池模式：快速模式。</string>
   <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">電池模式已更改為省電模式。</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">電池模式已變更為省電模式。</string>
   <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_bal">電池模式已更改為平衡模式。</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_bal">電池模式已變更為平衡模式。</string>
   <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_perf">電池模式已更改為高效能模式。</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">電池模式已變更為高效能模式。</string>
   <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">電池模式已更改為效率模式。</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">電池模式已變更為效率模式。</string>
   <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">電池模式已更改為快速模式。</string>
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">電池模式已變更為快速模式。</string>
   <string name="quick_settings_performance_profile_detail_title">電池模式</string>
   <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_lock_screen_off">鎖定螢幕關閉</string>
+  <string name="accessibility_quick_settings_lock_screen_off">鎖定畫面關閉</string>
   <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_lock_screen_on">鎖定螢幕開啟</string>
+  <string name="accessibility_quick_settings_lock_screen_on">鎖定畫面開啟</string>
   <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_lock_screen_changed_off">鎖定螢幕已關閉</string>
+  <string name="accessibility_quick_settings_lock_screen_changed_off">鎖定畫面已關閉</string>
   <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_lock_screen_changed_on">鎖定螢幕已開啟</string>
+  <string name="accessibility_quick_settings_lock_screen_changed_on">鎖定畫面已開啟</string>
   <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">環境顯示關閉</string>
   <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -170,40 +170,40 @@
   <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">省電模式已開啟</string>
   <!-- Dynamic tiles -->
-  <string name="quick_settings_dynamic_tile_detail_title">動態磚</string>
+  <string name="quick_settings_dynamic_tile_detail_title">動態圖塊</string>
   <string name="dynamic_qs_tile_next_alarm_label">下一個鬧鐘</string>
   <string name="dynamic_qs_tile_ime_selector_label">輸入法選擇器</string>
   <string name="dynamic_qs_tile_su_label">Root 權限</string>
   <string name="dynamic_qs_tile_themes_label">主題</string>
   <string name="quick_settings_title_advanced_location">三角定位</string>
   <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_battery_saving">位置回報：節約耗電量</string>
+  <string name="accessibility_quick_settings_location_battery_saving">位置回報：省電模式。</string>
   <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_gps_only">位置回報：僅限裝置</string>
+  <string name="accessibility_quick_settings_location_gps_only">位置回報：僅限感應器模式。</string>
   <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_high_accuracy">位置回報：高精確度</string>
+  <string name="accessibility_quick_settings_location_high_accuracy">位置回報：高精確度模式。</string>
   <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">定位模式</string>
   <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
-  <string name="quick_settings_location_battery_saving_label">節約耗電量</string>
+  <string name="quick_settings_location_battery_saving_label">省電模式</string>
   <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">僅限裝置</string>
   <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">高精確度</string>
   <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_changed_battery_saving">位置回報已更改為省電模式。</string>
+  <string name="accessibility_quick_settings_location_changed_battery_saving">位置回報已變更為省電模式。</string>
   <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_changed_gps_only">位置回報已更改為僅感應器模式。</string>
+  <string name="accessibility_quick_settings_location_changed_gps_only">位置回報已變更為僅限感應器模式。</string>
   <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_quick_settings_location_changed_high_accuracy">位置回報已更改為高精確度模式。</string>
-  <string name="quick_settings_tiles_category_system">系統瓷磚</string>
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">位置回報已變更為高精確度模式。</string>
+  <string name="quick_settings_tiles_category_system">系統圖塊</string>
   <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">新增瓷磚</string>
   <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">飛航模式啟用時無法連線行動網路，請停用飛航模式後再試一次。</string>
   <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">手電筒已經開啟</string>
-  <string name="quick_settings_tile_flashlight_not_summary">點擊關閉</string>
+  <string name="quick_settings_tile_flashlight_not_summary">輕觸即可關閉</string>
   <!-- Wi-Fi hotspot label when enabled -->
   <plurals name="wifi_hotspot_connected_clients_label">
     <item quantity="other">%1$d 客戶端</item>