From efdb0dd6bb5a2968e3133893d6a25db0bf515f89 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Fri, 16 Jul 2021 20:28:25 +0200
Subject: [PATCH] Consolidate 2 very similar strings

---
 .../main/java/protect/card_locker/LoyaltyCardEditActivity.java  | 2 +-
 app/src/main/res/values-de/strings.xml                          | 1 -
 app/src/main/res/values-fi/strings.xml                          | 1 -
 app/src/main/res/values-fr/strings.xml                          | 1 -
 app/src/main/res/values-it/strings.xml                          | 1 -
 app/src/main/res/values-nb-rNO/strings.xml                      | 1 -
 app/src/main/res/values-nl/strings.xml                          | 1 -
 app/src/main/res/values-ru/strings.xml                          | 1 -
 app/src/main/res/values/strings.xml                             | 1 -
 9 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index a391cd9df..a6723110f 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -916,7 +916,7 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                 return null;
             });
 
-            cardOptions.put(getString(R.string.chooseImageFromGallery), () -> {
+            cardOptions.put(getString(R.string.addFromImage), () -> {
                 Intent i = new Intent(Intent.ACTION_PICK);
                 i.setType("image/*");
                 startActivityForResult(i, v.getId() == ID_IMAGE_FRONT ? Utils.CARD_IMAGE_FROM_FILE_FRONT : Utils.CARD_IMAGE_FROM_FILE_BACK);
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e00e8c2e8..267f5e6cb 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -149,7 +149,6 @@
     <string name="yes">Ja</string>
     <string name="updateBarcodeQuestionText">Sie haben die Karten-ID geändert. Möchten Sie auch den Strichcode aktualisieren, um denselben Wert zu verwenden\?</string>
     <string name="updateBarcodeQuestionTitle">Strichcodewert aktualisieren\?</string>
-    <string name="chooseImageFromGallery">Bild aus der Galerie auswählen</string>
     <string name="takePhoto">Foto aufnehmen</string>
     <string name="removeImage">Bild entfernen</string>
     <string name="setBackImage">Rückseitenbild einstellen</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index ebcb3e983..1e66f6a4a 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -150,7 +150,6 @@
     <string name="action_add">Lisää</string>
     <string name="action_search">Hae</string>
     <string name="takePhoto">Ota valokuva</string>
-    <string name="chooseImageFromGallery">Valitse kuva galleriasta</string>
     <string name="removeImage">Poista kuva</string>
     <string name="setBackImage">Aseta takakuva</string>
     <string name="setFrontImage">Aseta etukuva</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ebaeb7aa4..e6d3ca2b9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -149,7 +149,6 @@
     <string name="no">Non</string>
     <string name="yes">Oui</string>
     <string name="updateBarcodeQuestionTitle">Mettre à jour la valeur du code-barres \?</string>
-    <string name="chooseImageFromGallery">Choisir une image dans la galerie</string>
     <string name="takePhoto">Prendre une photo</string>
     <string name="removeImage">Retirer l’image</string>
     <string name="setBackImage">Définir l’image verso</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index f3e9024f6..80834952c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -150,7 +150,6 @@
     <string name="updateBarcodeQuestionText">Hai cambiato l\'ID della carta. Vuoi anche aggiornare il codice a barre per usare lo stesso valore\?</string>
     <string name="updateBarcodeQuestionTitle">Aggiornare il valore del codice a barre\?</string>
     <string name="takePhoto">Scatta una foto</string>
-    <string name="chooseImageFromGallery">Scegli un’immagine dalla galleria</string>
     <string name="removeImage">Rimuovi l’immagine</string>
     <string name="setBackImage">Imposta immagine posteriore</string>
     <string name="setFrontImage">Imposta immagine frontale</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 18e9e3c28..f98f1b95e 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -150,7 +150,6 @@
     <string name="yes">Ja</string>
     <string name="updateBarcodeQuestionTitle">Oppdater strekkodeverdi\?</string>
     <string name="takePhoto">Ta et bilde</string>
-    <string name="chooseImageFromGallery">Velg bilde fra galleriet</string>
     <string name="removeImage">Fjern bilde</string>
     <string name="setBackImage">Sett bakside</string>
     <string name="setFrontImage">Sett forside</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 712a6036e..4248ba791 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -150,7 +150,6 @@
     <string name="updateBarcodeQuestionText">Je hebt de kaart-id aangepast. Wil je dezelfde waarde toekennen aan de barcode\?</string>
     <string name="updateBarcodeQuestionTitle">Barcodewaarde bijwerken\?</string>
     <string name="takePhoto">Foto maken</string>
-    <string name="chooseImageFromGallery">Kiezen uit galerij</string>
     <string name="removeImage">Afbeelding verwijderen</string>
     <string name="setFrontImage">Voorzijde kiezen</string>
     <string name="setBackImage">Achterzijde kiezen</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f52381da0..993d628f6 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -154,7 +154,6 @@
     <string name="setBackImage">Изображение задней стороны</string>
     <string name="setFrontImage">Изображение лицевой стороны</string>
     <string name="takePhoto">Сфотографировать</string>
-    <string name="chooseImageFromGallery">Выбрать изображение из галереи</string>
     <string name="removeImage">Удалить изображение</string>
     <string name="backImageDescription">Задняя сторона карты</string>
     <string name="frontImageDescription">Лицевая сторона карты</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d27fa4488..2b521658e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -190,7 +190,6 @@
     <string name="setFrontImage">Set front image</string>
     <string name="setBackImage">Set back image</string>
     <string name="removeImage">Remove image</string>
-    <string name="chooseImageFromGallery">Choose image from gallery</string>
     <string name="takePhoto">Take a photo</string>
     <string name="updateBarcodeQuestionTitle">Update barcode value?</string>
     <string name="updateBarcodeQuestionText">You changed the card ID. Do you want to also update the barcode to use the same value?</string>