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

---
 res/values-fr/strings.xml | 137 +++++++++++++++++++-------------------
 res/values-nl/strings.xml |  13 ++--
 2 files changed, 78 insertions(+), 72 deletions(-)

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index b777f04f..8e0bea48 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) 2015 The Android Open Source Project
 
@@ -13,71 +13,74 @@
   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">
-    <string name="app_name" msgid="1756503303878374382">Calculatrice</string>
-    <string name="dec_point" msgid="8920102493070918054">,</string>
-    <string name="mode_deg" msgid="1146123354434332479">deg</string>
-    <string name="mode_rad" msgid="1434228830085760996">rad</string>
-    <string name="cleared" msgid="3952521190281880880">effacé</string>
-    <string name="del" msgid="5878069000864178910">suppr</string>
-    <string name="desc_const_e" msgid="1889187337970539507">nombre d\'Euler</string>
-    <string name="desc_const_pi" msgid="5430918714009441655">pi</string>
-    <string name="desc_dec_point" msgid="5725254504360445023">virgule</string>
-    <string name="desc_lparen" msgid="8688758170211924916">parenthèse gauche</string>
-    <string name="desc_rparen" msgid="7920608385146151731">parenthèse droite</string>
-    <string name="desc_fun_cos" msgid="3787913784504974731">cosinus</string>
-    <string name="desc_fun_ln" msgid="2505119732546227166">logarithme naturel</string>
-    <string name="desc_fun_log" msgid="4202230639814060062">logarithme</string>
-    <string name="desc_fun_sin" msgid="7425661271929838876">sinus</string>
-    <string name="desc_fun_tan" msgid="3545496562069310036">tangente</string>
-    <string name="desc_fun_arccos" msgid="7583077865497939123">cosinus inverse</string>
-    <string name="desc_fun_arcsin" msgid="8592309261123302915">sinus inverse</string>
-    <string name="desc_fun_arctan" msgid="6891388393360447455">tangente inverse</string>
-    <string name="desc_fun_10pow" msgid="3972646467174520812">dix à la puissance</string>
-    <string name="desc_fun_exp" msgid="657106837530588390">fonction exponentielle</string>
-    <string name="desc_op_sqr" msgid="693577095029219627">au carré</string>
-    <string name="desc_op_add" msgid="5539599782598050813">plus</string>
-    <string name="desc_op_div" msgid="3032399266115257498">diviser</string>
-    <string name="desc_op_fact" msgid="6142780103294179702">factoriel</string>
-    <string name="desc_op_mul" msgid="6882122010553947015">multiplier</string>
-    <string name="desc_op_pct" msgid="2466179646911499434">pour cent</string>
-    <string name="desc_op_pow" msgid="6010144442344099030">puissance</string>
-    <string name="desc_op_sqrt" msgid="6882241473601721767">racine carrée</string>
-    <string name="desc_op_sub" msgid="2744940875059679129">moins</string>
-    <string name="desc_mode_deg" msgid="4129831241246511710">mode degré</string>
-    <string name="desc_mode_rad" msgid="730135521908627673">mode radian</string>
-    <string name="desc_switch_deg" msgid="6675211986921592374">passer en mode degré</string>
-    <string name="desc_switch_rad" msgid="2845875847488919914">passer en mode radian</string>
-    <string name="desc_eq" msgid="3349320880874699285">égale</string>
-    <string name="desc_clr" msgid="737502124268890797">effacer</string>
-    <string name="desc_del" msgid="7879515781929311432">supprimer</string>
-    <string name="desc_inv_off" msgid="3672218250519616068">afficher les fonctions inverses</string>
-    <string name="desc_inv_on" msgid="2515675590767677178">masquer les fonctions inverses</string>
-    <string name="desc_formula" msgid="8056588859637585007">Aucune formule</string>
-    <string name="desc_result" msgid="1794073190203126821">Aucun résultat</string>
-    <string name="desc_num_pad" msgid="515720457459745571">Nombres et opérations de base</string>
-    <string name="desc_adv_pad" msgid="3794276256462677914">Opérations avancées</string>
-    <string name="error_nan" msgid="5674077944929888710">Pas un nombre</string>
-    <string name="error_syntax" msgid="4786987111228645602">Express. incorr.</string>
+   -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="1756503303878374382">"Calculatrice"</string>
+    <string name="dec_point" msgid="8920102493070918054">","</string>
+    <string name="mode_deg" msgid="1146123354434332479">"deg"</string>
+    <string name="mode_rad" msgid="1434228830085760996">"rad"</string>
+    <string name="cleared" msgid="3952521190281880880">"effacés"</string>
+    <string name="del" msgid="5878069000864178910">"sup"</string>
+    <string name="desc_const_e" msgid="1889187337970539507">"nombre d\'Euler"</string>
+    <string name="desc_const_pi" msgid="5430918714009441655">"pi"</string>
+    <string name="desc_dec_point" msgid="5725254504360445023">"virgule"</string>
+    <string name="desc_lparen" msgid="8688758170211924916">"parenthèse gauche"</string>
+    <string name="desc_rparen" msgid="7920608385146151731">"parenthèse droite"</string>
+    <string name="desc_fun_cos" msgid="3787913784504974731">"cosinus"</string>
+    <string name="desc_fun_ln" msgid="2505119732546227166">"logarithme naturel"</string>
+    <string name="desc_fun_log" msgid="4202230639814060062">"logarithme"</string>
+    <string name="desc_fun_sin" msgid="7425661271929838876">"sinus"</string>
+    <string name="desc_fun_tan" msgid="3545496562069310036">"tangente"</string>
+    <string name="desc_fun_arccos" msgid="7583077865497939123">"cosinus inverse"</string>
+    <string name="desc_fun_arcsin" msgid="8592309261123302915">"sinus inverse"</string>
+    <string name="desc_fun_arctan" msgid="6891388393360447455">"tangente inverse"</string>
+    <string name="desc_fun_10pow" msgid="3972646467174520812">"dix à la puissance"</string>
+    <string name="desc_fun_exp" msgid="657106837530588390">"fonction exponentielle"</string>
+    <string name="desc_op_sqr" msgid="693577095029219627">"au carré"</string>
+    <string name="desc_op_add" msgid="5539599782598050813">"plus"</string>
+    <string name="desc_op_div" msgid="3032399266115257498">"divisé"</string>
+    <string name="desc_op_fact" msgid="6142780103294179702">"factoriel"</string>
+    <string name="desc_op_mul" msgid="6882122010553947015">"multiplier"</string>
+    <string name="desc_op_pct" msgid="2466179646911499434">"pourcent"</string>
+    <string name="desc_op_pow" msgid="6010144442344099030">"puissance"</string>
+    <string name="desc_op_sqrt" msgid="6882241473601721767">"racine carrée"</string>
+    <string name="desc_op_sub" msgid="2744940875059679129">"moins"</string>
+    <string name="desc_mode_deg" msgid="4129831241246511710">"mode degrés"</string>
+    <string name="desc_mode_rad" msgid="730135521908627673">"mode radians"</string>
+    <string name="desc_switch_deg" msgid="6675211986921592374">"passer en mode degrés"</string>
+    <string name="desc_switch_rad" msgid="2845875847488919914">"passer en mode radians"</string>
+    <string name="desc_eq" msgid="3349320880874699285">"égal"</string>
+    <string name="desc_clr" msgid="737502124268890797">"effacer"</string>
+    <string name="desc_del" msgid="7879515781929311432">"supprimer"</string>
+    <string name="desc_inv_off" msgid="3672218250519616068">"afficher les fonctions inverses"</string>
+    <string name="desc_inv_on" msgid="2515675590767677178">"masquer les fonctions inverses"</string>
+    <string name="desc_formula" msgid="8056588859637585007">"Aucune formule"</string>
+    <string name="desc_result" msgid="1794073190203126821">"Aucun résultat"</string>
+    <string name="desc_num_pad" msgid="515720457459745571">"Nombres et opérations de base"</string>
+    <string name="desc_adv_pad" msgid="3794276256462677914">"Opérations avancées"</string>
+    <string name="error_nan" msgid="5674077944929888710">"Pas un nombre"</string>
+    <string name="error_syntax" msgid="4786987111228645602">"Express. incorr."</string>
     <string name="error_aborted" msgid="3402238176316342537">"Annulée"</string>
-    <string name="error_overflow" msgid="7800547394563434764">Infini \?</string>
-    <string name="error_zero_divide" msgid="458040988686661801">Div par 0 impossible</string>
-    <string name="text_copied_toast" msgid="2104264466812485425">Texte copié</string>
-    <string name="cancelled" msgid="2207323593183640994">Calcul annulé.</string>
-    <string name="timeout" msgid="5461892570729418573">Il est possible que la valeur soit infinie ou non définie.</string>
-    <string name="ok_remove_timeout" msgid="8344529153919268011">Utiliser des délais plus longs</string>
-    <string name="dismiss" msgid="7872443888515066216">Ignorer</string>
-    <string name="exact" msgid="2597237880041789948">(exact)</string>
-    <string name="approximate" msgid="7117143366610670836">(±1 sur dernier chiffre)</string>
-    <string name="menu_leading" msgid="2338520833272667740">Réponse avec prem. chiffres</string>
+    <string name="error_overflow" msgid="7800547394563434764">"Infini ?"</string>
+    <string name="error_zero_divide" msgid="458040988686661801">"Div par 0 impossible"</string>
+    <string name="text_copied_toast" msgid="2104264466812485425">"Le texte a bien été copié."</string>
+    <string name="cancelled" msgid="2207323593183640994">"Calcul annulé."</string>
+    <string name="timeout" msgid="5461892570729418573">"Il est possible que la valeur soit infinie ou non définie."</string>
+    <string name="ok_remove_timeout" msgid="8344529153919268011">"Utiliser délais plus longs"</string>
+    <string name="dismiss" msgid="7872443888515066216">"Fermer"</string>
+    <string name="exact" msgid="2597237880041789948">"(exact)"</string>
+    <string name="approximate" msgid="7117143366610670836">"(±1 au dernier chiffre)"</string>
+    <string name="menu_leading" msgid="2338520833272667740">"Réponse avec prem. chiffres"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"Réponse en fraction"</string>
-    <string name="menu_licenses" msgid="1890541368064108592">Licences Open Source</string>
-    <string name="menu_history" msgid="9006222701220105452">Historique</string>
-    <string name="menu_clear_history" msgid="2336526604226069572">Effacer</string>
-    <string name="title_history" msgid="7820912156315181539">Historique</string>
-    <string name="desc_navigate_up" msgid="6208699569165589623">Remonter d\'un niveau</string>
-    <string name="dialog_timeout" msgid="9069768442342329065">Expiration du délai</string>
-    <string name="dialog_clear" msgid="7137395395908350702">Effacer l\'historique et la mémoire \?</string>
-    <string name="title_current_expression" msgid="2442754548537900591">Expression actuelle</string>
-    <string name="no_history" msgid="4331262030447527188">Aucun historique</string>
-</resources>
\ No newline at end of file
+    <string name="menu_licenses" msgid="1890541368064108592">"Licences Open Source"</string>
+    <string name="menu_history" msgid="9006222701220105452">"Historique"</string>
+    <string name="menu_clear_history" msgid="2336526604226069572">"Effacer"</string>
+    <string name="title_history" msgid="7820912156315181539">"Historique"</string>
+    <string name="desc_navigate_up" msgid="6208699569165589623">"Remonter d\'un niveau"</string>
+    <string name="dialog_timeout" msgid="9069768442342329065">"Expiration du délai"</string>
+    <string name="dialog_clear" msgid="7137395395908350702">"Effacer historique et mémoire ?"</string>
+    <string name="title_current_expression" msgid="2442754548537900591">"Expression actuelle"</string>
+    <string name="no_history" msgid="4331262030447527188">"Aucun historique"</string>
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 555742e8..64241ad2 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) 2015 The Android Open Source Project
 
@@ -13,11 +13,14 @@
   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="app_name" msgid="1756503303878374382">"Rekenmachine"</string>
     <string name="dec_point" msgid="8920102493070918054">","</string>
     <string name="mode_deg" msgid="1146123354434332479">"deg"</string>
-    <string name="mode_rad" msgid="1434228830085760996">rad</string>
+    <string name="mode_rad" msgid="1434228830085760996">"rad"</string>
     <string name="cleared" msgid="3952521190281880880">"gewist"</string>
     <string name="del" msgid="5878069000864178910">"←"</string>
     <string name="desc_const_e" msgid="1889187337970539507">"constante van Neper"</string>
@@ -67,7 +70,7 @@
     <string name="timeout" msgid="5461892570729418573">"De waarde is mogelijk oneindig of niet gedefinieerd."</string>
     <string name="ok_remove_timeout" msgid="8344529153919268011">"Langere time-outs gebruiken"</string>
     <string name="dismiss" msgid="7872443888515066216">"Sluiten"</string>
-    <string name="exact" msgid="2597237880041789948">(exact)</string>
+    <string name="exact" msgid="2597237880041789948">"(exact)"</string>
     <string name="approximate" msgid="7117143366610670836">"(±1 in laatste cijfer)"</string>
     <string name="menu_leading" msgid="2338520833272667740">"Antwoord met voorloopcijfers"</string>
     <string name="menu_fraction" msgid="1247477377840252234">"Antwoord als breuk"</string>
@@ -80,4 +83,4 @@
     <string name="dialog_clear" msgid="7137395395908350702">"Geschiedenis/geheugen wissen?"</string>
     <string name="title_current_expression" msgid="2442754548537900591">"Huidige expressie"</string>
     <string name="no_history" msgid="4331262030447527188">"Geen geschiedenis"</string>
-</resources>
\ No newline at end of file
+</resources>
-- 
GitLab