From d493a04936ea59f73f7acd8080d7cdc1cca4f2bf Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Tue, 6 Sep 2022 16:25:35 +0530
Subject: [PATCH 1/5] Don't translate some strings as it causes issue with
 weblate

---
 res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a1d6982fd..f1507e63d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -29,10 +29,10 @@
     <string name="downloads_label">Downloads</string>
 
     <!-- Title of the documents application [CHAR LIMIT=32] -->
-    <string name="app_label">@string/files_label</string>
+    <string name="app_label" translatable="false">@string/files_label</string>
 
     <!-- Title of the documents application [CHAR LIMIT=32] -->
-    <string name="launcher_label">@string/files_label</string>
+    <string name="launcher_label" translatable="false">@string/files_label</string>
 
     <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
     <string name="title_open">Open from</string>
-- 
GitLab


From 74b9d2bd750e956b82fd19730869b6c994ca1125 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Tue, 6 Sep 2022 16:27:00 +0530
Subject: [PATCH 2/5] Change app icon to our custom icon

---
 res/drawable/ic_launcher_background.xml | 36 ++++++++++++++----
 res/drawable/ic_launcher_foreground.xml | 49 ++++++++++++-------------
 res/drawable/ic_launcher_monochrome.xml | 15 --------
 res/mipmap-anydpi/ic_launcher.xml       | 24 +++++++++---
 4 files changed, 69 insertions(+), 55 deletions(-)
 delete mode 100644 res/drawable/ic_launcher_monochrome.xml

diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml
index 452f45a3a..5ec6d6298 100644
--- a/res/drawable/ic_launcher_background.xml
+++ b/res/drawable/ic_launcher_background.xml
@@ -1,17 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
   <path
-      android:pathData="M0,0h108v108h-108z"
-      android:fillColor="#0092E4"/>
-  <path
-      android:pathData="M60,70m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"
-      android:fillColor="#CBDEFB"/>
+      android:pathData="M0,0h108v108h-108z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="54"
+          android:startY="1.52"
+          android:endX="54"
+          android:endY="108.02"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#FFE6E8E9"/>
+      </gradient>
+    </aapt:attr>
+  </path>
 </vector>
diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml
index 7ce0be904..6fe8e07e1 100644
--- a/res/drawable/ic_launcher_foreground.xml
+++ b/res/drawable/ic_launcher_foreground.xml
@@ -1,34 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group>
-    <clip-path
-        android:pathData="M0,0h108v108h-108z"/>
-    <path
-        android:pathData="M108,0H0V108H108V0ZM34,38C31.791,38 30,39.791 30,42V68C30,70.209 31.791,72 34,72H74C76.209,72 78,70.209 78,68V42C78,39.791 76.209,38 74,38H58L54.586,34.586C54.211,34.211 53.702,34 53.172,34H38.828C38.298,34 37.789,34.211 37.414,34.586L34,38Z"
-        android:fillColor="#ffffff"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
-        android:fillAlpha="0.6">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:gradientRadius="72"
-            android:centerX="28.54"
-            android:centerY="28.54"
-            android:type="radial">
-          <item android:offset="0" android:color="#19FFFFFF"/>
-          <item android:offset="1" android:color="#00FFFFFF"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-  </group>
+  <path
+      android:pathData="M75.47,33H32.52C30.02,33 28,35.02 28,37.52V63.92C28,66.42 30.02,68.45 32.52,68.45H75.47C77.97,68.45 80,66.42 80,63.92V37.52C80,35.02 77.97,33 75.47,33Z"
+      android:fillColor="#00A9ED"/>
+  <path
+      android:pathData="M74.52,35.46H33.48C30.98,35.46 28.96,37.48 28.96,39.98V66.38C28.96,68.88 30.98,70.9 33.48,70.9H74.52C77.02,70.9 79.04,68.88 79.04,66.38V39.98C79.04,37.48 77.02,35.46 74.52,35.46Z"
+      android:fillColor="#FAF17A"/>
+  <path
+      android:pathData="M46.17,42.32L46.2,42.39C45.51,41.12 44.12,40.22 43,40.22H31.51C31.05,40.22 30.59,40.31 30.17,40.49C29.74,40.67 29.35,40.92 29.03,41.25C28.7,41.58 28.45,41.96 28.27,42.39C28.09,42.81 28,43.27 28,43.73V45.3H28.01V45.31H28V70.29C28,71.49 28.48,72.64 29.32,73.48C30.17,74.33 31.32,74.81 32.52,74.81H75.48C76.68,74.81 77.83,74.33 78.68,73.48C79.52,72.64 80,71.49 80,70.29V49.83C80,48.63 79.52,47.48 78.68,46.63C77.83,45.78 76.68,45.31 75.48,45.31L50.48,45.3C48.83,45.3 46.98,43.81 46.17,42.32Z"
+      android:fillColor="#00A9ED"/>
 </vector>
diff --git a/res/drawable/ic_launcher_monochrome.xml b/res/drawable/ic_launcher_monochrome.xml
deleted file mode 100644
index 38f9fbb9b..000000000
--- a/res/drawable/ic_launcher_monochrome.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M34,38C31.791,38 30,39.791 30,42V68C30,70.209 31.791,72 34,72H74C76.209,72 78,70.209 78,68V42C78,39.791 76.209,38 74,38H58L54.586,34.586C54.211,34.211 53.702,34 53.172,34H38.828C38.298,34 37.789,34.211 37.414,34.586L34,38ZM75,68V51.264C70.891,47.97 65.676,46 60,46C47.08,46 36.545,56.209 36.02,69H74C74.552,69 75,68.552 75,68Z"
-      android:fillColor="#ffffffff"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml
index b58c81ff9..d24a0f7ef 100644
--- a/res/mipmap-anydpi/ic_launcher.xml
+++ b/res/mipmap-anydpi/ic_launcher.xml
@@ -1,10 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground>
+        <inset android:drawable="@drawable/ic_launcher_foreground" android:inset="5%" />
+    </foreground>
 </adaptive-icon>
-- 
GitLab


From 0e88aa2b8d52b489dfc3659dea57c2fe55b99fc8 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Thu, 15 Sep 2022 19:24:13 +0530
Subject: [PATCH 3/5] Theme app according to our palette

---
 Android.bp                                    |  1 +
 res/color/search_chip_background_color.xml    |  4 +--
 .../bottom_sheet_dialog_background.xml        |  2 +-
 res/drawable/ic_arrow_back.xml                |  2 +-
 res/drawable/ic_hamburger.xml                 |  2 +-
 res/drawable/list_divider.xml                 |  2 +-
 res/layout/drawer_layout.xml                  |  4 +--
 res/layout/inspector_activity.xml             |  4 +--
 res/layout/inspector_header.xml               |  2 +-
 res/values-night/colors.xml                   |  7 -----
 res/values-night/themes.xml                   | 26 -------------------
 res/values/colors.xml                         | 12 ++++-----
 res/values/styles.xml                         |  7 +++--
 res/values/themes.xml                         | 17 ++++++------
 src/com/android/documentsui/BaseActivity.java |  6 -----
 .../inspector/InspectorActivity.java          |  6 -----
 16 files changed, 32 insertions(+), 72 deletions(-)

diff --git a/Android.bp b/Android.bp
index 6cda44131..e9cae0778 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,6 +40,7 @@ java_defaults {
         "androidx.transition_transition",
         "apache-commons-compress",
         "com.google.android.material_material",
+        "elib",
         "guava",
         "modules-utils-build_system",
     ],
diff --git a/res/color/search_chip_background_color.xml b/res/color/search_chip_background_color.xml
index c94d155a5..ed5f3222f 100644
--- a/res/color/search_chip_background_color.xml
+++ b/res/color/search_chip_background_color.xml
@@ -16,7 +16,7 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:color="?android:attr/colorSecondary"/>
-    <item android:state_enabled="true" android:color="?android:attr/colorBackground"/>
+    <item android:state_selected="true" android:color="@color/e_alpha_accent"/>
+    <item android:state_enabled="true" android:color="@color/e_action_bar"/>
     <item android:state_enabled="false" android:color="@color/chip_background_disable_color"/>
 </selector>
\ No newline at end of file
diff --git a/res/drawable/bottom_sheet_dialog_background.xml b/res/drawable/bottom_sheet_dialog_background.xml
index 703667a52..f3f7bb930 100644
--- a/res/drawable/bottom_sheet_dialog_background.xml
+++ b/res/drawable/bottom_sheet_dialog_background.xml
@@ -15,7 +15,7 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid android:color="?android:attr/colorBackground" />
+    <solid android:color="?android:attr/colorBackgroundFloating" />
 
     <corners android:topLeftRadius="@dimen/grid_item_radius"
              android:topRightRadius="@dimen/grid_item_radius"
diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml
index 1a9993033..08f4e1ae9 100644
--- a/res/drawable/ic_arrow_back.xml
+++ b/res/drawable/ic_arrow_back.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?android:colorControlNormal"
+        android:fillColor="@color/e_primary_text_color"
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_hamburger.xml b/res/drawable/ic_hamburger.xml
index bc273524b..4e4ef7f7b 100644
--- a/res/drawable/ic_hamburger.xml
+++ b/res/drawable/ic_hamburger.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="?android:attr/colorControlNormal"
+        android:fillColor="@color/e_primary_text_color"
         android:pathData="M3,18h18v-2H3V18zM3,13h18v-2H3V13zM3,6v2h18V6H3z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/list_divider.xml b/res/drawable/list_divider.xml
index 5067af08e..de96b1f12 100644
--- a/res/drawable/list_divider.xml
+++ b/res/drawable/list_divider.xml
@@ -15,7 +15,7 @@
 -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:tint="?android:attr/colorForeground">
+       android:tint="@android:color/transparent">
     <solid android:color="@color/list_divider_color" />
     <size
         android:height="1dp"
diff --git a/res/layout/drawer_layout.xml b/res/layout/drawer_layout.xml
index d08c17d9f..25a982eb8 100644
--- a/res/layout/drawer_layout.xml
+++ b/res/layout/drawer_layout.xml
@@ -79,13 +79,13 @@
             android:layout_gravity="start"
             android:orientation="vertical"
             android:elevation="0dp"
-            android:background="?android:attr/colorBackground">
+            android:background="@color/e_drawer_background">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/roots_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/actionBarSize"
-                android:background="?android:attr/colorBackground"
+                android:background="@color/e_drawer_background"
                 android:elevation="0dp"
                 app:titleTextAppearance="@style/DrawerMenuTitle"
                 app:titleTextColor="?android:colorAccent"/>
diff --git a/res/layout/inspector_activity.xml b/res/layout/inspector_activity.xml
index 8763351c9..9d6908a04 100644
--- a/res/layout/inspector_activity.xml
+++ b/res/layout/inspector_activity.xml
@@ -55,7 +55,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/actionBarSize"
-                android:background="?android:attr/colorBackground"
+                android:background="@color/e_action_bar"
                 android:theme="?actionBarTheme"
                 app:title="@string/inspector_title"
                 app:titleTextAppearance="@style/ToolbarTitle"
@@ -76,7 +76,7 @@
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bottom_sheet_dialog_background"
+            android:background="@color/app_background_color"
             android:paddingBottom="5dp">
 
             <com.android.documentsui.inspector.DetailsView
diff --git a/res/layout/inspector_header.xml b/res/layout/inspector_header.xml
index 94a092790..d50ccf096 100644
--- a/res/layout/inspector_header.xml
+++ b/res/layout/inspector_header.xml
@@ -24,6 +24,6 @@
         android:layout_height="match_parent"
         android:scaleType="fitCenter"
         android:alpha="0.0"
-        android:background="?android:colorBackgroundFloating" />
+        android:background="?android:colorBackground" />
 
 </RelativeLayout>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 143b3e693..71c0d45b2 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -14,14 +14,8 @@
      limitations under the License.
 -->
 <resources>
-    <color name="app_background_color">#202124</color>
-    <color name="background_floating">#3C4043</color>
     <color name="nav_bar_translucent">#52000000</color>
 
-    <color name="primary">#8AB4F8</color>
-    <color name="secondary">#3D8AB4F8</color>
-    <color name="hairline">#5F6368</color>
-
     <color name="empty_state_text_color">@android:color/white</color>
     <color name="error_image_color">@android:color/white</color>
 
@@ -32,7 +26,6 @@
     <color name="doc_list_item_subtitle_disabled">#36ffffff</color>
 
     <color name="list_divider_color">#9aa0a6</color>
-    <color name="list_item_selected_background_color">?android:colorSecondary</color>
 
     <color name="fragment_pick_active_text_color">#202124</color> <!-- Grey 900 -->
 </resources>
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index 8ade73172..ddf2dcd02 100644
--- a/res/values-night/themes.xml
+++ b/res/values-night/themes.xml
@@ -18,30 +18,4 @@
     <style name="LauncherTheme" parent="DocumentsTheme">
         <item name="android:windowBackground">@drawable/launcher_screen_night</item>
     </style>
-    <style name="DocumentsTheme" parent="@android:style/Theme.DeviceDefault.DocumentsUI">
-
-        <!-- Toolbar -->
-        <item name="android:actionModeBackground">?android:attr/colorBackground</item>
-        <item name="android:actionBarSize">@dimen/action_bar_size</item>
-
-        <!-- Color section -->
-        <item name="android:colorAccent">@color/primary</item>
-        <item name="android:colorBackground">@color/app_background_color</item>
-        <item name="android:colorBackgroundFloating">@color/background_floating</item>
-        <item name="android:colorControlHighlight">@color/ripple_material_dark</item>
-        <item name="android:colorControlActivated">@color/primary</item>
-        <item name="android:colorPrimary">@color/primary</item>
-        <item name="android:colorSecondary">@color/secondary</item>
-        <item name="android:strokeColor">@color/hairline</item>
-
-        <!-- System | Widget section -->
-        <item name="android:listDivider">@drawable/list_divider</item>
-        <item name="android:statusBarColor">?android:attr/colorBackground</item>
-        <item name="android:windowBackground">?android:attr/colorBackground</item>
-        <item name="android:windowLightStatusBar">false</item>
-        <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
-
-    </style>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 12b8762aa..48a5f713e 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -18,13 +18,13 @@
        else that needs to manually declare a background matching the "default"
        app background (e.g. the drawer overlay). -->
 
-  <color name="app_background_color">@android:color/white</color>
-  <color name="background_floating">@android:color/white</color>
+  <color name="app_background_color">@color/e_background</color>
+  <color name="background_floating">@color/e_floating_background</color>
   <color name="nav_bar_translucent">#99FFFFFF</color>
 
-  <color name="primary">#1E88E5</color> <!-- Blue 600 -->
-  <color name="secondary">#E3F2FD</color> <!-- Blue 50 -->
-  <color name="hairline">#E0E0E0</color> <!-- Gray 300 -->
+  <color name="primary">@color/e_accent</color> <!-- Blue 600 -->
+  <color name="secondary">@color/e_alpha_accent</color> <!-- Blue 50 -->
+  <color name="hairline">@color/e_stroke_color</color>
 
   <color name="chip_background_disable_color">#fff1f3f4</color>
   <color name="menu_search_background">@android:color/transparent</color>
@@ -55,7 +55,7 @@
   <color name="list_divider_color">#1f000000</color>
   <color name="list_item_selected_background_color">?android:colorSecondary
   </color>
-  <color name="color_surface_header">@color/app_background_color</color>
+  <color name="color_surface_header">@color/e_action_bar</color>
 
   <color name="tab_selected_text_color">@color/primary</color>
   <color name="work_profile_button_stroke_color">@color/primary</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index b27f2ea55..bbbb0de2b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,6 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
         <item name="colorControlNormal">?android:textColorSecondary</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
     </style>
 
     <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode">
@@ -27,7 +28,7 @@
     </style>
 
     <style name="CardViewStyle" parent="@style/Widget.MaterialComponents.CardView">
-        <item name="cardBackgroundColor">@color/app_background_color</item>
+        <item name="cardBackgroundColor">@color/e_floating_background</item>
         <item name="cardPreventCornerOverlap">false</item>
         <item name="cardCornerRadius">@dimen/grid_item_radius</item>
         <item name="cardElevation">@dimen/grid_item_elevation</item>
@@ -59,7 +60,7 @@
     </style>
 
     <style name="OverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">?android:colorControlNormal</item>
+        <item name="android:src">@drawable/e_ic_more</item>
         <item name="android:minWidth">@dimen/button_touch_size</item>
     </style>
 
@@ -103,6 +104,8 @@
     </style>
 
     <style name="MaterialAlertDialogTheme" parent="@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog.Centered">
+        <item name="colorSurface">@color/background_floating</item>
+        <item name="elevationOverlayEnabled">false</item>
         <item name="android:dialogCornerRadius">@dimen/grid_item_radius</item>
         <item name="alertDialogStyle">@style/MaterialAlertDialogStyle</item>
         <item name="buttonBarPositiveButtonStyle">@style/DialogTextButton</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 443374282..a7bae6433 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -22,13 +22,13 @@
     <style name="DocumentsTheme" parent="@android:style/Theme.DeviceDefault.DocumentsUI">
 
         <item name="android:actionBarSize">@dimen/action_bar_size</item>
-        <item name="android:actionModeBackground">?android:attr/colorBackground</item>
+        <item name="android:actionModeBackground">@color/e_action_bar</item>
 
         <!-- Color section -->
         <item name="android:colorAccent">@color/primary</item>
-        <item name="android:colorBackground">@android:color/white</item>
+        <item name="android:colorBackground">@color/app_background_color</item>
         <item name="android:colorBackgroundFloating">@color/background_floating</item>
-        <item name="android:colorControlHighlight">@color/ripple_material_light</item>
+        <item name="android:colorControlHighlight">@color/e_alpha_accent</item>
         <item name="android:colorControlActivated">@color/primary</item>
         <item name="android:colorPrimary">@color/primary</item>
         <item name="android:colorSecondary">@color/secondary</item>
@@ -36,16 +36,17 @@
 
         <!-- System | Widget section -->
         <item name="android:listDivider">@drawable/list_divider</item>
-        <item name="android:statusBarColor">?android:colorBackground</item>
-        <item name="android:navigationBarColor">?android:colorBackground</item>
+        <item name="android:statusBarColor">@color/e_action_bar</item>
+        <item name="android:navigationBarColor">@color/e_action_bar</item>
         <item name="android:windowBackground">?android:colorBackground</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">@bool/isLight</item>
+        <item name="android:windowLightNavigationBar">@bool/isLight</item>
         <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
 
         <!-- OEM should not overlay this attr -->
         <item name="android:windowNoTitle">true</item>
-
+        <item name="android:textColorPrimary">@color/e_primary_text_color</item>
+        <item name="android:textColorSecondary">@color/e_secondary_text_color</item>
     </style>
 
     <style name="DocumentsDefaultTheme" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java
index f9a0d0ff5..0e1dd8f28 100644
--- a/src/com/android/documentsui/BaseActivity.java
+++ b/src/com/android/documentsui/BaseActivity.java
@@ -459,12 +459,6 @@ public abstract class BaseActivity
         });
 
         getWindow().setNavigationBarDividerColor(Color.TRANSPARENT);
-        if (Build.VERSION.SDK_INT >= 29) {
-            getWindow().setNavigationBarColor(Color.TRANSPARENT);
-            getWindow().setNavigationBarContrastEnforced(true);
-        } else {
-            getWindow().setNavigationBarColor(getColor(R.color.nav_bar_translucent));
-        }
     }
 
     @Override
diff --git a/src/com/android/documentsui/inspector/InspectorActivity.java b/src/com/android/documentsui/inspector/InspectorActivity.java
index 948d66fb2..427595261 100644
--- a/src/com/android/documentsui/inspector/InspectorActivity.java
+++ b/src/com/android/documentsui/inspector/InspectorActivity.java
@@ -119,11 +119,5 @@ public class InspectorActivity extends AppCompatActivity {
         });
 
         getWindow().setNavigationBarDividerColor(Color.TRANSPARENT);
-        if (Build.VERSION.SDK_INT >= 29) {
-            getWindow().setNavigationBarColor(Color.TRANSPARENT);
-            getWindow().setNavigationBarContrastEnforced(true);
-        } else {
-            getWindow().setNavigationBarColor(getColor(R.color.nav_bar_translucent));
-        }
     }
 }
\ No newline at end of file
-- 
GitLab


From dcf46a1a6fc491df496c75d2b54c4f36775b1277 Mon Sep 17 00:00:00 2001
From: althafvly <althafvly@gmail.com>
Date: Mon, 6 Mar 2023 06:42:53 +0000
Subject: [PATCH 4/5] DocumentsUI: use translation of files_label for all

---
 AndroidManifest.xml                                         | 6 +++---
 src/com/android/documentsui/files/FilesActivity.java        | 2 +-
 src/com/android/documentsui/files/LauncherActivity.java     | 2 +-
 src/com/android/documentsui/files/MenuManager.java          | 2 +-
 src/com/android/documentsui/picker/PickActivity.java        | 2 +-
 .../android/documentsui/services/FileOperationService.java  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3802d1d8c..d8a11f897 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -41,7 +41,7 @@
 
     <application
         android:name=".DocumentsApplication"
-        android:label="@string/app_label"
+        android:label="@string/files_label"
         android:icon="@mipmap/ic_launcher"
         android:supportsRtl="true"
         android:allowBackup="true"
@@ -85,7 +85,7 @@
 
         <activity
             android:name=".files.LauncherActivity"
-            android:label="@string/launcher_label"
+            android:label="@string/files_label"
             android:icon="@drawable/launcher_icon"
             android:theme="@android:style/Theme.NoDisplay">
         </activity>
@@ -101,7 +101,7 @@
         <activity-alias
             android:name=".LauncherActivity"
             android:targetActivity=".files.LauncherActivity"
-            android:label="@string/launcher_label"
+            android:label="@string/files_label"
             android:exported="true"
             android:icon="@drawable/launcher_icon" >
             <intent-filter>
diff --git a/src/com/android/documentsui/files/FilesActivity.java b/src/com/android/documentsui/files/FilesActivity.java
index 4ab393d30..5650c9db1 100644
--- a/src/com/android/documentsui/files/FilesActivity.java
+++ b/src/com/android/documentsui/files/FilesActivity.java
@@ -290,7 +290,7 @@ public class FilesActivity extends BaseActivity implements AbstractActionHandler
         Intent intent = getIntent();
         return (intent != null && intent.hasExtra(Intent.EXTRA_TITLE))
                 ? intent.getStringExtra(Intent.EXTRA_TITLE)
-                : getString(R.string.app_label);
+                : getString(R.string.files_label);
     }
 
     @Override
diff --git a/src/com/android/documentsui/files/LauncherActivity.java b/src/com/android/documentsui/files/LauncherActivity.java
index 8cd7dcbb8..6ae3652c5 100644
--- a/src/com/android/documentsui/files/LauncherActivity.java
+++ b/src/com/android/documentsui/files/LauncherActivity.java
@@ -98,7 +98,7 @@ public class LauncherActivity extends Activity {
     private void startTask() {
         Intent intent = createLaunchIntent(this);
 
-        intent.putExtra(TASK_LABEL_RES, R.string.launcher_label);
+        intent.putExtra(TASK_LABEL_RES, R.string.files_label);
         intent.putExtra(TASK_ICON_RES, R.drawable.launcher_icon);
 
         // Forward any flags from the original intent.
diff --git a/src/com/android/documentsui/files/MenuManager.java b/src/com/android/documentsui/files/MenuManager.java
index e51b26892..04db0d44d 100644
--- a/src/com/android/documentsui/files/MenuManager.java
+++ b/src/com/android/documentsui/files/MenuManager.java
@@ -78,7 +78,7 @@ public final class MenuManager extends com.android.documentsui.MenuManager {
     public void updateKeyboardShortcutsMenu(
             List<KeyboardShortcutGroup> data, IntFunction<String> stringSupplier) {
         KeyboardShortcutGroup group = new KeyboardShortcutGroup(
-                stringSupplier.apply(R.string.app_label));
+                stringSupplier.apply(R.string.files_label));
         group.addItem(new KeyboardShortcutInfo(
                 stringSupplier.apply(R.string.menu_cut_to_clipboard), KeyEvent.KEYCODE_X,
                 KeyEvent.META_CTRL_ON));
diff --git a/src/com/android/documentsui/picker/PickActivity.java b/src/com/android/documentsui/picker/PickActivity.java
index c2fbd50a0..263c2654c 100644
--- a/src/com/android/documentsui/picker/PickActivity.java
+++ b/src/com/android/documentsui/picker/PickActivity.java
@@ -300,7 +300,7 @@ public class PickActivity extends BaseActivity implements ActionHandler.Addons {
                     title = getResources().getString(R.string.title_save);
                 } else {
                     // If all else fails, just call it "Documents".
-                    title = getResources().getString(R.string.app_label);
+                    title = getResources().getString(R.string.files_label);
                 }
             }
         }
diff --git a/src/com/android/documentsui/services/FileOperationService.java b/src/com/android/documentsui/services/FileOperationService.java
index c7be5f4fc..ffbffdfed 100644
--- a/src/com/android/documentsui/services/FileOperationService.java
+++ b/src/com/android/documentsui/services/FileOperationService.java
@@ -176,7 +176,7 @@ public class FileOperationService extends Service implements Job.Listener {
         if (features.isNotificationChannelEnabled()) {
             NotificationChannel channel = new NotificationChannel(
                     NOTIFICATION_CHANNEL_ID,
-                    getString(R.string.app_label),
+                    getString(R.string.files_label),
                     NotificationManager.IMPORTANCE_LOW);
             notificationManager.createNotificationChannel(channel);
         }
-- 
GitLab


From 7179ebfeaa5113d0148e6a94018785b244fcd231 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Wed, 22 Mar 2023 17:12:04 +0530
Subject: [PATCH 5/5] Port translation changes from Android S

---
 res/values-de/strings.xml | 161 ++++++++++++++--------------
 res/values-es/strings.xml |  15 ++-
 res/values-fr/strings.xml |  58 +++++------
 res/values-it/strings.xml |  87 ++++++++--------
 res/values-nl/strings.xml | 109 ++++++++++---------
 res/values-ru/strings.xml | 213 +++++++++++++++++++-------------------
 res/values-uk/strings.xml | 191 +++++++++++++++++-----------------
 7 files changed, 407 insertions(+), 427 deletions(-)

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 978822db8..4692a2015 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,18 +12,15 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="missing_rename_error" msgid="9098952207447981103">"Du musst einen neuen Namen eingeben"</string>
     <string name="add_folder_name_error" msgid="6014615052491406810">"Du musst einen Namen für den Ordner angeben"</string>
     <string name="files_label" msgid="771781190045103748">"Dateien"</string>
     <string name="downloads_label" msgid="5462789470049501103">"Downloads"</string>
     <!-- no translation found for app_label (8089292432455111409) -->
-    <skip />
+    <skip/>
     <!-- no translation found for launcher_label (799410258349837668) -->
-    <skip />
+    <skip/>
     <string name="title_open" msgid="3165686459158020921">"Öffnen aus"</string>
     <string name="title_save" msgid="4384490653102710025">"Speichern unter"</string>
     <string name="menu_create_dir" msgid="2413624798689091042">"Neuer Ordner"</string>
@@ -35,7 +32,7 @@
     <string name="menu_open_with" msgid="5507647065467520229">"Öffnen mit"</string>
     <string name="menu_open_in_new_window" msgid="6686563636123311276">"In neuem Fenster öffnen"</string>
     <string name="menu_save" msgid="5195367497138965168">"Speichern"</string>
-    <string name="menu_share" msgid="4307140947108068356">"Teilen"</string>
+    <string name="menu_share" msgid="4307140947108068356">Teilen</string>
     <string name="menu_delete" msgid="1022254131543256626">"Löschen"</string>
     <string name="menu_select_all" msgid="7600576812185570403">"Alle auswählen"</string>
     <string name="menu_deselect_all" msgid="7729916068862742979">"Auswahl für alle aufheben"</string>
@@ -49,7 +46,7 @@
     <string name="menu_inspect" msgid="7279855349299446224">"Weitere Informationen"</string>
     <string name="menu_show_hidden_files" msgid="5140676344684492769">"Ausgeblendete Dateien anzeigen"</string>
     <string name="menu_hide_hidden_files" msgid="5654495713350153702">"Ausgeblendete Dateien nicht anzeigen"</string>
-    <string name="menu_view_in_owner" msgid="7228948660557554770">"In <xliff:g id="SOURCE">%1$s</xliff:g> ansehen"</string>
+    <string name="menu_view_in_owner" msgid="7228948660557554770">In<xliff:g id="source" example="Google Drive">%1$s</xliff:g> ansehen</string>
     <string name="menu_new_window" msgid="2947837751796109126">"Neues Fenster"</string>
     <string name="menu_cut_to_clipboard" msgid="2878752142015026229">"Ausschneiden"</string>
     <string name="menu_copy_to_clipboard" msgid="5064081159073330776">"Kopieren"</string>
@@ -82,11 +79,11 @@
     <string name="sort_dimension_size_descending" msgid="2367030017597348938">"Größe (größte zuerst)"</string>
     <string name="sort_dimension_date_descending" msgid="5466839955763127113">"Änderungszeitpunkt (neueste zuerst)"</string>
     <string name="sort_dimension_dialog_title" msgid="3048641573962982157">"Sortieren nach"</string>
-    <string name="sort_dimension_button_title" msgid="1898606989130896126">"Nach <xliff:g id="LABEL">%s</xliff:g> sortiert"</string>
+    <string name="sort_dimension_button_title" msgid="1898606989130896126">Nach <xliff:g id="label" example="File name (A to Z)">%s</xliff:g> sortiert</string>
     <string name="directory_items" msgid="6645621978998614003">"Anzahl der Elemente"</string>
     <string name="sort_direction_ascending" msgid="5882787683763248102">"Aufsteigend"</string>
     <string name="sort_direction_descending" msgid="1729187589765894076">"Absteigend"</string>
-    <string name="open_external_app" msgid="7107920381038980086">"<xliff:g id="APPNAME">%1$s</xliff:g> öffnen"</string>
+    <string name="open_external_app" msgid="7107920381038980086"><xliff:g id="appName" example="Drive">%1$s</xliff:g> öffnen</string>
     <string name="drawer_open" msgid="8071673398187261741">"Root-Verzeichnis anzeigen"</string>
     <string name="drawer_close" msgid="4263880768630848848">"Root-Verzeichnis ausblenden"</string>
     <string name="save_error" msgid="8631128801982095782">"Dokument konnte nicht gespeichert werden"</string>
@@ -105,7 +102,7 @@
     <string name="cross_profile_action_not_allowed_title" msgid="6611281348716476478">"Diese Aktion ist nicht zulässig"</string>
     <string name="cross_profile_action_not_allowed_message" msgid="7331275433061690947">"Wenn du mehr wissen möchtest, wende dich bitte an deinen IT-Administrator"</string>
     <string name="root_recent" msgid="1080156975424341623">"Zuletzt verwendet"</string>
-    <string name="root_available_bytes" msgid="8269870862691408864">"<xliff:g id="SIZE">%1$s</xliff:g> verfügbar"</string>
+    <string name="root_available_bytes" msgid="8269870862691408864"><xliff:g id="size" example="3GB">%1$s</xliff:g> verfügbar</string>
     <string name="root_type_service" msgid="6521366147466512289">"Speicherdienste"</string>
     <string name="root_type_shortcut" msgid="6059343175525442279">"Verknüpfungen"</string>
     <string name="root_type_device" msgid="1713604128005476585">"Geräte"</string>
@@ -115,7 +112,7 @@
     <string name="toast_no_application" msgid="7555319548595113121">"Datei kann nicht geöffnet werden"</string>
     <string name="toast_view_in_archives_unsupported" msgid="1923221390170964845">"Dateien in Archiven können nicht geöffnet werden"</string>
     <string name="toast_failed_delete" msgid="3453846588205817591">"Einige Dokumente konnten nicht gelöscht werden"</string>
-    <string name="toast_share_over_limit" msgid="5805442886537093015">"Du kannst höchstens <xliff:g id="COUNT">%1$d</xliff:g> Dateien teilen"</string>
+    <string name="toast_share_over_limit" msgid="5805442886537093015">Du kannst höchstens <xliff:g id="count" example="1">%1$d</xliff:g> Dateien teilen</string>
     <string name="toast_action_not_allowed" msgid="1329382474450572415">"Aktion nicht zulässig"</string>
     <string name="share_via" msgid="8725082736005677161">"Teilen über"</string>
     <string name="copy_notification_title" msgid="52256435625098456">"Dateien werden kopiert"</string>
@@ -123,26 +120,26 @@
     <string name="extract_notification_title" msgid="5067393961754430469">"Dekomprimierung läuft"</string>
     <string name="move_notification_title" msgid="3173424987049347605">"Dateien werden verschoben"</string>
     <string name="delete_notification_title" msgid="2512757431856830792">"Dateien werden gelöscht"</string>
-    <string name="copy_remaining" msgid="5390517377265177727">"Noch <xliff:g id="DURATION">%s</xliff:g>"</string>
+    <string name="copy_remaining" msgid="5390517377265177727">Noch <xliff:g id="duration" example="3 minutes">%s</xliff:g></string>
     <plurals name="copy_begin" formatted="false" msgid="151184708996738192">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Elemente werden kopiert.</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Element wird kopiert.</item>
+        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> Element wird kopiert.</item>
+        <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> Elemente werden kopiert.</item>
     </plurals>
     <plurals name="compress_begin" formatted="false" msgid="3534158317098678895">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Dateien werden komprimiert.</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Datei wird komprimiert.</item>
+        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> Datei wird komprimiert.</item>
+        <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> Dateien werden komprimiert.</item>
     </plurals>
     <plurals name="extract_begin" formatted="false" msgid="1006380679562903749">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Dateien werden extrahiert.</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Datei wird extrahiert.</item>
+        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> Datei wird entpackt.</item>
+        <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> Dateien werden entpackt.</item>
     </plurals>
     <plurals name="move_begin" formatted="false" msgid="1464229874265756956">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Elemente werden verschoben.</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Element wird verschoben.</item>
+        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> Element wird verschoben.</item>
+        <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> Elemente werden verschoben.</item>
     </plurals>
     <plurals name="deleting" formatted="false" msgid="1729138001178158901">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Elemente werden gelöscht.</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Element wird gelöscht.</item>
+        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> Element wird gelöscht.</item>
+        <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> Elemente werden gelöscht.</item>
     </plurals>
     <string name="undo" msgid="2902438994196400565">"Rückgängig"</string>
     <string name="copy_preparing" msgid="4759516490222449324">"Wird vorbereitet…"</string>
@@ -150,112 +147,112 @@
     <string name="extract_preparing" msgid="4796626960061745796">"Wird vorbereitet…"</string>
     <string name="move_preparing" msgid="6504239656430530761">"Wird vorbereitet…"</string>
     <string name="delete_preparing" msgid="7339349837842802508">"Wird vorbereitet…"</string>
-    <string name="delete_progress" msgid="2627631054702306423">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="TOTALCOUNT">%2$d</xliff:g>"</string>
+    <string name="delete_progress" msgid="2627631054702306423"><xliff:g id="count" example="3">%1$d</xliff:g> / <xliff:g id="totalCount" example="5">%2$d</xliff:g></string>
     <plurals name="copy_error_notification_title" formatted="false" msgid="3188432450429390963">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Elemente konnten nicht kopiert werden</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Element konnte nicht kopiert werden</item>
+        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> Element konnte nicht kopiert werden</item>
+        <item quantity="other"><xliff:g id="count" example="2">%1$d</xliff:g> Elemente konnten nicht kopiert werden</item>
     </plurals>
     <plurals name="compress_error_notification_title" formatted="false" msgid="3043630066678213644">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Dateien konnten nicht komprimiert werden</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Datei konnte nicht komprimiert werden</item>
+        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> Datei konnte nicht komprimiert werden</item>
+        <item quantity="other"><xliff:g id="count" example="2">%1$d</xliff:g> Dateien konnten nicht komprimiert werden</item>
     </plurals>
     <plurals name="move_error_notification_title" formatted="false" msgid="2185736082411854754">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Elemente konnten nicht verschoben werden</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Element konnte nicht verschoben werden</item>
+        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> Element konnte nicht verschoben werden</item>
+        <item quantity="other"><xliff:g id="count" example="2">%1$d</xliff:g> Elemente konnten nicht verschoben werden</item>
     </plurals>
     <plurals name="delete_error_notification_title" formatted="false" msgid="7568122018481625267">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Elemente konnten nicht gelöscht werden</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Element konnte nicht gelöscht werden</item>
+        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> Element konnte nicht gelöscht werden</item>
+        <item quantity="other"><xliff:g id="count" example="2">%1$d</xliff:g> Elemente konnten nicht gelöscht werden</item>
     </plurals>
     <string name="notification_touch_for_details" msgid="2385563502445129570">"Zum Ansehen der Details tippen"</string>
     <string name="close" msgid="905969391788869975">"Schließen"</string>
     <plurals name="copy_failure_alert_content" formatted="false" msgid="5570549471912990536">
-      <item quantity="other">Folgende Dateien wurden nicht kopiert: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="one">Folgende Datei wurde nicht kopiert: <xliff:g id="LIST_0">%1$s</xliff:g></item>
+        <item quantity="one">Folgende Datei wurden nicht kopiert: <xliff:g id="list" example="Document.pdf">%1$s</xliff:g></item>
+        <item quantity="other">Folgende Dateien wurde nicht kopiert: <xliff:g id="list" example="Document.pdf, Photo.jpg, Song.ogg">%1$s</xliff:g></item>
     </plurals>
     <plurals name="compress_failure_alert_content" formatted="false" msgid="5760632881868842400">
-      <item quantity="other">Folgende Dateien wurden nicht komprimiert: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="one">Folgende Datei wurde nicht komprimiert: <xliff:g id="LIST_0">%1$s</xliff:g></item>
+        <item quantity="one">Folgende Datei wurden nicht komprimiert: <xliff:g id="list" example="Document.pdf">%1$s</xliff:g></item>
+        <item quantity="other">Folgende Dateien wurde nicht komprimiert: <xliff:g id="list" example="Document.pdf, Photo.jpg, Song.ogg">%1$s</xliff:g></item>
     </plurals>
     <plurals name="extract_failure_alert_content" formatted="false" msgid="7572748127571720803">
-      <item quantity="other">Folgende Dateien wurden nicht extrahiert: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="one">Folgende Datei wurde nicht extrahiert: <xliff:g id="LIST_0">%1$s</xliff:g></item>
+        <item quantity="one">Folgende Datei wurden nicht extrahiert: <xliff:g id="list" example="Document.pdf">%1$s</xliff:g></item>
+        <item quantity="other">Folgende Dateien wurde nicht extrahiert: <xliff:g id="list" example="Document.pdf, Photo.jpg, Song.ogg">%1$s</xliff:g></item>
     </plurals>
     <plurals name="move_failure_alert_content" formatted="false" msgid="2747390342670799196">
-      <item quantity="other">Folgende Dateien wurden nicht verschoben: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="one">Folgende Datei wurde nicht verschoben: <xliff:g id="LIST_0">%1$s</xliff:g></item>
+        <item quantity="one">Folgende Datei wurden nicht verschoben: <xliff:g id="list" example="Document.pdf">%1$s</xliff:g></item>
+        <item quantity="other">Folgende Dateien wurde nicht verschoben: <xliff:g id="list" example="Document.pdf, Photo.jpg, Song.ogg">%1$s</xliff:g></item>
     </plurals>
     <plurals name="delete_failure_alert_content" formatted="false" msgid="6122372614839711711">
-      <item quantity="other">Folgende Dateien wurden nicht gelöscht: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="one">Folgende Datei wurde nicht gelöscht: <xliff:g id="LIST_0">%1$s</xliff:g></item>
+        <item quantity="one">Folgende Datei wurden nicht gelöscht: <xliff:g id="list" example="Document.pdf">%1$s</xliff:g></item>
+        <item quantity="other">Folgende Dateien wurde nicht gelöscht: <xliff:g id="list" example="Document.pdf, Photo.jpg, Song.ogg">%1$s</xliff:g></item>
     </plurals>
     <plurals name="copy_converted_warning_content" formatted="false" msgid="7433742181712126588">
-      <item quantity="other">Folgende Dateien wurden in ein anderes Format konvertiert: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="one">Folgende Datei wurde in ein anderes Format konvertiert: <xliff:g id="LIST_0">%1$s</xliff:g></item>
+        <item quantity="one">Folgende Datei wurden in ein anderes Format konvertiert: <xliff:g id="list" example="Document.pdf">%1$s</xliff:g></item>
+        <item quantity="other">Folgende Dateien wurde in ein anderes Format konvertiert: <xliff:g id="list" example="Document.pdf, Photo.jpg, Song.ogg">%1$s</xliff:g></item>
     </plurals>
     <plurals name="clipboard_files_clipped" formatted="false" msgid="4847061634862926902">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Elemente wurden in die Zwischenablage kopiert.</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Element wurde in die Zwischenablage kopiert.</item>
+        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> Element wurde in die Zwischenablage kopiert.</item>
+        <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> Elemente wurden in die Zwischenablage kopiert.</item>
     </plurals>
     <string name="file_operation_rejected" msgid="4301554203329008794">"Dateioperation wird nicht unterstützt."</string>
     <string name="file_operation_error" msgid="2234357335716533795">"Dateioperation fehlgeschlagen."</string>
     <string name="rename_error" msgid="6700093173508118635">"Dokument konnte nicht umbenannt werden"</string>
     <string name="menu_eject_root" msgid="9215040039374893613">"Auswerfen"</string>
     <string name="notification_copy_files_converted_title" msgid="6916768494891833365">"Einige Dateien wurden konvertiert"</string>
-    <string name="open_external_dialog_request" msgid="8173558471322861268">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> Zugriff auf das Verzeichnis <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> auf <xliff:g id="STORAGE"><i>^3</i></xliff:g> geben?"</string>
-    <string name="open_external_dialog_request_primary_volume" msgid="2240992164087948176">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> Zugriff auf das Verzeichnis <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> geben?"</string>
-    <string name="open_external_dialog_root_request" msgid="6776729293982633">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> Zugriff auf die Daten auf <xliff:g id="STORAGE"><i>^2</i></xliff:g> geben, einschließlich Fotos und Videos?"</string>
+    <string name="open_external_dialog_request" msgid="8173558471322861268"><xliff:g id="appName" example="System Settings"><b>^1</b></xliff:g> Zugriff auf das Verzeichnis <xliff:g id="directory" example="Pictures"><i>^2</i></xliff:g> auf <xliff:g id="storage" example="SD Card"><i>^3</i></xliff:g> gewähren\?</string>
+    <string name="open_external_dialog_request_primary_volume" msgid="2240992164087948176"><xliff:g id="appName" example="System Settings"><b>^1</b></xliff:g> Zugriff auf das Verzeichnis <xliff:g id="directory" example="Pictures"><i>^2</i></xliff:g> gewähren\?</string>
+    <string name="open_external_dialog_root_request" msgid="6776729293982633"><xliff:g id="appName" example="System Settings"><b>^1</b></xliff:g> Zugriff auf die Daten auf <xliff:g id="storage" example="SD Card"><i>^2</i></xliff:g> gewähren, einschließlich Fotos und Videos\?</string>
     <string name="allow" msgid="1275746941353040309">"Zulassen"</string>
     <string name="deny" msgid="5127201668078153379">"Ablehnen"</string>
     <plurals name="elements_selected" formatted="false" msgid="4448165978637163692">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ausgewählt</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ausgewählt</item>
+        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> ausgewählt</item>
+        <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> ausgewählt</item>
     </plurals>
     <plurals name="elements_dragged" formatted="false" msgid="5932571296037626279">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Elemente</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Element</item>
+        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> Element</item>
+        <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> Elemente</item>
     </plurals>
-    <string name="delete_filename_confirmation_message" msgid="8338069763240613258">"\"<xliff:g id="NAME">%1$s</xliff:g>\" löschen?"</string>
-    <string name="delete_foldername_confirmation_message" msgid="9084085260877704140">"Ordner \"<xliff:g id="NAME">%1$s</xliff:g>\" und dessen Inhalte löschen?"</string>
+    <string name="delete_filename_confirmation_message" msgid="8338069763240613258">„<xliff:g id="name" example="cat.jpg">%1$s</xliff:g>“ löschen\?</string>
+    <string name="delete_foldername_confirmation_message" msgid="9084085260877704140">Ordner „<xliff:g id="name" example="Photos">%1$s</xliff:g>“ und dessen Inhalte löschen\?</string>
     <plurals name="delete_files_confirmation_message" formatted="false" msgid="4866664063250034142">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Dateien löschen?</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Datei löschen?</item>
+        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> Datei löschen\?</item>
+        <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> Dateien löschen\?</item>
     </plurals>
     <plurals name="delete_folders_confirmation_message" formatted="false" msgid="1028946402799686388">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Ordner und deren Inhalte löschen?</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Ordner und dessen Inhalte löschen?</item>
+        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> Ordner und dessen Inhalte löschen\?</item>
+        <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> Ordner und deren Inhalte löschen\?</item>
     </plurals>
     <plurals name="delete_items_confirmation_message" formatted="false" msgid="7285090426511028179">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> Elemente löschen?</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> Element löschen?</item>
+        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> Element löschen\?</item>
+        <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> Elemente löschen\?</item>
     </plurals>
     <string name="images_shortcut_label" msgid="2545168016070493574">"Bilder"</string>
     <string name="archive_loading_failed" msgid="7243436722828766996">"Die Archivdatei konnte nicht geöffnet werden. Die Datei ist entweder beschädigt oder das Format wird nicht unterstützt."</string>
     <string name="name_conflict" msgid="28407269328862986">"Eine Datei mit diesem Namen ist bereits vorhanden."</string>
-    <string name="authentication_required" msgid="8030880723643436099">"Um dieses Verzeichnis anzusehen, melde dich bei <xliff:g id="NAME">%1$s</xliff:g> an"</string>
+    <string name="authentication_required" msgid="8030880723643436099">Um dieses Verzeichnis anzusehen, melde dich bei <xliff:g id="name" example="Cloud Storage">%1$s</xliff:g> an</string>
     <string name="cant_display_content" msgid="8633226333229417237">"Inhalt kann nicht angezeigt werden"</string>
-    <string name="sign_in" msgid="6253762676723505592">"Anmelden"</string>
-    <string name="new_archive_file_name" msgid="1604650338077249838">"archiv<xliff:g id="EXTENSION">%s</xliff:g>"</string>
-    <string name="overwrite_file_confirmation_message" msgid="2496109652768222716">"<xliff:g id="NAME">%1$s</xliff:g> überschreiben?"</string>
+    <string name="sign_in" msgid="6253762676723505592">Anmelden</string>
+    <string name="new_archive_file_name" msgid="1604650338077249838">archiv<xliff:g id="extension" example=".zip">%s</xliff:g></string>
+    <string name="overwrite_file_confirmation_message" msgid="2496109652768222716"><xliff:g id="name" example="foobar.txt">%1$s</xliff:g> überschreiben\?</string>
     <string name="continue_in_background" msgid="1974214559047793331">"Im Hintergrund fortsetzen"</string>
     <plurals name="selected_count" formatted="false" msgid="7555250236512981129">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ausgewählt</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ausgewählt</item>
+        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> ausgewählt</item>
+        <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> ausgewählt</item>
     </plurals>
     <string name="root_info_header_recent" msgid="5654901877295332262">"Zuletzt verwendete Dateien"</string>
     <string name="root_info_header_global_search" msgid="4904078222280496152">"Dateien"</string>
     <string name="root_info_header_downloads" msgid="8848161246921154115">"Dateien in \"Downloads\""</string>
-    <string name="root_info_header_storage" msgid="2989014130584927442">"Dateien auf <xliff:g id="DEVICE">%1$s</xliff:g>"</string>
-    <string name="root_info_header_folder" msgid="5851172222368049864">"Dateien in <xliff:g id="FOLDER">%1$s</xliff:g>"</string>
-    <string name="root_info_header_app" msgid="2125422047558420885">"Dateien aus \"<xliff:g id="LABEL">%1$s</xliff:g>\""</string>
-    <string name="root_info_header_app_with_summary" msgid="3223302581236069702">"Dateien von <xliff:g id="LABEL">%1$s</xliff:g>/<xliff:g id="SUMMARY">%2$s</xliff:g>"</string>
+    <string name="root_info_header_storage" msgid="2989014130584927442">Dateien auf <xliff:g id="device" example="Pixel">%1$s</xliff:g></string>
+    <string name="root_info_header_folder" msgid="5851172222368049864">Dateien in <xliff:g id="folder" example="DCIM">%1$s</xliff:g></string>
+    <string name="root_info_header_app" msgid="2125422047558420885">Dateien aus <xliff:g id="label" example="Drive">%1$s</xliff:g></string>
+    <string name="root_info_header_app_with_summary" msgid="3223302581236069702">Dateien von <xliff:g id="label" example="Drive">%1$s</xliff:g>/<xliff:g id="summary" example="example@com">%2$s</xliff:g></string>
     <string name="root_info_header_image_recent" msgid="7494373563753926014">"Aktuelle Bilder"</string>
     <string name="root_info_header_image_global_search" msgid="7307009823489854697">"Bilder"</string>
     <string name="root_info_header_image_downloads" msgid="7072252612657612307">"Bilder in \"Downloads\""</string>
-    <string name="root_info_header_image_storage" msgid="5086740886360075930">"Bilder auf <xliff:g id="DEVICE">%1$s</xliff:g>"</string>
-    <string name="root_info_header_image_folder" msgid="5980430877636279667">"Bilder in <xliff:g id="FOLDER">%1$s</xliff:g>"</string>
-    <string name="root_info_header_image_app" msgid="4858114210851525359">"Bilder aus <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="root_info_header_image_app_with_summary" msgid="6404842960923224778">"Bilder aus <xliff:g id="LABEL">%1$s</xliff:g>/<xliff:g id="SUMMARY">%2$s</xliff:g>"</string>
+    <string name="root_info_header_image_storage" msgid="5086740886360075930">Bilder auf <xliff:g id="device" example="Pixel">%1$s</xliff:g></string>
+    <string name="root_info_header_image_folder" msgid="5980430877636279667">Bilder in <xliff:g id="folder" example="DCIM">%1$s</xliff:g></string>
+    <string name="root_info_header_image_app" msgid="4858114210851525359">Bilder aus <xliff:g id="label" example="Drive">%1$s</xliff:g></string>
+    <string name="root_info_header_image_app_with_summary" msgid="6404842960923224778">Bilder aus <xliff:g id="label" example="Drive">%1$s</xliff:g>/<xliff:g id="summary" example="example@com">%2$s</xliff:g></string>
     <string name="chip_title_images" msgid="7838299046109841015">"Bilder"</string>
     <string name="chip_title_audio" msgid="1032801828748235436">"Audio"</string>
     <string name="chip_title_videos" msgid="7011260091979776447">"Videos"</string>
@@ -264,22 +261,22 @@
     <string name="chip_title_from_this_week" msgid="4961536405220379672">"Diese Woche"</string>
     <string name="input_hint_new_folder" msgid="479672411219725677">"Ordnername"</string>
     <string name="input_hint_rename" msgid="8390711744270994452">"Neuer Name"</string>
-    <string name="preview_file" msgid="4056622696305432343">"Datei \"<xliff:g id="FILENAME">%1$s</xliff:g>\" als Vorschau ansehen"</string>
-    <string name="preview_work_file" msgid="4495643735563487273">"Vorschau der geschäftlichen Datei \"<xliff:g id="FILENAME">%1$s</xliff:g>\""</string>
+    <string name="preview_file" msgid="4056622696305432343">Datei <xliff:g id="fileName" example="example.jpg">%1$s</xliff:g> als Vorschau ansehen</string>
+    <string name="preview_work_file" msgid="4495643735563487273">Vorschau der geschäftlichen Datei <xliff:g id="fileName" example="example.jpg">%1$s</xliff:g></string>
     <string name="apps_row_title" msgid="3340490016663092925">"Dateien in anderen Apps ansehen"</string>
     <string name="anonymous_application" msgid="7633027057951625862">"Anonym"</string>
     <string name="open_tree_button" msgid="6402871398424497776">"Diesen Ordner verwenden"</string>
-    <string name="open_tree_dialog_title" msgid="6339509533852318569">"<xliff:g id="APPNAME">%1$s</xliff:g> erlauben, auf Dateien in <xliff:g id="DIRECTORY">%2$s</xliff:g> zuzugreifen?"</string>
-    <string name="open_tree_dialog_message" msgid="4120695398430659628">"<xliff:g id="APPNAME">%1$s</xliff:g> kann dann auf Inhalte zugreifen, die derzeit und zukünftig in <xliff:g id="DIRECTORY">%2$s</xliff:g> gespeichert sind."</string>
+    <string name="open_tree_dialog_title" msgid="6339509533852318569"><xliff:g id="appName" example="Drive">%1$s</xliff:g> erlauben, auf Dateien in <xliff:g id="directory" example="DCIM">%2$s</xliff:g> zuzugreifen\?</string>
+    <string name="open_tree_dialog_message" msgid="4120695398430659628"><xliff:g id="appName" example="Drive">%1$s</xliff:g> kann dann auf Inhalte zugreifen, die derzeit und zukünftig in <xliff:g id="directory" example="DCIM">%2$s</xliff:g> gespeichert sind.</string>
     <string name="directory_blocked_header_title" msgid="1164584889578740066">"Dieser Ordner kann nicht verwendet werden"</string>
     <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"Zum Schutz deiner Daten einen anderen Ordner auswählen"</string>
     <string name="create_new_folder_button" msgid="8859613309559794890">"Neuen Ordner erstellen"</string>
     <string name="search_bar_hint" msgid="4517366509897977321">"Auf diesem Smartphone suchen"</string>
-    <string name="delete_search_history" msgid="2202015025607694515">"<xliff:g id="TEXT">%1$s</xliff:g>-Suchverlauf löschen"</string>
+    <string name="delete_search_history" msgid="2202015025607694515"><xliff:g id="text" example="image">%1$s</xliff:g>-Suchverlauf löschen</string>
     <string name="personal_tab" msgid="3878576287868528503">"Privat"</string>
     <string name="work_tab" msgid="7265359366883747413">"Geschäftlich"</string>
     <string name="a11y_work" msgid="7504431382825242153">"Aus Arbeitsprofil"</string>
     <string name="drag_from_another_app" msgid="8310249276199969905">"Du kannst keine Dateien aus einer anderen App verschieben."</string>
     <string name="grid_mode_showing" msgid="2803166871485028508">"Wird im Rastermodus angezeigt."</string>
     <string name="list_mode_showing" msgid="1225413902295895166">"Wird im Listenmodus angezeigt."</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b447155c8..67de06f34 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,18 +12,15 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="missing_rename_error" msgid="9098952207447981103">"Tienes que cambiar el nombre"</string>
     <string name="add_folder_name_error" msgid="6014615052491406810">"Tienes que dar un nombre a la carpeta"</string>
     <string name="files_label" msgid="771781190045103748">"Archivos"</string>
     <string name="downloads_label" msgid="5462789470049501103">"Descargas"</string>
     <!-- no translation found for app_label (8089292432455111409) -->
-    <skip />
+    <skip/>
     <!-- no translation found for launcher_label (799410258349837668) -->
-    <skip />
+    <skip/>
     <string name="title_open" msgid="3165686459158020921">"Abrir desde"</string>
     <string name="title_save" msgid="4384490653102710025">"Guardar en"</string>
     <string name="menu_create_dir" msgid="2413624798689091042">"Nueva carpeta"</string>
@@ -255,7 +252,7 @@
     <string name="name_conflict" msgid="28407269328862986">"Ya existe un archivo con este nombre."</string>
     <string name="authentication_required" msgid="8030880723643436099">"Para ver este directorio, inicia sesión en <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="cant_display_content" msgid="8633226333229417237">"No se ha podido mostrar el contenido"</string>
-    <string name="sign_in" msgid="6253762676723505592">"Iniciar sesión"</string>
+    <string name="sign_in" msgid="6253762676723505592">Acceder</string>
     <string name="new_archive_file_name" msgid="1604650338077249838">"archivo<xliff:g id="EXTENSION">%s</xliff:g>"</string>
     <string name="overwrite_file_confirmation_message" msgid="2496109652768222716">"¿Sobrescribir <xliff:g id="NAME">%1$s</xliff:g>?"</string>
     <string name="continue_in_background" msgid="1974214559047793331">"Continuar en segundo plano"</string>
@@ -304,4 +301,4 @@
     <string name="drag_from_another_app" msgid="8310249276199969905">"No puedes mover archivos de otra aplicación."</string>
     <string name="grid_mode_showing" msgid="2803166871485028508">"Mostrando modo de cuadrícula."</string>
     <string name="list_mode_showing" msgid="1225413902295895166">"Mostrando modo de lista."</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 50609c8c5..38663f26b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,18 +12,15 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="missing_rename_error" msgid="9098952207447981103">"Vous devez lui attribuer un autre nom"</string>
     <string name="add_folder_name_error" msgid="6014615052491406810">"Vous devez ajouter un nom de dossier"</string>
     <string name="files_label" msgid="771781190045103748">"Fichiers"</string>
     <string name="downloads_label" msgid="5462789470049501103">"Téléchargements"</string>
     <!-- no translation found for app_label (8089292432455111409) -->
-    <skip />
+    <skip/>
     <!-- no translation found for launcher_label (799410258349837668) -->
-    <skip />
+    <skip/>
     <string name="title_open" msgid="3165686459158020921">"Ouvrir à partir de"</string>
     <string name="title_save" msgid="4384490653102710025">"Enregistrer sous"</string>
     <string name="menu_create_dir" msgid="2413624798689091042">"Nouveau dossier"</string>
@@ -49,14 +46,14 @@
     <string name="menu_inspect" msgid="7279855349299446224">"Obtenir les informations"</string>
     <string name="menu_show_hidden_files" msgid="5140676344684492769">"Afficher les fichiers masqués"</string>
     <string name="menu_hide_hidden_files" msgid="5654495713350153702">"Ne pas afficher les fichiers masqués"</string>
-    <string name="menu_view_in_owner" msgid="7228948660557554770">"Afficher dans <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
+    <string name="menu_view_in_owner" msgid="7228948660557554770">Afficher dans <xliff:g id="source" example="Google Drive">%1$s</xliff:g></string>
     <string name="menu_new_window" msgid="2947837751796109126">"Nouvelle fenêtre"</string>
     <string name="menu_cut_to_clipboard" msgid="2878752142015026229">"Couper"</string>
     <string name="menu_copy_to_clipboard" msgid="5064081159073330776">"Copier"</string>
     <string name="menu_paste_from_clipboard" msgid="360947260414135827">"Coller"</string>
     <string name="menu_paste_into_folder" msgid="8000644546983240101">"Coller dans le dossier"</string>
     <string name="menu_advanced_show" msgid="7558626506462906726">"Aff. mémoire stockage interne"</string>
-    <string name="menu_advanced_hide" msgid="6488381508009246334">"Masquer mém. stock. int."</string>
+    <string name="menu_advanced_hide" msgid="6488381508009246334">Masquer mém. stock. int.</string>
     <string name="button_select" msgid="240863497069321364">"Sélectionner"</string>
     <string name="button_copy" msgid="8219059853840996027">"Copier"</string>
     <string name="button_compress" msgid="8951561310857223966">"Compresser"</string>
@@ -72,7 +69,7 @@
     <string name="sort_dimension_summary" msgid="7724534446881397860">"Résumé"</string>
     <string name="sort_dimension_file_type" msgid="5779709622922085381">"Type"</string>
     <string name="sort_dimension_size" msgid="2190547351159472884">"Taille"</string>
-    <string name="sort_dimension_date" msgid="4231005651895254033">"Dernière modif."</string>
+    <string name="sort_dimension_date" msgid="4231005651895254033">Dernière modif.</string>
     <string name="sort_dimension_name_ascending" msgid="3715725253270614742">"Nom de fichier (de A à Z)"</string>
     <string name="sort_dimension_file_type_ascending" msgid="3466973933402894292">"Type (de A à Z)"</string>
     <string name="sort_dimension_size_ascending" msgid="2617359017800057762">"Taille (moins volumineux d\'abord)"</string>
@@ -82,11 +79,11 @@
     <string name="sort_dimension_size_descending" msgid="2367030017597348938">"Taille (plus volumineux d\'abord)"</string>
     <string name="sort_dimension_date_descending" msgid="5466839955763127113">"Date de modification (plus récents d\'abord)"</string>
     <string name="sort_dimension_dialog_title" msgid="3048641573962982157">"Trier par"</string>
-    <string name="sort_dimension_button_title" msgid="1898606989130896126">"Triés par <xliff:g id="LABEL">%s</xliff:g>"</string>
+    <string name="sort_dimension_button_title" msgid="1898606989130896126">Triés par <xliff:g id="label" example="File name (A to Z)">%s</xliff:g></string>
     <string name="directory_items" msgid="6645621978998614003">"Nombre d\'éléments"</string>
     <string name="sort_direction_ascending" msgid="5882787683763248102">"Croissant"</string>
     <string name="sort_direction_descending" msgid="1729187589765894076">"Décroissant"</string>
-    <string name="open_external_app" msgid="7107920381038980086">"Ouvrir <xliff:g id="APPNAME">%1$s</xliff:g>"</string>
+    <string name="open_external_app" msgid="7107920381038980086">Ouvrir <xliff:g id="appName" example="Drive">%1$s</xliff:g></string>
     <string name="drawer_open" msgid="8071673398187261741">"Afficher les répertoires racines"</string>
     <string name="drawer_close" msgid="4263880768630848848">"Masquer les répertoires racines"</string>
     <string name="save_error" msgid="8631128801982095782">"Échec de l\'enregistrement du document"</string>
@@ -105,7 +102,7 @@
     <string name="cross_profile_action_not_allowed_title" msgid="6611281348716476478">"Cette opération n\'est pas autorisée"</string>
     <string name="cross_profile_action_not_allowed_message" msgid="7331275433061690947">"Pour en savoir plus, contactez ce dernier"</string>
     <string name="root_recent" msgid="1080156975424341623">"Récents"</string>
-    <string name="root_available_bytes" msgid="8269870862691408864">"<xliff:g id="SIZE">%1$s</xliff:g> disponible(s)"</string>
+    <string name="root_available_bytes" msgid="8269870862691408864"><xliff:g id="size" example="3GB">%1$s</xliff:g> disponible(s)</string>
     <string name="root_type_service" msgid="6521366147466512289">"Services de stockage"</string>
     <string name="root_type_shortcut" msgid="6059343175525442279">"Raccourcis"</string>
     <string name="root_type_device" msgid="1713604128005476585">"Appareils"</string>
@@ -115,15 +112,15 @@
     <string name="toast_no_application" msgid="7555319548595113121">"Impossible d\'ouvrir le fichier"</string>
     <string name="toast_view_in_archives_unsupported" msgid="1923221390170964845">"Impossible d\'ouvrir un fichier dans une archive"</string>
     <string name="toast_failed_delete" msgid="3453846588205817591">"Impossible de supprimer certains documents"</string>
-    <string name="toast_share_over_limit" msgid="5805442886537093015">"Impossible de partager plus de <xliff:g id="COUNT">%1$d</xliff:g> fichiers"</string>
+    <string name="toast_share_over_limit" msgid="5805442886537093015">Impossible de partager plus de \u0020<xliff:g id="count" example="1">%1$d</xliff:g> fichiers</string>
     <string name="toast_action_not_allowed" msgid="1329382474450572415">"Action interdite"</string>
     <string name="share_via" msgid="8725082736005677161">"Partager via"</string>
-    <string name="copy_notification_title" msgid="52256435625098456">"Copie de fichiers…"</string>
+    <string name="copy_notification_title" msgid="52256435625098456">Copie en cours</string>
     <string name="compress_notification_title" msgid="6830195148113751021">"Compression de fichiers"</string>
     <string name="extract_notification_title" msgid="5067393961754430469">"Extraction des fichiers"</string>
-    <string name="move_notification_title" msgid="3173424987049347605">"Déplacement de fichiers…"</string>
-    <string name="delete_notification_title" msgid="2512757431856830792">"Suppression des fichiers…"</string>
-    <string name="copy_remaining" msgid="5390517377265177727">"Temps restant : <xliff:g id="DURATION">%s</xliff:g>"</string>
+    <string name="move_notification_title" msgid="3173424987049347605">Déplacement en cours</string>
+    <string name="delete_notification_title" msgid="2512757431856830792">Suppression en cours</string>
+    <string name="copy_remaining" msgid="5390517377265177727">Temps restant :<xliff:g id="duration" example="3 minutes">%s</xliff:g></string>
     <plurals name="copy_begin" formatted="false" msgid="151184708996738192">
       <item quantity="one">Copie de <xliff:g id="COUNT_1">%1$d</xliff:g> élément…</item>
       <item quantity="many">Copying <xliff:g id="COUNT_1">%1$d</xliff:g> items.</item>
@@ -155,7 +152,8 @@
     <string name="extract_preparing" msgid="4796626960061745796">"Préparation..."</string>
     <string name="move_preparing" msgid="6504239656430530761">"Préparation..."</string>
     <string name="delete_preparing" msgid="7339349837842802508">"Préparation..."</string>
-    <string name="delete_progress" msgid="2627631054702306423">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="TOTALCOUNT">%2$d</xliff:g>"</string>
+    <string name="delete_progress" msgid="2627631054702306423"><xliff:g id="count" example="3">%1$d</xliff:g> /
+\n<xliff:g id="totalCount" example="5">%2$d</xliff:g></string>
     <plurals name="copy_error_notification_title" formatted="false" msgid="3188432450429390963">
       <item quantity="one">Impossible de copier <xliff:g id="COUNT_1">%1$d</xliff:g> élément</item>
       <item quantity="many">Couldn’t copy <xliff:g id="COUNT_1">%1$d</xliff:g> items</item>
@@ -176,7 +174,7 @@
       <item quantity="many">Couldn’t delete <xliff:g id="COUNT_1">%1$d</xliff:g> items</item>
       <item quantity="other">Impossible de supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> éléments</item>
     </plurals>
-    <string name="notification_touch_for_details" msgid="2385563502445129570">"Appuyez pour afficher plus d\'informations."</string>
+    <string name="notification_touch_for_details" msgid="2385563502445129570">Appuyez pour afficher plus d\'informations</string>
     <string name="close" msgid="905969391788869975">"Fermer"</string>
     <plurals name="copy_failure_alert_content" formatted="false" msgid="5570549471912990536">
       <item quantity="one">Ce fichier n\'a pas été copié : <xliff:g id="LIST_1">%1$s</xliff:g></item>
@@ -255,7 +253,7 @@
     <string name="name_conflict" msgid="28407269328862986">"Il existe déjà un fichier portant ce nom."</string>
     <string name="authentication_required" msgid="8030880723643436099">"Pour afficher cet annuaire, connectez-vous à <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="cant_display_content" msgid="8633226333229417237">"Impossible d\'afficher le contenu"</string>
-    <string name="sign_in" msgid="6253762676723505592">"Connexion"</string>
+    <string name="sign_in" msgid="6253762676723505592">Se connecter</string>
     <string name="new_archive_file_name" msgid="1604650338077249838">"archive<xliff:g id="EXTENSION">%s</xliff:g>"</string>
     <string name="overwrite_file_confirmation_message" msgid="2496109652768222716">"Remplacer <xliff:g id="NAME">%1$s</xliff:g> ?"</string>
     <string name="continue_in_background" msgid="1974214559047793331">"Continuer en arrière-plan"</string>
@@ -267,10 +265,10 @@
     <string name="root_info_header_recent" msgid="5654901877295332262">"Fichiers récents"</string>
     <string name="root_info_header_global_search" msgid="4904078222280496152">"Fichiers"</string>
     <string name="root_info_header_downloads" msgid="8848161246921154115">"Fichiers dans le dossier \"Téléchargements\""</string>
-    <string name="root_info_header_storage" msgid="2989014130584927442">"Fichiers sur <xliff:g id="DEVICE">%1$s</xliff:g>"</string>
-    <string name="root_info_header_folder" msgid="5851172222368049864">"Fichiers dans <xliff:g id="FOLDER">%1$s</xliff:g>"</string>
-    <string name="root_info_header_app" msgid="2125422047558420885">"Fichiers provenant de <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="root_info_header_app_with_summary" msgid="3223302581236069702">"Fichiers provenant de <xliff:g id="LABEL">%1$s</xliff:g>/<xliff:g id="SUMMARY">%2$s</xliff:g>"</string>
+    <string name="root_info_header_storage" msgid="2989014130584927442">Fichiers sur <xliff:g id="device" example="Pixel">%1$s</xliff:g></string>
+    <string name="root_info_header_folder" msgid="5851172222368049864">Fichiers dans <xliff:g id="folder" example="DCIM">%1$s</xliff:g></string>
+    <string name="root_info_header_app" msgid="2125422047558420885">Fichiers provenant de <xliff:g id="label" example="Drive">%1$s</xliff:g></string>
+    <string name="root_info_header_app_with_summary" msgid="3223302581236069702">Fichiers provenant de <xliff:g id="label" example="Drive">%1$s</xliff:g> / <xliff:g id="summary" example="example@com">%2$s</xliff:g></string>
     <string name="root_info_header_image_recent" msgid="7494373563753926014">"Images récentes"</string>
     <string name="root_info_header_image_global_search" msgid="7307009823489854697">"Images"</string>
     <string name="root_info_header_image_downloads" msgid="7072252612657612307">"Images dans le dossier \"Téléchargements\""</string>
@@ -282,16 +280,16 @@
     <string name="chip_title_audio" msgid="1032801828748235436">"Audio"</string>
     <string name="chip_title_videos" msgid="7011260091979776447">"Vidéos"</string>
     <string name="chip_title_documents" msgid="7432457563000753983">"Documents"</string>
-    <string name="chip_title_large_files" msgid="7740269190493883980">"Fichiers volumineux"</string>
+    <string name="chip_title_large_files" msgid="7740269190493883980">Fichiers volumineux</string>
     <string name="chip_title_from_this_week" msgid="4961536405220379672">"Cette semaine"</string>
     <string name="input_hint_new_folder" msgid="479672411219725677">"Nom du dossier"</string>
     <string name="input_hint_rename" msgid="8390711744270994452">"Nouveau nom"</string>
     <string name="preview_file" msgid="4056622696305432343">"Prévisualiser le fichier <xliff:g id="FILENAME">%1$s</xliff:g>"</string>
     <string name="preview_work_file" msgid="4495643735563487273">"Prévisualiser le fichier professionnel <xliff:g id="FILENAME">%1$s</xliff:g>"</string>
-    <string name="apps_row_title" msgid="3340490016663092925">"Parcourir les fichiers dans d\'autres applications"</string>
+    <string name="apps_row_title" msgid="3340490016663092925">Parcourir les fichiers dans d\'autres applications</string>
     <string name="anonymous_application" msgid="7633027057951625862">"Anonyme"</string>
     <string name="open_tree_button" msgid="6402871398424497776">"Utiliser ce dossier"</string>
-    <string name="open_tree_dialog_title" msgid="6339509533852318569">"Autoriser <xliff:g id="APPNAME">%1$s</xliff:g> à accéder aux fichiers dans <xliff:g id="DIRECTORY">%2$s</xliff:g> ?"</string>
+    <string name="open_tree_dialog_title" msgid="6339509533852318569">Autoriser <xliff:g id="appName" example="Drive">%1$s</xliff:g> à accéder aux fichiers dans <xliff:g id="directory" example="DCIM">%2$s</xliff:g> \?</string>
     <string name="open_tree_dialog_message" msgid="4120695398430659628">"<xliff:g id="APPNAME">%1$s</xliff:g> pourra ainsi accéder aux contenus qui sont ou seront enregistrés dans <xliff:g id="DIRECTORY">%2$s</xliff:g>."</string>
     <string name="directory_blocked_header_title" msgid="1164584889578740066">"Impossible d\'utiliser ce dossier"</string>
     <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"Pour protéger votre vie privée, choisissez un autre dossier"</string>
@@ -301,7 +299,7 @@
     <string name="personal_tab" msgid="3878576287868528503">"Personnel"</string>
     <string name="work_tab" msgid="7265359366883747413">"Professionnel"</string>
     <string name="a11y_work" msgid="7504431382825242153">"Pro"</string>
-    <string name="drag_from_another_app" msgid="8310249276199969905">"Vous ne pouvez pas déplacer de fichiers depuis une autre application."</string>
+    <string name="drag_from_another_app" msgid="8310249276199969905">Vous ne pouvez pas déplacer de fichiers depuis une autre application.</string>
     <string name="grid_mode_showing" msgid="2803166871485028508">"Affichage en mode grille."</string>
     <string name="list_mode_showing" msgid="1225413902295895166">"Affichage en mode liste."</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 22cb97064..10e439fa2 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,18 +12,15 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="missing_rename_error" msgid="9098952207447981103">"Devi rinominare"</string>
     <string name="add_folder_name_error" msgid="6014615052491406810">"Devi aggiungere un nome per la cartella"</string>
     <string name="files_label" msgid="771781190045103748">"File"</string>
     <string name="downloads_label" msgid="5462789470049501103">"Download"</string>
     <!-- no translation found for app_label (8089292432455111409) -->
-    <skip />
+    <skip/>
     <!-- no translation found for launcher_label (799410258349837668) -->
-    <skip />
+    <skip/>
     <string name="title_open" msgid="3165686459158020921">"Apri da"</string>
     <string name="title_save" msgid="4384490653102710025">"Salva in"</string>
     <string name="menu_create_dir" msgid="2413624798689091042">"Nuova cartella"</string>
@@ -49,7 +46,7 @@
     <string name="menu_inspect" msgid="7279855349299446224">"Informazioni"</string>
     <string name="menu_show_hidden_files" msgid="5140676344684492769">"Mostra file nascosti"</string>
     <string name="menu_hide_hidden_files" msgid="5654495713350153702">"Non mostrare file nascosti"</string>
-    <string name="menu_view_in_owner" msgid="7228948660557554770">"Visualizza in <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
+    <string name="menu_view_in_owner" msgid="7228948660557554770">Vedi in <xliff:g id="source" example="Google Drive">%1$s</xliff:g></string>
     <string name="menu_new_window" msgid="2947837751796109126">"Nuova finestra"</string>
     <string name="menu_cut_to_clipboard" msgid="2878752142015026229">"Taglia"</string>
     <string name="menu_copy_to_clipboard" msgid="5064081159073330776">"Copia"</string>
@@ -82,18 +79,18 @@
     <string name="sort_dimension_size_descending" msgid="2367030017597348938">"Dimensione (decrescente)"</string>
     <string name="sort_dimension_date_descending" msgid="5466839955763127113">"Modifica più recente"</string>
     <string name="sort_dimension_dialog_title" msgid="3048641573962982157">"Ordina per"</string>
-    <string name="sort_dimension_button_title" msgid="1898606989130896126">"Ordine per <xliff:g id="LABEL">%s</xliff:g>"</string>
+    <string name="sort_dimension_button_title" msgid="1898606989130896126">Ordina per <xliff:g id="label" example="File name (A to Z)">%s</xliff:g></string>
     <string name="directory_items" msgid="6645621978998614003">"Numero di elementi"</string>
     <string name="sort_direction_ascending" msgid="5882787683763248102">"Crescente"</string>
     <string name="sort_direction_descending" msgid="1729187589765894076">"Decrescente"</string>
-    <string name="open_external_app" msgid="7107920381038980086">"Apri <xliff:g id="APPNAME">%1$s</xliff:g>"</string>
+    <string name="open_external_app" msgid="7107920381038980086">Apri <xliff:g id="appName" example="Drive">%1$s</xliff:g></string>
     <string name="drawer_open" msgid="8071673398187261741">"Mostra nodi principali"</string>
     <string name="drawer_close" msgid="4263880768630848848">"Nascondi nodi principali"</string>
-    <string name="save_error" msgid="8631128801982095782">"Impossibile salvare il documento."</string>
-    <string name="create_error" msgid="3092144450044861994">"Impossibile creare la cartella."</string>
-    <string name="query_error" msgid="6625421453613879336">"Impossibile caricare i contenuti al momento."</string>
-    <string name="quiet_mode_error_title" msgid="554319751414657910">"Le app di lavoro sono in pausa"</string>
-    <string name="quiet_mode_button" msgid="8051436551926677305">"Attiva app di lavoro"</string>
+    <string name="save_error" msgid="8631128801982095782">Impossibile salvare il documento</string>
+    <string name="create_error" msgid="3092144450044861994">Impossibile creare la cartella</string>
+    <string name="query_error" msgid="6625421453613879336">Al momento è impossibile caricare i contenuti</string>
+    <string name="quiet_mode_error_title" msgid="9126656325282792843">"Profilo di lavoro in pausa"</string>
+    <string name="quiet_mode_button" msgid="6977115032320235420">"Attiva"</string>
     <string name="cant_select_work_files_error_title" msgid="6688716319549644354">"Impossibile selezionare file di lavoro"</string>
     <string name="cant_select_work_files_error_message" msgid="683480676150690641">"L\'amministratore IT non consente l\'accesso ai file di lavoro da un\'app personale"</string>
     <string name="cant_select_personal_files_error_title" msgid="3200697170148617742">"Impossibile selezionare file personali"</string>
@@ -105,17 +102,17 @@
     <string name="cross_profile_action_not_allowed_title" msgid="6611281348716476478">"Questa azione non è consentita"</string>
     <string name="cross_profile_action_not_allowed_message" msgid="7331275433061690947">"Per ulteriori informazioni, contatta il tuo amministratore IT"</string>
     <string name="root_recent" msgid="1080156975424341623">"Recenti"</string>
-    <string name="root_available_bytes" msgid="8269870862691408864">"<xliff:g id="SIZE">%1$s</xliff:g> liberi"</string>
+    <string name="root_available_bytes" msgid="8269870862691408864"><xliff:g id="size" example="3GB">%1$s</xliff:g> liberi</string>
     <string name="root_type_service" msgid="6521366147466512289">"Servizi di archiviazione"</string>
     <string name="root_type_shortcut" msgid="6059343175525442279">"Scorciatoie"</string>
     <string name="root_type_device" msgid="1713604128005476585">"Dispositivi"</string>
     <string name="root_type_apps" msgid="8646073235029886342">"Altre app"</string>
     <string name="empty" msgid="5300254272613103004">"Nessun elemento"</string>
     <string name="no_results" msgid="2371026325236359209">"Nessuna corrispondenza in %1$s"</string>
-    <string name="toast_no_application" msgid="7555319548595113121">"Impossibile aprire il file."</string>
+    <string name="toast_no_application" msgid="7555319548595113121">Impossibile aprire il file</string>
     <string name="toast_view_in_archives_unsupported" msgid="1923221390170964845">"Impossibile aprire i file negli archivi"</string>
-    <string name="toast_failed_delete" msgid="3453846588205817591">"Impossibile eliminare alcuni documenti."</string>
-    <string name="toast_share_over_limit" msgid="5805442886537093015">"Impossibile condividere più di <xliff:g id="COUNT">%1$d</xliff:g> file."</string>
+    <string name="toast_failed_delete" msgid="3453846588205817591">Impossibile eliminare alcuni documenti</string>
+    <string name="toast_share_over_limit" msgid="5805442886537093015">Impossibile condividere più di <xliff:g id="count" example="1">%1$d</xliff:g> file</string>
     <string name="toast_action_not_allowed" msgid="1329382474450572415">"Azione non consentita"</string>
     <string name="share_via" msgid="8725082736005677161">"Condividi tramite"</string>
     <string name="copy_notification_title" msgid="52256435625098456">"Copia dei file in corso"</string>
@@ -123,7 +120,7 @@
     <string name="extract_notification_title" msgid="5067393961754430469">"Estrazione dei file"</string>
     <string name="move_notification_title" msgid="3173424987049347605">"Spostamento di file"</string>
     <string name="delete_notification_title" msgid="2512757431856830792">"Eliminazione dei file"</string>
-    <string name="copy_remaining" msgid="5390517377265177727">"<xliff:g id="DURATION">%s</xliff:g> rimanenti"</string>
+    <string name="copy_remaining" msgid="5390517377265177727"><xliff:g id="duration" example="3 minutes">%s</xliff:g> rimanenti</string>
     <plurals name="copy_begin" formatted="false" msgid="151184708996738192">
       <item quantity="many">Copying <xliff:g id="COUNT_1">%1$d</xliff:g> items.</item>
       <item quantity="other">Copia di <xliff:g id="COUNT_1">%1$d</xliff:g> elementi.</item>
@@ -155,7 +152,7 @@
     <string name="extract_preparing" msgid="4796626960061745796">"Preparazione…"</string>
     <string name="move_preparing" msgid="6504239656430530761">"Preparazione…"</string>
     <string name="delete_preparing" msgid="7339349837842802508">"Preparazione…"</string>
-    <string name="delete_progress" msgid="2627631054702306423">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="TOTALCOUNT">%2$d</xliff:g>"</string>
+    <string name="delete_progress" msgid="2627631054702306423"><xliff:g id="count" example="3">%1$d</xliff:g> / <xliff:g id="totalCount" example="5">%2$d</xliff:g></string>
     <plurals name="copy_error_notification_title" formatted="false" msgid="3188432450429390963">
       <item quantity="many">Couldn’t copy <xliff:g id="COUNT_1">%1$d</xliff:g> items</item>
       <item quantity="other">Copia di <xliff:g id="COUNT_1">%1$d</xliff:g> elementi non riuscita</item>
@@ -177,7 +174,7 @@
       <item quantity="one">Eliminazione di <xliff:g id="COUNT_0">%1$d</xliff:g> elemento non riuscita</item>
     </plurals>
     <string name="notification_touch_for_details" msgid="2385563502445129570">"Tocca per vedere i dettagli"</string>
-    <string name="close" msgid="905969391788869975">"Chiudi"</string>
+    <string name="close" msgid="905969391788869975">Chiudi</string>
     <plurals name="copy_failure_alert_content" formatted="false" msgid="5570549471912990536">
       <item quantity="many">These files weren’t copied: <xliff:g id="LIST_1">%1$s</xliff:g></item>
       <item quantity="other">I seguenti file non sono stati copiati: <xliff:g id="LIST_1">%1$s</xliff:g></item>
@@ -218,9 +215,9 @@
     <string name="rename_error" msgid="6700093173508118635">"Ridenominazione documento non riuscita"</string>
     <string name="menu_eject_root" msgid="9215040039374893613">"Espelli"</string>
     <string name="notification_copy_files_converted_title" msgid="6916768494891833365">"Alcuni file sono stati convertiti"</string>
-    <string name="open_external_dialog_request" msgid="8173558471322861268">"Concedere all\'app <xliff:g id="APPNAME"><b>^1</b></xliff:g> l\'accesso alla directory <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> su <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string>
-    <string name="open_external_dialog_request_primary_volume" msgid="2240992164087948176">"Concedere all\'app <xliff:g id="APPNAME"><b>^1</b></xliff:g> l\'accesso alla directory <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>?"</string>
-    <string name="open_external_dialog_root_request" msgid="6776729293982633">"Concedere all\'app <xliff:g id="APPNAME"><b>^1</b></xliff:g> l\'accesso ai tuoi dati, inclusi video e foto, sull\'unità <xliff:g id="STORAGE"><i>^2</i></xliff:g>?"</string>
+    <string name="open_external_dialog_request" msgid="8173558471322861268">Concedi a <xliff:g id="appName" example="System Settings"><b>^1</b></xliff:g> l\'accesso alla directory <xliff:g id="directory" example="Pictures"><i>^2</i></xliff:g> su <xliff:g id="storage" example="SD Card"><i>^3</i></xliff:g>\?</string>
+    <string name="open_external_dialog_request_primary_volume" msgid="2240992164087948176">Concedi a <xliff:g id="appName" example="System Settings"><b>^1</b></xliff:g> l\'accesso alla directory <xliff:g id="directory" example="Pictures"><i>^2</i></xliff:g> \?</string>
+    <string name="open_external_dialog_root_request" msgid="6776729293982633">Concedi a <xliff:g id="appName" example="System Settings"><b>^1</b></xliff:g> l\'accesso ai tuoi dati, inclusi foto e video, su <xliff:g id="storage" example="SD Card"><i>^2</i></xliff:g>\?</string>
     <string name="allow" msgid="1275746941353040309">"Consenti"</string>
     <string name="deny" msgid="5127201668078153379">"Rifiuta"</string>
     <plurals name="elements_selected" formatted="false" msgid="4448165978637163692">
@@ -233,8 +230,8 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementi</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elemento</item>
     </plurals>
-    <string name="delete_filename_confirmation_message" msgid="8338069763240613258">"Eliminare \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
-    <string name="delete_foldername_confirmation_message" msgid="9084085260877704140">"Eliminare la cartella \"<xliff:g id="NAME">%1$s</xliff:g>\" e i relativi contenuti?"</string>
+    <string name="delete_filename_confirmation_message" msgid="8338069763240613258">Cancello \"<xliff:g id="name" example="cat.jpg">%1$s</xliff:g>\"\?</string>
+    <string name="delete_foldername_confirmation_message" msgid="9084085260877704140">Cancello la cartella \"<xliff:g id="name" example="Photos">%1$s</xliff:g>\" e i suoi contenuti\?</string>
     <plurals name="delete_files_confirmation_message" formatted="false" msgid="4866664063250034142">
       <item quantity="many">Delete <xliff:g id="COUNT_1">%1$d</xliff:g> files?</item>
       <item quantity="other">Eliminare <xliff:g id="COUNT_1">%1$d</xliff:g> file?</item>
@@ -253,11 +250,11 @@
     <string name="images_shortcut_label" msgid="2545168016070493574">"Immagini"</string>
     <string name="archive_loading_failed" msgid="7243436722828766996">"Impossibile aprire il file di archivio per la navigazione. Il file è corrotto o in un formato non supportato."</string>
     <string name="name_conflict" msgid="28407269328862986">"Esiste già un file con questo nome."</string>
-    <string name="authentication_required" msgid="8030880723643436099">"Per vedere questa directory, accedi a <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="authentication_required" msgid="8030880723643436099">Per vedere la directory, accedi a <xliff:g id="name" example="Cloud Storage">%1$s</xliff:g></string>
     <string name="cant_display_content" msgid="8633226333229417237">"Impossibile mostrare contenuti"</string>
-    <string name="sign_in" msgid="6253762676723505592">"Accedi"</string>
-    <string name="new_archive_file_name" msgid="1604650338077249838">"archivio<xliff:g id="EXTENSION">%s</xliff:g>"</string>
-    <string name="overwrite_file_confirmation_message" msgid="2496109652768222716">"Sovrascrivere <xliff:g id="NAME">%1$s</xliff:g>?"</string>
+    <string name="sign_in" msgid="6253762676723505592">Accedi</string>
+    <string name="new_archive_file_name" msgid="1604650338077249838">archivio<xliff:g id="extension" example=".zip">%s</xliff:g></string>
+    <string name="overwrite_file_confirmation_message" msgid="2496109652768222716">Sovrascrivo <xliff:g id="name" example="foobar.txt">%1$s</xliff:g>\?</string>
     <string name="continue_in_background" msgid="1974214559047793331">"Continua in background"</string>
     <plurals name="selected_count" formatted="false" msgid="7555250236512981129">
       <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> selected</item>
@@ -267,17 +264,17 @@
     <string name="root_info_header_recent" msgid="5654901877295332262">"File recenti"</string>
     <string name="root_info_header_global_search" msgid="4904078222280496152">"File"</string>
     <string name="root_info_header_downloads" msgid="8848161246921154115">"File memorizzati in Download"</string>
-    <string name="root_info_header_storage" msgid="2989014130584927442">"File su <xliff:g id="DEVICE">%1$s</xliff:g>"</string>
-    <string name="root_info_header_folder" msgid="5851172222368049864">"File memorizzati in <xliff:g id="FOLDER">%1$s</xliff:g>"</string>
-    <string name="root_info_header_app" msgid="2125422047558420885">"File di <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="root_info_header_app_with_summary" msgid="3223302581236069702">"File di <xliff:g id="LABEL">%1$s</xliff:g>/<xliff:g id="SUMMARY">%2$s</xliff:g>"</string>
+    <string name="root_info_header_storage" msgid="2989014130584927442">File su <xliff:g id="device" example="Pixel">%1$s</xliff:g></string>
+    <string name="root_info_header_folder" msgid="5851172222368049864">File in <xliff:g id="folder" example="DCIM">%1$s</xliff:g></string>
+    <string name="root_info_header_app" msgid="2125422047558420885">File da <xliff:g id="label" example="Drive">%1$s</xliff:g></string>
+    <string name="root_info_header_app_with_summary" msgid="3223302581236069702">File da <xliff:g id="label" example="Drive">%1$s</xliff:g> / <xliff:g id="summary" example="example@com">%2$s</xliff:g></string>
     <string name="root_info_header_image_recent" msgid="7494373563753926014">"Immagini recenti"</string>
     <string name="root_info_header_image_global_search" msgid="7307009823489854697">"Immagini"</string>
     <string name="root_info_header_image_downloads" msgid="7072252612657612307">"Immagini memorizzate in Download"</string>
-    <string name="root_info_header_image_storage" msgid="5086740886360075930">"Immagini su <xliff:g id="DEVICE">%1$s</xliff:g>"</string>
-    <string name="root_info_header_image_folder" msgid="5980430877636279667">"Immagini memorizzate in <xliff:g id="FOLDER">%1$s</xliff:g>"</string>
-    <string name="root_info_header_image_app" msgid="4858114210851525359">"Immagini di <xliff:g id="LABEL">%1$s</xliff:g>"</string>
-    <string name="root_info_header_image_app_with_summary" msgid="6404842960923224778">"Immagini di <xliff:g id="LABEL">%1$s</xliff:g>/<xliff:g id="SUMMARY">%2$s</xliff:g>"</string>
+    <string name="root_info_header_image_storage" msgid="5086740886360075930">Immagini su <xliff:g id="device" example="Pixel">%1$s</xliff:g></string>
+    <string name="root_info_header_image_folder" msgid="5980430877636279667">Immagini in <xliff:g id="folder" example="DCIM">%1$s</xliff:g></string>
+    <string name="root_info_header_image_app" msgid="4858114210851525359">Immagini da <xliff:g id="label" example="Drive">%1$s</xliff:g></string>
+    <string name="root_info_header_image_app_with_summary" msgid="6404842960923224778">Immagini da <xliff:g id="label" example="Drive">%1$s</xliff:g> / <xliff:g id="summary" example="example@com">%2$s</xliff:g></string>
     <string name="chip_title_images" msgid="7838299046109841015">"Immagini"</string>
     <string name="chip_title_audio" msgid="1032801828748235436">"Audio"</string>
     <string name="chip_title_videos" msgid="7011260091979776447">"Video"</string>
@@ -286,22 +283,22 @@
     <string name="chip_title_from_this_week" msgid="4961536405220379672">"Questa settimana"</string>
     <string name="input_hint_new_folder" msgid="479672411219725677">"Nome cartella"</string>
     <string name="input_hint_rename" msgid="8390711744270994452">"Nuovo nome"</string>
-    <string name="preview_file" msgid="4056622696305432343">"Visualizza il file <xliff:g id="FILENAME">%1$s</xliff:g> in anteprima"</string>
-    <string name="preview_work_file" msgid="4495643735563487273">"Visualizza l\'anteprima del file di lavoro <xliff:g id="FILENAME">%1$s</xliff:g>"</string>
+    <string name="preview_file" msgid="4056622696305432343">Anteprima del file <xliff:g id="fileName" example="example.jpg">%1$s</xliff:g></string>
+    <string name="preview_work_file" msgid="4495643735563487273">Anteprima del file di lavoro <xliff:g id="fileName" example="example.jpg">%1$s</xliff:g></string>
     <string name="apps_row_title" msgid="3340490016663092925">"Sfoglia i file in altre app"</string>
     <string name="anonymous_application" msgid="7633027057951625862">"Anonima"</string>
     <string name="open_tree_button" msgid="6402871398424497776">"Usa questa cartella"</string>
-    <string name="open_tree_dialog_title" msgid="6339509533852318569">"Consentire all\'app <xliff:g id="APPNAME">%1$s</xliff:g> di accedere ai file memorizzati in <xliff:g id="DIRECTORY">%2$s</xliff:g>?"</string>
-    <string name="open_tree_dialog_message" msgid="4120695398430659628">"<xliff:g id="APPNAME">%1$s</xliff:g> potrà accedere ai contenuti attuali e futuri memorizzati in <xliff:g id="DIRECTORY">%2$s</xliff:g>."</string>
+    <string name="open_tree_dialog_title" msgid="6339509533852318569">Permetti a <xliff:g id="appName" example="Drive">%1$s</xliff:g> di accedere ai file in <xliff:g id="directory" example="DCIM">%2$s</xliff:g>\?</string>
+    <string name="open_tree_dialog_message" msgid="4120695398430659628">Stai dando a <xliff:g id="appName" example="Drive">%1$s</xliff:g> l\'accesso immediato e futuro ai contenuti in <xliff:g id="directory" example="DCIM">%2$s</xliff:g>.</string>
     <string name="directory_blocked_header_title" msgid="1164584889578740066">"Impossibile usare questa cartella"</string>
     <string name="directory_blocked_header_subtitle" msgid="2829150911849033408">"Per tutelare la tua privacy, scegli un\'altra cartella"</string>
     <string name="create_new_folder_button" msgid="8859613309559794890">"Crea nuova cartella"</string>
     <string name="search_bar_hint" msgid="4517366509897977321">"Cerca su questo telefono"</string>
-    <string name="delete_search_history" msgid="2202015025607694515">"Elimina la cronologia delle ricerche <xliff:g id="TEXT">%1$s</xliff:g>"</string>
+    <string name="delete_search_history" msgid="2202015025607694515">Elimino dalla cronologia <xliff:g id="text" example="image">%1$s</xliff:g></string>
     <string name="personal_tab" msgid="3878576287868528503">"Personali"</string>
     <string name="work_tab" msgid="7265359366883747413">"Di lavoro"</string>
     <string name="a11y_work" msgid="7504431382825242153">"Lavoro"</string>
     <string name="drag_from_another_app" msgid="8310249276199969905">"Impossibile spostare file da un\'altra app."</string>
     <string name="grid_mode_showing" msgid="2803166871485028508">"Visualizzazione in modalità griglia."</string>
     <string name="list_mode_showing" msgid="1225413902295895166">"Visualizzazione in modalità elenco."</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 384b670a6..3f8a4d3da 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,30 +12,27 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="missing_rename_error" msgid="9098952207447981103">"Je moet deze naam wijzigen"</string>
     <string name="add_folder_name_error" msgid="6014615052491406810">"Je moet een mapnaam toevoegen"</string>
     <string name="files_label" msgid="771781190045103748">"Bestanden"</string>
     <string name="downloads_label" msgid="5462789470049501103">"Downloads"</string>
     <!-- no translation found for app_label (8089292432455111409) -->
-    <skip />
+    <skip/>
     <!-- no translation found for launcher_label (799410258349837668) -->
-    <skip />
+    <skip/>
     <string name="title_open" msgid="3165686459158020921">"Openen vanuit"</string>
     <string name="title_save" msgid="4384490653102710025">"Opslaan in"</string>
     <string name="menu_create_dir" msgid="2413624798689091042">"Nieuwe map"</string>
     <string name="menu_grid" msgid="1453636521731880680">"Rasterweergave"</string>
     <string name="menu_list" msgid="6714267452146410402">"Lijstweergave"</string>
-    <string name="menu_search" msgid="1876699106790719849">"Zoeken"</string>
+    <string name="menu_search" msgid="1876699106790719849">Zoeken</string>
     <string name="menu_settings" msgid="6520844520117939047">"Instellingen voor opslag"</string>
     <string name="menu_open" msgid="9092138100049759315">"Openen"</string>
     <string name="menu_open_with" msgid="5507647065467520229">"Openen met"</string>
     <string name="menu_open_in_new_window" msgid="6686563636123311276">"Openen in nieuw venster"</string>
     <string name="menu_save" msgid="5195367497138965168">"Opslaan"</string>
-    <string name="menu_share" msgid="4307140947108068356">"Delen"</string>
+    <string name="menu_share" msgid="4307140947108068356">Delen</string>
     <string name="menu_delete" msgid="1022254131543256626">"Verwijderen"</string>
     <string name="menu_select_all" msgid="7600576812185570403">"Alles selecteren"</string>
     <string name="menu_deselect_all" msgid="7729916068862742979">"Alles deselecteren"</string>
@@ -125,24 +122,24 @@
     <string name="delete_notification_title" msgid="2512757431856830792">"Bestanden verwijderen"</string>
     <string name="copy_remaining" msgid="5390517377265177727">"Nog <xliff:g id="DURATION">%s</xliff:g>"</string>
     <plurals name="copy_begin" formatted="false" msgid="151184708996738192">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items kopiëren.</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item kopiëren.</item>
+        <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items kopiëren.</item>
+        <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item kopiëren.</item>
     </plurals>
     <plurals name="compress_begin" formatted="false" msgid="3534158317098678895">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> bestanden comprimeren.</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> bestand comprimeren.</item>
+        <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> bestanden comprimeren.</item>
+        <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> bestand comprimeren.</item>
     </plurals>
     <plurals name="extract_begin" formatted="false" msgid="1006380679562903749">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> bestanden uitpakken.</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> bestand uitpakken.</item>
+        <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> bestanden uitpakken.</item>
+        <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> bestand uitpakken.</item>
     </plurals>
     <plurals name="move_begin" formatted="false" msgid="1464229874265756956">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items verplaatsen.</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item verplaatsen.</item>
+        <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items verplaatsen.</item>
+        <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item verplaatsen.</item>
     </plurals>
     <plurals name="deleting" formatted="false" msgid="1729138001178158901">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items verwijderen.</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item verwijderen.</item>
+        <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items verwijderen.</item>
+        <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item verwijderen.</item>
     </plurals>
     <string name="undo" msgid="2902438994196400565">"Ongedaan maken"</string>
     <string name="copy_preparing" msgid="4759516490222449324">"Voorbereiden..."</string>
@@ -152,50 +149,50 @@
     <string name="delete_preparing" msgid="7339349837842802508">"Voorbereiden..."</string>
     <string name="delete_progress" msgid="2627631054702306423">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="TOTALCOUNT">%2$d</xliff:g>"</string>
     <plurals name="copy_error_notification_title" formatted="false" msgid="3188432450429390963">
-      <item quantity="other">Kan <xliff:g id="COUNT_1">%1$d</xliff:g> items niet kopiëren</item>
-      <item quantity="one">Kan <xliff:g id="COUNT_0">%1$d</xliff:g> item niet kopiëren</item>
+        <item quantity="other">Kan <xliff:g id="COUNT_1">%1$d</xliff:g> items niet kopiëren</item>
+        <item quantity="one">Kan <xliff:g id="COUNT_0">%1$d</xliff:g> item niet kopiëren</item>
     </plurals>
     <plurals name="compress_error_notification_title" formatted="false" msgid="3043630066678213644">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> bestanden kunnen niet worden gecomprimeerd</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> bestand kan niet worden gecomprimeerd</item>
+        <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> bestanden kunnen niet worden gecomprimeerd</item>
+        <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> bestand kan niet worden gecomprimeerd</item>
     </plurals>
     <plurals name="move_error_notification_title" formatted="false" msgid="2185736082411854754">
-      <item quantity="other">Kan <xliff:g id="COUNT_1">%1$d</xliff:g> items niet verplaatsen</item>
-      <item quantity="one">Kan <xliff:g id="COUNT_0">%1$d</xliff:g> item niet verplaatsen</item>
+        <item quantity="other">Kan <xliff:g id="COUNT_1">%1$d</xliff:g> items niet verplaatsen</item>
+        <item quantity="one">Kan <xliff:g id="COUNT_0">%1$d</xliff:g> item niet verplaatsen</item>
     </plurals>
     <plurals name="delete_error_notification_title" formatted="false" msgid="7568122018481625267">
-      <item quantity="other">Kan <xliff:g id="COUNT_1">%1$d</xliff:g> items niet verwijderen</item>
-      <item quantity="one">Kan <xliff:g id="COUNT_0">%1$d</xliff:g> item niet verwijderen</item>
+        <item quantity="other">Kan <xliff:g id="COUNT_1">%1$d</xliff:g> items niet verwijderen</item>
+        <item quantity="one">Kan <xliff:g id="COUNT_0">%1$d</xliff:g> item niet verwijderen</item>
     </plurals>
     <string name="notification_touch_for_details" msgid="2385563502445129570">"Tik om details te bekijken"</string>
-    <string name="close" msgid="905969391788869975">"Sluiten"</string>
+    <string name="close" msgid="905969391788869975">Sluiten</string>
     <plurals name="copy_failure_alert_content" formatted="false" msgid="5570549471912990536">
-      <item quantity="other">Deze bestanden zijn niet gekopieerd: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="one">Dit bestand is niet gekopieerd: <xliff:g id="LIST_0">%1$s</xliff:g></item>
+        <item quantity="other">Deze bestanden zijn niet gekopieerd: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="one">Dit bestand is niet gekopieerd: <xliff:g id="LIST_0">%1$s</xliff:g></item>
     </plurals>
     <plurals name="compress_failure_alert_content" formatted="false" msgid="5760632881868842400">
-      <item quantity="other">Deze bestanden zijn niet gecomprimeerd: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="one">Dit bestand is niet gecomprimeerd: <xliff:g id="LIST_0">%1$s</xliff:g></item>
+        <item quantity="other">Deze bestanden zijn niet gecomprimeerd: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="one">Dit bestand is niet gecomprimeerd: <xliff:g id="LIST_0">%1$s</xliff:g></item>
     </plurals>
     <plurals name="extract_failure_alert_content" formatted="false" msgid="7572748127571720803">
-      <item quantity="other">Deze bestanden zijn niet uitgepakt: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="one">Dit bestand is niet uitgepakt: <xliff:g id="LIST_0">%1$s</xliff:g></item>
+        <item quantity="other">Deze bestanden zijn niet uitgepakt: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="one">Dit bestand is niet uitgepakt: <xliff:g id="LIST_0">%1$s</xliff:g></item>
     </plurals>
     <plurals name="move_failure_alert_content" formatted="false" msgid="2747390342670799196">
-      <item quantity="other">Deze bestanden zijn niet verplaatst: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="one">Dit bestand is niet verplaatst: <xliff:g id="LIST_0">%1$s</xliff:g></item>
+        <item quantity="other">Deze bestanden zijn niet verplaatst: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="one">Dit bestand is niet verplaatst: <xliff:g id="LIST_0">%1$s</xliff:g></item>
     </plurals>
     <plurals name="delete_failure_alert_content" formatted="false" msgid="6122372614839711711">
-      <item quantity="other">Deze bestanden zijn niet verwijderd: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="one">Dit bestand is niet verwijderd: <xliff:g id="LIST_0">%1$s</xliff:g></item>
+        <item quantity="other">Deze bestanden zijn niet verwijderd: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="one">Dit bestand is niet verwijderd: <xliff:g id="LIST_0">%1$s</xliff:g></item>
     </plurals>
     <plurals name="copy_converted_warning_content" formatted="false" msgid="7433742181712126588">
-      <item quantity="other">Deze bestanden zijn geconverteerd naar een andere indeling: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="one">Dit bestand is geconverteerd naar een andere indeling: <xliff:g id="LIST_0">%1$s</xliff:g></item>
+        <item quantity="other">Deze bestanden zijn geconverteerd naar een andere indeling: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="one">Dit bestand is geconverteerd naar een andere indeling: <xliff:g id="LIST_0">%1$s</xliff:g></item>
     </plurals>
     <plurals name="clipboard_files_clipped" formatted="false" msgid="4847061634862926902">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items gekopieerd naar klembord.</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item gekopieerd naar klembord.</item>
+        <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items gekopieerd naar klembord.</item>
+        <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item gekopieerd naar klembord.</item>
     </plurals>
     <string name="file_operation_rejected" msgid="4301554203329008794">"Bestandsbewerking wordt niet ondersteund."</string>
     <string name="file_operation_error" msgid="2234357335716533795">"Bestandsbewerking mislukt."</string>
@@ -208,39 +205,39 @@
     <string name="allow" msgid="1275746941353040309">"Toestaan"</string>
     <string name="deny" msgid="5127201668078153379">"Weigeren"</string>
     <plurals name="elements_selected" formatted="false" msgid="4448165978637163692">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> geselecteerd</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> geselecteerd</item>
+        <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> geselecteerd</item>
+        <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> geselecteerd</item>
     </plurals>
     <plurals name="elements_dragged" formatted="false" msgid="5932571296037626279">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item</item>
+        <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items</item>
+        <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item</item>
     </plurals>
     <string name="delete_filename_confirmation_message" msgid="8338069763240613258">"\'<xliff:g id="NAME">%1$s</xliff:g>\' verwijderen?"</string>
     <string name="delete_foldername_confirmation_message" msgid="9084085260877704140">"Map \'<xliff:g id="NAME">%1$s</xliff:g>\' en de bijbehorende content verwijderen?"</string>
     <plurals name="delete_files_confirmation_message" formatted="false" msgid="4866664063250034142">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> bestanden verwijderen?</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> bestand verwijderen?</item>
+        <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> bestanden verwijderen?</item>
+        <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> bestand verwijderen?</item>
     </plurals>
     <plurals name="delete_folders_confirmation_message" formatted="false" msgid="1028946402799686388">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> mappen en de bijbehorende content verwijderen?</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> map en de bijbehorende content verwijderen?</item>
+        <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> mappen en de bijbehorende content verwijderen?</item>
+        <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> map en de bijbehorende content verwijderen?</item>
     </plurals>
     <plurals name="delete_items_confirmation_message" formatted="false" msgid="7285090426511028179">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items verwijderen?</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item verwijderen?</item>
+        <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> items verwijderen?</item>
+        <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> item verwijderen?</item>
     </plurals>
     <string name="images_shortcut_label" msgid="2545168016070493574">"Afbeeldingen"</string>
     <string name="archive_loading_failed" msgid="7243436722828766996">"Archief kan niet worden geopend voor browsen. Het bestand is mogelijk beschadigd of heeft een niet-ondersteunde indeling."</string>
     <string name="name_conflict" msgid="28407269328862986">"Er bestaat al een bestand met deze naam."</string>
     <string name="authentication_required" msgid="8030880723643436099">"Log in bij <xliff:g id="NAME">%1$s</xliff:g> om deze directory te bekijken"</string>
     <string name="cant_display_content" msgid="8633226333229417237">"Kan content niet bekijken"</string>
-    <string name="sign_in" msgid="6253762676723505592">"Inloggen"</string>
+    <string name="sign_in" msgid="6253762676723505592">Inloggen</string>
     <string name="new_archive_file_name" msgid="1604650338077249838">"archief<xliff:g id="EXTENSION">%s</xliff:g>"</string>
     <string name="overwrite_file_confirmation_message" msgid="2496109652768222716">"<xliff:g id="NAME">%1$s</xliff:g> overschrijven?"</string>
     <string name="continue_in_background" msgid="1974214559047793331">"Doorgaan op de achtergrond"</string>
     <plurals name="selected_count" formatted="false" msgid="7555250236512981129">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> geselecteerd</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> geselecteerd</item>
+        <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> geselecteerd</item>
+        <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> geselecteerd</item>
     </plurals>
     <string name="root_info_header_recent" msgid="5654901877295332262">"Recente bestanden"</string>
     <string name="root_info_header_global_search" msgid="4904078222280496152">"Bestanden"</string>
@@ -282,4 +279,4 @@
     <string name="drag_from_another_app" msgid="8310249276199969905">"Je kunt geen bestanden verplaatsen vanuit een andere app."</string>
     <string name="grid_mode_showing" msgid="2803166871485028508">"Tonen in rastermodus."</string>
     <string name="list_mode_showing" msgid="1225413902295895166">"Tonen in lijstmodus."</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5329c0aa1..eebb41ab0 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,39 +12,36 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="missing_rename_error" msgid="9098952207447981103">"Измените название."</string>
     <string name="add_folder_name_error" msgid="6014615052491406810">"Укажите название папки."</string>
     <string name="files_label" msgid="771781190045103748">"Файлы"</string>
     <string name="downloads_label" msgid="5462789470049501103">"Скачанное"</string>
     <!-- no translation found for app_label (8089292432455111409) -->
-    <skip />
+    <skip/>
     <!-- no translation found for launcher_label (799410258349837668) -->
-    <skip />
+    <skip/>
     <string name="title_open" msgid="3165686459158020921">"Открыть"</string>
     <string name="title_save" msgid="4384490653102710025">"Сохранить"</string>
     <string name="menu_create_dir" msgid="2413624798689091042">"Создать папку"</string>
     <string name="menu_grid" msgid="1453636521731880680">"Таблица"</string>
     <string name="menu_list" msgid="6714267452146410402">"Список"</string>
-    <string name="menu_search" msgid="1876699106790719849">"Найти"</string>
+    <string name="menu_search" msgid="1876699106790719849">Поиск</string>
     <string name="menu_settings" msgid="6520844520117939047">"Настройки хранилища"</string>
     <string name="menu_open" msgid="9092138100049759315">"Открыть"</string>
     <string name="menu_open_with" msgid="5507647065467520229">"Открыть с помощью"</string>
     <string name="menu_open_in_new_window" msgid="6686563636123311276">"Открыть в новом окне"</string>
     <string name="menu_save" msgid="5195367497138965168">"Сохранить"</string>
-    <string name="menu_share" msgid="4307140947108068356">"Поделиться"</string>
+    <string name="menu_share" msgid="4307140947108068356">Поделиться</string>
     <string name="menu_delete" msgid="1022254131543256626">"Удалить"</string>
     <string name="menu_select_all" msgid="7600576812185570403">"Выбрать все"</string>
     <string name="menu_deselect_all" msgid="7729916068862742979">"Отменить выбор"</string>
     <string name="menu_select" msgid="1366061076507142387">"Выбрать"</string>
     <string name="menu_sort" msgid="3362419226163725275">"Сортировать…"</string>
     <string name="menu_copy" msgid="7404820171352314754">"Копировать в…"</string>
-    <string name="menu_move" msgid="2310760789561129882">"Переместить в..."</string>
+    <string name="menu_move" msgid="2310760789561129882">Переместить в…</string>
     <string name="menu_compress" msgid="37539111904724188">"Сжать"</string>
-    <string name="menu_extract" msgid="8171946945982532262">"Извлечь"</string>
+    <string name="menu_extract" msgid="8171946945982532262">Извлечь…</string>
     <string name="menu_rename" msgid="1883113442688817554">"Переименовать"</string>
     <string name="menu_inspect" msgid="7279855349299446224">"Сведения о файле"</string>
     <string name="menu_show_hidden_files" msgid="5140676344684492769">"Показывать скрытые файлы"</string>
@@ -81,7 +78,7 @@
     <string name="sort_dimension_file_type_descending" msgid="3344796059784511100">"типу (от Я до А)"</string>
     <string name="sort_dimension_size_descending" msgid="2367030017597348938">"размеру (с больших)"</string>
     <string name="sort_dimension_date_descending" msgid="5466839955763127113">"изменениям (с новых)"</string>
-    <string name="sort_dimension_dialog_title" msgid="3048641573962982157">"Сортировать по…"</string>
+    <string name="sort_dimension_dialog_title" msgid="3048641573962982157">Сортировать по</string>
     <string name="sort_dimension_button_title" msgid="1898606989130896126">"Отсортировано по <xliff:g id="LABEL">%s</xliff:g>"</string>
     <string name="directory_items" msgid="6645621978998614003">"Количество объектов"</string>
     <string name="sort_direction_ascending" msgid="5882787683763248102">"По возрастанию"</string>
@@ -125,34 +122,34 @@
     <string name="delete_notification_title" msgid="2512757431856830792">"Удаление файлов"</string>
     <string name="copy_remaining" msgid="5390517377265177727">"Осталось <xliff:g id="DURATION">%s</xliff:g>"</string>
     <plurals name="copy_begin" formatted="false" msgid="151184708996738192">
-      <item quantity="one">Копирование <xliff:g id="COUNT_1">%1$d</xliff:g> файла…</item>
-      <item quantity="few">Копирование <xliff:g id="COUNT_1">%1$d</xliff:g> файлов…</item>
-      <item quantity="many">Копирование <xliff:g id="COUNT_1">%1$d</xliff:g> файлов…</item>
-      <item quantity="other">Копирование <xliff:g id="COUNT_1">%1$d</xliff:g> файла…</item>
+        <item quantity="one">Копирование <xliff:g id="COUNT_1">%1$d</xliff:g> файла…</item>
+        <item quantity="few">Копирование <xliff:g id="COUNT_1">%1$d</xliff:g> файлов…</item>
+        <item quantity="many">Копирование <xliff:g id="COUNT_1">%1$d</xliff:g> файлов…</item>
+        <item quantity="other">Копирование <xliff:g id="COUNT_1">%1$d</xliff:g> файла…</item>
     </plurals>
     <plurals name="compress_begin" formatted="false" msgid="3534158317098678895">
-      <item quantity="one">Сжатие <xliff:g id="COUNT_1">%1$d</xliff:g> файла…</item>
-      <item quantity="few">Сжатие <xliff:g id="COUNT_1">%1$d</xliff:g> файлов…</item>
-      <item quantity="many">Сжатие <xliff:g id="COUNT_1">%1$d</xliff:g> файлов…</item>
-      <item quantity="other">Сжатие <xliff:g id="COUNT_1">%1$d</xliff:g> файла…</item>
+        <item quantity="one">Сжатие <xliff:g id="COUNT_1">%1$d</xliff:g> файла…</item>
+        <item quantity="few">Сжатие <xliff:g id="COUNT_1">%1$d</xliff:g> файлов…</item>
+        <item quantity="many">Сжатие <xliff:g id="COUNT_1">%1$d</xliff:g> файлов…</item>
+        <item quantity="other">Сжатие <xliff:g id="COUNT_1">%1$d</xliff:g> файла…</item>
     </plurals>
     <plurals name="extract_begin" formatted="false" msgid="1006380679562903749">
-      <item quantity="one">Извлечение <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
-      <item quantity="few">Извлечение <xliff:g id="COUNT_1">%1$d</xliff:g> файлов</item>
-      <item quantity="many">Извлечение <xliff:g id="COUNT_1">%1$d</xliff:g> файлов</item>
-      <item quantity="other">Извлечение <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
+        <item quantity="one">Извлечение <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
+        <item quantity="few">Извлечение <xliff:g id="COUNT_1">%1$d</xliff:g> файлов</item>
+        <item quantity="many">Извлечение <xliff:g id="COUNT_1">%1$d</xliff:g> файлов</item>
+        <item quantity="other">Извлечение <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
     </plurals>
     <plurals name="move_begin" formatted="false" msgid="1464229874265756956">
-      <item quantity="one">Перемещение <xliff:g id="COUNT_1">%1$d</xliff:g> файла…</item>
-      <item quantity="few">Перемещение <xliff:g id="COUNT_1">%1$d</xliff:g> файлов…</item>
-      <item quantity="many">Перемещение <xliff:g id="COUNT_1">%1$d</xliff:g> файлов…</item>
-      <item quantity="other">Перемещение <xliff:g id="COUNT_1">%1$d</xliff:g> файла…</item>
+        <item quantity="one">Перемещение <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
+        <item quantity="few">Перемещение <xliff:g id="COUNT_1">%1$d</xliff:g> файлов.</item>
+        <item quantity="many">Перемещение <xliff:g id="COUNT_1">%1$d</xliff:g> файлов.</item>
+        <item quantity="other">Перемещение <xliff:g id="COUNT_1">%1$d</xliff:g> файлов.</item>
     </plurals>
     <plurals name="deleting" formatted="false" msgid="1729138001178158901">
-      <item quantity="one">Удаление <xliff:g id="COUNT_1">%1$d</xliff:g> файла…</item>
-      <item quantity="few">Удаление <xliff:g id="COUNT_1">%1$d</xliff:g> файлов…</item>
-      <item quantity="many">Удаление <xliff:g id="COUNT_1">%1$d</xliff:g> файлов…</item>
-      <item quantity="other">Удаление <xliff:g id="COUNT_1">%1$d</xliff:g> файла…</item>
+        <item quantity="one">Удаление <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item>
+        <item quantity="few">Удаление <xliff:g id="COUNT_1">%1$d</xliff:g> файлов.</item>
+        <item quantity="many">Удаление <xliff:g id="COUNT_1">%1$d</xliff:g> файлов.</item>
+        <item quantity="other">Удаление <xliff:g id="COUNT_1">%1$d</xliff:g> файлов.</item>
     </plurals>
     <string name="undo" msgid="2902438994196400565">"Отменить"</string>
     <string name="copy_preparing" msgid="4759516490222449324">"Подготовка…"</string>
@@ -162,75 +159,75 @@
     <string name="delete_preparing" msgid="7339349837842802508">"Подготовка…"</string>
     <string name="delete_progress" msgid="2627631054702306423">"<xliff:g id="COUNT_0">%1$d</xliff:g> из <xliff:g id="TOTALCOUNT">%2$d</xliff:g>"</string>
     <plurals name="copy_error_notification_title" formatted="false" msgid="3188432450429390963">
-      <item quantity="one">Не удалось скопировать <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
-      <item quantity="few">Не удалось скопировать <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
-      <item quantity="many">Не удалось скопировать <xliff:g id="COUNT_1">%1$d</xliff:g> файлов</item>
-      <item quantity="other">Не удалось скопировать <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
+        <item quantity="one">Не удалось скопировать <xliff:g id="count" example="1">%1$d</xliff:g> файл</item>
+        <item quantity="few">Не удалось скопировать <xliff:g id="count" example="2">%1$d</xliff:g> файла</item>
+        <item quantity="many">Не удалось скопировать <xliff:g id="count" example="2">%1$d</xliff:g> файлов</item>
+        <item quantity="other">Не удалось скопировать <xliff:g id="count" example="2">%1$d</xliff:g> файлов</item>
     </plurals>
     <plurals name="compress_error_notification_title" formatted="false" msgid="3043630066678213644">
-      <item quantity="one">Не удалось сжать <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
-      <item quantity="few">Не удалось сжать <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
-      <item quantity="many">Не удалось сжать <xliff:g id="COUNT_1">%1$d</xliff:g> файлов</item>
-      <item quantity="other">Не удалось сжать <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
+        <item quantity="one">Не удалось сжать <xliff:g id="count" example="1">%1$d</xliff:g> файл</item>
+        <item quantity="few">Не удалось сжать <xliff:g id="count" example="2">%1$d</xliff:g> файла</item>
+        <item quantity="many">Не удалось сжать <xliff:g id="count" example="2">%1$d</xliff:g> файлов</item>
+        <item quantity="other">Не удалось сжать <xliff:g id="count" example="2">%1$d</xliff:g> файлов</item>
     </plurals>
     <plurals name="move_error_notification_title" formatted="false" msgid="2185736082411854754">
-      <item quantity="one">Не удалось переместить <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
-      <item quantity="few">Не удалось переместить <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
-      <item quantity="many">Не удалось переместить <xliff:g id="COUNT_1">%1$d</xliff:g> файлов</item>
-      <item quantity="other">Не удалось переместить <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
+        <item quantity="one">Не удалось переместить <xliff:g id="count" example="1">%1$d</xliff:g> файл</item>
+        <item quantity="few">Не удалось переместить <xliff:g id="count" example="2">%1$d</xliff:g> файла</item>
+        <item quantity="many">Не удалось переместить &lt;&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"count\" example=\"2\"&gt;%1$d&lt;/xliff:g&gt; файлов</item>
+        <item quantity="other">Не удалось переместить &lt;&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\" id=\"count\" example=\"2\"&gt;%1$d&lt;/xliff:g&gt; файлов</item>
     </plurals>
     <plurals name="delete_error_notification_title" formatted="false" msgid="7568122018481625267">
-      <item quantity="one">Не удалось удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
-      <item quantity="few">Не удалось удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
-      <item quantity="many">Не удалось удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файлов</item>
-      <item quantity="other">Не удалось удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
+        <item quantity="one">Не удалось удалить <xliff:g id="count" example="1">%1$d</xliff:g> файл</item>
+        <item quantity="few">Не удалось удалить <xliff:g id="count" example="2">%1$d</xliff:g> файла</item>
+        <item quantity="many">Не удалось удалить <xliff:g id="count" example="2">%1$d</xliff:g> файлов</item>
+        <item quantity="other">Не удалось удалить <xliff:g id="count" example="2">%1$d</xliff:g> файлов</item>
     </plurals>
     <string name="notification_touch_for_details" msgid="2385563502445129570">"Нажмите, чтобы узнать подробности"</string>
-    <string name="close" msgid="905969391788869975">"Закрыть"</string>
+    <string name="close" msgid="905969391788869975">Закрыть</string>
     <plurals name="copy_failure_alert_content" formatted="false" msgid="5570549471912990536">
-      <item quantity="one">Не удалось скопировать эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="few">Не удалось скопировать эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="many">Не удалось скопировать эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="other">Не удалось скопировать эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="one">Не удалось скопировать этот файл: <xliff:g id="list" example="Document.pdf">%1$s</xliff:g></item>
+        <item quantity="few">Не удалось скопировать эти файлы: <xliff:g id="list" example="Document.pdf, Photo.jpg, Song.ogg">%1$s</xliff:g></item>
+        <item quantity="many">Не удалось скопировать эти файлы: <xliff:g id="list" example="Document.pdf, Photo.jpg, Song.ogg">%1$s</xliff:g></item>
+        <item quantity="other">Не удалось скопировать эти файлы: <xliff:g id="list" example="Document.pdf, Photo.jpg, Song.ogg">%1$s</xliff:g></item>
     </plurals>
     <plurals name="compress_failure_alert_content" formatted="false" msgid="5760632881868842400">
-      <item quantity="one">Не удалось сжать эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="few">Не удалось сжать эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="many">Не удалось сжать эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="other">Не удалось сжать эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="one">Не удалось сжать этот файл: <xliff:g id="list" example="Document.pdf">%1$s</xliff:g></item>
+        <item quantity="few">Не удалось сжать эти файлы: <xliff:g id="list" example="Document.pdf, Photo.jpg, Song.ogg">%1$s</xliff:g></item>
+        <item quantity="many">Не удалось сжать эти файлы: <xliff:g id="list" example="Document.pdf, Photo.jpg, Song.ogg">%1$s</xliff:g></item>
+        <item quantity="other">Не удалось сжать эти файлы: <xliff:g id="list" example="Document.pdf, Photo.jpg, Song.ogg">%1$s</xliff:g></item>
     </plurals>
     <plurals name="extract_failure_alert_content" formatted="false" msgid="7572748127571720803">
-      <item quantity="one">Не удалось извлечь эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="few">Не удалось извлечь эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="many">Не удалось извлечь эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="other">Не удалось извлечь эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="one">Не удалось извлечь этот файл: <xliff:g id="list" example="Document.pdf">%1$s</xliff:g></item>
+        <item quantity="few">Не удалось извлечь эти файлы: <xliff:g id="list" example="Document.pdf, Photo.jpg, Song.ogg">%1$s</xliff:g></item>
+        <item quantity="many">Не удалось извлечь эти файлы: <xliff:g id="list" example="Document.pdf, Photo.jpg, Song.ogg">%1$s</xliff:g></item>
+        <item quantity="other">Не удалось извлечь эти файлы: <xliff:g id="list" example="Document.pdf, Photo.jpg, Song.ogg">%1$s</xliff:g></item>
     </plurals>
     <plurals name="move_failure_alert_content" formatted="false" msgid="2747390342670799196">
-      <item quantity="one">Не удалось переместить эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="few">Не удалось переместить эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="many">Не удалось переместить эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="other">Не удалось переместить эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="one">Не удалось переместить эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="few">Не удалось переместить эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="many">Не удалось переместить эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="other">Не удалось переместить эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
     </plurals>
     <plurals name="delete_failure_alert_content" formatted="false" msgid="6122372614839711711">
-      <item quantity="one">Не удалось удалить эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="few">Не удалось удалить эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="many">Не удалось удалить эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="other">Не удалось удалить эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="one">Не удалось удалить эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="few">Не удалось удалить эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="many">Не удалось удалить эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="other">Не удалось удалить эти файлы: <xliff:g id="LIST_1">%1$s</xliff:g></item>
     </plurals>
     <plurals name="copy_converted_warning_content" formatted="false" msgid="7433742181712126588">
-      <item quantity="one">Формат этих файлов изменен: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="few">Формат этих файлов изменен: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="many">Формат этих файлов изменен: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="other">Формат этих файлов изменен: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="one">Формат этих файлов изменен: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="few">Формат этих файлов изменен: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="many">Формат этих файлов изменен: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="other">Формат этих файлов изменен: <xliff:g id="LIST_1">%1$s</xliff:g></item>
     </plurals>
     <plurals name="clipboard_files_clipped" formatted="false" msgid="4847061634862926902">
-      <item quantity="one">Скопирован <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
-      <item quantity="few">Скопировано <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
-      <item quantity="many">Скопировано <xliff:g id="COUNT_1">%1$d</xliff:g> файлов</item>
-      <item quantity="other">Скопировано <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item>
+        <item quantity="one">Скопирован <xliff:g id="COUNT_1">%1$d</xliff:g> файл в буфер обмена.</item>
+        <item quantity="few">Скопировано <xliff:g id="COUNT_1">%1$d</xliff:g> файла в буфер обмена.</item>
+        <item quantity="many">Скопировано <xliff:g id="COUNT_1">%1$d</xliff:g> файлов в буфер обмена.</item>
+        <item quantity="other">Скопировано <xliff:g id="COUNT_1">%1$d</xliff:g> файлов в буфер обмена.</item>
     </plurals>
-    <string name="file_operation_rejected" msgid="4301554203329008794">"Файловая операция не поддерживается"</string>
-    <string name="file_operation_error" msgid="2234357335716533795">"Не удалось выполнить операцию"</string>
+    <string name="file_operation_rejected" msgid="4301554203329008794">Файловая операция не поддерживается.</string>
+    <string name="file_operation_error" msgid="2234357335716533795">Не удалось выполнить операцию.</string>
     <string name="rename_error" msgid="6700093173508118635">"Не удалось переименовать документ"</string>
     <string name="menu_eject_root" msgid="9215040039374893613">"Извлечь"</string>
     <string name="notification_copy_files_converted_title" msgid="6916768494891833365">"Формат некоторых файлов изменен"</string>
@@ -240,51 +237,51 @@
     <string name="allow" msgid="1275746941353040309">"Разрешить"</string>
     <string name="deny" msgid="5127201668078153379">"Запретить"</string>
     <plurals name="elements_selected" formatted="false" msgid="4448165978637163692">
-      <item quantity="one">Выбран <xliff:g id="COUNT_1">%1$d</xliff:g> объект</item>
-      <item quantity="few">Выбрано <xliff:g id="COUNT_1">%1$d</xliff:g> объекта</item>
-      <item quantity="many">Выбрано <xliff:g id="COUNT_1">%1$d</xliff:g> объектов</item>
-      <item quantity="other">Выбрано <xliff:g id="COUNT_1">%1$d</xliff:g> объекта</item>
+        <item quantity="one">Выбран <xliff:g id="COUNT_1">%1$d</xliff:g> объект</item>
+        <item quantity="few">Выбрано <xliff:g id="COUNT_1">%1$d</xliff:g> объекта</item>
+        <item quantity="many">Выбрано <xliff:g id="COUNT_1">%1$d</xliff:g> объектов</item>
+        <item quantity="other">Выбрано <xliff:g id="COUNT_1">%1$d</xliff:g> объекта</item>
     </plurals>
     <plurals name="elements_dragged" formatted="false" msgid="5932571296037626279">
-      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> объект</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> объекта</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> объектов</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> объекта</item>
+        <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> объект</item>
+        <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> объекта</item>
+        <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> объектов</item>
+        <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> объекта</item>
     </plurals>
     <string name="delete_filename_confirmation_message" msgid="8338069763240613258">"Удалить файл \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
     <string name="delete_foldername_confirmation_message" msgid="9084085260877704140">"Удалить папку \"<xliff:g id="NAME">%1$s</xliff:g>\" со всем содержимым?"</string>
     <plurals name="delete_files_confirmation_message" formatted="false" msgid="4866664063250034142">
-      <item quantity="one">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файл?</item>
-      <item quantity="few">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файла?</item>
-      <item quantity="many">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файлов?</item>
-      <item quantity="other">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файла?</item>
+        <item quantity="one">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файл?</item>
+        <item quantity="few">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файла?</item>
+        <item quantity="many">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файлов?</item>
+        <item quantity="other">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файла?</item>
     </plurals>
     <plurals name="delete_folders_confirmation_message" formatted="false" msgid="1028946402799686388">
-      <item quantity="one">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> папку со всем содержимым?</item>
-      <item quantity="few">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> папки со всем содержимым?</item>
-      <item quantity="many">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> папок со всем содержимым?</item>
-      <item quantity="other">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> папки со всем содержимым?</item>
+        <item quantity="one">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> папку со всем содержимым?</item>
+        <item quantity="few">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> папки со всем содержимым?</item>
+        <item quantity="many">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> папок со всем содержимым?</item>
+        <item quantity="other">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> папки со всем содержимым?</item>
     </plurals>
     <plurals name="delete_items_confirmation_message" formatted="false" msgid="7285090426511028179">
-      <item quantity="one">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> объект?</item>
-      <item quantity="few">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> объекта?</item>
-      <item quantity="many">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> объектов?</item>
-      <item quantity="other">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> объекта?</item>
+        <item quantity="one">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> объект?</item>
+        <item quantity="few">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> объекта?</item>
+        <item quantity="many">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> объектов?</item>
+        <item quantity="other">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> объекта?</item>
     </plurals>
     <string name="images_shortcut_label" msgid="2545168016070493574">"Изображения"</string>
     <string name="archive_loading_failed" msgid="7243436722828766996">"Не удалось открыть архив. Файл поврежден, или такой формат не поддерживается."</string>
     <string name="name_conflict" msgid="28407269328862986">"Файл с таким названием уже существует."</string>
-    <string name="authentication_required" msgid="8030880723643436099">"Для просмотра каталога необходимо войти в <xliff:g id="NAME">%1$s</xliff:g>."</string>
-    <string name="cant_display_content" msgid="8633226333229417237">"Не удается отобразить контент."</string>
-    <string name="sign_in" msgid="6253762676723505592">"Войти"</string>
+    <string name="authentication_required" msgid="8030880723643436099">Для просмотра каталога необходимо войти в <xliff:g id="NAME">%1$s</xliff:g></string>
+    <string name="cant_display_content" msgid="8633226333229417237">Не удается отобразить контент</string>
+    <string name="sign_in" msgid="6253762676723505592">Войти</string>
     <string name="new_archive_file_name" msgid="1604650338077249838">"Архив<xliff:g id="EXTENSION">%s</xliff:g>"</string>
     <string name="overwrite_file_confirmation_message" msgid="2496109652768222716">"Заменить файл <xliff:g id="NAME">%1$s</xliff:g>?"</string>
     <string name="continue_in_background" msgid="1974214559047793331">"Продолжить в фоновом режиме"</string>
     <plurals name="selected_count" formatted="false" msgid="7555250236512981129">
-      <item quantity="one">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
-      <item quantity="few">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
-      <item quantity="many">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
-      <item quantity="other">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
+        <item quantity="one">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
+        <item quantity="few">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
+        <item quantity="many">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
+        <item quantity="other">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item>
     </plurals>
     <string name="root_info_header_recent" msgid="5654901877295332262">"Недавние файлы"</string>
     <string name="root_info_header_global_search" msgid="4904078222280496152">"Файлы"</string>
@@ -308,7 +305,7 @@
     <string name="chip_title_from_this_week" msgid="4961536405220379672">"На этой неделе"</string>
     <string name="input_hint_new_folder" msgid="479672411219725677">"Название папки"</string>
     <string name="input_hint_rename" msgid="8390711744270994452">"Новое название"</string>
-    <string name="preview_file" msgid="4056622696305432343">"Открыть файл \"<xliff:g id="FILENAME">%1$s</xliff:g>\" в режиме предпросмотра."</string>
+    <string name="preview_file" msgid="4056622696305432343">Открыть файл \"<xliff:g id="FILENAME">%1$s</xliff:g>\" в режиме предпросмотра</string>
     <string name="preview_work_file" msgid="4495643735563487273">"Предпросмотр рабочего файла \"<xliff:g id="FILENAME">%1$s</xliff:g>\""</string>
     <string name="apps_row_title" msgid="3340490016663092925">"Поиск файлов в других приложениях"</string>
     <string name="anonymous_application" msgid="7633027057951625862">"Анонимное приложение"</string>
@@ -326,4 +323,4 @@
     <string name="drag_from_another_app" msgid="8310249276199969905">"Перемещать файлы из другого приложения нельзя."</string>
     <string name="grid_mode_showing" msgid="2803166871485028508">"Показано в виде таблицы."</string>
     <string name="list_mode_showing" msgid="1225413902295895166">"Показано в виде списка."</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 30d8d7933..fc9d315ff 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--  Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,24 +12,21 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ --><resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="missing_rename_error" msgid="9098952207447981103">"Змініть цю назву"</string>
     <string name="add_folder_name_error" msgid="6014615052491406810">"Додайте назву папки"</string>
     <string name="files_label" msgid="771781190045103748">"Файли"</string>
     <string name="downloads_label" msgid="5462789470049501103">"Завантаження"</string>
     <!-- no translation found for app_label (8089292432455111409) -->
-    <skip />
+    <skip/>
     <!-- no translation found for launcher_label (799410258349837668) -->
-    <skip />
+    <skip/>
     <string name="title_open" msgid="3165686459158020921">"Відкрити"</string>
     <string name="title_save" msgid="4384490653102710025">"Зберегти в"</string>
     <string name="menu_create_dir" msgid="2413624798689091042">"Нова папка"</string>
     <string name="menu_grid" msgid="1453636521731880680">"Ескізи"</string>
     <string name="menu_list" msgid="6714267452146410402">"Список"</string>
-    <string name="menu_search" msgid="1876699106790719849">"Шукати"</string>
+    <string name="menu_search" msgid="1876699106790719849">Пошук</string>
     <string name="menu_settings" msgid="6520844520117939047">"Параметри зберігання"</string>
     <string name="menu_open" msgid="9092138100049759315">"Відкрити"</string>
     <string name="menu_open_with" msgid="5507647065467520229">"Відкрити за допомогою"</string>
@@ -125,34 +122,34 @@
     <string name="delete_notification_title" msgid="2512757431856830792">"Видалення файлів"</string>
     <string name="copy_remaining" msgid="5390517377265177727">"Залишилося <xliff:g id="DURATION">%s</xliff:g>"</string>
     <plurals name="copy_begin" formatted="false" msgid="151184708996738192">
-      <item quantity="one">Копіюється <xliff:g id="COUNT_1">%1$d</xliff:g> файл.</item>
-      <item quantity="few">Копіюються <xliff:g id="COUNT_1">%1$d</xliff:g> файли.</item>
-      <item quantity="many">Копіюються <xliff:g id="COUNT_1">%1$d</xliff:g> файлів.</item>
-      <item quantity="other">Копіюються <xliff:g id="COUNT_1">%1$d</xliff:g> файлу.</item>
+        <item quantity="one">Копіюється <xliff:g id="COUNT_1">%1$d</xliff:g> файл.</item>
+        <item quantity="few">Копіюються <xliff:g id="COUNT_1">%1$d</xliff:g> файли.</item>
+        <item quantity="many">Копіюються <xliff:g id="COUNT_1">%1$d</xliff:g> файлів.</item>
+        <item quantity="other">Копіюються <xliff:g id="COUNT_1">%1$d</xliff:g> файлу.</item>
     </plurals>
     <plurals name="compress_begin" formatted="false" msgid="3534158317098678895">
-      <item quantity="one">Стискається <xliff:g id="COUNT_1">%1$d</xliff:g> файл.</item>
-      <item quantity="few">Стискаються <xliff:g id="COUNT_1">%1$d</xliff:g> файли.</item>
-      <item quantity="many">Стискаються <xliff:g id="COUNT_1">%1$d</xliff:g> файлів.</item>
-      <item quantity="other">Стискаються <xliff:g id="COUNT_1">%1$d</xliff:g> файлу.</item>
+        <item quantity="one">Стискається <xliff:g id="COUNT_1">%1$d</xliff:g> файл.</item>
+        <item quantity="few">Стискаються <xliff:g id="COUNT_1">%1$d</xliff:g> файли.</item>
+        <item quantity="many">Стискаються <xliff:g id="COUNT_1">%1$d</xliff:g> файлів.</item>
+        <item quantity="other">Стискаються <xliff:g id="COUNT_1">%1$d</xliff:g> файлу.</item>
     </plurals>
     <plurals name="extract_begin" formatted="false" msgid="1006380679562903749">
-      <item quantity="one">Розпаковується <xliff:g id="COUNT_1">%1$d</xliff:g> файл.</item>
-      <item quantity="few">Розпаковуються <xliff:g id="COUNT_1">%1$d</xliff:g> файли.</item>
-      <item quantity="many">Розпаковуються <xliff:g id="COUNT_1">%1$d</xliff:g> файлів.</item>
-      <item quantity="other">Розпаковуються <xliff:g id="COUNT_1">%1$d</xliff:g> файлу.</item>
+        <item quantity="one">Розпаковується <xliff:g id="COUNT_1">%1$d</xliff:g> файл.</item>
+        <item quantity="few">Розпаковуються <xliff:g id="COUNT_1">%1$d</xliff:g> файли.</item>
+        <item quantity="many">Розпаковуються <xliff:g id="COUNT_1">%1$d</xliff:g> файлів.</item>
+        <item quantity="other">Розпаковуються <xliff:g id="COUNT_1">%1$d</xliff:g> файлу.</item>
     </plurals>
     <plurals name="move_begin" formatted="false" msgid="1464229874265756956">
-      <item quantity="one">Переміщується <xliff:g id="COUNT_1">%1$d</xliff:g> файл.</item>
-      <item quantity="few">Переміщуються <xliff:g id="COUNT_1">%1$d</xliff:g> файли.</item>
-      <item quantity="many">Переміщуються <xliff:g id="COUNT_1">%1$d</xliff:g> файлів.</item>
-      <item quantity="other">Переміщуються <xliff:g id="COUNT_1">%1$d</xliff:g> файлу.</item>
+        <item quantity="one">Переміщується <xliff:g id="COUNT_1">%1$d</xliff:g> файл.</item>
+        <item quantity="few">Переміщуються <xliff:g id="COUNT_1">%1$d</xliff:g> файли.</item>
+        <item quantity="many">Переміщуються <xliff:g id="COUNT_1">%1$d</xliff:g> файлів.</item>
+        <item quantity="other">Переміщуються <xliff:g id="COUNT_1">%1$d</xliff:g> файлу.</item>
     </plurals>
     <plurals name="deleting" formatted="false" msgid="1729138001178158901">
-      <item quantity="one">Видаляється <xliff:g id="COUNT_1">%1$d</xliff:g> файл.</item>
-      <item quantity="few">Видаляються <xliff:g id="COUNT_1">%1$d</xliff:g> файли.</item>
-      <item quantity="many">Видаляються <xliff:g id="COUNT_1">%1$d</xliff:g> файлів.</item>
-      <item quantity="other">Видаляються <xliff:g id="COUNT_1">%1$d</xliff:g> файлу.</item>
+        <item quantity="one">Видаляється <xliff:g id="COUNT_1">%1$d</xliff:g> файл.</item>
+        <item quantity="few">Видаляються <xliff:g id="COUNT_1">%1$d</xliff:g> файли.</item>
+        <item quantity="many">Видаляються <xliff:g id="COUNT_1">%1$d</xliff:g> файлів.</item>
+        <item quantity="other">Видаляються <xliff:g id="COUNT_1">%1$d</xliff:g> файлу.</item>
     </plurals>
     <string name="undo" msgid="2902438994196400565">"Скасувати"</string>
     <string name="copy_preparing" msgid="4759516490222449324">"Підготовка…"</string>
@@ -162,72 +159,72 @@
     <string name="delete_preparing" msgid="7339349837842802508">"Підготовка…"</string>
     <string name="delete_progress" msgid="2627631054702306423">"<xliff:g id="COUNT_0">%1$d</xliff:g> з <xliff:g id="TOTALCOUNT">%2$d</xliff:g>"</string>
     <plurals name="copy_error_notification_title" formatted="false" msgid="3188432450429390963">
-      <item quantity="one">Не вдалося скопіювати <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
-      <item quantity="few">Не вдалося скопіювати <xliff:g id="COUNT_1">%1$d</xliff:g> файли</item>
-      <item quantity="many">Не вдалося скопіювати <xliff:g id="COUNT_1">%1$d</xliff:g> файлів</item>
-      <item quantity="other">Не вдалося скопіювати <xliff:g id="COUNT_1">%1$d</xliff:g> файлу</item>
+        <item quantity="one">Не вдалося скопіювати <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
+        <item quantity="few">Не вдалося скопіювати <xliff:g id="COUNT_1">%1$d</xliff:g> файли</item>
+        <item quantity="many">Не вдалося скопіювати <xliff:g id="COUNT_1">%1$d</xliff:g> файлів</item>
+        <item quantity="other">Не вдалося скопіювати <xliff:g id="COUNT_1">%1$d</xliff:g> файлу</item>
     </plurals>
     <plurals name="compress_error_notification_title" formatted="false" msgid="3043630066678213644">
-      <item quantity="one">Не вдалося стиснути <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
-      <item quantity="few">Не вдалося стиснути <xliff:g id="COUNT_1">%1$d</xliff:g> файли</item>
-      <item quantity="many">Не вдалося стиснути <xliff:g id="COUNT_1">%1$d</xliff:g> файлів</item>
-      <item quantity="other">Не вдалося стиснути <xliff:g id="COUNT_1">%1$d</xliff:g> файлу</item>
+        <item quantity="one">Не вдалося стиснути <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
+        <item quantity="few">Не вдалося стиснути <xliff:g id="COUNT_1">%1$d</xliff:g> файли</item>
+        <item quantity="many">Не вдалося стиснути <xliff:g id="COUNT_1">%1$d</xliff:g> файлів</item>
+        <item quantity="other">Не вдалося стиснути <xliff:g id="COUNT_1">%1$d</xliff:g> файлу</item>
     </plurals>
     <plurals name="move_error_notification_title" formatted="false" msgid="2185736082411854754">
-      <item quantity="one">Не вдалося перемістити <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
-      <item quantity="few">Не вдалося перемістити <xliff:g id="COUNT_1">%1$d</xliff:g> файли</item>
-      <item quantity="many">Не вдалося перемістити <xliff:g id="COUNT_1">%1$d</xliff:g> файлів</item>
-      <item quantity="other">Не вдалося перемістити <xliff:g id="COUNT_1">%1$d</xliff:g> файлу</item>
+        <item quantity="one">Не вдалося перемістити <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
+        <item quantity="few">Не вдалося перемістити <xliff:g id="COUNT_1">%1$d</xliff:g> файли</item>
+        <item quantity="many">Не вдалося перемістити <xliff:g id="COUNT_1">%1$d</xliff:g> файлів</item>
+        <item quantity="other">Не вдалося перемістити <xliff:g id="COUNT_1">%1$d</xliff:g> файлу</item>
     </plurals>
     <plurals name="delete_error_notification_title" formatted="false" msgid="7568122018481625267">
-      <item quantity="one">Не вдалося видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
-      <item quantity="few">Не вдалося видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файли</item>
-      <item quantity="many">Не вдалося видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файлів</item>
-      <item quantity="other">Не вдалося видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файлу</item>
+        <item quantity="one">Не вдалося видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item>
+        <item quantity="few">Не вдалося видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файли</item>
+        <item quantity="many">Не вдалося видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файлів</item>
+        <item quantity="other">Не вдалося видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файлу</item>
     </plurals>
     <string name="notification_touch_for_details" msgid="2385563502445129570">"Торкніться, щоб переглянути деталі"</string>
     <string name="close" msgid="905969391788869975">"Закрити"</string>
     <plurals name="copy_failure_alert_content" formatted="false" msgid="5570549471912990536">
-      <item quantity="one">Не скопійовано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="few">Не скопійовано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="many">Не скопійовано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="other">Не скопійовано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="one">Не скопійовано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="few">Не скопійовано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="many">Не скопійовано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="other">Не скопійовано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
     </plurals>
     <plurals name="compress_failure_alert_content" formatted="false" msgid="5760632881868842400">
-      <item quantity="one">Не стиснено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="few">Не стиснено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="many">Не стиснено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="other">Не стиснено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="one">Не стиснено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="few">Не стиснено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="many">Не стиснено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="other">Не стиснено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
     </plurals>
     <plurals name="extract_failure_alert_content" formatted="false" msgid="7572748127571720803">
-      <item quantity="one">Не розпаковано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="few">Не розпаковано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="many">Не розпаковано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="other">Не розпаковано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="one">Не розпаковано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="few">Не розпаковано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="many">Не розпаковано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="other">Не розпаковано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
     </plurals>
     <plurals name="move_failure_alert_content" formatted="false" msgid="2747390342670799196">
-      <item quantity="one">Не переміщено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="few">Не переміщено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="many">Не переміщено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="other">Не переміщено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="one">Не переміщено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="few">Не переміщено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="many">Не переміщено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="other">Не переміщено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
     </plurals>
     <plurals name="delete_failure_alert_content" formatted="false" msgid="6122372614839711711">
-      <item quantity="one">Не видалено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="few">Не видалено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="many">Не видалено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="other">Не видалено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="one">Не видалено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="few">Не видалено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="many">Не видалено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="other">Не видалено такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
     </plurals>
     <plurals name="copy_converted_warning_content" formatted="false" msgid="7433742181712126588">
-      <item quantity="one">В інший формат не конвертовано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="few">В інший формат не конвертовано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="many">В інший формат не конвертовано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
-      <item quantity="other">В інший формат не конвертовано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="one">В інший формат не конвертовано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="few">В інший формат не конвертовано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="many">В інший формат не конвертовано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
+        <item quantity="other">В інший формат не конвертовано такі файли: <xliff:g id="LIST_1">%1$s</xliff:g></item>
     </plurals>
     <plurals name="clipboard_files_clipped" formatted="false" msgid="4847061634862926902">
-      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> файл скопійовано в буфер обміну.</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> файли скопійовано в буфер обміну.</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> файлів скопійовано в буфер обміну.</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файлу скопійовано в буфер обміну.</item>
+        <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> файл скопійовано в буфер обміну.</item>
+        <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> файли скопійовано в буфер обміну.</item>
+        <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> файлів скопійовано в буфер обміну.</item>
+        <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файлу скопійовано в буфер обміну.</item>
     </plurals>
     <string name="file_operation_rejected" msgid="4301554203329008794">"Операція з файлом не підтримується."</string>
     <string name="file_operation_error" msgid="2234357335716533795">"Операцію з файлом не виконано."</string>
@@ -240,36 +237,36 @@
     <string name="allow" msgid="1275746941353040309">"Дозволити"</string>
     <string name="deny" msgid="5127201668078153379">"Відхилити"</string>
     <plurals name="elements_selected" formatted="false" msgid="4448165978637163692">
-      <item quantity="one">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
-      <item quantity="few">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
-      <item quantity="many">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
-      <item quantity="other">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
+        <item quantity="one">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
+        <item quantity="few">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
+        <item quantity="many">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
+        <item quantity="other">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
     </plurals>
     <plurals name="elements_dragged" formatted="false" msgid="5932571296037626279">
-      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> елемент</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> елементи</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> елементів</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> елемента</item>
+        <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> елемент</item>
+        <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> елементи</item>
+        <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> елементів</item>
+        <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> елемента</item>
     </plurals>
     <string name="delete_filename_confirmation_message" msgid="8338069763240613258">"Видалити файл <xliff:g id="NAME">%1$s</xliff:g>?"</string>
     <string name="delete_foldername_confirmation_message" msgid="9084085260877704140">"Видалити папку \"<xliff:g id="NAME">%1$s</xliff:g>\" та її вміст?"</string>
     <plurals name="delete_files_confirmation_message" formatted="false" msgid="4866664063250034142">
-      <item quantity="one">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файл?</item>
-      <item quantity="few">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файли?</item>
-      <item quantity="many">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файлів?</item>
-      <item quantity="other">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файлу?</item>
+        <item quantity="one">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файл?</item>
+        <item quantity="few">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файли?</item>
+        <item quantity="many">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файлів?</item>
+        <item quantity="other">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файлу?</item>
     </plurals>
     <plurals name="delete_folders_confirmation_message" formatted="false" msgid="1028946402799686388">
-      <item quantity="one">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> папку та їх вміст?</item>
-      <item quantity="few">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> папки та їх вміст?</item>
-      <item quantity="many">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> папок і їх вміст?</item>
-      <item quantity="other">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> папки та їх вміст?</item>
+        <item quantity="one">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> папку та їх вміст?</item>
+        <item quantity="few">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> папки та їх вміст?</item>
+        <item quantity="many">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> папок і їх вміст?</item>
+        <item quantity="other">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> папки та їх вміст?</item>
     </plurals>
     <plurals name="delete_items_confirmation_message" formatted="false" msgid="7285090426511028179">
-      <item quantity="one">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> елемент?</item>
-      <item quantity="few">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> елементи?</item>
-      <item quantity="many">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> елементів?</item>
-      <item quantity="other">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> елемента?</item>
+        <item quantity="one">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> елемент?</item>
+        <item quantity="few">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> елементи?</item>
+        <item quantity="many">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> елементів?</item>
+        <item quantity="other">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> елемента?</item>
     </plurals>
     <string name="images_shortcut_label" msgid="2545168016070493574">"Зображення"</string>
     <string name="archive_loading_failed" msgid="7243436722828766996">"Не вдається відкрити архів для перегляду. Файл пошкоджено або має непідтримуваний формат."</string>
@@ -281,10 +278,10 @@
     <string name="overwrite_file_confirmation_message" msgid="2496109652768222716">"Замінити назву \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string>
     <string name="continue_in_background" msgid="1974214559047793331">"Продовжити у фоновому режимі"</string>
     <plurals name="selected_count" formatted="false" msgid="7555250236512981129">
-      <item quantity="one">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
-      <item quantity="few">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
-      <item quantity="many">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
-      <item quantity="other">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
+        <item quantity="one">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
+        <item quantity="few">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
+        <item quantity="many">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
+        <item quantity="other">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item>
     </plurals>
     <string name="root_info_header_recent" msgid="5654901877295332262">"Нещодавні файли"</string>
     <string name="root_info_header_global_search" msgid="4904078222280496152">"Файли"</string>
@@ -326,4 +323,4 @@
     <string name="drag_from_another_app" msgid="8310249276199969905">"Не можна переміщувати файли з іншого додатка."</string>
     <string name="grid_mode_showing" msgid="2803166871485028508">"Перегляд у режимі таблиці."</string>
     <string name="list_mode_showing" msgid="1225413902295895166">"Перегляд у режимі списку."</string>
-</resources>
+</resources>
\ No newline at end of file
-- 
GitLab