Merge pull request #1751 from CatimaLoyalty/create-pull-request/patch-1708269529

Update feature graphic

.scripts/generate_feature_graphic/generate_feature_graphic.sh

@@ -10,6 +10,9 @@ for lang in "$script_location/../../fastlane/metadata/android/"*; do
   if grep -q — title.txt; then
     # Try splitting title.txt on — (em dash)
     IFS='—' read -r appname subtext < title.txt
+  elif grep -q – title.txt; then
+    # No result, try splitting title.txt on – (en dash)
+    IFS='–' read -r appname subtext < title.txt
   else
     # No result, try splitting on - (dash)
     IFS='-' read -r appname subtext < title.txt
@@ -25,6 +28,7 @@ for lang in "$script_location/../../fastlane/metadata/android/"*; do
     # We specifically need the Serif version because of the 200 weight
     case "$(basename "$lang")" in
       bg|el-GR|ru-RU|uk) sed -i "s/Lexend Deca/Noto Serif/" featureGraphic.svg ;;
+      hi-IN) sed -i -e "s/Yesteryear/Noto Serif Devanagari/" -e "s/Lexend Deca/Noto Serif Devanagari/" featureGraphic.svg ;;
       ja-JP) sed -i "s/Lexend Deca/Noto Serif CJK JP/" featureGraphic.svg ;;
       ko) sed -i "s/Lexend Deca/Noto Serif CJK KR/" featureGraphic.svg ;;
       kn-IN) sed -i -e 's/font-size="150"/font-size="100"/' -e 's/y="285.511"/y="235.511"/' featureGraphic.svg ;;

app/src/main/java/protect/card_locker/ScanActivity.java

@@ -343,13 +343,21 @@ public class ScanActivity extends CatimaAppCompatActivity {
     }
 
     public void addManually() {
-        Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
-        if (cardId != null) {
-            final Bundle b = new Bundle();
-            b.putString("initialCardId", cardId);
-            i.putExtras(b);
-        }
-        manualAddLauncher.launch(i);
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ScanActivity.this);
+        builder.setTitle(R.string.add_manually_warning_title);
+        builder.setMessage(R.string.add_manually_warning_message);
+        builder.setPositiveButton(R.string.continue_, (dialog, which) -> {
+            Intent i = new Intent(getApplicationContext(), BarcodeSelectorActivity.class);
+            if (cardId != null) {
+                final Bundle b = new Bundle();
+                b.putString("initialCardId", cardId);
+                i.putExtras(b);
+            }
+            manualAddLauncher.launch(i);
+        });
+        builder.setNegativeButton(R.string.cancel, (dialog, which) -> setScannerActive(true));
+        builder.setOnCancelListener(dialog -> setScannerActive(true));
+        builder.show();
     }
 
     public void addFromImage() {

app/src/main/res/values-ast/strings.xml

@@ -24,10 +24,6 @@
     <string name="save">Guardar</string>
     <string name="edit">Editar</string>
     <string name="delete">Desaniciar</string>
-    <plurals name="deleteCardsTitle">
-        <item quantity="one"></item>
-        <item quantity="other"></item>
-    </plurals>
     <string name="unstar">Quitar de Favoritos</string>
     <string name="cancel">Encaboxar</string>
     <string name="importFailed">Nun se pudo facer la importación</string>

app/src/main/res/values-vi/strings.xml

@@ -245,7 +245,7 @@
         <item quantity="other"><xliff:g>%d</xliff:g> thẻ</item>
     </plurals>
     <plurals name="selectedCardCount">
-        <item quantity="other">Chọn <xliff:g>%d</xliff:g></item>
+        <item quantity="other"><xliff:g>%d</xliff:g> đã được chọn</item>
     </plurals>
     <string name="version_history">Lịch Sử Phiên Bản</string>
     <string name="note">Ghi chú</string>

app/src/main/res/values/strings.xml

@@ -335,4 +335,7 @@
     <string name="add_a_card_in_a_different_way">Add a card in a different way</string>
     <string name="field_must_not_be_empty">Field must not be empty</string>
     <string name="manually_enter_barcode_instructions">Enter the ID number or text on your card and press the barcode that looks like the one on your card.</string>
+    <string name="add_manually_warning_title">Scanning is recommended</string>
+    <string name="add_manually_warning_message">For some stores, the barcode value differs from the number written on the card. Because of this, entering a barcode manually may not always work. It is strongly recommended to scan the barcode with your camera instead. Do you still want to continue?</string>
+    <string name="continue_">Continue</string>
 </resources>

fastlane/metadata/android/kn-IN/full_description.txt

@@ -1,5 +1,5 @@
 ಅಂಗಡಿ ಅಥವಾ ವೆಬ್‌ಶಾಪ್ ಚೆಕ್‌ಔಟ್ ಸಮಯದಲ್ಲಿ ಪ್ಲಾಸ್ಟಿಕ್ ಬಹುಮಾನ ಕಾರ್ಡ್‌ಗಳ ಹುಡುಕಾಟವನ್ನು ನಿಲ್ಲಿಸಿ.
-<b>ಅದರ ಕ್ಯಾಮರಾವನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಸಾಧನಕ್ಕೆ ಬಾರ್‌ಕೋಡ್‌ಗಳನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ, ಕಾರ್ಡ್‌ಗಳನ್ನು ಮರೆತುಬಿಡಿ.<b>
+<b>ಅದರ ಕ್ಯಾಮರಾವನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಸಾಧನಕ್ಕೆ ಬಾರ್‌ಕೋಡ್‌ಗಳನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ, ಕಾರ್ಡ್‌ಗಳನ್ನು ಮರೆತುಬಿಡಿ.</b>
 
 ನಿಮ್ಮ ಕೈಚೀಲವನ್ನು ಮರೆತುಬಿಡಿ ಅಥವಾ ಬೆಲೆಬಾಳುವ ವಸ್ತುಗಳಿಗಾಗಿ ಅದನ್ನು ಅಲ್ಟ್ರಾಲೈಟ್ ಆಗಿ ಇರಿಸಿ.
 

fastlane/metadata/android/kn-IN/short_description.txt

@@ -1 +1 @@
-ನಿಮ್ಮ ಬಾರ್‌ಕೋಡ್‌ಗಳು, ಸದಸ್ಯತ್ವಗಳು, ಲಾಯಲ್ಟಿ ಕಾರ್ಯಕ್ರಮಗಳು, ಕೂಪನ್‌ಗಳು ಮತ್ತು ಟಿಕೆಟ್‌ಗಳಿಗಾಗಿ.
+For your barcodes, memberships, loyalty programs, coupons and tickets.

fastlane/metadata/android/kn-IN/title.txt

@@ -1 +1 @@
-ಕ್ಯಾಟಿಮಾ - ಲಾಯಲ್ಟಿ ಕಾರ್ಡ್ ಕೈಚೀಲ
+ಕ್ಯಾಟಿಮಾ

fastlane/metadata/android/ro/short_description.txt

@@ -1 +1 @@
-Pentru codurile de bare, abonamentele, programele de loialitate, cupoanele și biletele dvs.
+For your barcodes, memberships, loyalty programs, coupons and tickets.

fastlane/metadata/android/vi/short_description.txt

@@ -1 +1 @@
-Đối với mã vạch, thẻ thành viên, chương trình khách hàng thân thiết, phiếu giảm giá và vé.
+Dành cho mã vạch, thẻ thành viên, tích điểm, mã giảm giá và vé của bạn

fastlane/metadata/android/vi/title.txt

@@ -1 +1 @@
-Catima
+Catima — Quản lý thẻ an toàn