Temporarily opt ucrop activity out of Android 15 edge-to-edge

This should be reverted as soon as
https://github.com/Yalantis/uCrop/issues/913 is fixed

.github/workflows/changelog-to-fastlane.yml

@@ -29,7 +29,7 @@ jobs:
       id: checkout
       uses: actions/checkout@v4.2.2
     - name: Setup Python
-      uses: actions/setup-python@v5.4.0
+      uses: actions/setup-python@v5.3.0
       with:
         python-version: '3.x'
     - name: Run converter script

.github/workflows/generate-feature-graphic.yml

@@ -29,7 +29,7 @@ jobs:
     - name: Install requirements
       run: |
         sudo apt-get update
-        sudo apt-get install imagemagick mat2 optipng
+        sudo apt-get install optipng mat2
         # Install 200 weight versions of relevant Noto (to use for languages not supported by Lexend Deca)
         sudo apt-get install fonts-noto-extra fonts-noto-cjk-extra
         # Custom fonts

CHANGELOG.md

@@ -1,9 +1,8 @@
 # Changelog
 
-## v2.34.4 - 146 (2025-01-17)
+## Unreleased - 146
 
 - Ability to sort cards by start of validity
-- Temporarily revert to targeting Android 14 to fix some UI issues
 
 ## v2.34.3 - 145 (2025-01-15)
 

app/build.gradle.kts

@@ -21,9 +21,9 @@ android {
     defaultConfig {
         applicationId = "me.hackerchick.catima"
         minSdk = 21
-        targetSdk = 34
-        versionCode = 146
-        versionName = "2.34.4"
+        targetSdk = 35
+        versionCode = 145
+        versionName = "2.34.3"
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true

app/src/debug/res/values-ca/strings.xml

@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Debugar Catima</string>
-</resources>
+<resources></resources>

app/src/main/AndroidManifest.xml

@@ -179,7 +179,7 @@
 
         <activity
             android:name=".UCropWrapper"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/TempUCropAndroid15WorkaroundTheme" />
 
         <provider
             android:name=".contentprovider.CardsContentProvider"

app/src/main/res/layout/barcode_selector_activity.xml

@@ -4,7 +4,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_height="fill_parent"
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="fill_parent"

app/src/main/res/layout/import_export_activity.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                                     xmlns:app="http://schemas.android.com/apk/res-auto"
-                                                     android:layout_width="match_parent"
-                                                     android:layout_height="match_parent"
-                                                     android:fitsSystemWindows="true">
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
+        android:layout_height="wrap_content">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"

app/src/main/res/layout/loyalty_card_view_layout.xml

@@ -8,7 +8,8 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
@@ -25,7 +26,8 @@
         android:layout_marginBottom="100dp"
         android:orientation="vertical"
         android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp">
+        android:layout_marginEnd="0dp"
+        android:fitsSystemWindows="true">
 
         <LinearLayout
             android:id="@+id/icon_container"
@@ -147,7 +149,8 @@
         android:id="@+id/fullscreen_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:fitsSystemWindows="false">
 
         <ImageView
             android:importantForAccessibility="no"
@@ -206,13 +209,13 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:background="?attr/colorPrimary"
-        app:contentInsetLeft="0dp"
-        app:contentInsetStart="0dp"
-        app:contentInsetRight="0dp"
-        app:contentInsetEnd="0dp"
-        app:fabAlignmentMode="center">
+        app:fabAlignmentMode="center"
+        app:fabCradleVerticalOffset="2dp"
+        android:fitsSystemWindows="true">
 
         <LinearLayout
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layoutDirection="ltr">

app/src/main/res/layout/scan_activity.xml

@@ -5,6 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     tools:context=".ScanActivity">
 
     <com.google.android.material.appbar.AppBarLayout

app/src/main/res/raw/contributors.txt

@@ -11,40 +11,40 @@ Katharine Chui
 SlavekB
 mondstern
 IllusiveMan196
-大王叫我来巡山
 Altonss
+大王叫我来巡山
 Michael Moroni
 Eric
 GM
 Petr Novák
 laralem
 Joel A
-B o d o
 Taco
-Priit Jõerüüt
 pfaffenrodt
-Aayush Gupta
-Scrambled777
 Максим Горпиніч
-ikanakova
+Aayush Gupta
+B o d o
+Scrambled777
+Priit Jõerüüt
 Giovanni Donisi
 HudobniVolk
 Nyatsuki
 Jiri Grönroos
-Edgars Andersons
-Milo Ivir
+ikanakova
 Samantaz Fox
 Balázs Meskó
+Milo Ivir
 Arno-github
-josé m
 Ankit Tiwari
 Cliff Heraldo
 Sergio Paredes
 Jose Delvani
 mdvhimself
 Milan Šalka
+josé m
 huuhaa
 Skrripy
+Edgars Andersons
 Kachelkaiser
 Projjal Moitra
 Quentin PAGÈS
@@ -53,10 +53,7 @@ Silvério Santos
 waffshappen
 Marnick L'Eau
 Robin
-JungHee Lee
-Maksim2005UA
 Ziad OUALHADJ
-Vasilis
 Denis Shilin
 Robin Liu
 Renko
@@ -68,6 +65,7 @@ Viet Nguyen Hoang
 stavpup
 ehrt74
 Virginie
+Vasilis
 Tim Trek
 Peter Dave Hello
 Michael Gangolf

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

@@ -41,7 +41,7 @@
     <string name="removeImage">Премахване на изображение</string>
     <string name="takePhoto">Снимане</string>
     <string name="intent_import_card_from_url_share_multiple_text">Искам да споделя тези карти с вас</string>
-    <string name="wrongValueForBarcodeType">Стойността е неприемлива за избрания вид щрихкод</string>
+    <string name="wrongValueForBarcodeType">Стойноста е неприемлива за избрания щрихкод</string>
     <string name="setBarcodeId">Задаване на стойност</string>
     <string name="sameAsCardId">Като номера</string>
     <string name="barcodeId">Стойност на щрихкода</string>
@@ -308,5 +308,4 @@
     <string name="generic_error_please_retry">Съжаляваме, нещо се обърка, опитайте отново…</string>
     <string name="addFromPkpass">Изберете файл на Passbook (.pkpass)</string>
     <string name="unsupportedFile">Този вид файлове не се поддържат</string>
-    <string name="sort_by_valid_from">Начало валидност</string>
-</resources>
+</resources>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+<resources>
     <string name="groups">Grups</string>
     <string name="action_add">Afegeix</string>
     <string name="save">Desa</string>
@@ -15,234 +15,4 @@
     <string name="noGiftCards">Cliqueu el botó + més per afegir una targeta, o importeu-ne des del ⋮ menú.</string>
     <string name="photos">Fotos</string>
     <string name="app_name">Catima</string>
-    <string name="moveDown">Baixar abaix</string>
-    <string name="setBackImage">Setejar la imatge posterior</string>
-    <string name="setFrontImage">Imatge Frontal</string>
-    <string name="exportPassword">Setegi el password per tal de protegir l\'exportació (opcional)</string>
-    <string name="failedGeneratingShareURL">No s\'ha pogut generar una URL per compartir. Siusplau reporti-ho.</string>
-    <string name="unarchive">Desarxivar</string>
-    <string name="on_google_play">al Google Play</string>
-    <string name="settings_locale">Idioma</string>
-    <string name="field_must_not_be_empty">El camp no pot estar buit</string>
-    <string name="importOptionApplicationTitle">Utilitzar una altra app</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os i contribuïdors</string>
-    <string name="app_copyright_short">Copyright © Sylvia van Os i contribuïdors</string>
-    <string name="app_license">Software lliure Copyleft, licència GPLv3+</string>
-    <string name="app_resources">Recursos lliures de tercers: <xliff:g id="app_resources_list">%s</xliff:g></string>
-    <string name="thumbnailDescription">Miniatura</string>
-    <string name="starImage">Estrella de preferides</string>
-    <string name="settings">Configuració</string>
-    <string name="settings_theme">Tema</string>
-    <string name="settings_light_theme">Tema clar</string>
-    <string name="settings_system_theme">Tema de sistema</string>
-    <string name="settings_dark_theme">Tema Fosc</string>
-    <string name="settings_card_orientation">Orientació de la pantalla</string>
-    <string name="settings_allow_content_provider_read_title">Permet altres apps a accedir a les meves dades</string>
-    <string name="settings_disable_lockscreen_while_viewing_card_summary">Desactiva el bloqueix la pantalla mentre es visualitza la targeta</string>
-    <string name="settings_allow_content_provider_read_summary">Les aplicacions han de seguir demanant permís per tenir-hi accés</string>
-    <string name="leaveWithoutSaveTitle">Sortir</string>
-    <string name="leaveWithoutSaveConfirmation">Vols sortir sense grabar?</string>
-    <string name="passwordRequired">Introdueixi el password</string>
-    <string name="turn_flashlight_on">Encendre el llum flash</string>
-    <string name="settings_magenta_theme">Magenta</string>
-    <string name="settings_violet_theme">Violeta</string>
-    <string name="settings_blue_theme">Blau</string>
-    <string name="settings_green_theme">Verd</string>
-    <string name="translate_platform">a la Pàgina Web</string>
-    <string name="report_error">Informar un Error</string>
-    <string name="archived">Targeta arxivada</string>
-    <string name="reverse">...en ordre invers</string>
-    <string name="icon_header_click_text">Pulsa llarg per editar la miniatura</string>
-    <string name="show_note">Mostrar nota</string>
-    <string name="add_manually_warning_title">Recomenem escanejar</string>
-    <string name="add_manually_warning_message">En algunes targetes el valor imprès en la targeta no correspon amb el codi registrat en el codi de barres. Per això, introduint manualment el codi pot no funcionar en alguns casos. Recomanem sempre que sigui possible escanejar la targeta amb la càmera. Vol igualment continuar la edició manual?</string>
-    <string name="continue_">Continuar</string>
-    <string name="exportOptionExplanation">La informació serà escrita al lloc de la seva elecció.</string>
-    <string name="importOptionFilesystemTitle">Importar desde el sistema de fitxers</string>
-    <string name="importOptionFilesystemButton">Desde el sistema de fitxers</string>
-    <string name="selectBarcodeTitle">Sel•lecciona el Codi de Barres</string>
-    <string name="importSuccessful">Dades importades correctament</string>
-    <string name="exportSuccessful">Dades exportades correctament</string>
-    <string name="failedOpeningFileManager">Instala un gestor de fitxers.</string>
-    <string name="showMoreInfo">Mostrar informació</string>
-    <string name="version_history">Històric de versions</string>
-    <string name="sort_by">Ordenar per</string>
-    <string name="sort_by_most_recently_used">Per les més utilitzades</string>
-    <string name="options">Opcions</string>
-    <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> seleccionat</item>
-        <item quantity="many"><xliff:g>%d</xliff:g> seleccionats</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> seleccionats</item>
-    </plurals>
-    <string name="importOptionFilesystemExplanation">Escull un fitxer especific del sistema de fitxers.</string>
-    <string name="no">No</string>
-    <string name="settings_pink_theme">Rosa</string>
-    <string name="sort">Ordenar</string>
-    <string name="failedToRetrieveImageFile">Ha fallat l\'obtenció del fitxer d\'imatge</string>
-    <string name="barcodeLongPressMessage">Les imatges només es poden obrir desde la app galeria</string>
-    <string name="settings_category_title_privacy">Privacitat</string>
-    <plurals name="deleteCardsTitle">
-        <item quantity="one">Eliminar <xliff:g>%d</xliff:g> targeta</item>
-        <item quantity="many">Eliminar <xliff:g>%d</xliff:g> targetes</item>
-        <item quantity="other">Eliminar <xliff:g>%d</xliff:g> targetes</item>
-    </plurals>
-    <plurals name="deleteCardsConfirmation">
-        <item quantity="one">Eliminaras aquesta <xliff:g>%d</xliff:g> targeta permanentment?</item>
-        <item quantity="many">Eliminaras aquestes <xliff:g>%d</xliff:g> targetes permanentment?</item>
-        <item quantity="other">Eliminaras aquestes <xliff:g>%d</xliff:g> targetes permanentment?</item>
-    </plurals>
-    <plurals name="groupCardCountWithArchived">
-        <item quantity="one"><xliff:g>%1$d</xliff:g> targeta (<xliff:g id="archivedCount">%2$d</xliff:g> arxivada)</item>
-        <item quantity="many"><xliff:g>%1$d</xliff:g> targetes (<xliff:g id="archivedCount">%2$d</xliff:g> arxivades)</item>
-        <item quantity="other"><xliff:g>%1$d</xliff:g> targetes (<xliff:g id="archivedCount">%2$d</xliff:g> arxivades)</item>
-    </plurals>
-    <string name="importCancelled">Importació anulada</string>
-    <string name="exportCancelled">Exportació cancelada</string>
-    <string name="noGiftCardsGroup">Crea algunes targetes, asigna-les en un grup aquí.</string>
-    <string name="noMatchingGiftCards">Sense resultats. Prova a canviar la teva cerca.</string>
-    <string name="storeName">Nom</string>
-    <string name="note">Nota</string>
-    <string name="cardId">Id. de la Targeta</string>
-    <string name="barcodeType">Tipus de codi de barres</string>
-    <string name="noBarcode">Sense codi de barres</string>
-    <string name="settings_portrait_orientation">Vertical</string>
-    <string name="yes">Si</string>
-    <string name="addFromPdfFile">Seleccioni un PDF</string>
-    <string name="errorReadingFile">No s\'ha pogut llegir el fitxer</string>
-    <string name="failedLaunchingFileManager">No s\'ha pogut trobar un gestor de fitxers compatible</string>
-    <string name="multipleBarcodesFoundPleaseChooseOne">Quin dels següents codis de barres prefereix utilitzar?</string>
-    <string name="pageWithNumber">Pàgina <xliff:g>%d</xliff:g></string>
-    <string name="settings_follow_system_orientation">Seguir el sistema</string>
-    <string name="settings_landscape_orientation">Horitzontal</string>
-    <string name="intent_import_card_from_url_share_text">Vull compartir una targeta amb tu</string>
-    <string name="takePhoto">Fer una foto</string>
-    <string name="help_translate_this_app">Ajuda a traduïr aquesta app</string>
-    <string name="license">Llicència</string>
-    <string name="credits">Crèdits</string>
-    <string name="unarchived">Targeta desarxivades</string>
-    <string name="failedLaunchingPhotoPicker">No s\'ha pogut trobar una aplicació de galeria de fotos</string>
-    <string name="previousCard">Anterior</string>
-    <string name="failedToOpenUrl">Instali un navegador abans</string>
-    <string name="importCards">Importar targetes</string>
-    <string name="updateBalanceTitle">Quan ha gastat o ha rebut?</string>
-    <string name="updateBalanceHint">Introdueixi quantitat</string>
-    <string name="anyDate">Qualsevol data</string>
-    <string name="validFromSentence">Vàlid desde: <xliff:g>%s</xliff:g></string>
-    <string name="setBarcodeHeight">Setejar l\'alçada del codi de barres</string>
-    <string name="donate">Donatiu</string>
-    <string name="receive">Rebre</string>
-    <string name="amountParsingFailed">Import invàlid</string>
-    <string name="barcodeImageDescriptionWithType">Codi de barres <xliff:g>%s</xliff:g></string>
-    <string name="about_title_fmt">Sobre <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="debug_version_fmt">Versió: <xliff:g id="version">%s</xliff:g></string>
-    <string name="settings_follow_sensor_orientation">Sempre rota (ignora la configuració de sistema)</string>
-    <string name="settings_display_barcode_max_brightness_summary">Alguns escàners ho necesiten</string>
-    <string name="settings_keep_screen_on">Mantenir la pantalla encesa</string>
-    <string name="settings_keep_screen_on_summary">Desactiva el bloqueix de la pantalla mentre mostra una targeta</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Evita el bloqueix de la pantalla</string>
-    <string name="enter_group_name">Introdueix el nom del grup</string>
-    <string name="group_edit">Editar el Group</string>
-    <plurals name="groupCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> targeta</item>
-        <item quantity="many"><xliff:g>%d</xliff:g> targetes</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> targetes</item>
-    </plurals>
-    <string name="group_name_is_empty">El nom del grup ha de contenir algun text</string>
-    <string name="all">Totes</string>
-    <string name="settings_oled_dark">Negre pur en el tema fosc</string>
-    <string name="selectColor">Sel•leccioni el color</string>
-    <string name="setIcon">Setegi la miniatura</string>
-    <string name="settings_theme_color">Color del tema</string>
-    <string name="app_contributors">Fet possible per: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="updateBalance">Actualitzar el balanç</string>
-    <string name="sort_by_name">Nom</string>
-    <string name="archive">Arxivar</string>
-    <string name="currentBalanceSentence">Balanç actual: <xliff:g>%s</xliff:g></string>
-    <string name="height">Alçada:</string>
-    <string name="switchToBackImage">Canviar a la imatge posterior</string>
-    <string name="switchToBarcode">Canviar al codi de barres</string>
-    <string name="show_name_below_image_thumbnail">Mostrar el nom sota de la imatge en miniatura</string>
-    <string name="settings_category_title_cards">Veure la Targeta</string>
-    <string name="enter_card_id">Introdueixi el nombre ID o text de la seva targeta</string>
-    <string name="card_id_must_not_be_empty">ID de la Targeta no pot estar buit</string>
-    <string name="add_a_card_in_a_different_way">Afegeix una targeta de forma diferent</string>
-    <string name="unstar">Treure entre les preferides</string>
-    <string name="star">Afegir a les preferides</string>
-    <string name="cancel">Cancel•la</string>
-    <string name="deleteConfirmation">Vols eliminar de forma permanent aquesta targeta?</string>
-    <string name="share">Compartir</string>
-    <string name="sendLabel">Enviar…</string>
-    <string name="editCardTitle">Editar Targeta</string>
-    <string name="addCardTitle">Afegir Targeta</string>
-    <string name="scanCardBarcode">Escanejar Codi de Barres</string>
-    <string name="cardShortcut">Drecera a la Targeta</string>
-    <string name="noCardsMessage">Afegeix primer una targeta</string>
-    <string name="noCardExistsError">No s\'ha pogut trobar aquesta targeta</string>
-    <string name="failedParsingImportUriError">No s\'ha pogut analitzar la URI d\'importació</string>
-    <string name="openFrontImageInGalleryApp">Obrir la imatge frontal a l\'app de galeria</string>
-    <string name="settings_lock_on_opening_orientation">En obrir la targeta, bloquejar la orientació de la pantalla</string>
-    <string name="settings_use_volume_keys_navigation_summary">Utilitza els botons de volum per canviar la targeta que es mostra</string>
-    <string name="updateBarcodeQuestionText">Ha canviat el valor ID. Vol actualitzar també el codi de barres per uter utilitzar el mateix valor?</string>
-    <string name="settings_sky_blue_theme">Blau fluix</string>
-    <string name="starred">Preferides</string>
-    <string name="deleteConfirmationGroup">Vols eliminar aquest grup?</string>
-    <string name="removeImage">Eliminar imatge</string>
-    <string name="app_libraries">Llibreries lliures de tercers: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="settings_display_barcode_max_brightness">Màxima iluminació</string>
-    <string name="settings_brown_theme">Marró</string>
-    <string name="manually_enter_barcode_instructions">Introdueixi el ID de la targeta manualment i trii un codi de barres que s\'assembli al de la seva targeta.</string>
-    <string name="rate_this_app">Valora aquesta app</string>
-    <string name="exportPasswordHint">Introdueixi el password</string>
-    <string name="backImageDescription">Imatge posterior</string>
-    <string name="source_repository">Repositori font</string>
-    <string name="on_github">al Github</string>
-    <string name="include_if_asking_support">Si vol demanar suport tècnic, inclogui la següent informació:</string>
-    <string name="newBalanceSentence">Nou balanç: <xliff:g>%s</xliff:g></string>
-    <string name="openBackImageInGalleryApp">Obrir la imatge posterior a l\'app de la galeria</string>
-    <string name="generic_error_please_retry">Perdoni, alguna cosa ha anat malament, siusplau torni-ho a provar...</string>
-    <string name="settings_column_count_6">6</string>
-    <string name="useBackImage">Utilitzar la imatge posterior</string>
-    <string name="sort_by_valid_from">Valid desde</string>
-    <string name="sort_by_expiry">Expiració</string>
-    <string name="and_data_usage">i us de dades</string>
-    <string name="shortcutSelectCard">Sel•leccioni una targeta</string>
-    <string name="duplicateCard">Duplicar</string>
-    <string name="nextCard">Següent</string>
-    <string name="validFromDate">Vàlid desde</string>
-    <string name="chooseValidFromDate">Esculli una data inicial vàlida</string>
-    <string name="switchToFrontImage">Canviar a la imatge frontal</string>
-    <string name="show_balance">Mostrar balanç</string>
-    <string name="show_validity">Mostrar la validesa</string>
-    <string name="settings_category_title_cards_overview">Vista de targetes</string>
-    <string name="settings_column_count_portrait">Columnes en mode vertical</string>
-    <string name="settings_column_count_landscape">Columnes en mode apaisat</string>
-    <string name="settings_automatic_column_count">Automàtic</string>
-    <string name="settings_column_count_1">1</string>
-    <string name="settings_column_count_2">2</string>
-    <string name="settings_column_count_3">3</string>
-    <string name="settings_column_count_4">4</string>
-    <string name="settings_column_count_5">5</string>
-    <string name="settings_column_count_7">7</string>
-    <string name="settings_category_title_general">General</string>
-    <string name="action_display_options">Mostrar opcions</string>
-    <string name="show_archived_cards">Mostrar targetes arxivades</string>
-    <string name="view_online">Vista online</string>
-    <string name="action_more_options">Més opcions</string>
-    <string name="addWithoutBarcode">Afegeix una targeta sebse codi de barres</string>
-    <string name="noCameraFoundGuideText">El seu dispositiu sembla que no té càmera. Si realment en té, provi a reiniciar el dispositiu. Sino utilitzi el botó Més opcions i introdueixi el codi de barres d\'una altra manera.</string>
-    <string name="useFrontImage">Utilitzar la imatge frontal</string>
-    <string name="addFromPkpass">Seleccioni el fitxer Passbook (.pkpass)</string>
-    <string name="unsupportedFile">Aquest fitxer no està soportat</string>
-    <string name="settings_use_volume_keys_navigation">Canviar les targetes al prèmer els botons de volum</string>
-    <string name="noGroups">Clica el botó + per afegir grups per categoritzar.</string>
-    <string name="noGroupCards">Aquest grup està buit</string>
-    <string name="group_name_already_in_use">Ja existeix un grup amb aquest nom</string>
-    <string name="group_updated">Grup actualitzat</string>
-    <string name="moveUp">Pujar amunt</string>
-    <string name="updateBarcodeQuestionTitle">Actualitzar el valor del codi de barres?</string>
-    <string name="turn_flashlight_off">Apagar el llum Flash</string>
-    <string name="settings_oled_dark_summary">Redueix l\'ús de la bateria en pantalles OLED</string>
-    <string name="settings_system_locale">Idioma del sistema</string>
-    <string name="settings_catima_theme">Catima</string>
-    <string name="spend">Gastar</string>
-</resources>
+</resources>

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

@@ -314,5 +314,4 @@
     <string name="settings_column_count_7">7</string>
     <string name="settings_column_count_4">4</string>
     <string name="settings_column_count_5">5</string>
-    <string name="sort_by_valid_from">Platnost od</string>
-</resources>
+</resources>

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

@@ -48,7 +48,7 @@
     <string name="settings_theme">Tema</string>
     <string name="settings">Indstillinger</string>
     <string name="starImage">Favorit stjerne</string>
-    <string name="thumbnailDescription">Thumbnail</string>
+    <string name="thumbnailDescription">Miniaturebillede til kort</string>
     <string name="selectBarcodeTitle">Vælg stregkode</string>
     <string name="app_copyright_old">Baseret på Loyalty Card Keychain
 \ncopyright © 2016-2020 Branden Archer.</string>
@@ -66,22 +66,22 @@
     <string name="noCardExistsError">Kunne ikke finde det kort</string>
     <string name="deleteConfirmationGroup">Slet gruppe\?</string>
     <string name="all">Alle</string>
-    <string name="noGroupCards">Denne gruppe er tom</string>
-    <string name="noGroups">Klik på + plus-knappen for at tilføje grupper til kategorisering.</string>
+    <string name="noGroupCards">Denne gruppe indeholder ikke nogen kort</string>
+    <string name="noGroups">Klik på + plus-knappen for først at tilføje grupper til kategorisering.</string>
     <string name="groups">Grupper</string>
     <string name="enter_group_name">Indtast gruppenavn</string>
-    <string name="exportSuccessful">Data eksporteret</string>
-    <string name="importSuccessful">Data importeret</string>
+    <string name="exportSuccessful">Eksporterede kortdata</string>
+    <string name="importSuccessful">Kortdata importeret</string>
     <string name="intent_import_card_from_url_share_text">Jeg vil dele et kort med jer</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Forebyg låseskærm</string>
     <string name="settings_keep_screen_on">LHold skærm tændt</string>
     <string name="moveUp">Bevæg dig opad</string>
     <string name="leaveWithoutSaveConfirmation">Forlade uden at gemme\?</string>
-    <string name="settings_display_barcode_max_brightness">Gør skærm lysere</string>
+    <string name="settings_display_barcode_max_brightness">Lysere stregkodevisning</string>
     <string name="failedOpeningFileManager">Installer først en filhåndteringsprogram.</string>
     <string name="moveDown">Bevæger sig nedad</string>
     <string name="leaveWithoutSaveTitle">Afslut</string>
-    <string name="addManually">Indtast stregkoden manuelt</string>
+    <string name="addManually">Indtast kort-ID manuelt</string>
     <string name="noGiftCardsGroup">Opret kort og tildel dem gupper her.</string>
     <plurals name="deleteCardsConfirmation">
         <item quantity="one">Slet dette <xliff:g>%d</xliff:g> kort permanent\?</item>
@@ -100,58 +100,4 @@
     <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_license">Copylefted libre software, GPLv3+ licens</string>
     <string name="barcodeImageDescriptionWithType">Billede<xliff:g>%s</xliff:g> stregkode</string>
-    <string name="group_name_already_in_use">Gruppenavn allerede i brug</string>
-    <string name="editGroup">Redigerer Gruppe: <xliff:g>%s</xliff:g></string>
-    <string name="importFidme">Importer fra FidMe</string>
-    <string name="settings_card_orientation">Skærm orientation</string>
-    <string name="settings_follow_system_orientation">Følg system</string>
-    <string name="settings_portrait_orientation">Portræt</string>
-    <string name="settings_landscape_orientation">Landskab</string>
-    <string name="settings_disable_lockscreen_while_viewing_card_summary">Deaktiver låseskærm når et kort er åbent</string>
-    <string name="groupsList">Grupper: <xliff:g>%s</xliff:g></string>
-    <string name="expiryStateSentence">Udløber: <xliff:g>%s</xliff:g></string>
-    <string name="moveBarcodeToTopOfScreen">Flyt stregkoden til toppen af skærmen</string>
-    <string name="accept">Acceptér</string>
-    <string name="importCatima">Importer fra Catima</string>
-    <string name="expiryDate">Udløbsdato</string>
-    <string name="never">Aldrig</string>
-    <string name="chooseExpiryDate">Vælg udløbsdato</string>
-    <string name="balance">Balance</string>
-    <string name="importStocard">Importer fra Stocard</string>
-    <string name="balanceSentence">Balance: <xliff:g>%s</xliff:g></string>
-    <string name="group_name_is_empty">Gruppenavn må ikke være tom</string>
-    <string name="group_updated">Gruppe opdateret</string>
-    <string name="card">Kort</string>
-    <string name="currency">Valuta</string>
-    <string name="settings_display_barcode_max_brightness_summary">Nødvendigt for nogle scannere til at fungerer</string>
-    <string name="editBarcode">Rediger stregkode</string>
-    <string name="points">Point</string>
-    <string name="privacy_policy">Privatlivspolitik</string>
-    <plurals name="groupCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> kort</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> kort</item>
-    </plurals>
-    <string name="settings_allow_content_provider_read_title">Tillid andre apps tilgang til min data</string>
-    <string name="settings_allow_content_provider_read_summary">Apps vil stadig have behov for at spørge om tilladelse for at få adgang</string>
-    <string name="barcodeId">Stregkode værdi</string>
-    <string name="setBarcodeId">Vælg stregkode værdi</string>
-    <string name="sameAsCardId">Samme som ID</string>
-    <string name="settings_system_theme">System</string>
-    <string name="settings_lock_on_opening_orientation">Lås til orientation når kort åbnes</string>
-    <string name="settings_keep_screen_on_summary">Deaktiver skærm tids slukning når et kort er åbent</string>
-    <string name="group_edit">Rediger gruppe</string>
-    <string name="settings_follow_sensor_orientation">Altid roter (ignorer system indstillinger)</string>
-    <string name="chooseImportType">Importer data fra</string>
-    <string name="importVoucherVault">Importer fra Voucher Vault</string>
-    <string name="settings_use_volume_keys_navigation">Skift kort ved brug af lydstyrke knapperne</string>
-    <string name="settings_use_volume_keys_navigation_summary">Brug lydstyrke knapperne til at ændre hvilket kort bliver vist</string>
-    <string name="addFromImage">Vælg et billede fra galleri</string>
-    <string name="expiryStateSentenceExpired">Udløbet: <xliff:g>%s</xliff:g></string>
-    <string name="noBarcodeFound">Ingen stregkode blev fundet</string>
-    <string name="errorReadingImage">Kunne ikke læse billedet</string>
-    <string name="balanceParsingFailed">Ugyldig balance</string>
-    <plurals name="balancePoints">
-        <item quantity="one"><xliff:g>%s</xliff:g> point</item>
-        <item quantity="other"><xliff:g>%s</xliff:g> point</item>
-    </plurals>
 </resources>

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

@@ -163,7 +163,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">Gültig bis</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>
@@ -305,5 +305,4 @@
     <string name="generic_error_please_retry">Entschuldigung, da ist etwas schief gelaufen, versuchen Sie es noch einmal ...</string>
     <string name="unsupportedFile">Diese Datei wird nicht unterstützt</string>
     <string name="addFromPkpass">Passbook-Datei (.pkpass) auswählen</string>
-    <string name="sort_by_valid_from">Gültig ab</string>
-</resources>
+</resources>

app/src/main/res/values-el-rGR/strings.xml

@@ -307,5 +307,4 @@
     <string name="generic_error_please_retry">Λυπούμαστε, κάτι πήγε στραβά, δοκιμάστε ξανά...</string>
     <string name="unsupportedFile">Το αρχείο δεν υποστηρίζεται</string>
     <string name="addFromPkpass">Επιλογή αρχείου Passbook (.pkpass)</string>
-    <string name="sort_by_valid_from">Έναρξη ισχύος</string>
-</resources>
+</resources>

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

@@ -314,5 +314,4 @@
     <string name="generic_error_please_retry">Lo sentimos, algo salió mal, por favor inténtelo de nuevo...</string>
     <string name="unsupportedFile">Este archivo no es compatible</string>
     <string name="addFromPkpass">Seleccione un archivo Passbook (.pkpass)</string>
-    <string name="sort_by_valid_from">Válido desde</string>
-</resources>
+</resources>

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

@@ -303,5 +303,4 @@
     <string name="generic_error_please_retry">Vabandust, midagi läks nüüd viltu, palun proovi uuesti...</string>
     <string name="unsupportedFile">See fail pole toetatud</string>
     <string name="addFromPkpass">Vali Passbooki fail (.pkpass)</string>
-    <string name="sort_by_valid_from">Kehtib alates</string>
-</resources>
+</resources>

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

@@ -181,7 +181,7 @@
     <string name="sort_by_expiry">Viimeinen voimassaoloaika</string>
     <string name="reverse">...käänteisessä järjestyksessä</string>
     <string name="sort_by">Lajitteluperuste</string>
-    <string name="credits">Kiitettävää</string>
+    <string name="credits">Krediitit</string>
     <string name="help_translate_this_app">Auta kääntämään tämä sovellus</string>
     <string name="license">Lisenssi</string>
     <string name="source_repository">Lähdekoodivarasto</string>
@@ -308,4 +308,4 @@
     <string name="addFromPkpass">Valitse Passbook-tiedosto (.pkpass)</string>
     <string name="unsupportedFile">Tämä tiedosto ei ole tuettu</string>
     <string name="generic_error_please_retry">Pahoittelut, jokin meni pieleen. Yritä uudelleen...</string>
-</resources>
+</resources>

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

@@ -314,5 +314,4 @@
     <string name="addFromPkpass">Sélectionner un fichier Cartes / Passbook (.pkpass)</string>
     <string name="unsupportedFile">Ce fichier n\'est pas supporté</string>
     <string name="generic_error_please_retry">Désolé, un problème est survenu, veuillez réessayer...</string>
-    <string name="sort_by_valid_from">Valide à partir du</string>
-</resources>
+</resources>

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

@@ -302,5 +302,4 @@
     <string name="unsupportedFile">Este ficheiro non é compatible</string>
     <string name="addFromPkpass">Selecciona un ficheiro Passbook (.pkpass)</string>
     <string name="generic_error_please_retry">Sentímolo, pero algo fallou, inténtao outra vez…</string>
-    <string name="sort_by_valid_from">Válido desde</string>
-</resources>
+</resources>

app/src/main/res/values-he-rIL/strings.xml

@@ -15,6 +15,12 @@
     <string name="barcodeType">סוג ברקוד</string>
     <string name="noBarcode">אין ברקוד</string>
     <string name="edit">עריכה</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one">אחד</item>
+        <item quantity="two">שניים</item>
+        <item quantity="many">מעט</item>
+        <item quantity="other">אחר</item>
+    </plurals>
     <string name="exportFailed">לא ניתן לייצא</string>
     <string name="noGiftCardsGroup">צור מספר כרטיסים, ואז שייך אותם לקבוצה פה.</string>
     <string name="failedParsingImportUriError">נתיב לא נמצא</string>
@@ -43,6 +49,18 @@
     <string name="exportOptionExplanation">המידע יכתב למיקום שאת/ה תבחר/י.</string>
     <string name="importOptionFilesystemTitle">יבא ממערכת קבצים</string>
     <string name="importOptionFilesystemExplanation">בחר/י קובץ מסויים ממערכת הקבצים.</string>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">אחד</item>
+        <item quantity="two">שניים</item>
+        <item quantity="many">מעט</item>
+        <item quantity="other">אחר</item>
+    </plurals>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">אחד</item>
+        <item quantity="two">שניים</item>
+        <item quantity="many">מעט</item>
+        <item quantity="other">אחר</item>
+    </plurals>
     <string name="importCancelled">ייבוא בוטל</string>
     <string name="exportCancelled">ייצוא בוטל</string>
     <string name="addFromPdfFile">בחר קובץ PDF</string>
@@ -51,4 +69,4 @@
     <string name="multipleBarcodesFoundPleaseChooseOne">באיזה מהברקודים שנמצאו אתה רוצה להשתמש?</string>
     <string name="useFrontImage">השתמש בתמונה קדמית</string>
     <string name="useBackImage">השתמש בתמונה אחורית</string>
-</resources>
+</resources>

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

@@ -51,7 +51,7 @@
     <string name="settings_theme">Tema</string>
     <string name="settings_system_theme">Sustav</string>
     <string name="settings_light_theme">Svijetla</string>
-    <string name="settings_display_barcode_max_brightness">Posvijetli ekran</string>
+    <string name="settings_display_barcode_max_brightness">Posvijetli prikaz crtičnog koda</string>
     <string name="moveDown">Pomakni prema dolje</string>
     <string name="addManually">Upiši crtični kod</string>
     <string name="thumbnailDescription">Sličica</string>
@@ -129,7 +129,7 @@
     <string name="noCameraPermissionDirectToSystemSetting">Za snimanje crtičnih kodova Catima treba pristup tvojoj kameri. Dodirni ovdje za mijenjanje postavki dozvola.</string>
     <string name="app_libraries">Slobodne biblioteke trećih strana: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="selectBarcodeTitle">Odaberi crtični kod</string>
-    <string name="settings_portrait_orientation">Uspravno</string>
+    <string name="settings_portrait_orientation">Okomito</string>
     <string name="settings_lock_on_opening_orientation">Odredi orijentaciju koja se koristi prilikom otvaranja kartice</string>
     <string name="group_edit">Uredi grupu</string>
     <string name="group_name_already_in_use">Ime grupe se već koristi</string>
@@ -169,7 +169,7 @@
     <string name="storageReadPermissionRequired">Za ovu radnju je potrebna dozvola za čitanje spremljenih podataka …</string>
     <string name="cameraPermissionRequired">Za ovu radnju je potrebna dozvola za pristup kameri …</string>
     <string name="app_license">Copylefted libre softver, GPLv3+ licenca</string>
-    <string name="settings_card_orientation">Orijentacija ekrana</string>
+    <string name="settings_card_orientation">Orijentacija crtičnog koda</string>
     <string name="settings_follow_system_orientation">Slijedi sustav</string>
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
     <string name="importFidmeMessage">Odaberi tvoju iz FidMe izvezenu <i>idme-export-request-xxxxxx.zip</i> datoteku koju želiš uvesti i ručno odaberi vste crtičnog koda nakon toga. 
@@ -207,7 +207,7 @@
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Autorska prava © 2019. – <xliff:g>%d.</xliff:g> Sylvia van Os i doprinositelji</string>
     <string name="debug_version_fmt">Verzija: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_resources">Slobodni resursi trećih strana: <xliff:g id="app_resources_list">%s</xliff:g></string>
-    <string name="settings_landscape_orientation">Ležeće</string>
+    <string name="settings_landscape_orientation">Vodoravno</string>
     <string name="group_name_is_empty">Ime grupe ne smije biti prazno</string>
     <string name="group_updated">Grupa je aktualizirana</string>
     <string name="all">Sve</string>
@@ -270,7 +270,7 @@
     <string name="action_display_options">Opcije prikaza</string>
     <string name="settings_display_barcode_max_brightness_summary">Potrebno za rad nekih čitača</string>
     <string name="settings_oled_dark_summary">Smanjuje potrošnju baterije OLED ekrana</string>
-    <string name="settings_category_title_cards">Prikaz kartice</string>
+    <string name="settings_category_title_cards">Kartice</string>
     <string name="addWithoutBarcode">Dodaj karticu bez crtičnog koda</string>
     <string name="app_copyright_short">Autorska prava © Sylvia van Os i doprinositelji</string>
     <string name="field_must_not_be_empty">Polje ne smije biti prazno</string>
@@ -298,21 +298,4 @@
     <string name="exportCancelled">Izvoz je prekinut</string>
     <string name="useBackImage">Koristi stražnju sliku</string>
     <string name="useFrontImage">Koristi prednju sliku</string>
-    <string name="settings_column_count_portrait">Stupci u uspravnom modusu</string>
-    <string name="sort_by_valid_from">Vrijedi od</string>
-    <string name="settings_column_count_6">6</string>
-    <string name="settings_category_title_cards_overview">Pregled kartica</string>
-    <string name="settings_column_count_landscape">Stupci u ležećem modusu</string>
-    <string name="settings_automatic_column_count">Automatski</string>
-    <string name="settings_column_count_1">1</string>
-    <string name="settings_column_count_2">2</string>
-    <string name="settings_column_count_3">3</string>
-    <string name="settings_column_count_4">4</string>
-    <string name="settings_column_count_5">5</string>
-    <string name="settings_column_count_7">7</string>
-    <string name="generic_error_please_retry">Žao nam je, nešto nije u redu, pokušaj ponovo …</string>
-    <string name="addFromPkpass">Odaberi jednu Passbook datoteku (.pkpass)</string>
-    <string name="unsupportedFile">Ova datoteka nije podržana</string>
-    <string name="settings_use_volume_keys_navigation_summary">Pomoću gumba za glasnoću promijeni koja se kartica prikazuje</string>
-    <string name="settings_use_volume_keys_navigation">Mijenjaj kartice pomoću gumba za glasnoću</string>
-</resources>
+</resources>

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

@@ -302,5 +302,4 @@
     <string name="settings_column_count_landscape">가로 모드의 열</string>
     <string name="settings_automatic_column_count">자동</string>
     <string name="settings_column_count_1">1</string>
-    <string name="sort_by_valid_from">유효 기간</string>
-</resources>
+</resources>

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

@@ -309,5 +309,4 @@
     <string name="unsupportedFile">Šī datne netiek atbalstīta</string>
     <string name="addFromPkpass">Atlasīt Passbook datni (.pkpass)</string>
     <string name="generic_error_please_retry">Atvainojamies, kaut kas nogāja greizi. Lūgums mēģināt vēlreiz...</string>
-    <string name="sort_by_valid_from">Derīga no</string>
-</resources>
+</resources>

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

@@ -308,5 +308,4 @@
     <string name="addFromPkpass">Kies een Passbook bestand (.pkpass)</string>
     <string name="unsupportedFile">Dit bestand wordt niet ondersteund</string>
     <string name="generic_error_please_retry">Sorry, er ging iets mis. Probeer het opnieuw.</string>
-    <string name="sort_by_valid_from">Op geldig vanaf</string>
-</resources>
+</resources>

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

@@ -320,5 +320,4 @@
     <string name="addFromPkpass">Wybierz plik Passbook (.pkpass)</string>
     <string name="unsupportedFile">Ten plik nie jest obsługiwany</string>
     <string name="generic_error_please_retry">Coś poszło nie tak, spróbuj ponownie później...</string>
-    <string name="sort_by_valid_from">Poprawna forma</string>
-</resources>
+</resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -314,5 +314,4 @@
     <string name="unsupportedFile">Este arquivo não é suportado</string>
     <string name="addFromPkpass">Selecionar um arquivo do gerenciador de senhas (.pkpass)</string>
     <string name="generic_error_please_retry">Desculpe, alguma coisa deu errado, por favor tente novamente...</string>
-    <string name="sort_by_valid_from">Válido a partir de</string>
-</resources>
+</resources>

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

@@ -320,5 +320,4 @@
     <string name="unsupportedFile">Данный файл не поддерживается</string>
     <string name="addFromPkpass">Выбрать файл Passbook (.pkpass)</string>
     <string name="generic_error_please_retry">Извините, что-то пошло не так, попробуйте ещё раз…</string>
-    <string name="sort_by_valid_from">Начало действия</string>
-</resources>
+</resources>

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

@@ -308,5 +308,4 @@
     <string name="unsupportedFile">Bu dosya desteklenmiyor</string>
     <string name="generic_error_please_retry">Üzgünüz, bir şeyler ters gitti, lütfen tekrar deneyin...</string>
     <string name="addFromPkpass">Bir Passbook dosyası seçin (.pkpass)</string>
-    <string name="sort_by_valid_from">İtibaren Geçerli</string>
-</resources>
+</resources>

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

@@ -319,5 +319,4 @@
     <string name="unsupportedFile">Цей файл не підтримується</string>
     <string name="generic_error_please_retry">Вибачте, щось пішло не так, спробуйте ще раз...</string>
     <string name="addFromPkpass">Виберіть файл Passbook (.pkpass)</string>
-    <string name="sort_by_valid_from">Діє з</string>
-</resources>
+</resources>

app/src/main/res/values-v35/themes.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- FIXME: Remove this workaround as soon as uCrop no longer needs it: https://github.com/Yalantis/uCrop/issues/913 -->
+    <style name="TempUCropAndroid15WorkaroundTheme" parent="AppTheme.NoActionBar">
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
+    </style>
+</resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -302,5 +302,4 @@
     <string name="addFromPkpass">选择 Passbook 文件（.pkpass）</string>
     <string name="unsupportedFile">此文件不受支持</string>
     <string name="generic_error_please_retry">抱歉，某个东西出错了，请再试…</string>
-    <string name="sort_by_valid_from">有效期开始日</string>
-</resources>
+</resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -246,7 +246,7 @@
     <string name="setBarcodeHeight">設定條碼高度</string>
     <string name="app_copyright_short">著作權所有© Sylvia van Os與其他貢獻者</string>
     <string name="permissionReadCardsLabel">讀取Catima卡片</string>
-    <string name="app_name">Catima</string>
+    <string name="app_name">卡提碼</string>
     <string name="permissionReadCardsDescription">讀取Catima卡片及卡片資訊，包含註記與圖片</string>
     <string name="settings_disable_lockscreen_while_viewing_card_summary">觀看卡片時避免螢幕鎖定</string>
     <string name="settings_allow_content_provider_read_summary">其他程式仍然需要取得權限</string>
@@ -301,5 +301,4 @@
     <string name="addFromPkpass">選擇 Passbook 檔案 (.pkpass)</string>
     <string name="unsupportedFile">不支援此檔案</string>
     <string name="generic_error_please_retry">抱歉，似乎出了點錯誤，請您再試一次...</string>
-    <string name="sort_by_valid_from">有效期限開始日</string>
-</resources>
+</resources>

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

@@ -1,4 +1,7 @@
 <resources>
+    <!-- FIXME: Remove this workaround as soon as uCrop no longer needs it: https://github.com/Yalantis/uCrop/issues/913 -->
+    <style name="TempUCropAndroid15WorkaroundTheme" parent="AppTheme.NoActionBar">
+    </style>
 
     <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
         <item name="colorPrimary">@color/md_theme_light_primary</item>
@@ -31,6 +34,7 @@
         <item name="alertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog.Monet</item>
 
         <item name="windowActionModeOverlay">true</item>
+
     </style>
 
     <style name="ThemeOverlay.App.MaterialAlertDialog.Monet" parent="ThemeOverlay.Material3.MaterialAlertDialog">

build.gradle.kts

@@ -3,7 +3,7 @@
 plugins {
     id("com.android.application") version "8.8.0" apply false
     id("com.github.spotbugs") version "5.1.4" apply false
-    id("org.jetbrains.kotlin.android") version "2.1.10" apply false
+    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
 }
 
 allprojects {

fastlane/metadata/android/ca/changelogs/10.txt

@@ -1,3 +0,0 @@
-- Cambiat el nom per defecte en la exportació. (pull #84 (https://github.com/brarcher/loyalty-card-locker/pull/84))
-- Corregits els literals en la pàgina d'importació/exportació. (pull #87 (https://github.com/brarcher/loyalty-card-locker/pull/87))
-- Millores en l'estructura de la pàgina de visualització de targetes. El text hauria de ser més senzill de llegir i es pot seleccionar amb un clic llarg. (pull #91 (https://github.com/brarcher/loyalty-card-locker/pull/91))

fastlane/metadata/android/ca/changelogs/100.txt

@@ -1,2 +0,0 @@
-- La cerca s'amaga, els botons expandir i ordenar només es mostren quan hi ha contingut
-- Arreglos en els temes

fastlane/metadata/android/ca/changelogs/101.txt

@@ -1,3 +0,0 @@
-- Ajustos en el retallador que no s'ajusta al color del tema
-- Ajustos menors en els temes
-- Afegit el tema Negre pur per pantalles de tipus OLED

fastlane/metadata/android/ca/changelogs/128.txt

@@ -1 +0,0 @@
-- Corregit un error extrany

fastlane/metadata/android/ca/short_description.txt

@@ -1 +0,0 @@
-Pels teus codis de barres, subscripcions, targes de fidelitat, cupons i tiquets.

fastlane/metadata/android/ca/title.txt

@@ -1 +0,0 @@
-Catima

fastlane/metadata/android/cs-CZ/changelogs/145.txt

@@ -1,3 +1 @@
 - Cíl Android 15
-- Oprava klávesnice zakrývající tlačítko pro uložení na obrazovce úprav
-- Oprava některých souborů pkpass, které nejsou detekovány jako pkpass (podpora typu mime application/vnd-com.apple.pkpass)

fastlane/metadata/android/cs-CZ/changelogs/146.txt

@@ -1,2 +0,0 @@
-- Možnost třídit karty podle začátku platnosti
-- Dočasný návrat na cílový systém Android 14 kvůli opravě některých problémů s uživatelským rozhraním

fastlane/metadata/android/de-DE/changelogs/145.txt

@@ -1,3 +1,3 @@
-- Angepasst für Android 15
+- Ziel Android 15
 - Die Tastatur verdeckt jetzt nicht mehr den "Speichern"-Button im Bearbeitungsbildschirm
 - Einige pkpass-Dateien wurden nicht als pkpass erkannt (Unterstützung des Mime-Typs application/vnd-com.apple.pkpass)

fastlane/metadata/android/de-DE/changelogs/146.txt

@@ -1,2 +0,0 @@
-- Ermöglicht Kartensortierung nach „Beginn der Gültigkeit“
-- Vorübergehende Rückkehr zur Anpassung für Android 14, um ein paar Probleme mit der Benutzeroberfläche zu beheben

fastlane/metadata/android/en-US/changelogs/146.txt

@@ -1,2 +1 @@
-- Ability to sort cards by start of validity
-- Temporarily revert to targeting Android 14 to fix some UI issues
+- Ability to sort cards by start of validity

fastlane/metadata/android/et/changelogs/146.txt

@@ -1,2 +0,0 @@
-- Võimalus järjestada kaarte kehtivuse alguse alusel
-- Mõnede vigade parandamiseks on ajutiselt alusplatvormiks tagasi Android

fastlane/metadata/android/et/changelogs/95.txt

@@ -1 +0,0 @@
-- Parandasime kokkujooksmise kaardi jagamisel

fastlane/metadata/android/et/changelogs/96.txt

@@ -1,2 +0,0 @@
-- Lisaime CODE 93 toe
-- Mitmed väikesed veaparandused ja täiendused

fastlane/metadata/android/et/changelogs/97.txt

@@ -1,4 +0,0 @@
-- Parandasime vea, kus salvesta nupu järjest klõpsimisel salvestus mitu kaarti
-- Et oleks enam kaarte näha, siis üksikasjade peitmisel kasutame veel madalamat päisekirjet
-- Korraldasime ümber muutmisvaate
-- Parandasime lemmiku ikooni kontrastust põhivaates

fastlane/metadata/android/fi-FI/full_description.txt

@@ -13,7 +13,7 @@ Tämän päivittäiseen käyttöön suunnitellun sovelluksen avulla voit korvata
 - Jaa kuponkeja, yksinoikeustarjouksia, tarjouskoodeja tai kortteja ja koodeja millä tahansa sovelluksella.
 - Tumma teema ja saavutettavuusvaihtoehdot näkövammaisille käyttäjille.
 - Libre-ohjelmistoyhteisön kaikille tekemä.
-- Lokalisoidut käsintehdyt käännökset yli 40 kielelle.
+- Lokalisoidut käsintehdyt käännökset yli 20 kielelle.
 - Ilmainen, yhteisön panoksilla tuettu.
 - Käytä, tutki, muuta ja jaa sitä haluamallasi tavalla; <i>kaikkien</i> kanssa.
 - Ei vain vapaat ohjelmistot / avoin lähdekoodi. <i>Copylefted</i> libre-ohjelmisto (GPLv3+) kortinhallinta.

fastlane/metadata/android/it-IT/changelogs/2.txt

@@ -1,3 +1,3 @@
 - Traduzioni in italiano
-- Supporto per tutti i tipi di codici a barre 1D. (In origine erano supportati solo i codici a barre dei prodotti 1D).
+- Supporto per tutti i tipi di codici a barre 1D. (In origine erano supportati solo i codici a barre  dei prodotti 1D).
 - Aggiunta dei permessi della fotocamera, che inizialmente mancavano.

fastlane/metadata/android/it-IT/changelogs/6.txt

@@ -1,2 +1,3 @@
-- Consente di inserire manualmente codici a barre. In questo caso, si visualizza un elenco di immagini di codici validi e supportati. Si può selezionare l'immagine del codice a barre che desidera. issue #33 (https://github.com/brarcher/loyalty-card-locker/issues/33), pull #44 (https://github.com/brarcher/loyalty-card-locker/pull/44)
+- Consente di inserire manualmente codici a barre. In questo caso, si visualizza un elenco di immagini di codici validi e supportati. Si può selezionare l'immagine del codice a barre che desidera. issue #33 (https://github.com/brarcher/loyalty-card-locker/issues/33), pull #44
+(https://github.com/brarcher/loyalty-card-locker/pull/44)
 - Risolto il problema per cui alcuni codici a barre erano sfocati. (issue #37 (https://github.com/brarcher/loyalty-card-locker/issues/37))

fastlane/metadata/android/lv/changelogs/146.txt

@@ -1,2 +0,0 @@
-- Iespēja kārtot kartes pēc derīguma sākuma
-- Īslaicīgi atcelta pielāgošana Android 14, lai novērstu dažas saskarnes nepilnības

fastlane/metadata/android/ru-RU/changelogs/146.txt

@@ -1,2 +0,0 @@
-- Возможность сортировки карт по началу действия
-- Временный возврат к ориентации на Android 14 для исправления некоторых проблем интерфейса

fastlane/metadata/android/uk/changelogs/146.txt

@@ -1,2 +0,0 @@
-- Можливість сортування карток за терміном дії
-- Тимчасово поверніться до націлювання на Android 14, щоб вирішити деякі проблеми інтерфейсу користувача

fastlane/metadata/android/zh-CN/changelogs/146.txt

@@ -1,2 +0,0 @@
-- 可以根据有效期开始日排序卡片
-- 临时将目标 API 级别恢复为 34 修复一些用户界面问题