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

---
 app/src/main/res/values-es/strings.xml | 32 +++-----------------------
 app/src/main/res/values-fr/strings.xml |  5 ++--
 app/src/main/res/values-nl/strings.xml |  7 +++---
 app/src/main/res/values-ru/strings.xml |  7 +++---
 4 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7e37e7ad..8edc0094 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -12,7 +12,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>
+-->
+<resources>
     <string name="app_name">Grabadora</string>
     <string name="share">Compartir</string>
     <string name="stop">Detener</string>
@@ -34,31 +35,4 @@
     <string name="dialog_permissions_dismiss">Descartar</string>
     <string name="snack_permissions_no_permission">Permisos necesarios denegados, actívelos desde la aplicación de Ajustes para iniciar la grabación</string>
     <string name="main_sound_action">Grabar sonido</string>
-    <string name="delete_selected_message">¿Estás seguro de que quieres borrar las grabaciones seleccionadas\? Esto no se puede deshacer</string>
-    <string name="delete_selected_title">Eliminar seleccionados</string>
-    <string name="delete_all_message">¿Estás seguro de que quieres borrar todas las grabaciones\? Esto no se puede deshacer</string>
-    <string name="delete_all_title">Eliminar todo</string>
-    <string name="list_item_menu">Más acciones</string>
-    <string name="list_edit_confirm">Cambiar</string>
-    <string name="list_edit_title">Editar nombre de grabación</string>
-    <string name="list_error_empty">Todas tus grabaciones se mostrarán aquí</string>
-    <string name="list_title">Mis grabaciones</string>
-    <string name="snack_permissions_no_permission_location">El permiso de localización ha sido denegado, habilítalo desde la aplicación Ajustes para etiquetar tus grabaciones</string>
-    <string name="dialog_permissions_location">La grabadora necesita permiso de ubicación para etiquetar automáticamente tus grabaciones y ayudarte a organizarlas</string>
-    <string name="settings_quality_high">Grabar en alta calidad</string>
-    <string name="settings_location_message">Etiqueta tus grabaciones con tu posición actual</string>
-    <string name="sound_recording_title_paused">Pausado</string>
-    <string name="confirm_result_message">¿Quieres utilizar la última grabación\?</string>
-    <string name="confirm_result_title">¿Utilizar grabación\?</string>
-    <string name="record_again">Grabar de nuevo</string>
-    <string name="discard">Descartar</string>
-    <string name="confirm">Confirmar</string>
-    <string name="delete_recording_message">¿Estás seguro de que quieres borrar esta grabación\? No se puede deshacer</string>
-    <string name="rename">Renombrar</string>
-    <string name="delete_all">Eliminar todo</string>
-    <string name="delete_selected">Eliminar seleccionados</string>
-    <string name="resume">Reanudar</string>
-    <string name="pause">Pausa</string>
-    <string name="share_selected">Compartir seleccionados</string>
-    <string name="settings_title">Ajustes</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index bdc336ce..84a97d50 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -12,7 +12,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>
+-->
+<resources>
     <string name="app_name">Magnétophone</string>
     <string name="share">Partager</string>
     <string name="share_selected">Partager la sélection</string>
@@ -65,4 +66,4 @@
     <string name="delete_all_message">Êtes-vous sûr de vouloir supprimer tous les enregistrements ? Cette action est irréversible</string>
     <string name="delete_selected_title">Supprimer la sélection</string>
     <string name="delete_selected_message">Êtes-vous sûr de vouloir supprimer les enregistrements sélectionnés ? Cette action est irréversible</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index df3d63c6..88d42bca 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -12,7 +12,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>
+-->
+<resources>
     <string name="app_name">Recorder</string>
     <string name="share">Delen</string>
     <string name="share_selected">Selectie delen</string>
@@ -28,7 +29,7 @@
     <string name="delete_title">Opname verwijderen</string>
     <string name="delete_recording_message">Weet u zeker dat u deze opname wilt verwijderen? Dit kan niet ongedaan worden gemaakt</string>
     <string name="confirm">Bevestig</string>
-    <string name="discard">Verwerpen</string>
+    <string name="discard">Negeer</string>
     <string name="record_again">Neem opnieuw op</string>
     <string name="confirm_result_title">Opname gebruiken?</string>
     <string name="confirm_result_message">Wilt u de laatste opname gebruiken?</string>
@@ -65,4 +66,4 @@
     <string name="delete_all_message">Weet u zeker dat u alle opnames wilt verwijderen? Dit kan niet ongedaan worden gemaakt</string>
     <string name="delete_selected_title">Selectie verwijderen</string>
     <string name="delete_selected_message">Weet u zeker dat u de geselecteerde opnames wilt verwijderen? Dit kan niet ongedaan worden gemaakt</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 41688b45..acbd7ecd 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -12,9 +12,10 @@
      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>
+-->
+<resources>
     <string name="app_name">Рекордер</string>
-    <string name="share">Поделиться</string>
+    <string name="share">Отправить</string>
     <string name="share_selected">Поделиться выбранным</string>
     <string name="stop">Остановить</string>
     <string name="play">Воспроизвести</string>
@@ -65,4 +66,4 @@
     <string name="delete_all_message">Вы уверены, что хотите удалить все записи? Действие не может быть отменено</string>
     <string name="delete_selected_title">Удалить выбранное</string>
     <string name="delete_selected_message">Вы уверены, что хотите выбранные записи? Действие не может быть отменено</string>
-</resources>
\ No newline at end of file
+</resources>
-- 
GitLab