From bd1d33867df9b4d23d98ea45161c99937186ce6c Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Tue, 23 Mar 2021 21:01:56 +0100
Subject: [PATCH] Comply with Huawei's pedantic nonsense

https://twitter.com/SylvieLorxu/status/1374251557735256065
---
 CHANGELOG.md                                            | 6 ++++++
 app/src/main/java/protect/card_locker/MainActivity.java | 2 +-
 app/src/main/res/values-de/strings.xml                  | 1 -
 app/src/main/res/values-el-rGR/strings.xml              | 1 -
 app/src/main/res/values-es/strings.xml                  | 1 -
 app/src/main/res/values-fr/strings.xml                  | 1 -
 app/src/main/res/values-he-rIL/strings.xml              | 3 +--
 app/src/main/res/values-it/strings.xml                  | 1 -
 app/src/main/res/values-ko/strings.xml                  | 1 -
 app/src/main/res/values-nb-rNO/strings.xml              | 1 -
 app/src/main/res/values-nl/strings.xml                  | 2 --
 app/src/main/res/values-pl/strings.xml                  | 1 -
 app/src/main/res/values-ru/strings.xml                  | 2 --
 app/src/main/res/values-sk/strings.xml                  | 1 -
 app/src/main/res/values-sl/strings.xml                  | 1 -
 app/src/main/res/values/strings.xml                     | 3 +--
 16 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b652d9dbb..189e3fc02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+Changes:
+
+- Change "Thank you" text on privacy dialog to "Accept" because Huawei is overly pedantic
+
 ## v1.11 (2021-03-21)
 
 Changes:
diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java
index 7e5712ab2..1440a3fb8 100644
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -109,7 +109,7 @@ public class MainActivity extends AppCompatActivity implements GestureDetector.O
             new AlertDialog.Builder(this)
                     .setTitle(R.string.privacy_policy)
                     .setMessage(R.string.privacy_policy_popup_text)
-                    .setPositiveButton(R.string.thank_you, null)
+                    .setPositiveButton(R.string.accept, null)
                     .setNegativeButton(R.string.privacy_policy, new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int whichButton) {
                             openPrivacyPolicy();
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1e25956a8..23d833912 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -11,7 +11,6 @@
     <string name="cardId">Kartennummer</string>
     <string name="cancel">Abbrechen</string>
     <string name="save">Speichern</string>
-    <string name="editCard">Karte bearbeiten</string>
     <string name="edit">Bearbeiten</string>
     <string name="delete">Löschen</string>
     <string name="confirm">Bestätigen</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index bfd7dded7..f9d8843b9 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -7,7 +7,6 @@
     <string name="cardId">Κωδικός Κάρτας</string>
     <string name="cancel">Άκυρο</string>
     <string name="save">Αποθήκευση</string>
-    <string name="editCard">Επεξεργασία Κάρτας</string>
     <string name="edit">Επεξεργασία</string>
     <string name="delete">Διαγραφή</string>
     <string name="confirm">Επιβεβαίωση</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d1c9a4992..9c5fd5422 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -9,7 +9,6 @@
     <string name="cardId">Id. de tarjeta</string>
     <string name="cancel">Cancelar</string>
     <string name="save">Guardar</string>
-    <string name="editCard">Editar tarjeta</string>
     <string name="edit">Editar</string>
     <string name="delete">Eliminar</string>
     <string name="confirm">Confirmar</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a222e1ec6..11f79b58a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -9,7 +9,6 @@
     <string name="cardId">Numéro</string>
     <string name="cancel">Annuler</string>
     <string name="save">Enregistrer</string>
-    <string name="editCard">Modifier</string>
     <string name="edit">Modifier</string>
     <string name="delete">Supprimer</string>
     <string name="confirm">Confirmer</string>
diff --git a/app/src/main/res/values-he-rIL/strings.xml b/app/src/main/res/values-he-rIL/strings.xml
index d19047bba..b04df4902 100644
--- a/app/src/main/res/values-he-rIL/strings.xml
+++ b/app/src/main/res/values-he-rIL/strings.xml
@@ -6,5 +6,4 @@
     <string name="cardId">מזהה כרטיס</string>
     <string name="cancel">ביטול</string>
     <string name="save">שמור</string>
-    <string name="editCard">עריכת כרטיס</string>
-    </resources>
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0a39897af..af1fea448 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -12,7 +12,6 @@
     <string name="barcodeNoBarcode">Questa carta non ha un codice a barre</string>
     <string name="cancel">Annulla</string>
     <string name="save">Salva</string>
-    <string name="editCard">Modifica carta</string>
     <string name="edit">Modifica</string>
     <string name="delete">Elimina</string>
     <string name="confirm">Conferma</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index c576ff10e..00f739d84 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -44,7 +44,6 @@
     <string name="confirm">확인</string>
     <string name="delete">삭제</string>
     <string name="edit">편집</string>
-    <string name="editCard">카드 편집</string>
     <string name="save">저장</string>
     <string name="cancel">취소</string>
     <string name="unstar">즐겨찾기에서 제거</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 06450f79e..d6743fe0f 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -10,7 +10,6 @@
     <string name="barcodeType">Strekkodetype</string>
     <string name="cancel">Avbryt</string>
     <string name="save">Lagre</string>
-    <string name="editCard">Rediger kort</string>
     <string name="edit">Rediger</string>
     <string name="delete">Slett</string>
     <string name="confirm">Bekreft</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index f8dd70c6e..34fb2d90d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -13,7 +13,6 @@
     <string name="barcodeNoBarcode">Deze kaart heeft geen barcode</string>
     <string name="cancel">Annuleren</string>
     <string name="save">Opslaan</string>
-    <string name="editCard">Kaart bewerken</string>
     <string name="edit">Bewerken</string>
     <string name="delete">Verwijderen</string>
     <string name="confirm">Bevestigen</string>
@@ -126,6 +125,5 @@
     <string name="privacy_policy_popup_text">Veel appwinkels vereisen dat apps na de eerste keer opstarten hun privacybeleid tonen. Dat van ons is eenvoudig:
 \n
 \nWe verzamelen HELEMAAL NIKS. Bovendien is onze app open source, zodat een ieder met eigen ogen kan zien wat de app wel of niet doet.</string>
-    <string name="thank_you">Bedankt</string>
     <string name="privacy_policy">Privacybeleid</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 3ea0ca6bd..c5d3ba292 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -10,7 +10,6 @@
     <string name="barcodeNoBarcode">Ta karta nie ma kodu kreskowego</string>
     <string name="cancel">Anuluj</string>
     <string name="save">Zapisz</string>
-    <string name="editCard">Edytuj kartę</string>
     <string name="edit">Edytuj</string>
     <string name="delete">Usuń</string>
     <string name="confirm">Potwierdź</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 0de38deae..360eba2ed 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -13,7 +13,6 @@
     <string name="barcodeNoBarcode">Эта карта без штрих-кода</string>
     <string name="cancel">Отменить</string>
     <string name="save">Сохранить</string>
-    <string name="editCard">Изменить штрих-код</string>
     <string name="edit">Изменить</string>
     <string name="delete">Удалить карту</string>
     <string name="confirm">Подтвердить</string>
@@ -105,7 +104,6 @@
     <string name="privacy_policy_popup_text">Многие магазины приложений требуют, чтобы приложение показывало свою политику конфиденциальности при первом запуске. Вот наша:
 \n
 \nМы НЕ собираем НИКАКИХ ДАННЫХ и наше приложение имеет открытый исходный код, так что любой может убедиться в том, что это правда.</string>
-    <string name="thank_you">Спасибо</string>
     <string name="privacy_policy">Политика конфиденциальности</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="chooseImportType">Из какого приложения импортировать данные\?</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 7fbbce650..d675d748f 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -9,7 +9,6 @@
     <string name="cardId">ID karty</string>
     <string name="cancel">Zrušiť</string>
     <string name="save">Uložiť</string>
-    <string name="editCard">Úprava karty</string>
     <string name="edit">Upraviť</string>
     <string name="delete">Vymazať</string>
     <string name="confirm">Potvrdiť</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 51f45c030..74ca7d549 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -9,7 +9,6 @@
     <string name="cardId">Št. kartice</string>
     <string name="cancel">Prekliči</string>
     <string name="save">Shrani</string>
-    <string name="editCard">Uredi kartico</string>
     <string name="edit">Uredi</string>
     <string name="delete">Izbriši</string>
     <string name="confirm">Potrdi</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3acad1531..1a1bee696 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,7 +20,6 @@
 
     <string name="cancel">Cancel</string>
     <string name="save">Save</string>
-    <string name="editCard">Edit Card</string>
     <string name="edit">Edit</string>
     <string name="delete">Delete</string>
     <string name="confirm">Confirm</string>
@@ -160,6 +159,6 @@
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
 
     <string name="privacy_policy">Privacy Policy</string>
-    <string name="thank_you">Thank you</string>
     <string name="privacy_policy_popup_text">Many app stores require apps to show their privacy policy on first start. Here is ours:\n\nWe collect NO DATA AT ALL and our app is Open Source so anyone can confirm this to be true.</string>
+    <string name="accept">Accept</string>
 </resources>