From 161925a51df33f819c4546f0ae44f34064914e8e Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Thu, 28 Sep 2023 17:56:21 +0530
Subject: [PATCH 1/2] Move our string modifications to e_strings.xml

---
 res/values-de/e_strings.xml | 19 +++++++++++++++++++
 res/values-is/e_strings.xml | 19 +++++++++++++++++++
 res/values-it/e_strings.xml | 19 +++++++++++++++++++
 res/values-nl/e_strings.xml | 19 +++++++++++++++++++
 res/values/e_strings.xml    | 19 +++++++++++++++++++
 5 files changed, 95 insertions(+)
 create mode 100644 res/values-de/e_strings.xml
 create mode 100644 res/values-is/e_strings.xml
 create mode 100644 res/values-it/e_strings.xml
 create mode 100644 res/values-nl/e_strings.xml
 create mode 100644 res/values/e_strings.xml

diff --git a/res/values-de/e_strings.xml b/res/values-de/e_strings.xml
new file mode 100644
index 00000000..cc32355d
--- /dev/null
+++ b/res/values-de/e_strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ 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/>.
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="unknown_metadata">Unbekannt</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-is/e_strings.xml b/res/values-is/e_strings.xml
new file mode 100644
index 00000000..18b8e866
--- /dev/null
+++ b/res/values-is/e_strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ 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/>.
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="unknown_metadata">Óþekkt</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-it/e_strings.xml b/res/values-it/e_strings.xml
new file mode 100644
index 00000000..b1df0f2e
--- /dev/null
+++ b/res/values-it/e_strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ 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/>.
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="unknown_metadata">Sconosciuto</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-nl/e_strings.xml b/res/values-nl/e_strings.xml
new file mode 100644
index 00000000..4495045a
--- /dev/null
+++ b/res/values-nl/e_strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ 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/>.
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="unknown_metadata">Onbekend</string>
+</resources>
\ No newline at end of file
diff --git a/res/values/e_strings.xml b/res/values/e_strings.xml
new file mode 100644
index 00000000..6f9477e0
--- /dev/null
+++ b/res/values/e_strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ 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/>.
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="unknown_metadata">Unknown</string>
+</resources>
\ No newline at end of file
-- 
GitLab


From 5a58271035857e9eb368c3eccf48fb9b3628b3ee Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Thu, 28 Sep 2023 18:02:41 +0530
Subject: [PATCH 2/2] Make strings.xml and cm_strings.xml same as upstream so
 as to avoid conflicts when merging upstream changes

---
 res/values-fr/strings.xml | 5 +++--
 res/values-nl/strings.xml | 3 ++-
 res/values-ru/strings.xml | 3 ++-
 res/values/strings.xml    | 1 -
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 433004fd..747b1e6e 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -15,7 +15,8 @@
      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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Musique</string>
     <string name="page_artists">Artistes</string>
     <string name="page_albums">Albums</string>
@@ -68,6 +69,7 @@
     <string name="delete_warning">Cette action supprimera définitivement le cache des images</string>
     <string name="new_photo">Choisir une photo de la Galerie</string>
     <string name="use_default">Utiliser la photo par défaut</string>
+    <string name="visualizer_perm_denied">L\'autorisation d\'enregistrement audio a été refusée, activez-la depuis l\'application Paramètres pour permettre la visualisation de la musique</string>
     <string name="context_menu_play_selection">Lire</string>
     <string name="context_menu_play_next">Lire le suivant</string>
     <string name="context_menu_play_album">Lire l\'album</string>
@@ -135,7 +137,6 @@
     <string name="header_5_plus_albums">Plus de 5 albums</string>
     <string name="header_other">"Autres"</string>
     <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
-    <string name="visualizer_perm_denied">La permission d\'enregistrer des contenus audio a été refusée, activez-la depuis les Paramètres du téléphone pour afficher les animations musicales.</string>
     <string name="channel_music">Lecture de musique</string>
     <string name="widget_track_name">Nom de la piste</string>
     <string name="widget_artist_name">Nom de l\'artiste</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6db7ff89..8d858a8b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -15,7 +15,8 @@
      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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Muziek</string>
     <string name="page_artists">Artiesten</string>
     <string name="page_albums">Albums</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 572afc09..9deef608 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -15,7 +15,8 @@
      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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Музыка</string>
     <string name="page_artists">Исполнители</string>
     <string name="page_albums">Альбомы</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 19c7e9ce..2f882cac 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -173,7 +173,6 @@
 
     <string name="channel_music">Music playback</string>
 
-    <string name="unknown_metadata">Unknown</string>
     <string name="widget_track_name">Track name</string>
     <string name="widget_artist_name">Artist name</string>
     <string name="widget_album_name">Album name</string>
-- 
GitLab