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

Change-Id: I29830cf0e4e8a1cae5842500e9f7a6b57cd6fc20
---
 res/values-as-rIN/strings.xml    | 6 ------
 res/values-ast-rES/strings.xml   | 6 ------
 res/values-br-rFR/strings.xml    | 6 ------
 res/values-csb-rPL/strings.xml   | 6 ------
 res/values-cy/strings.xml        | 6 ------
 res/values-en-rPT/strings.xml    | 6 ------
 res/values-eo/strings.xml        | 6 ------
 res/values-es-rCO/strings.xml    | 6 ------
 res/values-es-rMX/strings.xml    | 6 ------
 res/values-frp-rIT/strings.xml   | 6 ------
 res/values-fy-rNL/strings.xml    | 6 ------
 res/values-ga-rIE/strings.xml    | 6 ------
 res/values-gd-rGB/strings.xml    | 6 ------
 res/values-ku/strings.xml        | 6 ------
 res/values-lb/strings.xml        | 6 ------
 res/values-oc-rFR/strings.xml    | 6 ------
 res/values-or-rIN/strings.xml    | 6 ------
 res/values-ro/cm_strings.xml     | 6 ++++++
 res/values-ug/strings.xml        | 6 ------
 res/values-zh-rCN/cm_strings.xml | 2 +-
 res/values-zh-rTW/cm_strings.xml | 4 ++--
 21 files changed, 9 insertions(+), 111 deletions(-)

diff --git a/res/values-as-rIN/strings.xml b/res/values-as-rIN/strings.xml
index d976f1d29..d8fc2a04b 100644
--- a/res/values-as-rIN/strings.xml
+++ b/res/values-as-rIN/strings.xml
@@ -19,13 +19,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- General -->
-  <skip></skip>
   <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] -->
   <!-- Application name -->
   <!-- Default folder name -->
-  <string name="folder_name"></string>
   <!-- Work folder name -->
   <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
   <!-- Displayed when user selects a shortcut for an app that is current not available [CHAR_LIMIT=none]-->
@@ -42,7 +40,6 @@
   <!-- Search market text.  This is a format string where the first argument is the name of the activity
          handling the search.  The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
   <!-- Drag and drop -->
-  <skip></skip>
   <!-- Error message when user has filled a home screen -->
   <!-- Error message when user has filled the hotseat -->
   <!-- All applications label -->
@@ -52,7 +49,6 @@
   <!-- Label for uninstall drop target. [CHAR_LIMIT=20]-->
   <!-- Label for the info icon. [CHAR_LIMIT=20] -->
   <!-- Permissions: -->
-  <skip></skip>
   <!-- Permission short label -->
   <!-- Permission description -->
   <!-- Permission short label -->
@@ -61,13 +57,11 @@
   <!-- Permission description -->
   <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
   <!-- Widgets: -->
-  <skip></skip>
   <!-- Text to show user in place of a gadget when we can't display it properly -->
   <!-- Text to show user in place of a gadget when it is not yet initialized. -->
   <!-- Text to inform the user that they can't uninstall a system application -->
   <!-- Default folder title -->
   <!-- Accessibility -->
-  <skip></skip>
   <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
   <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
   <!-- Clings -->
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 924c7a7ca..44e3f4a9b 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -19,14 +19,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- General -->
-  <skip></skip>
   <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] -->
   <!-- Application name -->
   <string name="app_name">Launcher3</string>
   <!-- Default folder name -->
-  <string name="folder_name"></string>
   <!-- Work folder name -->
   <string name="work_folder_name">Trabayu</string>
   <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
@@ -53,7 +51,6 @@
          handling the search.  The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
   <string name="all_apps_search_market_message">Dir a <xliff:g id="query" example="Play Store">%1$s</xliff:g></string>
   <!-- Drag and drop -->
-  <skip></skip>
   <!-- Error message when user has filled a home screen -->
   <string name="out_of_space">Nun queda espaciu na pantalla d\'aniciu.</string>
   <!-- Error message when user has filled the hotseat -->
@@ -70,7 +67,6 @@
   <!-- Label for the info icon. [CHAR_LIMIT=20] -->
   <string name="info_target_label">Información de l\'aplicación</string>
   <!-- Permissions: -->
-  <skip></skip>
   <!-- Permission short label -->
   <string name="permlab_install_shortcut">instalar accesos direutos</string>
   <!-- Permission description -->
@@ -87,7 +83,6 @@
   <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
   <string name="msg_no_phone_permission"><xliff:g id="app_name" example="Launcher3">%1$s</xliff:g> nun tien permisu pa facer llamaes telefóniques</string>
   <!-- Widgets: -->
-  <skip></skip>
   <!-- Text to show user in place of a gadget when we can't display it properly -->
   <string name="gadget_error_text">Fallu al cargar el widget</string>
   <!-- Text to show user in place of a gadget when it is not yet initialized. -->
@@ -97,7 +92,6 @@
   <!-- Default folder title -->
   <string name="folder_hint_text">Carpeta ensin nome</string>
   <!-- Accessibility -->
-  <skip></skip>
   <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
   <string name="default_scroll_format">Páxina %1$d de %2$d</string>
   <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
diff --git a/res/values-br-rFR/strings.xml b/res/values-br-rFR/strings.xml
index d976f1d29..d8fc2a04b 100644
--- a/res/values-br-rFR/strings.xml
+++ b/res/values-br-rFR/strings.xml
@@ -19,13 +19,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- General -->
-  <skip></skip>
   <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] -->
   <!-- Application name -->
   <!-- Default folder name -->
-  <string name="folder_name"></string>
   <!-- Work folder name -->
   <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
   <!-- Displayed when user selects a shortcut for an app that is current not available [CHAR_LIMIT=none]-->
@@ -42,7 +40,6 @@
   <!-- Search market text.  This is a format string where the first argument is the name of the activity
          handling the search.  The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
   <!-- Drag and drop -->
-  <skip></skip>
   <!-- Error message when user has filled a home screen -->
   <!-- Error message when user has filled the hotseat -->
   <!-- All applications label -->
@@ -52,7 +49,6 @@
   <!-- Label for uninstall drop target. [CHAR_LIMIT=20]-->
   <!-- Label for the info icon. [CHAR_LIMIT=20] -->
   <!-- Permissions: -->
-  <skip></skip>
   <!-- Permission short label -->
   <!-- Permission description -->
   <!-- Permission short label -->
@@ -61,13 +57,11 @@
   <!-- Permission description -->
   <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
   <!-- Widgets: -->
-  <skip></skip>
   <!-- Text to show user in place of a gadget when we can't display it properly -->
   <!-- Text to show user in place of a gadget when it is not yet initialized. -->
   <!-- Text to inform the user that they can't uninstall a system application -->
   <!-- Default folder title -->
   <!-- Accessibility -->
-  <skip></skip>
   <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
   <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
   <!-- Clings -->
diff --git a/res/values-csb-rPL/strings.xml b/res/values-csb-rPL/strings.xml
index d976f1d29..d8fc2a04b 100644
--- a/res/values-csb-rPL/strings.xml
+++ b/res/values-csb-rPL/strings.xml
@@ -19,13 +19,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- General -->
-  <skip></skip>
   <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] -->
   <!-- Application name -->
   <!-- Default folder name -->
-  <string name="folder_name"></string>
   <!-- Work folder name -->
   <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
   <!-- Displayed when user selects a shortcut for an app that is current not available [CHAR_LIMIT=none]-->
@@ -42,7 +40,6 @@
   <!-- Search market text.  This is a format string where the first argument is the name of the activity
          handling the search.  The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
   <!-- Drag and drop -->
-  <skip></skip>
   <!-- Error message when user has filled a home screen -->
   <!-- Error message when user has filled the hotseat -->
   <!-- All applications label -->
@@ -52,7 +49,6 @@
   <!-- Label for uninstall drop target. [CHAR_LIMIT=20]-->
   <!-- Label for the info icon. [CHAR_LIMIT=20] -->
   <!-- Permissions: -->
-  <skip></skip>
   <!-- Permission short label -->
   <!-- Permission description -->
   <!-- Permission short label -->
@@ -61,13 +57,11 @@
   <!-- Permission description -->
   <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
   <!-- Widgets: -->
-  <skip></skip>
   <!-- Text to show user in place of a gadget when we can't display it properly -->
   <!-- Text to show user in place of a gadget when it is not yet initialized. -->
   <!-- Text to inform the user that they can't uninstall a system application -->
   <!-- Default folder title -->
   <!-- Accessibility -->
-  <skip></skip>
   <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
   <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
   <!-- Clings -->
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
index d976f1d29..d8fc2a04b 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -19,13 +19,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- General -->
-  <skip></skip>
   <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] -->
   <!-- Application name -->
   <!-- Default folder name -->
-  <string name="folder_name"></string>
   <!-- Work folder name -->
   <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
   <!-- Displayed when user selects a shortcut for an app that is current not available [CHAR_LIMIT=none]-->
@@ -42,7 +40,6 @@
   <!-- Search market text.  This is a format string where the first argument is the name of the activity
          handling the search.  The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
   <!-- Drag and drop -->
-  <skip></skip>
   <!-- Error message when user has filled a home screen -->
   <!-- Error message when user has filled the hotseat -->
   <!-- All applications label -->
@@ -52,7 +49,6 @@
   <!-- Label for uninstall drop target. [CHAR_LIMIT=20]-->
   <!-- Label for the info icon. [CHAR_LIMIT=20] -->
   <!-- Permissions: -->
-  <skip></skip>
   <!-- Permission short label -->
   <!-- Permission description -->
   <!-- Permission short label -->
@@ -61,13 +57,11 @@
   <!-- Permission description -->
   <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
   <!-- Widgets: -->
-  <skip></skip>
   <!-- Text to show user in place of a gadget when we can't display it properly -->
   <!-- Text to show user in place of a gadget when it is not yet initialized. -->
   <!-- Text to inform the user that they can't uninstall a system application -->
   <!-- Default folder title -->
   <!-- Accessibility -->
-  <skip></skip>
   <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
   <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
   <!-- Clings -->
diff --git a/res/values-en-rPT/strings.xml b/res/values-en-rPT/strings.xml
index d976f1d29..d8fc2a04b 100644
--- a/res/values-en-rPT/strings.xml
+++ b/res/values-en-rPT/strings.xml
@@ -19,13 +19,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- General -->
-  <skip></skip>
   <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] -->
   <!-- Application name -->
   <!-- Default folder name -->
-  <string name="folder_name"></string>
   <!-- Work folder name -->
   <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
   <!-- Displayed when user selects a shortcut for an app that is current not available [CHAR_LIMIT=none]-->
@@ -42,7 +40,6 @@
   <!-- Search market text.  This is a format string where the first argument is the name of the activity
          handling the search.  The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
   <!-- Drag and drop -->
-  <skip></skip>
   <!-- Error message when user has filled a home screen -->
   <!-- Error message when user has filled the hotseat -->
   <!-- All applications label -->
@@ -52,7 +49,6 @@
   <!-- Label for uninstall drop target. [CHAR_LIMIT=20]-->
   <!-- Label for the info icon. [CHAR_LIMIT=20] -->
   <!-- Permissions: -->
-  <skip></skip>
   <!-- Permission short label -->
   <!-- Permission description -->
   <!-- Permission short label -->
@@ -61,13 +57,11 @@
   <!-- Permission description -->
   <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
   <!-- Widgets: -->
-  <skip></skip>
   <!-- Text to show user in place of a gadget when we can't display it properly -->
   <!-- Text to show user in place of a gadget when it is not yet initialized. -->
   <!-- Text to inform the user that they can't uninstall a system application -->
   <!-- Default folder title -->
   <!-- Accessibility -->
-  <skip></skip>
   <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
   <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
   <!-- Clings -->
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index 1e76841fe..c260c103a 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -19,13 +19,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- General -->
-  <skip></skip>
   <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] -->
   <!-- Application name -->
   <!-- Default folder name -->
-  <string name="folder_name"></string>
   <!-- Work folder name -->
   <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
   <!-- Displayed when user selects a shortcut for an app that is current not available [CHAR_LIMIT=none]-->
@@ -43,7 +41,6 @@
   <!-- Search market text.  This is a format string where the first argument is the name of the activity
          handling the search.  The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
   <!-- Drag and drop -->
-  <skip></skip>
   <!-- Error message when user has filled a home screen -->
   <!-- Error message when user has filled the hotseat -->
   <!-- All applications label -->
@@ -56,7 +53,6 @@
   <string name="delete_target_uninstall_label">Malinstali</string>
   <!-- Label for the info icon. [CHAR_LIMIT=20] -->
   <!-- Permissions: -->
-  <skip></skip>
   <!-- Permission short label -->
   <!-- Permission description -->
   <!-- Permission short label -->
@@ -65,13 +61,11 @@
   <!-- Permission description -->
   <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
   <!-- Widgets: -->
-  <skip></skip>
   <!-- Text to show user in place of a gadget when we can't display it properly -->
   <!-- Text to show user in place of a gadget when it is not yet initialized. -->
   <!-- Text to inform the user that they can't uninstall a system application -->
   <!-- Default folder title -->
   <!-- Accessibility -->
-  <skip></skip>
   <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
   <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
   <!-- Clings -->
diff --git a/res/values-es-rCO/strings.xml b/res/values-es-rCO/strings.xml
index d976f1d29..d8fc2a04b 100644
--- a/res/values-es-rCO/strings.xml
+++ b/res/values-es-rCO/strings.xml
@@ -19,13 +19,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- General -->
-  <skip></skip>
   <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] -->
   <!-- Application name -->
   <!-- Default folder name -->
-  <string name="folder_name"></string>
   <!-- Work folder name -->
   <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
   <!-- Displayed when user selects a shortcut for an app that is current not available [CHAR_LIMIT=none]-->
@@ -42,7 +40,6 @@
   <!-- Search market text.  This is a format string where the first argument is the name of the activity
          handling the search.  The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
   <!-- Drag and drop -->
-  <skip></skip>
   <!-- Error message when user has filled a home screen -->
   <!-- Error message when user has filled the hotseat -->
   <!-- All applications label -->
@@ -52,7 +49,6 @@
   <!-- Label for uninstall drop target. [CHAR_LIMIT=20]-->
   <!-- Label for the info icon. [CHAR_LIMIT=20] -->
   <!-- Permissions: -->
-  <skip></skip>
   <!-- Permission short label -->
   <!-- Permission description -->
   <!-- Permission short label -->
@@ -61,13 +57,11 @@
   <!-- Permission description -->
   <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
   <!-- Widgets: -->
-  <skip></skip>
   <!-- Text to show user in place of a gadget when we can't display it properly -->
   <!-- Text to show user in place of a gadget when it is not yet initialized. -->
   <!-- Text to inform the user that they can't uninstall a system application -->
   <!-- Default folder title -->
   <!-- Accessibility -->
-  <skip></skip>
   <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
   <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
   <!-- Clings -->
diff --git a/res/values-es-rMX/strings.xml b/res/values-es-rMX/strings.xml
index d976f1d29..d8fc2a04b 100644
--- a/res/values-es-rMX/strings.xml
+++ b/res/values-es-rMX/strings.xml
@@ -19,13 +19,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- General -->
-  <skip></skip>
   <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] -->
   <!-- Application name -->
   <!-- Default folder name -->
-  <string name="folder_name"></string>
   <!-- Work folder name -->
   <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
   <!-- Displayed when user selects a shortcut for an app that is current not available [CHAR_LIMIT=none]-->
@@ -42,7 +40,6 @@
   <!-- Search market text.  This is a format string where the first argument is the name of the activity
          handling the search.  The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
   <!-- Drag and drop -->
-  <skip></skip>
   <!-- Error message when user has filled a home screen -->
   <!-- Error message when user has filled the hotseat -->
   <!-- All applications label -->
@@ -52,7 +49,6 @@
   <!-- Label for uninstall drop target. [CHAR_LIMIT=20]-->
   <!-- Label for the info icon. [CHAR_LIMIT=20] -->
   <!-- Permissions: -->
-  <skip></skip>
   <!-- Permission short label -->
   <!-- Permission description -->
   <!-- Permission short label -->
@@ -61,13 +57,11 @@
   <!-- Permission description -->
   <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
   <!-- Widgets: -->
-  <skip></skip>
   <!-- Text to show user in place of a gadget when we can't display it properly -->
   <!-- Text to show user in place of a gadget when it is not yet initialized. -->
   <!-- Text to inform the user that they can't uninstall a system application -->
   <!-- Default folder title -->
   <!-- Accessibility -->
-  <skip></skip>
   <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
   <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
   <!-- Clings -->
diff --git a/res/values-frp-rIT/strings.xml b/res/values-frp-rIT/strings.xml
index d976f1d29..d8fc2a04b 100644
--- a/res/values-frp-rIT/strings.xml
+++ b/res/values-frp-rIT/strings.xml
@@ -19,13 +19,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- General -->
-  <skip></skip>
   <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] -->
   <!-- Application name -->
   <!-- Default folder name -->
-  <string name="folder_name"></string>
   <!-- Work folder name -->
   <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
   <!-- Displayed when user selects a shortcut for an app that is current not available [CHAR_LIMIT=none]-->
@@ -42,7 +40,6 @@
   <!-- Search market text.  This is a format string where the first argument is the name of the activity
          handling the search.  The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
   <!-- Drag and drop -->
-  <skip></skip>
   <!-- Error message when user has filled a home screen -->
   <!-- Error message when user has filled the hotseat -->
   <!-- All applications label -->
@@ -52,7 +49,6 @@
   <!-- Label for uninstall drop target. [CHAR_LIMIT=20]-->
   <!-- Label for the info icon. [CHAR_LIMIT=20] -->
   <!-- Permissions: -->
-  <skip></skip>
   <!-- Permission short label -->
   <!-- Permission description -->
   <!-- Permission short label -->
@@ -61,13 +57,11 @@
   <!-- Permission description -->
   <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
   <!-- Widgets: -->
-  <skip></skip>
   <!-- Text to show user in place of a gadget when we can't display it properly -->
   <!-- Text to show user in place of a gadget when it is not yet initialized. -->
   <!-- Text to inform the user that they can't uninstall a system application -->
   <!-- Default folder title -->
   <!-- Accessibility -->
-  <skip></skip>
   <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
   <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
   <!-- Clings -->
diff --git a/res/values-fy-rNL/strings.xml b/res/values-fy-rNL/strings.xml
index d976f1d29..d8fc2a04b 100644
--- a/res/values-fy-rNL/strings.xml
+++ b/res/values-fy-rNL/strings.xml
@@ -19,13 +19,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- General -->
-  <skip></skip>
   <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] -->
   <!-- Application name -->
   <!-- Default folder name -->
-  <string name="folder_name"></string>
   <!-- Work folder name -->
   <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
   <!-- Displayed when user selects a shortcut for an app that is current not available [CHAR_LIMIT=none]-->
@@ -42,7 +40,6 @@
   <!-- Search market text.  This is a format string where the first argument is the name of the activity
          handling the search.  The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
   <!-- Drag and drop -->
-  <skip></skip>
   <!-- Error message when user has filled a home screen -->
   <!-- Error message when user has filled the hotseat -->
   <!-- All applications label -->
@@ -52,7 +49,6 @@
   <!-- Label for uninstall drop target. [CHAR_LIMIT=20]-->
   <!-- Label for the info icon. [CHAR_LIMIT=20] -->
   <!-- Permissions: -->
-  <skip></skip>
   <!-- Permission short label -->
   <!-- Permission description -->
   <!-- Permission short label -->
@@ -61,13 +57,11 @@
   <!-- Permission description -->
   <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
   <!-- Widgets: -->
-  <skip></skip>
   <!-- Text to show user in place of a gadget when we can't display it properly -->
   <!-- Text to show user in place of a gadget when it is not yet initialized. -->
   <!-- Text to inform the user that they can't uninstall a system application -->
   <!-- Default folder title -->
   <!-- Accessibility -->
-  <skip></skip>
   <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
   <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
   <!-- Clings -->
diff --git a/res/values-ga-rIE/strings.xml b/res/values-ga-rIE/strings.xml
index d976f1d29..d8fc2a04b 100644
--- a/res/values-ga-rIE/strings.xml
+++ b/res/values-ga-rIE/strings.xml
@@ -19,13 +19,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- General -->
-  <skip></skip>
   <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] -->
   <!-- Application name -->
   <!-- Default folder name -->
-  <string name="folder_name"></string>
   <!-- Work folder name -->
   <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
   <!-- Displayed when user selects a shortcut for an app that is current not available [CHAR_LIMIT=none]-->
@@ -42,7 +40,6 @@
   <!-- Search market text.  This is a format string where the first argument is the name of the activity
          handling the search.  The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
   <!-- Drag and drop -->
-  <skip></skip>
   <!-- Error message when user has filled a home screen -->
   <!-- Error message when user has filled the hotseat -->
   <!-- All applications label -->
@@ -52,7 +49,6 @@
   <!-- Label for uninstall drop target. [CHAR_LIMIT=20]-->
   <!-- Label for the info icon. [CHAR_LIMIT=20] -->
   <!-- Permissions: -->
-  <skip></skip>
   <!-- Permission short label -->
   <!-- Permission description -->
   <!-- Permission short label -->
@@ -61,13 +57,11 @@
   <!-- Permission description -->
   <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
   <!-- Widgets: -->
-  <skip></skip>
   <!-- Text to show user in place of a gadget when we can't display it properly -->
   <!-- Text to show user in place of a gadget when it is not yet initialized. -->
   <!-- Text to inform the user that they can't uninstall a system application -->
   <!-- Default folder title -->
   <!-- Accessibility -->
-  <skip></skip>
   <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
   <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
   <!-- Clings -->
diff --git a/res/values-gd-rGB/strings.xml b/res/values-gd-rGB/strings.xml
index d976f1d29..d8fc2a04b 100644
--- a/res/values-gd-rGB/strings.xml
+++ b/res/values-gd-rGB/strings.xml
@@ -19,13 +19,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- General -->
-  <skip></skip>
   <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] -->
   <!-- Application name -->
   <!-- Default folder name -->
-  <string name="folder_name"></string>
   <!-- Work folder name -->
   <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
   <!-- Displayed when user selects a shortcut for an app that is current not available [CHAR_LIMIT=none]-->
@@ -42,7 +40,6 @@
   <!-- Search market text.  This is a format string where the first argument is the name of the activity
          handling the search.  The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
   <!-- Drag and drop -->
-  <skip></skip>
   <!-- Error message when user has filled a home screen -->
   <!-- Error message when user has filled the hotseat -->
   <!-- All applications label -->
@@ -52,7 +49,6 @@
   <!-- Label for uninstall drop target. [CHAR_LIMIT=20]-->
   <!-- Label for the info icon. [CHAR_LIMIT=20] -->
   <!-- Permissions: -->
-  <skip></skip>
   <!-- Permission short label -->
   <!-- Permission description -->
   <!-- Permission short label -->
@@ -61,13 +57,11 @@
   <!-- Permission description -->
   <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
   <!-- Widgets: -->
-  <skip></skip>
   <!-- Text to show user in place of a gadget when we can't display it properly -->
   <!-- Text to show user in place of a gadget when it is not yet initialized. -->
   <!-- Text to inform the user that they can't uninstall a system application -->
   <!-- Default folder title -->
   <!-- Accessibility -->
-  <skip></skip>
   <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
   <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
   <!-- Clings -->
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index 4e925159a..872f1a132 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -19,14 +19,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- General -->
-  <skip></skip>
   <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] -->
   <!-- Application name -->
   <string name="app_name">کارخەری٣</string>
   <!-- Default folder name -->
-  <string name="folder_name"></string>
   <!-- Work folder name -->
   <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
   <string name="activity_not_found">بەرنامە دانه‌به‌زیوه‌.</string>
@@ -47,7 +45,6 @@
   <!-- Search market text.  This is a format string where the first argument is the name of the activity
          handling the search.  The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
   <!-- Drag and drop -->
-  <skip></skip>
   <!-- Error message when user has filled a home screen -->
   <string name="out_of_space">لەم ماڵی ڕوونمایەدا دیوی تر نییە.</string>
   <!-- Error message when user has filled the hotseat -->
@@ -64,7 +61,6 @@
   <!-- Label for the info icon. [CHAR_LIMIT=20] -->
   <string name="info_target_label">زانیاریی بەرنامە</string>
   <!-- Permissions: -->
-  <skip></skip>
   <!-- Permission short label -->
   <string name="permlab_install_shortcut">دامەزراندنی کورتەڕێگەکان</string>
   <!-- Permission description -->
@@ -82,7 +78,6 @@
         کورتەڕێگەکانی سەر ماڵ.</string>
   <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
   <!-- Widgets: -->
-  <skip></skip>
   <!-- Text to show user in place of a gadget when we can't display it properly -->
   <string name="gadget_error_text">کێشەی بارکردنی ویجێت</string>
   <!-- Text to show user in place of a gadget when it is not yet initialized. -->
@@ -90,7 +85,6 @@
   <string name="uninstall_system_app_text">ئەمە بەرنامەیەکی سیستەمییە و ناتوانرێت دامەزرانسڕینەوەی بۆ بکرێت.</string>
   <!-- Default folder title -->
   <!-- Accessibility -->
-  <skip></skip>
   <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
   <string name="default_scroll_format">پەڕەی %1$d لە %2$d</string>
   <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 1830d5373..1df52a717 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -19,14 +19,12 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- General -->
-  <skip></skip>
   <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] -->
   <!-- Application name -->
   <string name="app_name">Launcher3</string>
   <!-- Default folder name -->
-  <string name="folder_name"></string>
   <!-- Work folder name -->
   <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
   <string name="activity_not_found">D\'App ass net installéiert.</string>
@@ -50,7 +48,6 @@
   <!-- Search market text.  This is a format string where the first argument is the name of the activity
          handling the search.  The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
   <!-- Drag and drop -->
-  <skip></skip>
   <!-- Error message when user has filled a home screen -->
   <string name="out_of_space">Keng Plaz méi op dësem Startschierm.</string>
   <!-- Error message when user has filled the hotseat -->
@@ -67,7 +64,6 @@
   <!-- Label for the info icon. [CHAR_LIMIT=20] -->
   <string name="info_target_label">App-Info</string>
   <!-- Permissions: -->
-  <skip></skip>
   <!-- Permission short label -->
   <string name="permlab_install_shortcut">Ofkierzungen installéieren</string>
   <!-- Permission description -->
@@ -82,7 +78,6 @@
   <string name="permdesc_write_settings">Erlaabt der App, d\'Startschierm-Astellungen an -Ofkierzungen z\'änneren.</string>
   <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
   <!-- Widgets: -->
-  <skip></skip>
   <!-- Text to show user in place of a gadget when we can't display it properly -->
   <string name="gadget_error_text">Problem beim Luede vum Widget</string>
   <!-- Text to show user in place of a gadget when it is not yet initialized. -->
@@ -91,7 +86,6 @@
   <string name="uninstall_system_app_text">Dëst ass eng System-App a kann net desinstalléiert ginn.</string>
   <!-- Default folder title -->
   <!-- Accessibility -->
-  <skip></skip>
   <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
   <string name="default_scroll_format">Säit %1$d / %2$d</string>
   <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
diff --git a/res/values-oc-rFR/strings.xml b/res/values-oc-rFR/strings.xml
index d976f1d29..d8fc2a04b 100644
--- a/res/values-oc-rFR/strings.xml
+++ b/res/values-oc-rFR/strings.xml
@@ -19,13 +19,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- General -->
-  <skip></skip>
   <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] -->
   <!-- Application name -->
   <!-- Default folder name -->
-  <string name="folder_name"></string>
   <!-- Work folder name -->
   <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
   <!-- Displayed when user selects a shortcut for an app that is current not available [CHAR_LIMIT=none]-->
@@ -42,7 +40,6 @@
   <!-- Search market text.  This is a format string where the first argument is the name of the activity
          handling the search.  The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
   <!-- Drag and drop -->
-  <skip></skip>
   <!-- Error message when user has filled a home screen -->
   <!-- Error message when user has filled the hotseat -->
   <!-- All applications label -->
@@ -52,7 +49,6 @@
   <!-- Label for uninstall drop target. [CHAR_LIMIT=20]-->
   <!-- Label for the info icon. [CHAR_LIMIT=20] -->
   <!-- Permissions: -->
-  <skip></skip>
   <!-- Permission short label -->
   <!-- Permission description -->
   <!-- Permission short label -->
@@ -61,13 +57,11 @@
   <!-- Permission description -->
   <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
   <!-- Widgets: -->
-  <skip></skip>
   <!-- Text to show user in place of a gadget when we can't display it properly -->
   <!-- Text to show user in place of a gadget when it is not yet initialized. -->
   <!-- Text to inform the user that they can't uninstall a system application -->
   <!-- Default folder title -->
   <!-- Accessibility -->
-  <skip></skip>
   <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
   <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
   <!-- Clings -->
diff --git a/res/values-or-rIN/strings.xml b/res/values-or-rIN/strings.xml
index d976f1d29..d8fc2a04b 100644
--- a/res/values-or-rIN/strings.xml
+++ b/res/values-or-rIN/strings.xml
@@ -19,13 +19,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- General -->
-  <skip></skip>
   <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] -->
   <!-- Application name -->
   <!-- Default folder name -->
-  <string name="folder_name"></string>
   <!-- Work folder name -->
   <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
   <!-- Displayed when user selects a shortcut for an app that is current not available [CHAR_LIMIT=none]-->
@@ -42,7 +40,6 @@
   <!-- Search market text.  This is a format string where the first argument is the name of the activity
          handling the search.  The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
   <!-- Drag and drop -->
-  <skip></skip>
   <!-- Error message when user has filled a home screen -->
   <!-- Error message when user has filled the hotseat -->
   <!-- All applications label -->
@@ -52,7 +49,6 @@
   <!-- Label for uninstall drop target. [CHAR_LIMIT=20]-->
   <!-- Label for the info icon. [CHAR_LIMIT=20] -->
   <!-- Permissions: -->
-  <skip></skip>
   <!-- Permission short label -->
   <!-- Permission description -->
   <!-- Permission short label -->
@@ -61,13 +57,11 @@
   <!-- Permission description -->
   <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
   <!-- Widgets: -->
-  <skip></skip>
   <!-- Text to show user in place of a gadget when we can't display it properly -->
   <!-- Text to show user in place of a gadget when it is not yet initialized. -->
   <!-- Text to inform the user that they can't uninstall a system application -->
   <!-- Default folder title -->
   <!-- Accessibility -->
-  <skip></skip>
   <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
   <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
   <!-- Clings -->
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index fd31aedfb..83f993ddb 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -48,17 +48,23 @@
   <!-- Protected apps -->
   <string name="protected_app_settings">Aplicații protejate</string>
   <!-- Developer settings -->
+  <string name="export_workspace_layout">Aspect export</string>
   <!-- Drawer settings -->
   <string name="app_drawer_style">Stil sertar</string>
   <string name="app_drawer_style_compact">Compact</string>
   <string name="app_drawer_style_sections">Secțiuni</string>
   <string name="app_drawer_color">Culoare sertar</string>
   <string name="app_drawer_color_dark">Întunecat</string>
+  <string name="app_drawer_color_light">Luminos</string>
   <string name="fast_scroller">Derulare rapidă</string>
+  <string name="fast_scroller_type">Tip derulator rapid</string>
   <string name="fast_scroller_type_horizontal">Orizontal</string>
   <string name="fast_scroller_type_vertical">Vertical</string>
   <!-- Search Manager doesn't exist -->
   <string name="search_activity_not_found">Imposibil de găsit o activitate de căutare!</string>
   <!-- App not available toast text -->
   <string name="app_not_available">Aplicația nu este disponibilă</string>
+  <string name="storage_permission_denied">Nu se poate accesa stocarea</string>
+  <string name="export_db_email_subject">DB lansator pentru locație</string>
+  <string name="export_db_could_not">Nu s-a putut exporta fișierul DB</string>
 </resources>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index fc79bfaba..af39e5761 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -19,13 +19,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- General -->
-  <skip></skip>
   <!-- URI used to import old favorites. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.LAUNCH intent. [DO NOT TRANSLATE] -->
   <!-- Permission to receive the com.android.launcher3.action.FIRST_LOAD_COMPLETE intent. [DO NOT TRANSLATE] -->
   <!-- Application name -->
   <!-- Default folder name -->
-  <string name="folder_name"></string>
   <!-- Work folder name -->
   <string name="work_folder_name">ئىش</string>
   <!-- Displayed when user selects a shortcut for an app that was uninstalled [CHAR_LIMIT=none]-->
@@ -43,7 +41,6 @@
   <!-- Search market text.  This is a format string where the first argument is the name of the activity
          handling the search.  The format string does not need to handle both of these arguments. [CHAR_LIMIT=50] -->
   <!-- Drag and drop -->
-  <skip></skip>
   <!-- Error message when user has filled a home screen -->
   <!-- Error message when user has filled the hotseat -->
   <!-- All applications label -->
@@ -53,7 +50,6 @@
   <!-- Label for uninstall drop target. [CHAR_LIMIT=20]-->
   <!-- Label for the info icon. [CHAR_LIMIT=20] -->
   <!-- Permissions: -->
-  <skip></skip>
   <!-- Permission short label -->
   <!-- Permission description -->
   <!-- Permission short label -->
@@ -62,13 +58,11 @@
   <!-- Permission description -->
   <!-- Toast shown on clicking a direct call shortcut. [CHAR_LIMIT=80] -->
   <!-- Widgets: -->
-  <skip></skip>
   <!-- Text to show user in place of a gadget when we can't display it properly -->
   <!-- Text to show user in place of a gadget when it is not yet initialized. -->
   <!-- Text to inform the user that they can't uninstall a system application -->
   <!-- Default folder title -->
   <!-- Accessibility -->
-  <skip></skip>
   <!-- The format string for default page scroll text [CHAR_LIMIT=none] -->
   <!-- The format string for Workspace page scroll text [CHAR_LIMIT=none] -->
   <!-- Clings -->
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index e761072d7..9cbe5c1f1 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -33,7 +33,7 @@
   <string name="grid_size_comfortable">宽松</string>
   <string name="grid_size_cozy">合适</string>
   <string name="grid_size_condensed">紧凑</string>
-  <string name="grid_size_custom">自定义(<xliff:g id="rows">%1$d</xliff:g>\u00d7<xliff:g id="columns">%2$d</xliff:g>)</string>
+  <string name="grid_size_custom">自定义 (<xliff:g id="rows">%1$d</xliff:g>\u00d7<xliff:g id="columns">%2$d</xliff:g>)</string>
   <string name="preferences_interface_homescreen_custom">选择自定义尺寸</string>
   <!-- Dialog -->
   <string name="dialog_confirm">确认</string>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 4fee33cdf..1446528f2 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -17,7 +17,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Application name -->
-  <string name="home_screen_settings">主螢幕設定</string>
+  <string name="home_screen_settings">主畫面設定</string>
   <string name="drawer_settings">清單設定</string>
   <string name="app_settings">應用程式設定</string>
   <!-- Settings states -->
@@ -42,7 +42,7 @@
   <!-- Larger icons -->
   <string name="larger_icons_text">大圖示</string>
   <!-- Icon labels -->
-  <string name="icon_labels">程式名稱</string>
+  <string name="icon_labels">圖示標籤</string>
   <string name="icon_labels_show">顯示</string>
   <string name="icon_labels_hide">隱藏</string>
   <!-- Protected apps -->
-- 
cgit v1.2.3