From 37a9d8e7a96b254844349c582ab9366e80248721 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@e.email>
Date: Tue, 9 Jun 2020 11:04:48 +0200
Subject: [PATCH] Fix the @string/files_label app name

---
 minimal/res/values/strings.xml | 4 ++--
 res/values-ast-rES/strings.xml | 2 --
 res/values-cy/strings.xml      | 2 --
 res/values-fr/strings.xml      | 4 +---
 res/values-it/strings.xml      | 4 +---
 res/values-nl/strings.xml      | 4 +---
 res/values/strings.xml         | 4 ++--
 7 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/minimal/res/values/strings.xml b/minimal/res/values/strings.xml
index bcffd6b69..1d6cfe67b 100644
--- a/minimal/res/values/strings.xml
+++ b/minimal/res/values/strings.xml
@@ -19,10 +19,10 @@
     <string name="files_label">Files</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>
 
     <!-- Text in an alert dialog asking user to grant app access to a given directory in an external storage volume -->
     <string name="open_external_dialog_request">Grant <xliff:g id="appName" example="System Settings"><b>^1</b></xliff:g>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 21b14fbbc..79b260cea 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -16,8 +16,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="files_label">Ficheros</string>
     <string name="downloads_label">Descargues</string>
-    <string name="app_label">@string/files_label</string>
-    <string name="launcher_label">@string/files_label</string>
     <string name="title_open">Abrir dende</string>
     <string name="title_save">Guardar en</string>
     <string name="menu_create_dir">Carpeta nueva</string>
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
index 017719239..05780f8d1 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -16,8 +16,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="files_label">Ffeiliau</string>
     <string name="downloads_label">Wedi ei lawrlwytho</string>
-    <string name="app_label">@string/files_label</string>
-    <string name="launcher_label">@string/files_label</string>
     <string name="title_open">Agor o</string>
     <string name="title_save">Cadw i</string>
     <string name="menu_create_dir">Ffolder newydd</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c3ffee759..add228434 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -203,6 +203,4 @@
     <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>
-    <string name="launcher_label">\@string/files_label</string>
-    <string name="app_label">\@string/files_label</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 449c2047f..0633c804f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -203,6 +203,4 @@
     <string name="new_archive_file_name" msgid="1604650338077249838"> no translation found for app_label (8089292432455111409) </string>
     <string name="overwrite_file_confirmation_message" msgid="2496109652768222716"> no translation found for app_label (8089292432455111409) </string>
     <string name="continue_in_background" msgid="1974214559047793331">"Continua in background"</string>
-    <string name="launcher_label">\@string/files_label</string>
-    <string name="app_label">\@string/files_label</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7809d6e6a..0ac57cc7d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -203,6 +203,4 @@
     <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>
-    <string name="launcher_label">\@string/files_label</string>
-    <string name="app_label">\@string/files_label</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d671960ee..0107fcc53 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -22,10 +22,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