Merge branch 'CatimaLoyalty:main' into main

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## Unreleased - 131
+## v2.26.0 - 131 (2023-09-14)
 
 - Move "Archive mode" into "Display options" (previously "Show details") menu
 - Android 13 per-app language support

app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "com.ziadoua.zcard"
         minSdk 21
         targetSdk 33
-        versionCode 130
-        versionName "2.25.3"
+        versionCode 131
+        versionName "2.26.0"
 
         vectorDrawables.useSupportLibrary true
         multiDexEnabled true

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

@@ -181,7 +181,7 @@
     <string name="app_contributors">Ermöglicht durch: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="barcodeImageDescriptionWithType">Bild <xliff:g>%s</xliff:g> Barcode</string>
     <string name="sort_by">Sortieren nach</string>
-    <string name="sort_by_expiry">Ablaufdatum</string>
+    <string name="sort_by_expiry">Ablauf</string>
     <string name="sort_by_most_recently_used">Zuletzt verwendet</string>
     <string name="sort_by_name">Name</string>
     <string name="sort">Sortieren</string>

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

@@ -90,7 +90,7 @@
 \n
 \nAUCUNE DONNÉE N’EST COLLECTÉE, ce que tout le monde peut confirmer puisque notre application est un logiciel libre.</string>
     <string name="privacy_policy">Politique de confidentialité</string>
-    <string name="app_loyalty_card_keychain">Porte-clés de cartes de fidélité</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="chooseImportType">Importer les données depuis</string>
     <string name="parsingBalanceFailed"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> ne semble pas être un solde valide.</string>
     <string name="points">Points</string>

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

@@ -99,7 +99,7 @@
     <string name="expiryStateSentenceExpired">Scaduta: <xliff:g>%s</xliff:g></string>
     <string name="expiryStateSentence">Scadenza: <xliff:g>%s</xliff:g></string>
     <string name="settings_keep_screen_on">Mantieni lo schermo attivo</string>
-    <string name="app_loyalty_card_keychain">Carte fedeltà</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="chooseImportType">Importa i dati da</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Impedisci il blocco dello schermo</string>
     <string name="accept">Accetta</string>

app/src/main/res/values-ro-rRO/strings.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="barcodeType">Tip cod de bare</string>
     <string name="cardId">Cardului ID</string>
     <string name="note">Notă</string>
     <string name="storeName">Numele</string>
     <string name="noMatchingGiftCards">Nu au fost găsite rezultate. Încercați să schimbați termenii de căutare.</string>
-    <string name="noGiftCards">Faceți clic pe butonul + plus pentru a adăuga o carte sau importați mai întâi câteva din meniul ⋮.</string>
+    <string name="noGiftCards">Faceți clic pe butonul + plus pentru a adăuga o carte sau importați mai întâi una din meniul ⋮.</string>
     <string name="action_add">Adăugați</string>
     <string name="action_search">Căutare</string>
     <string name="sendLabel">Trimiteți…</string>
@@ -33,9 +33,9 @@
     <string name="exportName">Exportați</string>
     <string name="importSuccessfulTitle">Importat</string>
     <string name="importFailedTitle">Importul a eșuat</string>
-    <string name="importFailed">Nu s-a putut importa carduri</string>
-    <string name="noCardIdError">Nu s-a introdus niciun ID de card</string>
-    <string name="exportFailed">Nu s-a putut exporta carduri</string>
+    <string name="importFailed">Nu s-a putut efectua importarea</string>
+    <string name="noCardIdError">Nu s-a introdus niciun ID</string>
+    <string name="exportFailed">Nu s-a putut efectua exportarea</string>
     <string name="importing">Importul…</string>
     <string name="exporting">Exportul…</string>
     <string name="exportOptionExplanation">Datele vor fi scrise într-o locație aleasă de dumneavoastră.</string>
@@ -101,4 +101,5 @@
     <string name="importCatima">Importați din Catima</string>
     <string name="importStocard">Importați din Stocard</string>
     <string name="intent_import_card_from_url_share_multiple_text">Aș dori să partajez niște carduri cu tine</string>
-</resources>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Drepturi de autor © 2019–<xliff:g>%d</xliff:g> Sylvia van Os și contribuitorii</string>
+</resources>

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

@@ -200,7 +200,7 @@
     <string name="group_name_is_empty">Gruppnamn måste anges</string>
     <string name="editGroup">Redigerar grupp: <xliff:g>%s</xliff:g></string>
     <string name="selectColor">Välj färg</string>
-    <string name="setIcon">Välj ikon</string>
+    <string name="setIcon">Ställ in miniatyr</string>
     <string name="credits">Bidragsgivare</string>
     <string name="source_repository">Källkodslager</string>
     <string name="noGiftCardsGroup">Skapa några kort och placera dem sedan i den här gruppen.</string>
@@ -254,4 +254,33 @@
     <string name="updateBalanceTitle">Hur mycket spenderade du\?</string>
     <string name="updateBalanceHint">Ange summa</string>
     <string name="newBalanceSentence">Ny balans: <xliff:g>%s</xliff:g></string>
-</resources>
+    <string name="openFrontImageInGalleryApp">Öppna bilden på framsidan i galleri-appen</string>
+    <string name="show_name_below_image_thumbnail">Visa namnet nedanför bildens miniatyr</string>
+    <string name="show_validity">Visa giltighet</string>
+    <string name="view_online">Visa på internet</string>
+    <string name="height">Höjd:</string>
+    <string name="settings_category_title_general">Generellt</string>
+    <string name="switchToBarcode">Byt till streckkod</string>
+    <string name="settings_disable_lockscreen_while_viewing_card_summary">Stänger av skärmlåset när kortet visas</string>
+    <string name="permissionReadCardsDescription">Läs dina kort och alla dess detaljer, inklusive anteckningar och bilder</string>
+    <string name="action_display_options">Visningsalternativ</string>
+    <string name="settings_display_barcode_max_brightness_summary">Nödvändigt för att en del skannrar ska fungera</string>
+    <string name="settings_oled_dark_summary">Reducerar batterianvändning på OLED-skärmar</string>
+    <string name="icon_header_click_text">Tryck länge för att redigera miniatyr</string>
+    <string name="settings_category_title_cards">Kort</string>
+    <string name="show_note">Visa anteckning</string>
+    <string name="switchToBackImage">Byt till bilden på baksidan</string>
+    <string name="app_copyright_short">Kopieringsskydd © Sylvia van Os och medverkande</string>
+    <string name="switchToFrontImage">Byt till bilden på framsidan</string>
+    <string name="settings_allow_content_provider_read_summary">Appar måste fortfarande begära åtkomst för att få tillgång</string>
+    <string name="setBarcodeHeight">Ställ in streckkodens höjd</string>
+    <string name="openBackImageInGalleryApp">Öppna bilden på baksidan i galleri-appen</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Kopieringsskydd © 2019–<xliff:g>%d</xliff:g> Sylvia van Os och medverkande</string>
+    <string name="settings_allow_content_provider_read_title">Tillåt andra appar att komma åt min data</string>
+    <string name="permissionReadCardsLabel">Läs Catima-kort</string>
+    <string name="donate">Donera</string>
+    <string name="show_archived_cards">Visa arkiverade kort</string>
+    <string name="settings_category_title_privacy">Sekretess</string>
+    <string name="show_balance">Visa konto</string>
+    <string name="settings_keep_screen_on_summary">Stänger av skärmens tidsgräns medan ett kort visas</string>
+</resources>