Automatic translation import

Change-Id: I2fdea62a259ff32c4bd6d182b92fd75aaffdbbc6
Ticket: -

19 files changed, 238 insertions, 4 deletions

diff --git a/Settings/res/values-as-rIN/strings.xml b/Settings/res/values-as-rIN/strings.xml
index be14cfcb..04d039ec 100644
--- a/Settings/res/values-as-rIN/strings.xml
+++ b/Settings/res/values-as-rIN/strings.xml
@@ -20,11 +20,13 @@
   <!-- Leanback Launcher App Title for Network settings app [CHAR LIMIT=40] -->
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <!-- Top level headers -->
+  <skip></skip>
   <!-- Header title for device [CHAR LIMIT=50] -->
   <!-- Header title for preferences [CHAR LIMIT=50] -->
   <!-- Header title for accessories [CHAR LIMIT=50] -->
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <!-- Account preferences -->
+  <skip></skip>
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
   <!-- Header for sync [CHAR LIMIT=50] -->
   <!-- Header for remove account [CHAR LIMIT=50] -->
@@ -38,6 +40,7 @@
   <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <!-- Connectivity preferences -->
+  <skip></skip>
   <!-- Top level network card title. [CHAR LIMIT=50] -->
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages ethernet settings. [CHAR LIMIT=50] -->
@@ -45,6 +48,7 @@
   <!-- Context help for always scan wifi. [CHAR LIMIT=200] -->
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
+  <skip></skip>
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
   <!-- Preference and title which changes system sounds settings. [CHAR LIMIT=50] -->
@@ -60,6 +64,7 @@
   <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing. [CHAR LIMIT=50] -->
@@ -74,6 +79,7 @@
   <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <!-- Description text for autopairing when the user is in the pairing activity due to pressing the back HW button.  %1 will be replaced with the countdown value. [CHAR LIMIT=150] -->
@@ -91,6 +97,7 @@
   <!-- Action title for Confirming the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- System -->
+  <skip></skip>
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
@@ -105,6 +112,7 @@
   <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
   <!-- Preference which manages Diagnostic and Usage reporting -->
   <!-- About -->
+  <skip></skip>
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
   <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
@@ -122,6 +130,7 @@
   <!-- Device Info screen. Confirmation that developer settings are enabled [CHAR LIMIT=NONE] -->
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
   <!-- Wifi -->
+  <skip></skip>
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <!-- titles for connection status -->
   <!-- label mac address [CHAR LIMIT=50] -->
@@ -411,6 +420,7 @@
   <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- General use strings -->
+  <skip></skip>
   <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
   <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
   <!-- Title for a status description saying that a feature is on [CHAR LIMIT=30] -->
@@ -418,6 +428,7 @@
   <!-- Title for action which denotes the user agrees [CHAR LIMIT=50] -->
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
   <!-- Security -->
+  <skip></skip>
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
   <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
@@ -512,6 +523,7 @@
   <!-- Title for action to change the PIN code to use when exiting restricted profile [CHAR LIMIT=100] -->
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
   <!-- PIN UX -->
+  <eat-comment></eat-comment>
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
@@ -564,6 +576,7 @@
   <!-- Daydream description for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=NONE] -->
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
   <!-- Privacy choice for choosing which account to backup [CHAR LIMIT=40] -->
diff --git a/Settings/res/values-ast-rES/strings.xml b/Settings/res/values-ast-rES/strings.xml
index 4137195c..da3b17f9 100644
--- a/Settings/res/values-ast-rES/strings.xml
+++ b/Settings/res/values-ast-rES/strings.xml
@@ -20,11 +20,13 @@
   <!-- Leanback Launcher App Title for Network settings app [CHAR LIMIT=40] -->
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <!-- Top level headers -->
+  <skip></skip>
   <!-- Header title for device [CHAR LIMIT=50] -->
   <!-- Header title for preferences [CHAR LIMIT=50] -->
   <!-- Header title for accessories [CHAR LIMIT=50] -->
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <!-- Account preferences -->
+  <skip></skip>
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
   <!-- Header for sync [CHAR LIMIT=50] -->
   <!-- Header for remove account [CHAR LIMIT=50] -->
@@ -38,6 +40,7 @@
   <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <!-- Connectivity preferences -->
+  <skip></skip>
   <!-- Top level network card title. [CHAR LIMIT=50] -->
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages ethernet settings. [CHAR LIMIT=50] -->
@@ -47,6 +50,7 @@
   <string name="wifi_setting_always_scan_context">Dexa que\'l serviciu d\'allugamientu de Google y otres aplicaciones gueten redes, incluso tando\'l Wi-Fi apagáu</string>
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
+  <skip></skip>
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
   <!-- Preference and title which changes system sounds settings. [CHAR LIMIT=50] -->
@@ -62,6 +66,7 @@
   <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing. [CHAR LIMIT=50] -->
@@ -77,6 +82,7 @@
   <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <!-- Description text for autopairing when the user is in the pairing activity due to pressing the back HW button.  %1 will be replaced with the countdown value. [CHAR LIMIT=150] -->
@@ -94,6 +100,7 @@
   <!-- Action title for Confirming the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- System -->
+  <skip></skip>
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
@@ -109,6 +116,7 @@
   <!-- Preference which manages Diagnostic and Usage reporting -->
   <string name="system_diagnostic">Usu y diagnósticos</string>
   <!-- About -->
+  <skip></skip>
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
   <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
@@ -126,6 +134,7 @@
   <!-- Device Info screen. Confirmation that developer settings are enabled [CHAR LIMIT=NONE] -->
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
   <!-- Wifi -->
+  <skip></skip>
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <!-- titles for connection status -->
   <!-- label mac address [CHAR LIMIT=50] -->
@@ -476,6 +485,7 @@
   <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- General use strings -->
+  <skip></skip>
   <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
   <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
   <!-- Title for a status description saying that a feature is on [CHAR LIMIT=30] -->
@@ -483,6 +493,7 @@
   <!-- Title for action which denotes the user agrees [CHAR LIMIT=50] -->
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
   <!-- Security -->
+  <skip></skip>
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
   <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
@@ -581,6 +592,7 @@
   <!-- Title for action to change the PIN code to use when exiting restricted profile [CHAR LIMIT=100] -->
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
   <!-- PIN UX -->
+  <eat-comment></eat-comment>
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
@@ -666,6 +678,7 @@
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
   <string name="backup_configure_account_default_summary">Nesti momentu, nenguna cuenta almacena copies de seguranza de los datos.</string>
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <string name="backup_erase_dialog_message">¿Quies dexar de guardar copies de seguranza de contraseñes Wi-Fi, marcadores, configuraciones, datos d\'apps y desaniciar toles copies de los sirvidores de Google?</string>
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
diff --git a/Settings/res/values-br-rFR/strings.xml b/Settings/res/values-br-rFR/strings.xml
index be14cfcb..04d039ec 100644
--- a/Settings/res/values-br-rFR/strings.xml
+++ b/Settings/res/values-br-rFR/strings.xml
@@ -20,11 +20,13 @@
   <!-- Leanback Launcher App Title for Network settings app [CHAR LIMIT=40] -->
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <!-- Top level headers -->
+  <skip></skip>
   <!-- Header title for device [CHAR LIMIT=50] -->
   <!-- Header title for preferences [CHAR LIMIT=50] -->
   <!-- Header title for accessories [CHAR LIMIT=50] -->
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <!-- Account preferences -->
+  <skip></skip>
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
   <!-- Header for sync [CHAR LIMIT=50] -->
   <!-- Header for remove account [CHAR LIMIT=50] -->
@@ -38,6 +40,7 @@
   <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <!-- Connectivity preferences -->
+  <skip></skip>
   <!-- Top level network card title. [CHAR LIMIT=50] -->
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages ethernet settings. [CHAR LIMIT=50] -->
@@ -45,6 +48,7 @@
   <!-- Context help for always scan wifi. [CHAR LIMIT=200] -->
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
+  <skip></skip>
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
   <!-- Preference and title which changes system sounds settings. [CHAR LIMIT=50] -->
@@ -60,6 +64,7 @@
   <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing. [CHAR LIMIT=50] -->
@@ -74,6 +79,7 @@
   <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <!-- Description text for autopairing when the user is in the pairing activity due to pressing the back HW button.  %1 will be replaced with the countdown value. [CHAR LIMIT=150] -->
@@ -91,6 +97,7 @@
   <!-- Action title for Confirming the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- System -->
+  <skip></skip>
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
@@ -105,6 +112,7 @@
   <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
   <!-- Preference which manages Diagnostic and Usage reporting -->
   <!-- About -->
+  <skip></skip>
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
   <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
@@ -122,6 +130,7 @@
   <!-- Device Info screen. Confirmation that developer settings are enabled [CHAR LIMIT=NONE] -->
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
   <!-- Wifi -->
+  <skip></skip>
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <!-- titles for connection status -->
   <!-- label mac address [CHAR LIMIT=50] -->
@@ -411,6 +420,7 @@
   <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- General use strings -->
+  <skip></skip>
   <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
   <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
   <!-- Title for a status description saying that a feature is on [CHAR LIMIT=30] -->
@@ -418,6 +428,7 @@
   <!-- Title for action which denotes the user agrees [CHAR LIMIT=50] -->
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
   <!-- Security -->
+  <skip></skip>
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
   <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
@@ -512,6 +523,7 @@
   <!-- Title for action to change the PIN code to use when exiting restricted profile [CHAR LIMIT=100] -->
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
   <!-- PIN UX -->
+  <eat-comment></eat-comment>
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
@@ -564,6 +576,7 @@
   <!-- Daydream description for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=NONE] -->
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
   <!-- Privacy choice for choosing which account to backup [CHAR LIMIT=40] -->
diff --git a/Settings/res/values-csb-rPL/strings.xml b/Settings/res/values-csb-rPL/strings.xml
index be14cfcb..04d039ec 100644
--- a/Settings/res/values-csb-rPL/strings.xml
+++ b/Settings/res/values-csb-rPL/strings.xml
@@ -20,11 +20,13 @@
   <!-- Leanback Launcher App Title for Network settings app [CHAR LIMIT=40] -->
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <!-- Top level headers -->
+  <skip></skip>
   <!-- Header title for device [CHAR LIMIT=50] -->
   <!-- Header title for preferences [CHAR LIMIT=50] -->
   <!-- Header title for accessories [CHAR LIMIT=50] -->
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <!-- Account preferences -->
+  <skip></skip>
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
   <!-- Header for sync [CHAR LIMIT=50] -->
   <!-- Header for remove account [CHAR LIMIT=50] -->
@@ -38,6 +40,7 @@
   <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <!-- Connectivity preferences -->
+  <skip></skip>
   <!-- Top level network card title. [CHAR LIMIT=50] -->
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages ethernet settings. [CHAR LIMIT=50] -->
@@ -45,6 +48,7 @@
   <!-- Context help for always scan wifi. [CHAR LIMIT=200] -->
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
+  <skip></skip>
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
   <!-- Preference and title which changes system sounds settings. [CHAR LIMIT=50] -->
@@ -60,6 +64,7 @@
   <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing. [CHAR LIMIT=50] -->
@@ -74,6 +79,7 @@
   <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <!-- Description text for autopairing when the user is in the pairing activity due to pressing the back HW button.  %1 will be replaced with the countdown value. [CHAR LIMIT=150] -->
@@ -91,6 +97,7 @@
   <!-- Action title for Confirming the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- System -->
+  <skip></skip>
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
@@ -105,6 +112,7 @@
   <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
   <!-- Preference which manages Diagnostic and Usage reporting -->
   <!-- About -->
+  <skip></skip>
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
   <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
@@ -122,6 +130,7 @@
   <!-- Device Info screen. Confirmation that developer settings are enabled [CHAR LIMIT=NONE] -->
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
   <!-- Wifi -->
+  <skip></skip>
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <!-- titles for connection status -->
   <!-- label mac address [CHAR LIMIT=50] -->
@@ -411,6 +420,7 @@
   <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- General use strings -->
+  <skip></skip>
   <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
   <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
   <!-- Title for a status description saying that a feature is on [CHAR LIMIT=30] -->
@@ -418,6 +428,7 @@
   <!-- Title for action which denotes the user agrees [CHAR LIMIT=50] -->
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
   <!-- Security -->
+  <skip></skip>
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
   <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
@@ -512,6 +523,7 @@
   <!-- Title for action to change the PIN code to use when exiting restricted profile [CHAR LIMIT=100] -->
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
   <!-- PIN UX -->
+  <eat-comment></eat-comment>
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
@@ -564,6 +576,7 @@
   <!-- Daydream description for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=NONE] -->
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
   <!-- Privacy choice for choosing which account to backup [CHAR LIMIT=40] -->
diff --git a/Settings/res/values-cy/strings.xml b/Settings/res/values-cy/strings.xml
index be14cfcb..04d039ec 100644
--- a/Settings/res/values-cy/strings.xml
+++ b/Settings/res/values-cy/strings.xml
@@ -20,11 +20,13 @@
   <!-- Leanback Launcher App Title for Network settings app [CHAR LIMIT=40] -->
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <!-- Top level headers -->
+  <skip></skip>
   <!-- Header title for device [CHAR LIMIT=50] -->
   <!-- Header title for preferences [CHAR LIMIT=50] -->
   <!-- Header title for accessories [CHAR LIMIT=50] -->
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <!-- Account preferences -->
+  <skip></skip>
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
   <!-- Header for sync [CHAR LIMIT=50] -->
   <!-- Header for remove account [CHAR LIMIT=50] -->
@@ -38,6 +40,7 @@
   <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <!-- Connectivity preferences -->
+  <skip></skip>
   <!-- Top level network card title. [CHAR LIMIT=50] -->
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages ethernet settings. [CHAR LIMIT=50] -->
@@ -45,6 +48,7 @@
   <!-- Context help for always scan wifi. [CHAR LIMIT=200] -->
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
+  <skip></skip>
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
   <!-- Preference and title which changes system sounds settings. [CHAR LIMIT=50] -->
@@ -60,6 +64,7 @@
   <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing. [CHAR LIMIT=50] -->
@@ -74,6 +79,7 @@
   <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <!-- Description text for autopairing when the user is in the pairing activity due to pressing the back HW button.  %1 will be replaced with the countdown value. [CHAR LIMIT=150] -->
@@ -91,6 +97,7 @@
   <!-- Action title for Confirming the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- System -->
+  <skip></skip>
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
@@ -105,6 +112,7 @@
   <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
   <!-- Preference which manages Diagnostic and Usage reporting -->
   <!-- About -->
+  <skip></skip>
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
   <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
@@ -122,6 +130,7 @@
   <!-- Device Info screen. Confirmation that developer settings are enabled [CHAR LIMIT=NONE] -->
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
   <!-- Wifi -->
+  <skip></skip>
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <!-- titles for connection status -->
   <!-- label mac address [CHAR LIMIT=50] -->
@@ -411,6 +420,7 @@
   <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- General use strings -->
+  <skip></skip>
   <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
   <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
   <!-- Title for a status description saying that a feature is on [CHAR LIMIT=30] -->
@@ -418,6 +428,7 @@
   <!-- Title for action which denotes the user agrees [CHAR LIMIT=50] -->
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
   <!-- Security -->
+  <skip></skip>
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
   <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
@@ -512,6 +523,7 @@
   <!-- Title for action to change the PIN code to use when exiting restricted profile [CHAR LIMIT=100] -->
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
   <!-- PIN UX -->
+  <eat-comment></eat-comment>
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
@@ -564,6 +576,7 @@
   <!-- Daydream description for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=NONE] -->
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
   <!-- Privacy choice for choosing which account to backup [CHAR LIMIT=40] -->
diff --git a/Settings/res/values-en-rPT/strings.xml b/Settings/res/values-en-rPT/strings.xml
index be14cfcb..04d039ec 100644
--- a/Settings/res/values-en-rPT/strings.xml
+++ b/Settings/res/values-en-rPT/strings.xml
@@ -20,11 +20,13 @@
   <!-- Leanback Launcher App Title for Network settings app [CHAR LIMIT=40] -->
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <!-- Top level headers -->
+  <skip></skip>
   <!-- Header title for device [CHAR LIMIT=50] -->
   <!-- Header title for preferences [CHAR LIMIT=50] -->
   <!-- Header title for accessories [CHAR LIMIT=50] -->
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <!-- Account preferences -->
+  <skip></skip>
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
   <!-- Header for sync [CHAR LIMIT=50] -->
   <!-- Header for remove account [CHAR LIMIT=50] -->
@@ -38,6 +40,7 @@
   <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <!-- Connectivity preferences -->
+  <skip></skip>
   <!-- Top level network card title. [CHAR LIMIT=50] -->
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages ethernet settings. [CHAR LIMIT=50] -->
@@ -45,6 +48,7 @@
   <!-- Context help for always scan wifi. [CHAR LIMIT=200] -->
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
+  <skip></skip>
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
   <!-- Preference and title which changes system sounds settings. [CHAR LIMIT=50] -->
@@ -60,6 +64,7 @@
   <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing. [CHAR LIMIT=50] -->
@@ -74,6 +79,7 @@
   <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <!-- Description text for autopairing when the user is in the pairing activity due to pressing the back HW button.  %1 will be replaced with the countdown value. [CHAR LIMIT=150] -->
@@ -91,6 +97,7 @@
   <!-- Action title for Confirming the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- System -->
+  <skip></skip>
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
@@ -105,6 +112,7 @@
   <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
   <!-- Preference which manages Diagnostic and Usage reporting -->
   <!-- About -->
+  <skip></skip>
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
   <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
@@ -122,6 +130,7 @@
   <!-- Device Info screen. Confirmation that developer settings are enabled [CHAR LIMIT=NONE] -->
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
   <!-- Wifi -->
+  <skip></skip>
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <!-- titles for connection status -->
   <!-- label mac address [CHAR LIMIT=50] -->
@@ -411,6 +420,7 @@
   <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- General use strings -->
+  <skip></skip>
   <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
   <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
   <!-- Title for a status description saying that a feature is on [CHAR LIMIT=30] -->
@@ -418,6 +428,7 @@
   <!-- Title for action which denotes the user agrees [CHAR LIMIT=50] -->
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
   <!-- Security -->
+  <skip></skip>
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
   <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
@@ -512,6 +523,7 @@
   <!-- Title for action to change the PIN code to use when exiting restricted profile [CHAR LIMIT=100] -->
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
   <!-- PIN UX -->
+  <eat-comment></eat-comment>
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
@@ -564,6 +576,7 @@
   <!-- Daydream description for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=NONE] -->
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
   <!-- Privacy choice for choosing which account to backup [CHAR LIMIT=40] -->
diff --git a/Settings/res/values-eo/strings.xml b/Settings/res/values-eo/strings.xml
index b27c4077..e57b4df0 100644
--- a/Settings/res/values-eo/strings.xml
+++ b/Settings/res/values-eo/strings.xml
@@ -23,12 +23,14 @@
   <string name="launcher_network_app_name">Reto</string>
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <!-- Top level headers -->
+  <skip></skip>
   <!-- Header title for device [CHAR LIMIT=50] -->
   <string name="header_category_device">Aparato</string>
   <!-- Header title for preferences [CHAR LIMIT=50] -->
   <!-- Header title for accessories [CHAR LIMIT=50] -->
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <!-- Account preferences -->
+  <skip></skip>
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
   <string name="add_account">Aldoni konton</string>
   <!-- Header for sync [CHAR LIMIT=50] -->
@@ -43,6 +45,7 @@
   <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <!-- Connectivity preferences -->
+  <skip></skip>
   <!-- Top level network card title. [CHAR LIMIT=50] -->
   <string name="connectivity_network">Reto</string>
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
@@ -51,6 +54,7 @@
   <!-- Context help for always scan wifi. [CHAR LIMIT=200] -->
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
+  <skip></skip>
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
   <!-- Preference and title which changes system sounds settings. [CHAR LIMIT=50] -->
@@ -67,6 +71,7 @@
   <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing. [CHAR LIMIT=50] -->
@@ -82,6 +87,7 @@
   <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <!-- Description text for autopairing when the user is in the pairing activity due to pressing the back HW button.  %1 will be replaced with the countdown value. [CHAR LIMIT=150] -->
@@ -100,6 +106,7 @@
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <string name="bluetooth_cancel">Nuligi</string>
   <!-- System -->
+  <skip></skip>
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
@@ -118,6 +125,7 @@
   <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
   <!-- Preference which manages Diagnostic and Usage reporting -->
   <!-- About -->
+  <skip></skip>
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
   <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
@@ -136,6 +144,7 @@
   <!-- Device Info screen. Confirmation that developer settings are enabled [CHAR LIMIT=NONE] -->
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
   <!-- Wifi -->
+  <skip></skip>
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <!-- titles for connection status -->
   <!-- label mac address [CHAR LIMIT=50] -->
@@ -431,6 +440,7 @@
   <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- General use strings -->
+  <skip></skip>
   <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
   <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
   <!-- Title for a status description saying that a feature is on [CHAR LIMIT=30] -->
@@ -438,6 +448,7 @@
   <!-- Title for action which denotes the user agrees [CHAR LIMIT=50] -->
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
   <!-- Security -->
+  <skip></skip>
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
   <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
@@ -536,6 +547,7 @@
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
   <string name="restriction_description"><xliff:g id="description">%1$s</xliff:g>\n<xliff:g id="value">%2$s</xliff:g></string>
   <!-- PIN UX -->
+  <eat-comment></eat-comment>
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
@@ -590,6 +602,7 @@
   <!-- Daydream description for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=NONE] -->
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
   <!-- Privacy choice for choosing which account to backup [CHAR LIMIT=40] -->
diff --git a/Settings/res/values-es-rCO/strings.xml b/Settings/res/values-es-rCO/strings.xml
index be14cfcb..04d039ec 100644
--- a/Settings/res/values-es-rCO/strings.xml
+++ b/Settings/res/values-es-rCO/strings.xml
@@ -20,11 +20,13 @@
   <!-- Leanback Launcher App Title for Network settings app [CHAR LIMIT=40] -->
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <!-- Top level headers -->
+  <skip></skip>
   <!-- Header title for device [CHAR LIMIT=50] -->
   <!-- Header title for preferences [CHAR LIMIT=50] -->
   <!-- Header title for accessories [CHAR LIMIT=50] -->
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <!-- Account preferences -->
+  <skip></skip>
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
   <!-- Header for sync [CHAR LIMIT=50] -->
   <!-- Header for remove account [CHAR LIMIT=50] -->
@@ -38,6 +40,7 @@
   <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <!-- Connectivity preferences -->
+  <skip></skip>
   <!-- Top level network card title. [CHAR LIMIT=50] -->
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages ethernet settings. [CHAR LIMIT=50] -->
@@ -45,6 +48,7 @@
   <!-- Context help for always scan wifi. [CHAR LIMIT=200] -->
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
+  <skip></skip>
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
   <!-- Preference and title which changes system sounds settings. [CHAR LIMIT=50] -->
@@ -60,6 +64,7 @@
   <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing. [CHAR LIMIT=50] -->
@@ -74,6 +79,7 @@
   <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <!-- Description text for autopairing when the user is in the pairing activity due to pressing the back HW button.  %1 will be replaced with the countdown value. [CHAR LIMIT=150] -->
@@ -91,6 +97,7 @@
   <!-- Action title for Confirming the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- System -->
+  <skip></skip>
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
@@ -105,6 +112,7 @@
   <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
   <!-- Preference which manages Diagnostic and Usage reporting -->
   <!-- About -->
+  <skip></skip>
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
   <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
@@ -122,6 +130,7 @@
   <!-- Device Info screen. Confirmation that developer settings are enabled [CHAR LIMIT=NONE] -->
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
   <!-- Wifi -->
+  <skip></skip>
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <!-- titles for connection status -->
   <!-- label mac address [CHAR LIMIT=50] -->
@@ -411,6 +420,7 @@
   <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- General use strings -->
+  <skip></skip>
   <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
   <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
   <!-- Title for a status description saying that a feature is on [CHAR LIMIT=30] -->
@@ -418,6 +428,7 @@
   <!-- Title for action which denotes the user agrees [CHAR LIMIT=50] -->
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
   <!-- Security -->
+  <skip></skip>
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
   <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
@@ -512,6 +523,7 @@
   <!-- Title for action to change the PIN code to use when exiting restricted profile [CHAR LIMIT=100] -->
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
   <!-- PIN UX -->
+  <eat-comment></eat-comment>
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
@@ -564,6 +576,7 @@
   <!-- Daydream description for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=NONE] -->
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
   <!-- Privacy choice for choosing which account to backup [CHAR LIMIT=40] -->
diff --git a/Settings/res/values-es-rMX/strings.xml b/Settings/res/values-es-rMX/strings.xml
index be14cfcb..04d039ec 100644
--- a/Settings/res/values-es-rMX/strings.xml
+++ b/Settings/res/values-es-rMX/strings.xml
@@ -20,11 +20,13 @@
   <!-- Leanback Launcher App Title for Network settings app [CHAR LIMIT=40] -->
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <!-- Top level headers -->
+  <skip></skip>
   <!-- Header title for device [CHAR LIMIT=50] -->
   <!-- Header title for preferences [CHAR LIMIT=50] -->
   <!-- Header title for accessories [CHAR LIMIT=50] -->
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <!-- Account preferences -->
+  <skip></skip>
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
   <!-- Header for sync [CHAR LIMIT=50] -->
   <!-- Header for remove account [CHAR LIMIT=50] -->
@@ -38,6 +40,7 @@
   <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <!-- Connectivity preferences -->
+  <skip></skip>
   <!-- Top level network card title. [CHAR LIMIT=50] -->
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages ethernet settings. [CHAR LIMIT=50] -->
@@ -45,6 +48,7 @@
   <!-- Context help for always scan wifi. [CHAR LIMIT=200] -->
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
+  <skip></skip>
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
   <!-- Preference and title which changes system sounds settings. [CHAR LIMIT=50] -->
@@ -60,6 +64,7 @@
   <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing. [CHAR LIMIT=50] -->
@@ -74,6 +79,7 @@
   <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <!-- Description text for autopairing when the user is in the pairing activity due to pressing the back HW button.  %1 will be replaced with the countdown value. [CHAR LIMIT=150] -->
@@ -91,6 +97,7 @@
   <!-- Action title for Confirming the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- System -->
+  <skip></skip>
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
@@ -105,6 +112,7 @@
   <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
   <!-- Preference which manages Diagnostic and Usage reporting -->
   <!-- About -->
+  <skip></skip>
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
   <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
@@ -122,6 +130,7 @@
   <!-- Device Info screen. Confirmation that developer settings are enabled [CHAR LIMIT=NONE] -->
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
   <!-- Wifi -->
+  <skip></skip>
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <!-- titles for connection status -->
   <!-- label mac address [CHAR LIMIT=50] -->
@@ -411,6 +420,7 @@
   <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- General use strings -->
+  <skip></skip>
   <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
   <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
   <!-- Title for a status description saying that a feature is on [CHAR LIMIT=30] -->
@@ -418,6 +428,7 @@
   <!-- Title for action which denotes the user agrees [CHAR LIMIT=50] -->
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
   <!-- Security -->
+  <skip></skip>
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
   <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
@@ -512,6 +523,7 @@
   <!-- Title for action to change the PIN code to use when exiting restricted profile [CHAR LIMIT=100] -->
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
   <!-- PIN UX -->
+  <eat-comment></eat-comment>
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
@@ -564,6 +576,7 @@
   <!-- Daydream description for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=NONE] -->
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
   <!-- Privacy choice for choosing which account to backup [CHAR LIMIT=40] -->
diff --git a/Settings/res/values-frp-rIT/strings.xml b/Settings/res/values-frp-rIT/strings.xml
index be14cfcb..04d039ec 100644
--- a/Settings/res/values-frp-rIT/strings.xml
+++ b/Settings/res/values-frp-rIT/strings.xml
@@ -20,11 +20,13 @@
   <!-- Leanback Launcher App Title for Network settings app [CHAR LIMIT=40] -->
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <!-- Top level headers -->
+  <skip></skip>
   <!-- Header title for device [CHAR LIMIT=50] -->
   <!-- Header title for preferences [CHAR LIMIT=50] -->
   <!-- Header title for accessories [CHAR LIMIT=50] -->
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <!-- Account preferences -->
+  <skip></skip>
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
   <!-- Header for sync [CHAR LIMIT=50] -->
   <!-- Header for remove account [CHAR LIMIT=50] -->
@@ -38,6 +40,7 @@
   <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <!-- Connectivity preferences -->
+  <skip></skip>
   <!-- Top level network card title. [CHAR LIMIT=50] -->
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages ethernet settings. [CHAR LIMIT=50] -->
@@ -45,6 +48,7 @@
   <!-- Context help for always scan wifi. [CHAR LIMIT=200] -->
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
+  <skip></skip>
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
   <!-- Preference and title which changes system sounds settings. [CHAR LIMIT=50] -->
@@ -60,6 +64,7 @@
   <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing. [CHAR LIMIT=50] -->
@@ -74,6 +79,7 @@
   <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <!-- Description text for autopairing when the user is in the pairing activity due to pressing the back HW button.  %1 will be replaced with the countdown value. [CHAR LIMIT=150] -->
@@ -91,6 +97,7 @@
   <!-- Action title for Confirming the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- System -->
+  <skip></skip>
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
@@ -105,6 +112,7 @@
   <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
   <!-- Preference which manages Diagnostic and Usage reporting -->
   <!-- About -->
+  <skip></skip>
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
   <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
@@ -122,6 +130,7 @@
   <!-- Device Info screen. Confirmation that developer settings are enabled [CHAR LIMIT=NONE] -->
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
   <!-- Wifi -->
+  <skip></skip>
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <!-- titles for connection status -->
   <!-- label mac address [CHAR LIMIT=50] -->
@@ -411,6 +420,7 @@
   <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- General use strings -->
+  <skip></skip>
   <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
   <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
   <!-- Title for a status description saying that a feature is on [CHAR LIMIT=30] -->
@@ -418,6 +428,7 @@
   <!-- Title for action which denotes the user agrees [CHAR LIMIT=50] -->
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
   <!-- Security -->
+  <skip></skip>
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
   <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
@@ -512,6 +523,7 @@
   <!-- Title for action to change the PIN code to use when exiting restricted profile [CHAR LIMIT=100] -->
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
   <!-- PIN UX -->
+  <eat-comment></eat-comment>
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
@@ -564,6 +576,7 @@
   <!-- Daydream description for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=NONE] -->
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
   <!-- Privacy choice for choosing which account to backup [CHAR LIMIT=40] -->
diff --git a/Settings/res/values-fy-rNL/strings.xml b/Settings/res/values-fy-rNL/strings.xml
index be14cfcb..04d039ec 100644
--- a/Settings/res/values-fy-rNL/strings.xml
+++ b/Settings/res/values-fy-rNL/strings.xml
@@ -20,11 +20,13 @@
   <!-- Leanback Launcher App Title for Network settings app [CHAR LIMIT=40] -->
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <!-- Top level headers -->
+  <skip></skip>
   <!-- Header title for device [CHAR LIMIT=50] -->
   <!-- Header title for preferences [CHAR LIMIT=50] -->
   <!-- Header title for accessories [CHAR LIMIT=50] -->
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <!-- Account preferences -->
+  <skip></skip>
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
   <!-- Header for sync [CHAR LIMIT=50] -->
   <!-- Header for remove account [CHAR LIMIT=50] -->
@@ -38,6 +40,7 @@
   <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <!-- Connectivity preferences -->
+  <skip></skip>
   <!-- Top level network card title. [CHAR LIMIT=50] -->
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages ethernet settings. [CHAR LIMIT=50] -->
@@ -45,6 +48,7 @@
   <!-- Context help for always scan wifi. [CHAR LIMIT=200] -->
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
+  <skip></skip>
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
   <!-- Preference and title which changes system sounds settings. [CHAR LIMIT=50] -->
@@ -60,6 +64,7 @@
   <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing. [CHAR LIMIT=50] -->
@@ -74,6 +79,7 @@
   <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <!-- Description text for autopairing when the user is in the pairing activity due to pressing the back HW button.  %1 will be replaced with the countdown value. [CHAR LIMIT=150] -->
@@ -91,6 +97,7 @@
   <!-- Action title for Confirming the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- System -->
+  <skip></skip>
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
@@ -105,6 +112,7 @@
   <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
   <!-- Preference which manages Diagnostic and Usage reporting -->
   <!-- About -->
+  <skip></skip>
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
   <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
@@ -122,6 +130,7 @@
   <!-- Device Info screen. Confirmation that developer settings are enabled [CHAR LIMIT=NONE] -->
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
   <!-- Wifi -->
+  <skip></skip>
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <!-- titles for connection status -->
   <!-- label mac address [CHAR LIMIT=50] -->
@@ -411,6 +420,7 @@
   <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- General use strings -->
+  <skip></skip>
   <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
   <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
   <!-- Title for a status description saying that a feature is on [CHAR LIMIT=30] -->
@@ -418,6 +428,7 @@
   <!-- Title for action which denotes the user agrees [CHAR LIMIT=50] -->
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
   <!-- Security -->
+  <skip></skip>
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
   <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
@@ -512,6 +523,7 @@
   <!-- Title for action to change the PIN code to use when exiting restricted profile [CHAR LIMIT=100] -->
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
   <!-- PIN UX -->
+  <eat-comment></eat-comment>
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
@@ -564,6 +576,7 @@
   <!-- Daydream description for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=NONE] -->
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
   <!-- Privacy choice for choosing which account to backup [CHAR LIMIT=40] -->
diff --git a/Settings/res/values-ga-rIE/strings.xml b/Settings/res/values-ga-rIE/strings.xml
index be14cfcb..04d039ec 100644
--- a/Settings/res/values-ga-rIE/strings.xml
+++ b/Settings/res/values-ga-rIE/strings.xml
@@ -20,11 +20,13 @@
   <!-- Leanback Launcher App Title for Network settings app [CHAR LIMIT=40] -->
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <!-- Top level headers -->
+  <skip></skip>
   <!-- Header title for device [CHAR LIMIT=50] -->
   <!-- Header title for preferences [CHAR LIMIT=50] -->
   <!-- Header title for accessories [CHAR LIMIT=50] -->
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <!-- Account preferences -->
+  <skip></skip>
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
   <!-- Header for sync [CHAR LIMIT=50] -->
   <!-- Header for remove account [CHAR LIMIT=50] -->
@@ -38,6 +40,7 @@
   <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <!-- Connectivity preferences -->
+  <skip></skip>
   <!-- Top level network card title. [CHAR LIMIT=50] -->
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages ethernet settings. [CHAR LIMIT=50] -->
@@ -45,6 +48,7 @@
   <!-- Context help for always scan wifi. [CHAR LIMIT=200] -->
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
+  <skip></skip>
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
   <!-- Preference and title which changes system sounds settings. [CHAR LIMIT=50] -->
@@ -60,6 +64,7 @@
   <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing. [CHAR LIMIT=50] -->
@@ -74,6 +79,7 @@
   <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <!-- Description text for autopairing when the user is in the pairing activity due to pressing the back HW button.  %1 will be replaced with the countdown value. [CHAR LIMIT=150] -->
@@ -91,6 +97,7 @@
   <!-- Action title for Confirming the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- System -->
+  <skip></skip>
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
@@ -105,6 +112,7 @@
   <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
   <!-- Preference which manages Diagnostic and Usage reporting -->
   <!-- About -->
+  <skip></skip>
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
   <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
@@ -122,6 +130,7 @@
   <!-- Device Info screen. Confirmation that developer settings are enabled [CHAR LIMIT=NONE] -->
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
   <!-- Wifi -->
+  <skip></skip>
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <!-- titles for connection status -->
   <!-- label mac address [CHAR LIMIT=50] -->
@@ -411,6 +420,7 @@
   <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- General use strings -->
+  <skip></skip>
   <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
   <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
   <!-- Title for a status description saying that a feature is on [CHAR LIMIT=30] -->
@@ -418,6 +428,7 @@
   <!-- Title for action which denotes the user agrees [CHAR LIMIT=50] -->
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
   <!-- Security -->
+  <skip></skip>
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
   <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
@@ -512,6 +523,7 @@
   <!-- Title for action to change the PIN code to use when exiting restricted profile [CHAR LIMIT=100] -->
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
   <!-- PIN UX -->
+  <eat-comment></eat-comment>
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
@@ -564,6 +576,7 @@
   <!-- Daydream description for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=NONE] -->
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
   <!-- Privacy choice for choosing which account to backup [CHAR LIMIT=40] -->
diff --git a/Settings/res/values-gd-rGB/strings.xml b/Settings/res/values-gd-rGB/strings.xml
index be14cfcb..04d039ec 100644
--- a/Settings/res/values-gd-rGB/strings.xml
+++ b/Settings/res/values-gd-rGB/strings.xml
@@ -20,11 +20,13 @@
   <!-- Leanback Launcher App Title for Network settings app [CHAR LIMIT=40] -->
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <!-- Top level headers -->
+  <skip></skip>
   <!-- Header title for device [CHAR LIMIT=50] -->
   <!-- Header title for preferences [CHAR LIMIT=50] -->
   <!-- Header title for accessories [CHAR LIMIT=50] -->
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <!-- Account preferences -->
+  <skip></skip>
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
   <!-- Header for sync [CHAR LIMIT=50] -->
   <!-- Header for remove account [CHAR LIMIT=50] -->
@@ -38,6 +40,7 @@
   <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <!-- Connectivity preferences -->
+  <skip></skip>
   <!-- Top level network card title. [CHAR LIMIT=50] -->
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages ethernet settings. [CHAR LIMIT=50] -->
@@ -45,6 +48,7 @@
   <!-- Context help for always scan wifi. [CHAR LIMIT=200] -->
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
+  <skip></skip>
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
   <!-- Preference and title which changes system sounds settings. [CHAR LIMIT=50] -->
@@ -60,6 +64,7 @@
   <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing. [CHAR LIMIT=50] -->
@@ -74,6 +79,7 @@
   <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <!-- Description text for autopairing when the user is in the pairing activity due to pressing the back HW button.  %1 will be replaced with the countdown value. [CHAR LIMIT=150] -->
@@ -91,6 +97,7 @@
   <!-- Action title for Confirming the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- System -->
+  <skip></skip>
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
@@ -105,6 +112,7 @@
   <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
   <!-- Preference which manages Diagnostic and Usage reporting -->
   <!-- About -->
+  <skip></skip>
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
   <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
@@ -122,6 +130,7 @@
   <!-- Device Info screen. Confirmation that developer settings are enabled [CHAR LIMIT=NONE] -->
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
   <!-- Wifi -->
+  <skip></skip>
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <!-- titles for connection status -->
   <!-- label mac address [CHAR LIMIT=50] -->
@@ -411,6 +420,7 @@
   <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- General use strings -->
+  <skip></skip>
   <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
   <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
   <!-- Title for a status description saying that a feature is on [CHAR LIMIT=30] -->
@@ -418,6 +428,7 @@
   <!-- Title for action which denotes the user agrees [CHAR LIMIT=50] -->
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
   <!-- Security -->
+  <skip></skip>
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
   <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
@@ -512,6 +523,7 @@
   <!-- Title for action to change the PIN code to use when exiting restricted profile [CHAR LIMIT=100] -->
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
   <!-- PIN UX -->
+  <eat-comment></eat-comment>
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
@@ -564,6 +576,7 @@
   <!-- Daydream description for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=NONE] -->
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
   <!-- Privacy choice for choosing which account to backup [CHAR LIMIT=40] -->
diff --git a/Settings/res/values-ku/strings.xml b/Settings/res/values-ku/strings.xml
index be14cfcb..04d039ec 100644
--- a/Settings/res/values-ku/strings.xml
+++ b/Settings/res/values-ku/strings.xml
@@ -20,11 +20,13 @@
   <!-- Leanback Launcher App Title for Network settings app [CHAR LIMIT=40] -->
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <!-- Top level headers -->
+  <skip></skip>
   <!-- Header title for device [CHAR LIMIT=50] -->
   <!-- Header title for preferences [CHAR LIMIT=50] -->
   <!-- Header title for accessories [CHAR LIMIT=50] -->
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <!-- Account preferences -->
+  <skip></skip>
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
   <!-- Header for sync [CHAR LIMIT=50] -->
   <!-- Header for remove account [CHAR LIMIT=50] -->
@@ -38,6 +40,7 @@
   <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <!-- Connectivity preferences -->
+  <skip></skip>
   <!-- Top level network card title. [CHAR LIMIT=50] -->
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages ethernet settings. [CHAR LIMIT=50] -->
@@ -45,6 +48,7 @@
   <!-- Context help for always scan wifi. [CHAR LIMIT=200] -->
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
+  <skip></skip>
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
   <!-- Preference and title which changes system sounds settings. [CHAR LIMIT=50] -->
@@ -60,6 +64,7 @@
   <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing. [CHAR LIMIT=50] -->
@@ -74,6 +79,7 @@
   <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <!-- Description text for autopairing when the user is in the pairing activity due to pressing the back HW button.  %1 will be replaced with the countdown value. [CHAR LIMIT=150] -->
@@ -91,6 +97,7 @@
   <!-- Action title for Confirming the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- System -->
+  <skip></skip>
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
@@ -105,6 +112,7 @@
   <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
   <!-- Preference which manages Diagnostic and Usage reporting -->
   <!-- About -->
+  <skip></skip>
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
   <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
@@ -122,6 +130,7 @@
   <!-- Device Info screen. Confirmation that developer settings are enabled [CHAR LIMIT=NONE] -->
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
   <!-- Wifi -->
+  <skip></skip>
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <!-- titles for connection status -->
   <!-- label mac address [CHAR LIMIT=50] -->
@@ -411,6 +420,7 @@
   <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- General use strings -->
+  <skip></skip>
   <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
   <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
   <!-- Title for a status description saying that a feature is on [CHAR LIMIT=30] -->
@@ -418,6 +428,7 @@
   <!-- Title for action which denotes the user agrees [CHAR LIMIT=50] -->
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
   <!-- Security -->
+  <skip></skip>
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
   <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
@@ -512,6 +523,7 @@
   <!-- Title for action to change the PIN code to use when exiting restricted profile [CHAR LIMIT=100] -->
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
   <!-- PIN UX -->
+  <eat-comment></eat-comment>
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
@@ -564,6 +576,7 @@
   <!-- Daydream description for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=NONE] -->
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
   <!-- Privacy choice for choosing which account to backup [CHAR LIMIT=40] -->
diff --git a/Settings/res/values-lb/strings.xml b/Settings/res/values-lb/strings.xml
index 175d7068..988894f4 100644
--- a/Settings/res/values-lb/strings.xml
+++ b/Settings/res/values-lb/strings.xml
@@ -24,6 +24,7 @@
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <string name="launcher_restricted_profile_app_name">Ageschränkte Profil</string>
   <!-- Top level headers -->
+  <skip></skip>
   <!-- Header title for device [CHAR LIMIT=50] -->
   <string name="header_category_device">Apparat</string>
   <!-- Header title for preferences [CHAR LIMIT=50] -->
@@ -33,6 +34,7 @@
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <string name="header_category_personal">Perséinlech</string>
   <!-- Account preferences -->
+  <skip></skip>
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
   <string name="add_account">Kont dobäisetzen</string>
   <!-- Header for sync [CHAR LIMIT=50] -->
@@ -58,6 +60,7 @@
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <string name="account_remove_failed">Kont kann net ewechgeholl ginn</string>
   <!-- Connectivity preferences -->
+  <skip></skip>
   <!-- Top level network card title. [CHAR LIMIT=50] -->
   <string name="connectivity_network">Netzwierk</string>
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
@@ -69,6 +72,7 @@
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <string name="wifi_setting_enable_wifi">WLAN</string>
   <!-- Device preferences -->
+  <skip></skip>
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <string name="device_daydream">Dagesdram</string>
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
@@ -98,6 +102,7 @@
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
   <string name="apps_running">Lafend App</string>
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
   <string name="accessories_add">Accessoiren dobäisetzen</string>
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
@@ -124,6 +129,7 @@
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <string name="accessory_connected">Verbonnen</string>
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
   <string name="accessories_add_title">Gëtt no Accessoirë gesicht&#8230;</string>
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
@@ -157,6 +163,7 @@
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <string name="bluetooth_cancel">Ofbriechen</string>
   <!-- System -->
+  <skip></skip>
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <string name="system_cast">Google Cast</string>
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
@@ -183,6 +190,7 @@
   <string name="accessibility_none">Keen</string>
   <!-- Preference which manages Diagnostic and Usage reporting -->
   <!-- About -->
+  <skip></skip>
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <string name="about_system_update">Systemaktualiséierungen</string>
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
@@ -219,6 +227,7 @@
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
   <string name="show_dev_already">Net néideg, du bass schonn en Entwéckler</string>
   <!-- Wifi -->
+  <skip></skip>
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <string-array name="wifi_signal_strength">
     <item>Schwaach</item>
@@ -744,6 +753,7 @@
   <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
   <string name="system_desc_profile_gpu_rendering">Rendering-Zäit an adb shell dumpsys gfxinfo moossen</string>
   <!-- General use strings -->
+  <skip></skip>
   <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
   <string name="action_on_title">Un</string>
   <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
@@ -757,6 +767,7 @@
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
   <string name="disagree">Net zoustëmmen</string>
   <!-- Security -->
+  <skip></skip>
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
   <string name="security_unknown_sources_title">Onbekannt Quellen</string>
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
@@ -954,6 +965,7 @@
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
   <string name="restriction_description"><xliff:g id="description">%1$s</xliff:g>\n<xliff:g id="value">%2$s</xliff:g></string>
   <!-- PIN UX -->
+  <eat-comment></eat-comment>
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
   <string name="pin_enter_unlock_channel">Gëff de PIN an, fir dëse Kanal ze gesinn</string>
@@ -1020,6 +1032,7 @@
   <!-- Daydream description for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=NONE] -->
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
   <!-- Privacy choice for choosing which account to backup [CHAR LIMIT=40] -->
diff --git a/Settings/res/values-oc-rFR/strings.xml b/Settings/res/values-oc-rFR/strings.xml
index be14cfcb..04d039ec 100644
--- a/Settings/res/values-oc-rFR/strings.xml
+++ b/Settings/res/values-oc-rFR/strings.xml
@@ -20,11 +20,13 @@
   <!-- Leanback Launcher App Title for Network settings app [CHAR LIMIT=40] -->
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <!-- Top level headers -->
+  <skip></skip>
   <!-- Header title for device [CHAR LIMIT=50] -->
   <!-- Header title for preferences [CHAR LIMIT=50] -->
   <!-- Header title for accessories [CHAR LIMIT=50] -->
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <!-- Account preferences -->
+  <skip></skip>
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
   <!-- Header for sync [CHAR LIMIT=50] -->
   <!-- Header for remove account [CHAR LIMIT=50] -->
@@ -38,6 +40,7 @@
   <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <!-- Connectivity preferences -->
+  <skip></skip>
   <!-- Top level network card title. [CHAR LIMIT=50] -->
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages ethernet settings. [CHAR LIMIT=50] -->
@@ -45,6 +48,7 @@
   <!-- Context help for always scan wifi. [CHAR LIMIT=200] -->
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
+  <skip></skip>
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
   <!-- Preference and title which changes system sounds settings. [CHAR LIMIT=50] -->
@@ -60,6 +64,7 @@
   <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing. [CHAR LIMIT=50] -->
@@ -74,6 +79,7 @@
   <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <!-- Description text for autopairing when the user is in the pairing activity due to pressing the back HW button.  %1 will be replaced with the countdown value. [CHAR LIMIT=150] -->
@@ -91,6 +97,7 @@
   <!-- Action title for Confirming the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- System -->
+  <skip></skip>
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
@@ -105,6 +112,7 @@
   <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
   <!-- Preference which manages Diagnostic and Usage reporting -->
   <!-- About -->
+  <skip></skip>
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
   <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
@@ -122,6 +130,7 @@
   <!-- Device Info screen. Confirmation that developer settings are enabled [CHAR LIMIT=NONE] -->
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
   <!-- Wifi -->
+  <skip></skip>
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <!-- titles for connection status -->
   <!-- label mac address [CHAR LIMIT=50] -->
@@ -411,6 +420,7 @@
   <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- General use strings -->
+  <skip></skip>
   <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
   <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
   <!-- Title for a status description saying that a feature is on [CHAR LIMIT=30] -->
@@ -418,6 +428,7 @@
   <!-- Title for action which denotes the user agrees [CHAR LIMIT=50] -->
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
   <!-- Security -->
+  <skip></skip>
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
   <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
@@ -512,6 +523,7 @@
   <!-- Title for action to change the PIN code to use when exiting restricted profile [CHAR LIMIT=100] -->
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
   <!-- PIN UX -->
+  <eat-comment></eat-comment>
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
@@ -564,6 +576,7 @@
   <!-- Daydream description for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=NONE] -->
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
   <!-- Privacy choice for choosing which account to backup [CHAR LIMIT=40] -->
diff --git a/Settings/res/values-or-rIN/strings.xml b/Settings/res/values-or-rIN/strings.xml
index be14cfcb..04d039ec 100644
--- a/Settings/res/values-or-rIN/strings.xml
+++ b/Settings/res/values-or-rIN/strings.xml
@@ -20,11 +20,13 @@
   <!-- Leanback Launcher App Title for Network settings app [CHAR LIMIT=40] -->
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <!-- Top level headers -->
+  <skip></skip>
   <!-- Header title for device [CHAR LIMIT=50] -->
   <!-- Header title for preferences [CHAR LIMIT=50] -->
   <!-- Header title for accessories [CHAR LIMIT=50] -->
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <!-- Account preferences -->
+  <skip></skip>
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
   <!-- Header for sync [CHAR LIMIT=50] -->
   <!-- Header for remove account [CHAR LIMIT=50] -->
@@ -38,6 +40,7 @@
   <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <!-- Connectivity preferences -->
+  <skip></skip>
   <!-- Top level network card title. [CHAR LIMIT=50] -->
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages ethernet settings. [CHAR LIMIT=50] -->
@@ -45,6 +48,7 @@
   <!-- Context help for always scan wifi. [CHAR LIMIT=200] -->
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
+  <skip></skip>
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
   <!-- Preference and title which changes system sounds settings. [CHAR LIMIT=50] -->
@@ -60,6 +64,7 @@
   <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing. [CHAR LIMIT=50] -->
@@ -74,6 +79,7 @@
   <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <!-- Description text for autopairing when the user is in the pairing activity due to pressing the back HW button.  %1 will be replaced with the countdown value. [CHAR LIMIT=150] -->
@@ -91,6 +97,7 @@
   <!-- Action title for Confirming the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- System -->
+  <skip></skip>
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
@@ -105,6 +112,7 @@
   <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
   <!-- Preference which manages Diagnostic and Usage reporting -->
   <!-- About -->
+  <skip></skip>
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
   <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
@@ -122,6 +130,7 @@
   <!-- Device Info screen. Confirmation that developer settings are enabled [CHAR LIMIT=NONE] -->
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
   <!-- Wifi -->
+  <skip></skip>
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <!-- titles for connection status -->
   <!-- label mac address [CHAR LIMIT=50] -->
@@ -411,6 +420,7 @@
   <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- General use strings -->
+  <skip></skip>
   <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
   <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
   <!-- Title for a status description saying that a feature is on [CHAR LIMIT=30] -->
@@ -418,6 +428,7 @@
   <!-- Title for action which denotes the user agrees [CHAR LIMIT=50] -->
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
   <!-- Security -->
+  <skip></skip>
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
   <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
@@ -512,6 +523,7 @@
   <!-- Title for action to change the PIN code to use when exiting restricted profile [CHAR LIMIT=100] -->
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
   <!-- PIN UX -->
+  <eat-comment></eat-comment>
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
@@ -564,6 +576,7 @@
   <!-- Daydream description for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=NONE] -->
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
   <!-- Privacy choice for choosing which account to backup [CHAR LIMIT=40] -->
diff --git a/Settings/res/values-ug/strings.xml b/Settings/res/values-ug/strings.xml
index be14cfcb..04d039ec 100644
--- a/Settings/res/values-ug/strings.xml
+++ b/Settings/res/values-ug/strings.xml
@@ -20,11 +20,13 @@
   <!-- Leanback Launcher App Title for Network settings app [CHAR LIMIT=40] -->
   <!-- Leanback Launcher App Title for Restricted Profile app [CHAR LIMIT=40] -->
   <!-- Top level headers -->
+  <skip></skip>
   <!-- Header title for device [CHAR LIMIT=50] -->
   <!-- Header title for preferences [CHAR LIMIT=50] -->
   <!-- Header title for accessories [CHAR LIMIT=50] -->
   <!-- Header title for personal [CHAR LIMIT=50] -->
   <!-- Account preferences -->
+  <skip></skip>
   <!-- Preference which adds an account [CHAR LIMIT=50] -->
   <!-- Header for sync [CHAR LIMIT=50] -->
   <!-- Header for remove account [CHAR LIMIT=50] -->
@@ -38,6 +40,7 @@
   <!-- Remove account item label: remove the account [CHAR LIMIT=30] -->
   <!-- Message posted if removing the account fails. [CHAR LIMIT=NONE] -->
   <!-- Connectivity preferences -->
+  <skip></skip>
   <!-- Top level network card title. [CHAR LIMIT=50] -->
   <!-- Preference which manages wifi settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages ethernet settings. [CHAR LIMIT=50] -->
@@ -45,6 +48,7 @@
   <!-- Context help for always scan wifi. [CHAR LIMIT=200] -->
   <!-- Title for enable wifi. [CHAR LIMIT=50] -->
   <!-- Device preferences -->
+  <skip></skip>
   <!-- Preference which changes daydream settings. [CHAR LIMIT=50] -->
   <!-- Preference which changes display settings. [CHAR LIMIT=50] -->
   <!-- Preference and title which changes system sounds settings. [CHAR LIMIT=50] -->
@@ -60,6 +64,7 @@
   <!-- Browse Header for all apps under device settings. [CHAR LIMIT=50] -->
   <!-- Browse Header for running apps under device settings. [CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Preference which manages pairing new accessories. [CHAR LIMIT=50] -->
   <!-- Preference which manages WiFi display settings. [CHAR LIMIT=50] -->
   <!-- Device Paring Status: Pairing. [CHAR LIMIT=50] -->
@@ -74,6 +79,7 @@
   <!-- Description shown while we are waiting for a device unpair operation to finish[CHAR LIMIT=50] -->
   <!-- Description for Connected accessory[CHAR LIMIT=50] -->
   <!-- Remote and Accessories -->
+  <skip></skip>
   <!-- Description text for new accessories pairing screen. [CHAR LIMIT=150] -->
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <!-- Description text for autopairing when the user is in the pairing activity due to pressing the back HW button.  %1 will be replaced with the countdown value. [CHAR LIMIT=150] -->
@@ -91,6 +97,7 @@
   <!-- Action title for Confirming the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- Action title for Cancelling the Bluetooth secure Pair action [CHAR LIMIT=50] -->
   <!-- System -->
+  <skip></skip>
   <!-- Preference which manages cast settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages date / time settings. [CHAR LIMIT=50] -->
   <!-- Preference which manages language settings. [CHAR LIMIT=50] -->
@@ -105,6 +112,7 @@
   <!-- Label for no accessibility color or opacity [CHAR LIMIT=50] -->
   <!-- Preference which manages Diagnostic and Usage reporting -->
   <!-- About -->
+  <skip></skip>
   <!-- Preference which shows system update status. [CHAR LIMIT=50] -->
   <!-- Preference which shows about screen with legal info, model, etc. [CHAR LIMIT=50] -->
   <!-- Preference which shows name of device as it will appear when being accessed remotely [CHAR LIMIT=50] -->
@@ -122,6 +130,7 @@
   <!-- Device Info screen. Confirmation that developer settings are enabled [CHAR LIMIT=NONE] -->
   <!-- Device Info screen. Okay we get it, stop pressing, you already have it on [CHAR LIMIT=NONE] -->
   <!-- Wifi -->
+  <skip></skip>
   <!-- wifi signal strength array [CHAR LIMIT=30] -->
   <!-- titles for connection status -->
   <!-- label mac address [CHAR LIMIT=50] -->
@@ -411,6 +420,7 @@
   <!-- Description for show cpu usage in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- Description for profile GPU rendering in System Settings Developer options [CHAR LIMIT=100] -->
   <!-- General use strings -->
+  <skip></skip>
   <!-- Title for an action which turns a feature on [CHAR LIMIT=30] -->
   <!-- Title for an action which turns a feature off [CHAR LIMIT=30] -->
   <!-- Title for a status description saying that a feature is on [CHAR LIMIT=30] -->
@@ -418,6 +428,7 @@
   <!-- Title for action which denotes the user agrees [CHAR LIMIT=50] -->
   <!-- Title for action which denotes the user disagrees [CHAR LIMIT=50] -->
   <!-- Security -->
+  <skip></skip>
   <!-- Title for action to allow installation of applications from unknown sources [CHAR LIMIT=50]-->
   <!-- Description for action to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
   <!-- Description for confirmation to allow installation of applications from unknown sources [CHAR LIMIT=NONE]-->
@@ -512,6 +523,7 @@
   <!-- Title for action to change the PIN code to use when exiting restricted profile [CHAR LIMIT=100] -->
   <!-- Description for action to configure an application's restriction [CHAR LIMIT=200] -->
   <!-- PIN UX -->
+  <eat-comment></eat-comment>
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock channel.
          [CHAR LIMIT=50] -->
   <!-- Title of PIN dialog when an user is asked to enter PIN to unlock program.
@@ -564,6 +576,7 @@
   <!-- Daydream description for configuring the time before the device's screen goes off after dreaming [CHAR LIMIT=NONE] -->
   <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80] -->
   <!-- Dialog title for confirmation to erase backup data from server -->
+  <string name="backup_erase_dialog_title"></string>
   <!-- Dialog title for confirmation to erase backup data from server -->
   <!-- Privacy choice for configuring backing up data [CHAR LIMIT=40] -->
   <!-- Privacy choice for choosing which account to backup [CHAR LIMIT=40] -->
diff --git a/Settings/res/values-zh-rTW/cm_strings.xml b/Settings/res/values-zh-rTW/cm_strings.xml
index c9b762e4..60dac877 100644
--- a/Settings/res/values-zh-rTW/cm_strings.xml
+++ b/Settings/res/values-zh-rTW/cm_strings.xml
@@ -37,7 +37,7 @@
   <!-- These statuses are displayed when a device was built with SE Android supoprt.
     These are displayed by the settings app in the about section. -->
   <string name="selinux_status_disabled">已停用</string>
-  <string name="selinux_status_permissive">許可</string>
+  <string name="selinux_status_permissive">權限</string>
   <string name="selinux_status_enforcing">強制</string>
   <!-- Description text for bluetooth device pairing instructions. [CHAR LIMIT=150] -->
   <string name="accessories_add_bluetooth_inst_cm">在使用 CyanogenMod 前，請確保藍牙裝置處於配對模式。對於 Nexus 遙控器，同時按下 [返回] 和 [主螢幕] 按鍵即可完成。</string>
@@ -68,11 +68,11 @@
   <string name="advanced_reboot_summary">包括選單內的選項，可重新啟動至 Recovery、Bootloader 或進行軟體重新啟動</string>
   <!-- Reboot menu -->
   <!-- Button to reboot the device into recovery, within the Reboot Options dialog -->
-  <string name="reboot_recovery_button_label">修復模式 (recovery)</string>
+  <string name="reboot_recovery_button_label">Recovery</string>
   <!-- Button to reboot the device into bootloader, within the Reboot Options dialog -->
-  <string name="reboot_bootloader_button_label">啟動載入模式 (bootloader)</string>
+  <string name="reboot_bootloader_button_label">Bootloader</string>
   <!-- Button to soft reboot the device, within the Reboot Options dialog -->
-  <string name="reboot_soft_button_label">軟重啟</string>
+  <string name="reboot_soft_button_label">軟體重新啟動</string>
   <!-- Android debugging over WiFi -->
   <string name="adb_over_network">透過網路 ADB </string>
   <string name="adb_over_network_summary">啟用透過網路介面 (Wi\u2011Fi、USB 網路) 進行 TCP/IP 偵錯。該設定會在重新啟動後重設</string>