Release Catima 2.13.1

Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker
Fix breaking scrolling
2025-12-24 15:47:53 -05:00 · 2022-01-09 15:51:50 +01:00 · 2022-01-09 15:00:26 +01:00 · 2022-01-09 15:00:20 +01:00 · 2022-01-09 09:47:42 +00:00 · 2022-01-09 10:45:38 +01:00
83 changed files with 676 additions and 259 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,20 @@
 # Changelog

-## Unreleased - 96
+## v2.13.1 - 98 (2022-01-09)
+
+- Fix various TalkBack-related bugs
+
+## v2.13.0 - 97 (2022-01-03)
+
+- Fixed pressing the save button multiple times creating multiple entries
+- Lower card header size when hiding details to fit even more cards
+- Restructure edit screen
+- Improve star icon contrast in main view
+
+## v2.12.0 - 96 (2021-12-23)

 - Add CODE 93 support
+- Various minor bugfixes and improvements

 ## v2.11.2 - 95 (2021-12-04)

--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,8 @@ android {
        applicationId "me.hackerchick.catima"
        minSdkVersion 21
        targetSdkVersion 31
-        versionCode 95
-        versionName "2.11.2"
+        versionCode 98
+        versionName "2.13.1"

        vectorDrawables.useSupportLibrary true
        multiDexEnabled true
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
@@ -101,6 +101,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            inputHolder.setExpiryField(null);
        }

+        setHeaderHeight(inputHolder, mShowDetails);
        Bitmap cardIcon = Utils.retrieveCardImage(mContext, loyaltyCard.id, ImageLocationType.icon);
        if (cardIcon != null) {
            inputHolder.mCardIcon.setImageBitmap(cardIcon);
@@ -121,6 +122,19 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
        inputHolder.mRow.requestLayout();
    }

+    private void setHeaderHeight(LoyaltyCardListItemViewHolder inputHolder, boolean expanded) {
+        int iconHeight;
+        if (expanded) {
+            iconHeight = ViewGroup.LayoutParams.MATCH_PARENT;
+        } else {
+            iconHeight = (int) mContext.getResources().getDimension(R.dimen.cardThumbnailSize);
+        }
+
+        inputHolder.mIconLayout.getLayoutParams().height = expanded ? 0 : iconHeight;
+        inputHolder.mCardIcon.getLayoutParams().height = iconHeight;
+        inputHolder.mTickIcon.getLayoutParams().height = iconHeight;
+    }
+
    private void applyClickEvents(LoyaltyCardListItemViewHolder inputHolder, final int inputPosition) {
        inputHolder.mRow.setOnClickListener(inputView -> mListener.onRowClicked(inputPosition));

@@ -200,7 +214,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso

        public TextView mStoreField, mNoteField, mBalanceField, mExpiryField;
        public ImageView mCardIcon, mStarBackground, mStarBorder, mTickIcon;
-        public MaterialCardView mRow;
+        public MaterialCardView mRow, mIconLayout;
        public ConstraintLayout mStar;
        public View mDivider;

@@ -215,6 +229,7 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
            mBalanceField = inputView.findViewById(R.id.balance);
            mExpiryField = inputView.findViewById(R.id.expiry);

+            mIconLayout = inputView.findViewById(R.id.icon_layout);
            mCardIcon = inputView.findViewById(R.id.thumbnail);
            mStar = inputView.findViewById(R.id.star);
            mStarBackground = inputView.findViewById(R.id.star_background);
@@ -302,10 +317,10 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
                dark = !mDarkModeEnabled;
            }
            if (dark) {
-                mStarBorder.setImageResource(R.drawable.ic_unstarred_black);
+                mStarBorder.setImageResource(R.drawable.ic_unstarred_white);
                mStarBackground.setImageResource(R.drawable.ic_starred_black);
            } else {
-                mStarBorder.setImageResource(R.drawable.ic_unstarred_white);
+                mStarBorder.setImageResource(R.drawable.ic_unstarred_black);
                mStarBackground.setImageResource(R.drawable.ic_starred_white);
            }
            if (enable) {
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -153,7 +153,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
    AlertDialog confirmExitDialog = null;

    boolean validBalance = true;
-    Runnable warnOnInvalidBarcodeType;
+    Runnable barcodeImageGenerationFinishedCallback;

    HashMap<String, Currency> currencies = new HashMap<>();

@@ -208,6 +208,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
    private void updateTempState(LoyaltyCardField fieldName, Object value) {
        tempLoyaltyCard = updateTempState(tempLoyaltyCard, fieldName, value);

+        if (initDone && (fieldName == LoyaltyCardField.cardId || fieldName == LoyaltyCardField.barcodeId || fieldName == LoyaltyCardField.barcodeType)) {
+            generateBarcode();
+        }
+
        hasChanged = true;
    }

@@ -223,7 +227,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {

        importLoyaltyCardUri = intent.getData();

-        Log.d(TAG, "View activity: id=" + loyaltyCardId
+        Log.d(TAG, "Edit activity: id=" + loyaltyCardId
                + ", updateLoyaltyCard=" + updateLoyaltyCard);
    }

@@ -326,8 +330,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
        cardImageFront.setBackgroundColor(getThemeColor());
        cardImageBack.setBackgroundColor(getThemeColor());

-        warnOnInvalidBarcodeType = () -> {
+        barcodeImageGenerationFinishedCallback = () -> {
            if (!(boolean) barcodeImage.getTag()) {
+                barcodeImageLayout.setVisibility(View.GONE);
                Toast.makeText(LoyaltyCardEditActivity.this, getString(R.string.wrongValueForBarcodeType), Toast.LENGTH_LONG).show();
            }
        };
@@ -524,8 +529,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                } else {
                    updateTempState(LoyaltyCardField.barcodeId, s.toString());
                }
-
-                generateOrHideBarcode();
            }

            @Override
@@ -556,8 +559,6 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                        } catch (IllegalArgumentException e) {
                        }
                    }
-
-                    generateOrHideBarcode();
                }
            }

@@ -889,7 +890,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
            hasChanged = hadChanges;
        }

-        generateOrHideBarcode();
+        generateBarcode();

        enterButton.setOnClickListener(new EditCardIdAndBarcode());
        barcodeImage.setOnClickListener(new EditCardIdAndBarcode());
@@ -1243,6 +1244,11 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
    }

    private void doSave() {
+        if (isFinishing()) {
+            // If we are done saving, ignore any queued up save button presses
+            return;
+        }
+
        if (tempStoredOldBarcodeValue != null) {
            askBarcodeChange(this::doSave);
            return;
@@ -1398,27 +1404,22 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
        );
    }

-    private void showBarcode() {
-        barcodeImageLayout.setVisibility(View.VISIBLE);
-    }
+    private void generateBarcode() {
+        if (tempLoyaltyCard == null) {
+            return;
+        }

-    private void hideBarcode() {
-        barcodeImageLayout.setVisibility(View.GONE);
-    }
+        mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);

-    private void generateOrHideBarcode() {
        String cardIdString = tempLoyaltyCard.barcodeId != null ? tempLoyaltyCard.barcodeId : tempLoyaltyCard.cardId;
        CatimaBarcode barcodeFormat = tempLoyaltyCard.barcodeType;

-        if (barcodeFormat == null || cardIdString.isEmpty() || !barcodeFormat.isSupported()) {
-            hideBarcode();
-        } else {
-            generateBarcode(cardIdString, barcodeFormat);
+        if (cardIdString == null || barcodeFormat == null) {
+            barcodeImageLayout.setVisibility(View.GONE);
+            return;
        }
-    }

-    private void generateBarcode(String cardIdString, CatimaBarcode barcodeFormat) {
-        mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
+        barcodeImageLayout.setVisibility(View.VISIBLE);

        if (barcodeImage.getHeight() == 0) {
            Log.d(TAG, "ImageView size is not known known at start, waiting for load");
@@ -1431,17 +1432,15 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                            barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);

                            Log.d(TAG, "ImageView size now known");
-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, warnOnInvalidBarcodeType);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback);
                            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                        }
                    });
        } else {
            Log.d(TAG, "ImageView size known known, creating barcode");
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, warnOnInvalidBarcodeType);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback);
            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
        }
-
-        showBarcode();
    }

    private void generateIcon(String store) {
@@ -1471,30 +1470,24 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
        }

        View cardPart = findViewById(R.id.cardPart);
-        View barcodePart = findViewById(R.id.barcodePart);
+        View optionsPart = findViewById(R.id.optionsPart);
        View picturesPart = findViewById(R.id.picturesPart);

        if (getString(R.string.card).equals(part)) {
            cardPart.setVisibility(View.VISIBLE);
-            barcodePart.setVisibility(View.GONE);
-            picturesPart.setVisibility(View.GONE);
-
-            // Explicitly hide barcode (fixes blurriness on redraw)
-            hideBarcode();
-        } else if (getString(R.string.barcode).equals(part)) {
-            cardPart.setVisibility(View.GONE);
-            barcodePart.setVisibility(View.VISIBLE);
+            optionsPart.setVisibility(View.GONE);
            picturesPart.setVisibility(View.GONE);

            // Redraw barcode due to size change (Visibility.GONE sets it to 0)
-            generateOrHideBarcode();
+            generateBarcode();
+        } else if (getString(R.string.options).equals(part)) {
+            cardPart.setVisibility(View.GONE);
+            optionsPart.setVisibility(View.VISIBLE);
+            picturesPart.setVisibility(View.GONE);
        } else if (getString(R.string.photos).equals(part)) {
            cardPart.setVisibility(View.GONE);
-            barcodePart.setVisibility(View.GONE);
+            optionsPart.setVisibility(View.GONE);
            picturesPart.setVisibility(View.VISIBLE);
-
-            // Explicitly hide barcode (fixes blurriness on redraw)
-            hideBarcode();
        } else {
            throw new UnsupportedOperationException();
        }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -46,6 +46,7 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.appcompat.widget.Toolbar;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import androidx.core.content.ContextCompat;
@@ -63,6 +64,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
    private GestureDetector mGestureDetector;

    CoordinatorLayout coordinatorLayout;
+    ConstraintLayout mainLayout;
    TextView cardIdFieldView;
    BottomSheetBehavior behavior;
    LinearLayout bottomSheet;
@@ -262,6 +264,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        importURIHelper = new ImportURIHelper(this);

        coordinatorLayout = findViewById(R.id.coordinator_layout);
+        mainLayout = findViewById(R.id.mainLayout);
        cardIdFieldView = findViewById(R.id.cardIdView);
        bottomSheet = findViewById(R.id.bottom_sheet);
        bottomSheetContentWrapper = findViewById(R.id.bottomSheetContentWrapper);
@@ -379,9 +382,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
            editButton.hide();
        } else if (newState == BottomSheetBehavior.STATE_EXPANDED) {
            bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_down_24);
+            bottomSheetButton.setContentDescription(getString(R.string.hideMoreInfo));
+            mainLayout.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
            editButton.hide();
        } else if (newState == BottomSheetBehavior.STATE_COLLAPSED) {
            bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_up_24);
+            bottomSheetButton.setContentDescription(getString(R.string.showMoreInfo));
+            mainLayout.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);
            if (!isFullscreen) {
                editButton.show();
            }
@@ -830,12 +837,15 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                drawBarcode();
            }
            mainImage.setBackgroundColor(Color.WHITE);
+            mainImage.setContentDescription(getString(R.string.barcodeImageDescriptionWithType, format.prettyName()));
        } else if (wantedImageType == ImageType.IMAGE_FRONT) {
            mainImage.setImageBitmap(frontImageBitmap);
            mainImage.setBackgroundColor(Color.TRANSPARENT);
+            mainImage.setContentDescription(getString(R.string.frontImageDescription));
        } else if (wantedImageType == ImageType.IMAGE_BACK) {
            mainImage.setImageBitmap(backImageBitmap);
            mainImage.setBackgroundColor(Color.TRANSPARENT);
+            mainImage.setContentDescription(getString(R.string.backImageDescription));
        } else {
            throw new IllegalArgumentException("Unknown image type: " + wantedImageType);
        }
--- a/app/src/main/java/protect/card_locker/ManageGroupCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupCursorAdapter.java
@@ -8,6 +8,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

+import androidx.recyclerview.widget.RecyclerView;
+
 public class ManageGroupCursorAdapter extends LoyaltyCardCursorAdapter {
    private HashMap<Integer, Integer> mIndexCardMap;
    private HashMap<Integer, Boolean> mInGroupOverlay;
--- a/app/src/main/java/protect/card_locker/importexport/Exporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/Exporter.java
@@ -6,8 +6,6 @@ import android.database.sqlite.SQLiteDatabase;
 import java.io.IOException;
 import java.io.OutputStream;

-import protect.card_locker.DBHelper;
-
 /**
 * Interface for a class which can export the contents of the database
 * in a given format.
--- a/app/src/main/java/protect/card_locker/importexport/MultiFormatExporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/MultiFormatExporter.java
@@ -7,8 +7,6 @@ import android.util.Log;
 import java.io.IOException;
 import java.io.OutputStream;

-import protect.card_locker.DBHelper;
-
 public class MultiFormatExporter {
    private static final String TAG = "Catima";

--- a/app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java
@@ -12,7 +12,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.text.ParseException;

-import protect.card_locker.DBHelper;
 import protect.card_locker.FormatException;

 public class MultiFormatImporter {
--- a/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
+++ b/app/src/main/java/protect/card_locker/preferences/SettingsActivity.java
@@ -6,6 +6,10 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.MenuItem;

+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatDelegate;
@@ -14,11 +18,6 @@ import androidx.fragment.app.DialogFragment;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
 import nl.invissvenska.numberpickerpreference.NumberDialogPreference;
 import nl.invissvenska.numberpickerpreference.NumberPickerPreferenceDialogFragment;
 import protect.card_locker.CatimaAppCompatActivity;
--- a/app/src/main/res/layout/about_activity.xml
+++ b/app/src/main/res/layout/about_activity.xml
@@ -61,6 +61,7 @@
                    app:layout_constraintTop_toBottomOf="@id/version_history_main" />

                <TextView
+                    android:importantForAccessibility="no"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_margin="8dp"
@@ -101,6 +102,7 @@
                    app:layout_constraintTop_toBottomOf="@id/credits_main" />

                <TextView
+                    android:importantForAccessibility="no"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_margin="8dp"
@@ -143,6 +145,7 @@
                    app:layout_constraintTop_toBottomOf="@id/translate_main"/>

                <TextView
+                    android:importantForAccessibility="no"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_margin="8dp"
@@ -185,6 +188,7 @@
                    app:layout_constraintTop_toBottomOf="@id/license_main"/>

                <TextView
+                    android:importantForAccessibility="no"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_margin="8dp"
@@ -226,6 +230,7 @@
                    app:layout_constraintTop_toBottomOf="@id/repo_main" />

                <TextView
+                    android:importantForAccessibility="no"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_margin="8dp"
@@ -267,6 +272,7 @@
                    app:layout_constraintTop_toBottomOf="@id/privacy_main" />

                <TextView
+                    android:importantForAccessibility="no"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_margin="8dp"
@@ -308,6 +314,7 @@
                    app:layout_constraintTop_toBottomOf="@id/rate_main" />

                <TextView
+                    android:importantForAccessibility="no"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_margin="8dp"
@@ -349,6 +356,7 @@
                    android:padding="2dp"/>

                <TextView
+                    android:importantForAccessibility="no"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_margin="8dp"
--- a/app/src/main/res/layout/barcode_layout.xml
+++ b/app/src/main/res/layout/barcode_layout.xml
@@ -5,6 +5,7 @@
    android:layout_height="wrap_content"
    xmlns:android="http://schemas.android.com/apk/res/android">
    <ImageView
+        android:importantForAccessibility="no"
        android:layout_width="match_parent"
        android:layout_height="@dimen/barcode_disp_height"
        android:layout_gravity="center_horizontal"
--- a/app/src/main/res/layout/barcode_selector_activity.xml
+++ b/app/src/main/res/layout/barcode_selector_activity.xml
@@ -2,6 +2,7 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    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">

@@ -62,7 +63,8 @@
                android:hint="AB1234"
                android:importantForAutofill="no"
                android:inputType="text"
-                android:minHeight="48dp" />
+                android:minHeight="48dp"
+                tools:ignore="ContentDescription" />
        </LinearLayout>
        <Button
            android:id="@+id/noBarcode"
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -39,7 +39,7 @@
            <com.google.android.material.tabs.TabItem
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                android:text="@string/barcode"/>
+                android:text="@string/options"/>
            <com.google.android.material.tabs.TabItem
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
@@ -128,6 +128,95 @@
                    </com.google.android.material.textfield.TextInputLayout>
                </LinearLayout>

+                <!-- Barcode ID -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="@dimen/inputPadding"
+                    android:paddingTop="@dimen/inputPadding"
+                    android:orientation="horizontal">
+
+                    <!-- Barcode ID -->
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/barcodeIdView"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.0"
+                        android:hint="@string/barcodeId"
+                        android:labelFor="@+id/barcodeIdView">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/barcodeIdField"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="none"/>
+
+                    </com.google.android.material.textfield.TextInputLayout>
+                </LinearLayout>
+
+                <!-- Barcode type -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="@dimen/inputPadding"
+                    android:paddingTop="@dimen/inputPadding"
+                    android:orientation="horizontal">
+
+                    <!-- Barcode type -->
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/barcodeTypeView"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1.0"
+                        android:hint="@string/barcodeType"
+                        android:labelFor="@+id/barcodeTypeField">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/barcodeTypeField"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="none"/>
+                    </com.google.android.material.textfield.TextInputLayout>
+                </LinearLayout>
+
+                <!-- Barcode -->
+                <LinearLayout android:orientation="horizontal"
+                    android:padding="10.0dip"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/barcodeLayout">
+                    <ImageView
+                        android:importantForAccessibility="no"
+                        android:layout_width="0dp"
+                        android:layout_height="@dimen/barcode_disp_height"
+                        android:layout_gravity="center_horizontal"
+                        android:padding="10.0dp"
+                        android:background="#ffffff"
+                        android:id="@+id/barcode"
+                        android:layout_weight="1.0"/>
+                </LinearLayout>
+
+                <!-- Buttons -->
+                <LinearLayout android:orientation="horizontal"
+                    android:padding="10.0dip"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/barcodeCaptureLayout">
+                    <Button android:id="@+id/enterButton"
+                        android:layout_margin="@dimen/inputMargin"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:text="@string/editBarcode"
+                        android:textColor="#FFFFFF"
+                        android:layout_weight="1.0"/>
+                </LinearLayout>
+            </TableLayout>
+            <TableLayout
+                android:id="@+id/optionsPart"
+                android:visibility="gone">
+
                <!-- Note -->
                <LinearLayout
                    android:layout_width="match_parent"
@@ -161,6 +250,7 @@
                    android:orientation="horizontal">

                    <com.google.android.material.chip.ChipGroup
+                        android:contentDescription="@string/groups"
                        android:id="@+id/groupChips"
                        android:layout_height="match_parent"
                        android:layout_width="match_parent"
@@ -240,99 +330,6 @@
                    </com.google.android.material.textfield.TextInputLayout>
                </LinearLayout>
            </TableLayout>
-            <TableLayout
-                android:id="@+id/barcodePart"
-                android:visibility="gone">
-
-                <!-- Barcode ID -->
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/inputPadding"
-                    android:paddingTop="@dimen/inputPadding"
-                    android:orientation="horizontal">
-
-                    <!-- Barcode ID -->
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/barcodeIdView"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1.0"
-                        android:hint="@string/barcodeId"
-                        android:labelFor="@+id/barcodeIdView">
-
-                        <AutoCompleteTextView
-                            android:id="@+id/barcodeIdField"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="none"/>
-
-                    </com.google.android.material.textfield.TextInputLayout>
-                </LinearLayout>
-
-                <!-- Barcode type -->
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingHorizontal="@dimen/inputPadding"
-                    android:paddingTop="@dimen/inputPadding"
-                    android:orientation="horizontal">
-
-                    <!-- Barcode type -->
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/barcodeTypeView"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1.0"
-                        android:hint="@string/barcodeType"
-                        android:labelFor="@+id/barcodeTypeField">
-
-                        <AutoCompleteTextView
-                            android:id="@+id/barcodeTypeField"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:inputType="none"/>
-                    </com.google.android.material.textfield.TextInputLayout>
-                </LinearLayout>
-
-                <!-- Barcode -->
-                <View
-                    android:layout_height="@dimen/inputBorderThickness"
-                    android:layout_width="match_parent" />
-
-                <LinearLayout android:orientation="horizontal"
-                              android:padding="10.0dip"
-                              android:layout_width="fill_parent"
-                              android:layout_height="wrap_content"
-                              android:visibility="gone"
-                              android:id="@+id/barcodeLayout">
-                    <ImageView
-                        android:layout_width="0dp"
-                        android:layout_height="@dimen/barcode_disp_height"
-                        android:layout_gravity="center_horizontal"
-                        android:padding="10.0dp"
-                        android:background="#ffffff"
-                        android:id="@+id/barcode"
-                        android:layout_weight="1.0"/>
-                </LinearLayout>
-
-                <!-- Buttons -->
-                <LinearLayout android:orientation="horizontal"
-                    android:padding="10.0dip"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/barcodeCaptureLayout">
-                    <Button android:id="@+id/enterButton"
-                        android:layout_margin="@dimen/inputMargin"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:text="@string/editBarcode"
-                        android:textColor="#FFFFFF"
-                        android:layout_weight="1.0"/>
-                </LinearLayout>
-            </TableLayout>

            <TableLayout
                android:id="@+id/picturesPart"
--- a/app/src/main/res/layout/loyalty_card_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_layout.xml
@@ -23,6 +23,7 @@
            app:layout_constraintTop_toTopOf="parent">

            <ImageView
+                android:importantForAccessibility="no"
                android:id="@+id/thumbnail"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
@@ -35,6 +36,7 @@
                app:layout_constraintTop_toTopOf="parent" />

            <ImageView
+                android:importantForAccessibility="no"
                android:id="@+id/selected_thumbnail"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
@@ -58,7 +60,7 @@
                    android:layout_height="@dimen/cardThumbnailSize"
                    android:layout_gravity="end"
                    android:alpha="0.5"
-                    android:contentDescription="@string/starImage"
+                    android:contentDescription="@string/starred"
                    android:elevation="4dp"
                    android:visibility="visible"
                    app:layout_constraintEnd_toEndOf="parent"
@@ -67,6 +69,7 @@
                    tools:ignore="ImageContrastCheck" />

                <ImageView
+                    android:importantForAccessibility="no"
                    android:id="@+id/star_border"
                    android:layout_width="@dimen/cardThumbnailSize"
                    android:layout_height="@dimen/cardThumbnailSize"
@@ -77,7 +80,7 @@
                    android:visibility="visible"
                    app:layout_constraintEnd_toEndOf="parent"
                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_unstarred_white"
+                    app:srcCompat="@drawable/ic_unstarred_black"
                    tools:ignore="ImageContrastCheck" />

            </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/loyalty_card_view_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_view_layout.xml
@@ -25,6 +25,7 @@
        app:layout_behavior="@string/appbar_scrolling_view_behavior">

        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/mainLayout"
            android:layout_width="fill_parent"
            android:layout_height="match_parent"
            android:orientation="vertical">
@@ -107,6 +108,7 @@
                app:layout_constraintTop_toBottomOf="@+id/minimizeButton"/>

            <SeekBar
+                android:contentDescription="@string/set_scale"
                android:id="@+id/barcodeScaler"
                android:visibility="gone"
                android:max="100"
@@ -168,7 +170,7 @@
            android:layout_width="match_parent"
            android:layout_height="80dp"
            android:layout_gravity="top|start"
-            android:contentDescription="@string/toggleMoreInfo"
+            android:contentDescription="@string/showMoreInfo"
            android:scaleType="fitCenter"
            app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
            app:tint="#ffffff" />
--- a/app/src/main/res/raw/contributors.txt
+++ b/app/src/main/res/raw/contributors.txt
@@ -10,28 +10,30 @@ Oğuz Ersen
 IllusiveMan196
 Petr Novák
 Taco
-Gediminas Murauskas
 Joel A
+Gediminas Murauskas
+Altonss
 StoyanDimitrov
 Nyatsuki
-Altonss
 Samantaz Fox
 arno-github
 Ankit Tiwari
 Sergio Paredes
+Michael Moroni
 laralem
 arshbeerSingh
 huuhaa
 Miha Frangež
-Michael Moroni
+sr093906
 Olivia (Zoe)
 betsythefc
 waffshappen
-sr093906
 K. Herbert
+Maciej Błędkowski
 Quentin PAGÈS
 String E. Fighter
 Yurical
+Silvério Santos
 /usr/local/ΕΨΗΕΛΩΝ
 Adolfo Jayme-Barrientos
 Alessandro Mandelli
@@ -59,9 +61,8 @@ Kasina Dheeraj
 Flav
 Franciszek Stefan
 Izzy
-Karol Kosek
+krkk
 bittin
-Maciej Błędkowski
 Marco
 Mattia
 Michael Gangolf
@@ -77,6 +78,7 @@ Still Hsu
 Subhashish Anand
 Tymofii Lytvynenko
 Tjipke van der Heide
+Yevgeny M
 avikkundu
 opsik
 psa-jforestier
@@ -84,3 +86,4 @@ Robin
 sergio
 Marcus
 techwebpd
+rr-vesp
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -188,7 +188,6 @@
    <string name="settings_system_locale">Система</string>
    <string name="settings_locale">Език</string>
    <string name="noGroupCards">Групата не съдържа карти</string>
-    <string name="toggleMoreInfo">Превключване на повече информация</string>
    <string name="barcodeImageDescriptionWithType">Изображение на щрихкод на карта от вида <xliff:g>%s</xliff:g></string>
    <string name="swipeToSwitchImages">Плъзване или задържане за смяна на изображения</string>
    <string name="sort_by">Сортиране по</string>
--- a/app/src/main/res/values-bn-rIN/strings.xml
+++ b/app/src/main/res/values-bn-rIN/strings.xml
@@ -66,7 +66,6 @@
    <string name="settings_green_theme">সবুজ থিম</string>
    <string name="settings_brown_theme">বাদামী থিম</string>
    <string name="sort">সাজান</string>
-    <string name="toggleMoreInfo">আরও তথ্য টগল করুন</string>
    <string name="swipeToSwitchImages">ছবি পরিবর্তন করতে সোয়াইপ করুন</string>
    <string name="sort_by_name">নামের দ্বারা সাজান</string>
    <string name="sort_by_most_recently_used">সর্বাধিক সম্প্রতি ব্যবহৃত দ্বারা সাজান</string>
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -66,7 +66,6 @@
    <string name="settings_green_theme">Zeleno</string>
    <string name="settings_brown_theme">Braun</string>
    <string name="sort">Poništi sortiranje</string>
-    <string name="toggleMoreInfo">Uključi savjete</string>
    <string name="swipeToSwitchImages">Swipe ili long press za prebacivanje slika</string>
    <string name="sort_by_name">Ime</string>
    <string name="sort_by_most_recently_used">Nedavno Korišten</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -199,7 +199,6 @@
    <string name="sort_by_most_recently_used">Naposledy použité</string>
    <string name="sort_by_name">Název</string>
    <string name="swipeToSwitchImages">Přejetím nebo dlouhým stisknutím přepínáte obrázky</string>
-    <string name="toggleMoreInfo">Přepnout zobrazení dalších informací</string>
    <string name="sort">Seřadit</string>
    <string name="barcodeImageDescriptionWithType">Obrázek čárového kódu karty typu <xliff:g>%s</xliff:g></string>
    <string name="version_history">Historie verzí</string>
@@ -222,4 +221,10 @@
    <string name="group_updated">Skupina aktualizována</string>
    <string name="editGroup">Úprava skupiny: <xliff:g>%s</xliff:g></string>
    <string name="noGiftCardsGroup">Zatím nemáte žádné věrnostní karty. Jakmile nějaké přidáte, můžete je přiřadit do skupiny zde.</string>
+    <string name="shortcutSelectCard">Vybrat kartu</string>
+    <string name="action_show_details">Zobrazit detaily</string>
+    <string name="action_hide_details">Skrýt detaily</string>
+    <string name="translate_platform">na Weblate</string>
+    <string name="showMoreInfo">Zobrazit podrobnosti</string>
+    <string name="hideMoreInfo">Skrýt podrobnosti</string>
 </resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -188,7 +188,6 @@
    <string name="settings_catima_theme">Catima</string>
    <string name="settings_theme_color">Designfarbe</string>
    <string name="app_contributors">Ermöglicht durch: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="toggleMoreInfo">Umschalten, um weitere Informationen anzuzeigen</string>
    <string name="barcodeImageDescriptionWithType">Bild <xliff:g>%s</xliff:g> Barcode</string>
    <string name="swipeToSwitchImages">Wischen oder langes Drücken zum Wechseln der Bilder</string>
    <string name="sort_by">Sortieren nach</string>
@@ -222,4 +221,8 @@
    <string name="action_hide_details">Details ausblenden</string>
    <string name="translate_platform">auf Weblate</string>
    <string name="shortcutSelectCard">Wählen Sie eine Karte</string>
+    <string name="options">Optionen</string>
+    <string name="hideMoreInfo">Infos ausblenden</string>
+    <string name="set_scale">Größe festlegen</string>
+    <string name="showMoreInfo">Infos anzeigen</string>
 </resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -188,7 +188,6 @@
    <string name="settings_theme_color">Couleur du thème</string>
    <string name="app_contributors">Rendu possible par : <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="noGroupCards">Ce groupe est vide</string>
-    <string name="toggleMoreInfo">Activer/désactiver l’affichage de plus d’infos</string>
    <string name="barcodeImageDescriptionWithType">Image <xliff:g>%s</xliff:g> code-barres</string>
    <string name="swipeToSwitchImages">Balayez ou appuyez longuement pour changer d’image</string>
    <string name="sort">Trier</string>
@@ -222,4 +221,9 @@
    <string name="action_hide_details">Masquer les détails</string>
    <string name="translate_platform">sur Weblate</string>
    <string name="shortcutSelectCard">Sélectionnez une carte</string>
+    <string name="options">Options</string>
+    <string name="starred">En favori</string>
+    <string name="set_scale">Définir une échelle</string>
+    <string name="showMoreInfo">Afficher les infos</string>
+    <string name="hideMoreInfo">Masquer les infos</string>
 </resources>
--- a/app/src/main/res/values-he-rIL/strings.xml
+++ b/app/src/main/res/values-he-rIL/strings.xml
@@ -1,9 +1,56 @@
-<resources
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="action_add">הוספה</string>
-
    <string name="cardId">מזהה כרטיס</string>
    <string name="cancel">ביטול</string>
    <string name="save">שמור</string>
-</resources>
+    <string name="ok">אישור</string>
+    <string name="action_search">חיפוש</string>
+    <string name="noGiftCards">לחץ על לחצן ה + להוספת כרטיס, או ייבא מספר כרטיסים באמצעות התפריט ⋮.</string>
+    <string name="lockScreen">סיבוב</string>
+    <string name="share">שיתוף</string>
+    <string name="copy_to_clipboard">העתקת מזהה ללוח</string>
+    <string name="addCardTitle">הוספת כרטיס</string>
+    <string name="noCardIdError">אין מזהה כרטיס</string>
+    <string name="star">הוספה למועדפים</string>
+    <string name="unstar">הסרה ממועדפים</string>
+    <string name="note">הערות</string>
+    <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>
+    <string name="noMatchingGiftCards">אין תוצאות. נסה חיפוש אחר.</string>
+    <string name="storeName">שם חנות</string>
+    <string name="barcodeNoBarcode">אין ברקוד</string>
+    <string name="delete">מחיקה</string>
+    <string name="confirm">אישור</string>
+    <string name="deleteTitle">מחק כרטיס</string>
+    <string name="deleteConfirmation">האם למחוק כרטיס זה\?</string>
+    <string name="sendLabel">שליחה…</string>
+    <string name="editCardTitle">עריכת כרטיס</string>
+    <string name="scanCardBarcode">סריקת ברקוד</string>
+    <string name="cardShortcut">קיצור דרך</string>
+    <string name="noCardsMessage">תחילה הוסף כרטיס</string>
+    <string name="card_ids_copied">מזהי כרטיס הועתקו</string>
+    <string name="barcodeImageDescriptionWithType"></string>
+    <string name="noStoreError">לא הוכנס שם חנות</string>
+    <string name="noCardExistsError">כרטיס לא נמצא</string>
+    <string name="importExport">ייבוא/ייצוא</string>
+    <string name="exportName">ייצוא</string>
+    <string name="importExportHelp">גיבוי המידע שלך מאפשר העברתו למכשיר אחר.</string>
+    <string name="importSuccessfulTitle">הייבוא הצליח</string>
+    <string name="importFailedTitle">הייבוא נכשל</string>
+    <string name="importFailed">לא ניתן לייבא</string>
+    <string name="exportSuccessfulTitle">הייצוא הצליח</string>
+    <string name="exportFailedTitle">הייצוא נכשל</string>
+    <string name="importing">מייבא…</string>
+    <string name="exporting">ייצוא…</string>
+</resources>
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -180,7 +180,6 @@
    <string name="exportPassword">Tetapkan kata sandi untuk melindungi ekspor anda (opsional)</string>
    <string name="failedGeneratingShareURL">Tidak dapat membuat alamat berbagi. Mohon laporkan ini.</string>
    <string name="app_contributors">Pengembangan dibantu oleh: <xliff:g id="app_contributors">%s</xliff:g></string>
-    <string name="toggleMoreInfo">Tampilkan info selengkapnya</string>
    <string name="swipeToSwitchImages">Geser atau tekan yang lama untuk mengganti gambar</string>
    <string name="reverse">Ubah urutan</string>
    <string name="version_history">Riwayat Versi</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -107,7 +107,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">Loyalty Card Keychain</string>
+    <string name="app_loyalty_card_keychain">Carte fedeltà</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>
@@ -188,7 +188,6 @@
    <string name="settings_theme_color">Colore del tema</string>
    <string name="app_contributors">Reso possibile da: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="noGroupCards">Questo gruppo è vuoto</string>
-    <string name="toggleMoreInfo">Attiva/disattiva la visualizzazione di altre informazioni</string>
    <string name="barcodeImageDescriptionWithType">Immagine del codice a barre in formato <xliff:g>%s</xliff:g></string>
    <string name="swipeToSwitchImages">Scorri o premi a lungo per cambiare immagine</string>
    <string name="sort_by">Ordina per</string>
@@ -221,4 +220,10 @@
    <string name="action_show_details">Mostra i dettagli</string>
    <string name="action_hide_details">Nascondi i dettagli</string>
    <string name="translate_platform">su Weblate</string>
+    <string name="shortcutSelectCard">Seleziona una tessera</string>
+    <string name="options">Opzioni</string>
+    <string name="starred">Nei preferiti</string>
+    <string name="set_scale">Imposta la scala</string>
+    <string name="showMoreInfo">Mostra info</string>
+    <string name="hideMoreInfo">Nascondi info</string>
 </resources>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -171,7 +171,6 @@
        <item quantity="other"><xliff:g>%d</xliff:g> 枚のカードの削除</item>
    </plurals>
    <string name="barcodeImageDescriptionWithType">バーコード形式の画像 <xliff:g>%s</xliff:g></string>
-    <string name="toggleMoreInfo">詳細を表示する</string>
    <string name="app_contributors">Made possible by: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="settings_brown_theme">Brown</string>
    <string name="settings_grey_theme">Gray</string>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -192,7 +192,6 @@
    <string name="settings_theme_color">Temos spalva</string>
    <string name="app_contributors">Tapo įmanoma su pagalba: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="noGroupCards">Šioje grupėje nėra jokių kortelių</string>
-    <string name="toggleMoreInfo">Perjungti išsamios informacijos rodymą</string>
    <string name="barcodeImageDescriptionWithType"><xliff:g>%s</xliff:g> tipo kortelės brūkšninio kodo vaizdas</string>
    <string name="swipeToSwitchImages">Perbraukite arba ilgai palaikykite paspaudę, kad perjungtumėte vaizdus</string>
    <string name="sort_by">Rikiuoti pagal</string>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
    <string name="action_add">Legg til</string>
-    <string name="noGiftCards">Klikk på «+» (pluss)-knappen for å legge til eller importer kort fra «⋮»-menyen først.</string>
+    <string name="noGiftCards">Klikk på «+» (pluss)-knappen for å legge til eller importer kort fra «⋮»-menyen</string>
    <string name="storeName">Navn</string>
    <string name="note">Merknad</string>
    <string name="cardId">Kort-ID</string>
@@ -18,24 +18,24 @@
    <string name="sendLabel">Send…</string>
    <string name="editCardTitle">Rediger kundekort</string>
    <string name="addCardTitle">Legg til kundekort</string>
-    <string name="scanCardBarcode">Skann kortets strekkode</string>
+    <string name="scanCardBarcode">Skann strekkoden</string>
    <string name="cardShortcut">Kort-snarvei</string>
    <string name="noCardsMessage">Legg til et kort først</string>
    <string name="noStoreError">Navn ikke angitt</string>
-    <string name="noCardIdError">Ingen kort-ID innskrevet</string>
-    <string name="noCardExistsError">Kunne ikke finne kort</string>
+    <string name="noCardIdError">Ingen ID innskrevet</string>
+    <string name="noCardExistsError">Fant ikke det kortet</string>
    <string name="importExport">Importer/eksporter</string>
    <string name="exportName">Eksporter</string>
-    <string name="importExportHelp">Sikkerhetskopiering av kort lar deg flytte dem til en annen enhet.</string>
+    <string name="importExportHelp">Sikkerhetskopiering av data lar deg flytte dem til en annen enhet.</string>
    <string name="importSuccessfulTitle">Importert</string>
    <string name="importFailedTitle">Kunne ikke importere</string>
-    <string name="importFailed">Klarte ikke å importere kort</string>
+    <string name="importFailed">Kunne ikke utføre import</string>
    <string name="exportSuccessfulTitle">Eksportert</string>
    <string name="exportFailedTitle">Kunne ikke eksportere</string>
-    <string name="exportFailed">Kunne ikke eksportere kort</string>
+    <string name="exportFailed">Kunne ikke utføre eksport</string>
    <string name="importing">Importerer…</string>
    <string name="exporting">Exporterer…</string>
-    <string name="noExternalStoragePermissionError">Innvilg lagringstilgang til eksternlager for å importere eller eksportere kort først</string>
+    <string name="noExternalStoragePermissionError">Innvilg lagringstilgang til eksternlager for å importere eller eksportere data</string>
    <string name="exportOptionExplanation">Data skrives dit du ønsker det.</string>
    <string name="importOptionFilesystemTitle">Importer fra filsystem</string>
    <string name="importOptionFilesystemExplanation">Velg spesifikk fil fra filsystemet.</string>
@@ -49,15 +49,15 @@
    <string name="debug_version_fmt">Versjon: <xliff:g id="version">%s</xliff:g></string>
    <string name="app_revision_fmt">Utgivelsesinfo: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="selectBarcodeTitle">Velg strekkode</string>
-    <string name="enterBarcodeInstructions">Skriv inn kortets ID, og enten velg dens strekkode nedenfor, eller «Dette kortet har ingen strekkode».</string>
-    <string name="copy_to_clipboard_toast">Kort-ID kopiert til utklippstavle</string>
-    <string name="thumbnailDescription">Miniatyrbilde for kort</string>
+    <string name="enterBarcodeInstructions">Skriv inn kortets ID, og enten velg strekkodetypen nedenfor, eller «Det er ingen strekkode».</string>
+    <string name="copy_to_clipboard_toast">ID kopiert til utklippstavle</string>
+    <string name="thumbnailDescription">Miniatyrbilde</string>
    <string name="settings">Innstillinger</string>
    <string name="settings_category_title_ui">Brukergrensesnitt</string>
    <string name="settings_display_barcode_max_brightness">Lysere strekkodevisning</string>
    <string name="settings_lock_barcode_orientation">Lås strekkodesideretning</string>
-    <string name="exportSuccessful">Kortdata eksportert</string>
-    <string name="importSuccessful">Kortdata importert</string>
+    <string name="exportSuccessful">Data eksportert</string>
+    <string name="importSuccessful">Data importert</string>
    <string name="intent_import_card_from_url_share_text">Jeg ønsker å dele et kort med deg</string>
    <string name="settings_dark_theme">Mørk</string>
    <string name="settings_light_theme">Lys</string>
@@ -67,8 +67,8 @@
 \nopphavsrett 2016–2020 Branden Archer</string>
    <string name="failedParsingImportUriError">Kunne ikke tolke importerings-URI</string>
    <string name="share">Del</string>
-    <string name="barcodeNoBarcode">Dette kortet har ingen strekkode</string>
-    <string name="noMatchingGiftCards">Fant ikke noe. Prøv å endre søket.</string>
+    <string name="barcodeNoBarcode">Det er ingen strekkode</string>
+    <string name="noMatchingGiftCards">Resultatløst. Prøv å endre søket.</string>
    <string name="action_search">Søk</string>
    <string name="starImage">Favorittstjerne</string>
    <string name="unstar">Fjern fra favoritter</string>
@@ -82,7 +82,7 @@
    <string name="failedOpeningFileManager">Installer en filbehandler først.</string>
    <string name="leaveWithoutSaveConfirmation">Forlat uten å lagre?</string>
    <string name="leaveWithoutSaveTitle">Avslutt</string>
-    <string name="addManually">Skriv inn kort-ID manuelt</string>
+    <string name="addManually">Skriv inn ID manuelt</string>
    <string name="moveDown">Flytt nedover</string>
    <string name="moveUp">Flytt oppover</string>
    <plurals name="groupCardCount">
@@ -122,7 +122,7 @@
    <string name="addFromImage">Velg bilde fra galleri</string>
    <string name="unsupportedBarcodeType">Denne strekkodetypen kan ikke vises for øyeblikket. Støtte kan bli lagt til i en senere versjon av programmet.</string>
    <string name="setBarcodeId">Sett strekkodeverdi</string>
-    <string name="sameAsCardId">Samme som kort-ID</string>
+    <string name="sameAsCardId">Samme som ID</string>
    <string name="barcodeId">Strekkodeverdi</string>
    <string name="importVoucherVaultMessage">Velg din <i>vouchervault.json</i>-eksport fra Voucher Vault å importere.
 \nOpprett den ved å trykke «Eksport» i Voucher Vault først.</string>
@@ -135,12 +135,12 @@
    <string name="settings_max_font_size_scale">Maks. skriftstørrelse</string>
    <string name="wrongValueForBarcodeType">Verdien er ikke gyldig for valgt strekkodetype</string>
    <string name="intent_import_card_from_url_share_multiple_text">Jeg vil dele noen kort med deg</string>
-    <string name="copy_to_clipboard_multiple_toast">Kort-ID-er kopiert til utklippstavle</string>
+    <string name="copy_to_clipboard_multiple_toast">ID-er ble kopiert til utklippstavle</string>
    <string name="app_resources">Frie tredjepartsressurser: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="app_libraries">Frie tredjepartsbibliotek: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="card_ids_copied">Kopierte kort-ID(er)</string>
+    <string name="card_ids_copied">Kopierte ID(er)</string>
    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Opphavsrett © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
-    <string name="updateBarcodeQuestionText">Du har endret kortets ID. Ønsker du å også oppdatere strekkoden til samme verdi?</string>
+    <string name="updateBarcodeQuestionText">Du har endret ID-en. Ønsker du å også oppdatere strekkoden til samme verdi\?</string>
    <string name="no">Nei</string>
    <string name="yes">Ja</string>
    <string name="updateBarcodeQuestionTitle">Oppdater strekkodeverdi?</string>
@@ -149,16 +149,16 @@
    <string name="setBackImage">Sett bakside</string>
    <string name="setFrontImage">Sett forside</string>
    <string name="photos">Bilder</string>
-    <string name="backImageDescription">Kortets bakside</string>
-    <string name="frontImageDescription">Kortets forside</string>
+    <string name="backImageDescription">Baksidebilde</string>
+    <string name="frontImageDescription">Forsidebilde</string>
    <string name="importStocardMessage">Velg din <i>***-sync.zip</i>-eksport fra Stocard å importere.
 \nSkaff den ved å sende e-post til support@stocardapp.com der du etterspør eksport av dataen din.</string>
    <string name="passwordRequired">Skriv inn passordet</string>
    <string name="importStocard">Importer fra Stocard</string>
    <string name="failedGeneratingShareURL">Klarte ikke å lage delbar nettadresse. Rapporter denne feilen.</string>
    <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> kort valgt</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> kort valgt</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> valgt</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> valgt</item>
    </plurals>
    <string name="deleteConfirmation">Slett dette kortet for godt?</string>
    <plurals name="deleteCardsConfirmation">
@@ -185,12 +185,11 @@
    <string name="settings_pink_theme">Rosa</string>
    <string name="settings_catima_theme">Catima</string>
    <string name="settings_theme_color">Draktfarge</string>
-    <string name="noGroupCards">Denne gruppen inneholder ikke noen kort</string>
-    <string name="toggleMoreInfo">Veksle visning av mer info</string>
-    <string name="barcodeImageDescriptionWithType">Bilde av kortstrekkode av typen <xliff:g>%s</xliff:g></string>
+    <string name="noGroupCards">Denne gruppen er tom</string>
+    <string name="barcodeImageDescriptionWithType">Bilde av <xliff:g>%s</xliff:g>-strekkode</string>
    <string name="swipeToSwitchImages">Dra eller hold lenge for å bygge bilder</string>
    <string name="sort_by">Sorter etter</string>
-    <string name="reverse">Vend</string>
+    <string name="reverse">…i omvendt rekkefølge</string>
    <string name="sort_by_balance">Saldo</string>
    <string name="sort_by_expiry">Utløp</string>
    <string name="sort_by_most_recently_used">Nyligst brukt</string>
@@ -215,9 +214,16 @@
    <string name="group_updated">Gruppe oppdatert</string>
    <string name="group_name_is_empty">Gruppenavn kan ikke være tomt</string>
    <string name="editGroup">Redigerer gruppe: <xliff:g>%s</xliff:g></string>
-    <string name="noGiftCardsGroup">Du har ingen lojalitetskort enda. Når du først har det kan du legge dem til i en gruppe her.</string>
+    <string name="noGiftCardsGroup">Lag noen kort, og legg dem til i en gruppe her.</string>
    <string name="action_show_details">Vis detaljer</string>
    <string name="action_hide_details">Skjul detaljer</string>
    <string name="selectColor">Velg farge</string>
    <string name="setIcon">Sett ikon</string>
+    <string name="shortcutSelectCard">velg et kort</string>
+    <string name="translate_platform">på Weblate</string>
+    <string name="options">Alternativer</string>
+    <string name="starred">Stjernemerket</string>
+    <string name="set_scale">Sett skalering</string>
+    <string name="showMoreInfo">Vis mer info</string>
+    <string name="hideMoreInfo">Skjul mer info</string>
 </resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -188,7 +188,6 @@
    <string name="settings_theme_color">Themakleur</string>
    <string name="app_contributors">Mede mogelijk gemaakt door: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="noGroupCards">Deze groep bevat geen kaarten</string>
-    <string name="toggleMoreInfo">Meer informatie tonen/verbergen</string>
    <string name="barcodeImageDescriptionWithType">Afbeelding van barcode <xliff:g>%s</xliff:g></string>
    <string name="swipeToSwitchImages">Veeg of houd lang ingedrukt om te bladeren</string>
    <string name="sort_by">Sorteren op</string>
@@ -222,4 +221,9 @@
    <string name="action_hide_details">Details verbergen</string>
    <string name="translate_platform">op Weblate</string>
    <string name="shortcutSelectCard">Kies een kaart</string>
+    <string name="options">Opties</string>
+    <string name="showMoreInfo">Informatie tonen</string>
+    <string name="starred">Favoriet</string>
+    <string name="hideMoreInfo">Informatie verbergen</string>
+    <string name="set_scale">Schaal instellen</string>
 </resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2,12 +2,12 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
    <string name="action_search">Szukaj</string>
    <string name="action_add">Dodaj</string>
-    <string name="noGiftCards">Kliknij przycisk + plus, aby dodać kartę lub zaimportuj jakieś z ⋮ menu w pierwszej kolejności.</string>
-    <string name="noMatchingGiftCards">Nic nie znaleziono. Spróbuj zmienić wyszukiwanie.</string>
+    <string name="noGiftCards">Kliknij przycisk + plus, aby dodać kartę lub zaimportuj z ⋮ menu.</string>
+    <string name="noMatchingGiftCards">Brak wyników. Spróbuj zmienić treść zapytania.</string>
    <string name="storeName">Nazwa</string>
    <string name="note">Notatka</string>
    <string name="cardId">Identyfikator karty</string>
-    <string name="barcodeNoBarcode">Ta karta nie ma kodu kreskowego</string>
+    <string name="barcodeNoBarcode">Bez kodu kreskowego</string>
    <string name="cancel">Anuluj</string>
    <string name="save">Zapisz</string>
    <string name="edit">Edytuj</string>
@@ -21,16 +21,16 @@
    <string name="sendLabel">Wyślij…</string>
    <string name="editCardTitle">Edytuj kartę lojalnościową</string>
    <string name="addCardTitle">Dodaj kartę lojalnościową</string>
-    <string name="scanCardBarcode">Zeskanuj kod kreskowy karty lojalnościowej</string>
+    <string name="scanCardBarcode">Zeskanuj kod kreskowy</string>
    <string name="cardShortcut">Skrót karty</string>
    <string name="noCardsMessage">Najpierw dodaj kartę</string>
    <string name="noStoreError">Nie wprowadzono nazwy</string>
-    <string name="noCardIdError">Nie wprowadzono identyfikatora karty</string>
+    <string name="noCardIdError">Nie wprowadzono identyfikatora</string>
    <string name="noCardExistsError">Nie można wyszukać karty lojalnościowej</string>
    <string name="failedParsingImportUriError">Nie można przeanalizować identyfikatora importu URI</string>
    <string name="importExport">Importuj/Eksportuj</string>
    <string name="exportName">Eksportuj</string>
-    <string name="importExportHelp">Zarchiwizowane dane umożliwiają przeniesienie kart na inne urządzenie.</string>
+    <string name="importExportHelp">Kopie zapasowe umożliwiają przeniesienie kart na inne urządzenie.</string>
    <string name="importSuccessfulTitle">Zaimportowano</string>
    <string name="importFailedTitle">Import nie powiódł się</string>
    <string name="importFailed">Nie udało się zaimportować</string>
@@ -39,7 +39,7 @@
    <string name="exportFailed">Nie udało się wyeksportować</string>
    <string name="importing">Importowanie…</string>
    <string name="exporting">Eksportowanie…</string>
-    <string name="noExternalStoragePermissionError">Najpierw przyznaj uprawnienia pamięci zewnętrznej do importowania lub eksportowania kart</string>
+    <string name="noExternalStoragePermissionError">Przyznaj uprawnienia pamięci zewnętrznej, aby importować lub eksportować dane</string>
    <string name="importOptionFilesystemTitle">Importuj z systemu plików</string>
    <string name="importOptionFilesystemExplanation">Wybierz określony plik z systemu plików.</string>
    <string name="importOptionFilesystemButton">Z systemu plików</string>
@@ -47,14 +47,14 @@
    <string name="importOptionApplicationExplanation">Użyj dowolnej aplikacji lub ulubionego menedżera plików, aby otworzyć plik.</string>
    <string name="importOptionApplicationButton">Użyj innej aplikacji</string>
    <string name="about">O aplikacji</string>
-    <string name="app_license">Wolne oprogramowanie copylefted, licencjonowane GPLv3 +.</string>
+    <string name="app_license">Wolne oprogramowanie typu copyleft, na licencji GPLv3+</string>
    <string name="about_title_fmt">O <xliff:g id="app_name">%s</xliff:g></string>
    <string name="debug_version_fmt">Wersja: <xliff:g id="version">%s</xliff:g></string>
    <string name="app_revision_fmt">Info o wydaniu: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="selectBarcodeTitle">Wybierz kod kreskowy</string>
-    <string name="enterBarcodeInstructions">Wprowadź ID karty, a następnie wybierz typ kodu kreskowego, którego chcesz użyć lub wybierz „Ta karta nie ma kodu kreskowego”.</string>
-    <string name="copy_to_clipboard_toast">Skopiowano ID karty do schowka</string>
-    <string name="thumbnailDescription">Miniaturka karty</string>
+    <string name="enterBarcodeInstructions">Wprowadź ID, a następnie wybierz typ kodu kreskowego, którego chcesz użyć lub wybierz „Bez kodu kreskowego”.</string>
+    <string name="copy_to_clipboard_toast">Skopiowano ID do schowka</string>
+    <string name="thumbnailDescription">Miniaturka</string>
    <string name="settings">Ustawienia</string>
    <string name="settings_category_title_ui">Interfejs użytkownika</string>
    <string name="settings_theme">Motyw</string>
@@ -66,14 +66,14 @@
    <string name="intent_import_card_from_url_share_text">Chcę udostępnić Ci kartę lojalnościową</string>
    <string name="deleteConfirmationGroup">Usunąć grupę\?</string>
    <string name="all">Wszystko</string>
-    <string name="noGroups">Najpierw kliknij przycisk + plus, aby dodać grupy dla kategoryzacji.</string>
+    <string name="noGroups">Kliknij przycisk + plus, aby dodać grupy w celu kategoryzacji.</string>
    <string name="groups">Grupy</string>
    <string name="enter_group_name">Wpisz nazwę grupy</string>
-    <string name="exportSuccessful">Dane karty zostały wyeksportowane</string>
-    <string name="importSuccessful">Zaimportowano dane karty</string>
+    <string name="exportSuccessful">Dane zostały wyeksportowane</string>
+    <string name="importSuccessful">Zaimportowano dane</string>
    <string name="starImage">Ulubiona gwiazda</string>
    <string name="app_copyright_old">Na podstawie Loyalty Card Keychain
-\nWszelkie prawa zastrzeżone © 2016–2020 Branden Archer.</string>
+\nWszelkie prawa zastrzeżone © 2016–2020 Branden Archer</string>
    <string name="exportOptionExplanation">Dane zostaną zapisane w wybranym przez Ciebie miejscu.</string>
    <string name="unstar">Usuń z ulubionych</string>
    <string name="star">Dodaj do ulubionych</string>
@@ -91,7 +91,7 @@
    <string name="settings_magenta_theme">Magenta</string>
    <string name="settings_pink_theme">Różowy</string>
    <string name="settings_catima_theme">Catima</string>
-    <string name="settings_theme_color">Kolor motywu</string>
+    <string name="settings_theme_color">Kolor akcentowy motywu</string>
    <string name="settings_system_locale">System</string>
    <string name="settings_locale">Język</string>
    <string name="turn_flashlight_off">Wyłącz latarkę</string>
@@ -100,36 +100,36 @@
    <string name="passwordRequired">Proszę wpisać hasło</string>
    <string name="no">Nie</string>
    <string name="yes">Tak</string>
-    <string name="updateBarcodeQuestionText">Zmieniłeś ID karty. Czy chcesz zaktualizować kod kreskowy, aby używał tej samej wartości\?</string>
+    <string name="updateBarcodeQuestionText">Zmieniłeś ID. Czy chcesz zaktualizować kod kreskowy, aby używał tej samej wartości\?</string>
    <string name="updateBarcodeQuestionTitle">Zaktualizować wartość kodu kreskowego\?</string>
    <string name="takePhoto">Zrób zdjęcie</string>
    <string name="removeImage">Usuń zdjęcie</string>
    <string name="setBackImage">Ustaw tylne zdjęcie</string>
    <string name="setFrontImage">Ustaw zdjęcie przednie</string>
    <string name="photos">Zdjęcia</string>
-    <string name="backImageDescription">Zdjęcie tylne karty</string>
-    <string name="frontImageDescription">Zdjęcie przednie karty</string>
+    <string name="backImageDescription">Zdjęcie tylne</string>
+    <string name="frontImageDescription">Zdjęcie przednie</string>
    <string name="intent_import_card_from_url_share_multiple_text">Chcę Ci udostępnić karty</string>
-    <string name="copy_to_clipboard_multiple_toast">Skopiowano ID karty do schowka</string>
+    <string name="copy_to_clipboard_multiple_toast">Skopiowano ID do schowka</string>
    <string name="wrongValueForBarcodeType">Wartość nie jest prawidłowa dla wybranego typu kodu kreskowego</string>
    <string name="unsupportedBarcodeType">Nie można jeszcze wyświetlić tego typu kodu kreskowego. Być może będzie on obsługiwany w nowszej wersji aplikacji.</string>
    <string name="setBarcodeId">Ustaw wartość kodu kreskowego</string>
-    <string name="sameAsCardId">Taki sam jak ID karty</string>
+    <string name="sameAsCardId">Taki sam jak ID</string>
    <string name="barcodeId">Wartość kodu kreskowego</string>
    <string name="importVoucherVaultMessage">Wybierz swój <i>vouchervault.json</i> z Voucher Vault, aby zaimportować.
-\nLub utwórz go wpierw klikając Eksportuj w Voucher Vault.</string>
+\nUtwórz go wpierw klikając Eksportuj w Voucher Vault.</string>
    <string name="importVoucherVault">Importuj z Voucher Vault</string>
    <string name="importStocardMessage">Wybierz swój <i>***-sync.zip</i> z Stocard, aby zaimportować.
-\nLub uzyskaj go, wysyłając email na adres support@stocardapp.com, z prośbą o eksport Twoich danych.</string>
+\nUzyskaj go, wysyłając email na adres support@stocardapp.com, z prośbą o eksport Twoich danych.</string>
    <string name="importStocard">Importuj z Stocard</string>
    <string name="importLoyaltyCardKeychainMessage">Wybierz swój <i>LoyaltyCardKeychain.csv</i> z Loyalty Card Keychain, aby zaimportować.
-\nLub utwórz go z menu Importuj/Eksportuj w Loyalty Card Keychain, wpierw klikając tam Eksportuj.</string>
+\nUtwórz go z menu Importuj/Eksportuj w Loyalty Card Keychain, wpierw klikając tam Eksportuj.</string>
    <string name="importLoyaltyCardKeychain">Importuj z Loyalty Card Keychain</string>
    <string name="importFidmeMessage">Wybierz swój <i>fidme-export-request-xxxxxx.zip</i> z FidMe, aby zaimportować, po czym wybierz typy kodów kreskowych.
-\nLub stwórz go ze swojego profilu FidMe, wybierając wpierw Ochrona Danych, a następnie naciskając Wyodrębnij moje dane.</string>
+\nStwórz go ze swojego profilu FidMe, wybierając wpierw Ochrona Danych, a następnie naciskając Wyodrębnij moje dane.</string>
    <string name="importFidme">Importuj z FidMe</string>
    <string name="importCatimaMessage">Wybierz swój <i>catima.zip</i> z Catima, aby zaimportować.
-\nLub utwórz go z menu Importuj/Eksportuj innej aplikacji Catima, wpierw klikając tam Eksportuj.</string>
+\nUtwórz go z menu Importuj/Eksportuj innej aplikacji Catima, wpierw klikając tam Eksportuj.</string>
    <string name="importCatima">Importuj z Catima</string>
    <string name="accept">Zaakceptuj</string>
    <string name="privacy_policy_popup_text">Informacja o polityce prywatności (wymagana przez niektóre sklepy z aplikacjami):
@@ -146,7 +146,7 @@
    <string name="noBarcodeFound">Nie znaleziono kodu kreskowego</string>
    <string name="moveBarcodeToCenterOfScreen">Wyśrodkuj kod kreskowy na ekranie</string>
    <string name="moveBarcodeToTopOfScreen">Przenieś kod kreskowy na górę ekranu</string>
-    <string name="chooseExpiryDate">Wybierz datę ważności</string>
+    <string name="chooseExpiryDate">Wybierz datę wygaśnięcia</string>
    <string name="never">Nigdy</string>
    <string name="expiryDate">Data wygaśnięcia</string>
    <string name="editBarcode">Edytuj kod kreskowy</string>
@@ -158,7 +158,7 @@
    <string name="expiryStateSentence">Wygasa: <xliff:g>%s</xliff:g></string>
    <string name="groupsList">Grupy: <xliff:g>%s</xliff:g></string>
    <string name="addFromImage">Wybierz zdjęcie z galerii</string>
-    <string name="addManually">Wpisz ręcznie ID karty</string>
+    <string name="addManually">Wpisz ręcznie ID</string>
    <string name="leaveWithoutSaveConfirmation">Wyjść bez zapisywania\?</string>
    <string name="leaveWithoutSaveTitle">Wyjdź</string>
    <string name="moveDown">Przesuń w dół</string>
@@ -170,14 +170,14 @@
        <item quantity="many"><xliff:g>%d</xliff:g> kart</item>
        <item quantity="other"><xliff:g>%d</xliff:g> kart</item>
    </plurals>
-    <string name="noGroupCards">Ta grupa nie zawiera żadnych kart</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Zapobiegaj blokowaniu ekranu</string>
-    <string name="settings_keep_screen_on">Pozostaw ekran włączony</string>
+    <string name="noGroupCards">Ta grupa jest pusta</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Zapobiegaj wyłączeniu ekranu</string>
+    <string name="settings_keep_screen_on">Nie wygaszaj ekranu</string>
    <string name="settings_max_font_size_scale">Maks. rozmiar czcionki</string>
    <string name="app_resources">Otwarte zewnętrzne zasoby: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="app_libraries">Otwarte zewnętrzne biblioteki: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Wszelkie prawa zastrzeżone © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
-    <string name="card_ids_copied">Skopiowano ID karty</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Wszelkie prawa zastrzeżone © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="card_ids_copied">Skopiowano identyfikator(y)</string>
    <plurals name="deleteCardsConfirmation">
        <item quantity="one">Usunąć tą <xliff:g>%d</xliff:g> kartę permamentnie\?</item>
        <item quantity="few">Usunąć te <xliff:g>%d</xliff:g> karty permamentnie\?</item>
@@ -191,9 +191,43 @@
        <item quantity="other">Usuń <xliff:g>%d</xliff:g> kart</item>
    </plurals>
    <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> wybrana karta</item>
-        <item quantity="few"><xliff:g>%d</xliff:g> wybrane karty</item>
-        <item quantity="many"><xliff:g>%d</xliff:g> wybranych kart</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> wybranych kart</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> zaznaczona</item>
+        <item quantity="few"><xliff:g>%d</xliff:g> zaznaczone</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> zaznaczonych</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> zaznaczonych</item>
    </plurals>
+    <string name="shortcutSelectCard">Wybierz kartę</string>
+    <string name="action_show_details">Pokaż szczegóły</string>
+    <string name="action_hide_details">Ukryj szczegóły</string>
+    <string name="sort_by_name">Nazwa</string>
+    <string name="sort_by_most_recently_used">Ostatnio użyte</string>
+    <string name="sort_by_expiry">Data wygaśnięcia</string>
+    <string name="sort_by_balance">Balans</string>
+    <string name="sort_by">Sortuj według</string>
+    <string name="credits">Podziękowania</string>
+    <string name="help_translate_this_app">Pomóż przetłumaczyć tą aplikację</string>
+    <string name="source_repository">Repozytorium Źródłowe</string>
+    <string name="report_error">Zgłoś Błąd</string>
+    <string name="setIcon">Ustaw ikonę</string>
+    <string name="on_github">na GitHub\'ie</string>
+    <string name="swipeToSwitchImages">Przeciągnij lub przytrzymaj aby zmienić obraz</string>
+    <string name="selectColor">Wybierz kolor</string>
+    <string name="version_history">Historia Wersji</string>
+    <string name="and_data_usage">i wykorzystanie danych</string>
+    <string name="rate_this_app">Oceń tą aplikację</string>
+    <string name="license">Licencja</string>
+    <string name="on_google_play">w Google Play</string>
+    <string name="noGiftCardsGroup">Stwórz karty i przypisz je do grupy w tym miejscu.</string>
+    <string name="reverse">...w odwrotnej kolejności</string>
+    <string name="translate_platform">na Weblate</string>
+    <string name="sort">Sortuj</string>
+    <string name="barcodeImageDescriptionWithType">Obraz kodu kreskowego typu <xliff:g>%s</xliff:g></string>
+    <string name="group_edit">Edytuj Grupę</string>
+    <string name="group_name_already_in_use">Ta nazwa jest już użyta</string>
+    <string name="group_name_is_empty">Nazwa grupy nie może być pusta</string>
+    <string name="group_updated">Zaktualizowano grupę</string>
+    <string name="editGroup">Edytowanie grupy: <xliff:g>%s</xliff:g></string>
+    <string name="exportPassword">Ustaw hasło, aby zabezpieczyć twoje wyeksportowane dane (opcjonalne)</string>
+    <string name="exportPasswordHint">Wpisz hasło</string>
+    <string name="options">Opcje</string>
 </resources>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -1,2 +1,192 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="shortcutSelectCard">Selecione um cartão</string>
+    <string name="action_show_details">Mostrar detalhes</string>
+    <string name="action_hide_details">Ocultar detalhes</string>
+    <string name="lockScreen">Bloquear rotação</string>
+    <string name="unlockScreen">Desbloquear rotação</string>
+    <string name="deleteTitle">Eliminar cartão</string>
+    <string name="deleteConfirmation">Eliminar este cartão permanentemente\?</string>
+    <string name="ok">OK</string>
+    <string name="copy_to_clipboard">Copiar identificador para a área de transferência</string>
+    <string name="share">Partilhar</string>
+    <string name="sendLabel">Enviar…</string>
+    <string name="editCardTitle">Editar cartão</string>
+    <string name="addCardTitle">Adicionar cartão</string>
+    <string name="cardShortcut">Atalho do cartão</string>
+    <string name="noCardsMessage">Adicione primeiro um cartão</string>
+    <string name="noStoreError">Nenhum nome inserido</string>
+    <string name="failedParsingImportUriError">Não foi possível analisar o URI de importação</string>
+    <string name="importExport">Importar / exportar</string>
+    <string name="exportName">Exportar</string>
+    <string name="importSuccessfulTitle">Importado</string>
+    <string name="importFailedTitle">A importação falhou</string>
+    <string name="exportSuccessfulTitle">Exportado</string>
+    <string name="exportFailedTitle">A exportação falhou</string>
+    <string name="importOptionFilesystemExplanation">Escolha um ficheiro específico a partir do sistema de ficheiros.</string>
+    <string name="importOptionApplicationTitle">Usar outra aplicação</string>
+    <string name="importOptionApplicationExplanation">Utilize qualquer aplicação ou o seu gestor de ficheiros favorito para abrir um ficheiro.</string>
+    <string name="importOptionApplicationButton">Utilizar outra aplicação</string>
+    <string name="about">Sobre</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Direitos de autor © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="app_copyright_old">Baseado no Loyalty Card Keychain
+\ndireitos de autor © 2016–2020 Branden Archer</string>
+    <string name="app_license">Software livre de partilha sob a mesma licença e segundo a licença GPLv3+</string>
+    <string name="about_title_fmt">Sobre o <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">Versão: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Informação da revisão: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries">Bibliotecas livres de terceiros: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">Recursos livres de terceiros: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="selectBarcodeTitle">Selecionar código de barras</string>
+    <string name="starImage">Favorito</string>
+    <string name="settings">Configurações</string>
+    <string name="settings_category_title_ui">Interface do utilizador</string>
+    <string name="settings_theme">Tema</string>
+    <string name="settings_system_theme">Sistema</string>
+    <string name="settings_light_theme">Claro</string>
+    <string name="settings_dark_theme">Escuro</string>
+    <string name="settings_max_font_size_scale">Tamanho máximo da fonte</string>
+    <string name="settings_display_barcode_max_brightness">Iluminar o código de barras</string>
+    <string name="settings_lock_barcode_orientation">Bloquear orientação do código de barras</string>
+    <string name="settings_keep_screen_on">Manter ecrã ligado</string>
+    <string name="group_name_is_empty">O nome do grupo não pode estar vazio</string>
+    <string name="group_updated">Grupo atualizado</string>
+    <string name="all">Todos</string>
+    <string name="deleteConfirmationGroup">Eliminar o grupo\?</string>
+    <string name="failedOpeningFileManager">Instalar primeiro um gestor de ficheiros.</string>
+    <string name="moveUp">Subir</string>
+    <string name="moveDown">Descer</string>
+    <string name="leaveWithoutSaveTitle">Sair</string>
+    <string name="leaveWithoutSaveConfirmation">Sair sem guardar\?</string>
+    <string name="addFromImage">Selecionar imagem da galeria</string>
+    <string name="groupsList">Grupos: <xliff:g>%s</xliff:g></string>
+    <string name="editGroup">A editar grupo: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentence">Expiram: <xliff:g>%s</xliff:g></string>
+    <string name="expiryStateSentenceExpired">Expirados: <xliff:g>%s</xliff:g></string>
+    <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
+    <string name="balancePoints"><xliff:g>%s</xliff:g> pontos</string>
+    <string name="card">Cartão</string>
+    <string name="barcode">Código de barras</string>
+    <string name="editBarcode">Editar código de barras</string>
+    <string name="expiryDate">Validade</string>
+    <string name="never">Nunca</string>
+    <string name="chooseExpiryDate">Escolher validade</string>
+    <string name="moveBarcodeToTopOfScreen">Mover o código de barras para o topo do ecrã</string>
+    <string name="moveBarcodeToCenterOfScreen">Centrar o código de barras no ecrã</string>
+    <string name="noBarcodeFound">Não foi encontrado nenhum código de barras</string>
+    <string name="errorReadingImage">Não foi possível ler a imagem</string>
+    <string name="balance">Saldo</string>
+    <string name="currency">Moeda</string>
+    <string name="privacy_policy_popup_text">Aviso de política de privacidade (exigido por algumas lojas de aplicações):
+\n
+\nNENHUM DADO É RECOLHIDO DE FORMA ALGUMA, o que qualquer pessoa pode confirmar, já que a nossa aplicação é um software livre de código-fonte aberto.</string>
+    <string name="accept">Aceitar</string>
+    <string name="importCatima">Importar do Catima</string>
+    <string name="importFidme">Importar do FidMe</string>
+    <string name="importFidmeMessage">Selecione a exportação <i>fidme-export-request-xxxxxx.zip</i> do FidMe para importar e depois selecione os tipos de código de barras manualmente.
+\nPrimeiro crie a exportação no seu perfil do FidMe escolhendo a opção \"Proteção de dados\" e em seguida pressionando \"Extrair os meus dados\".</string>
+    <string name="importLoyaltyCardKeychain">Importar do Loyalty Card Keychain</string>
+    <string name="importLoyaltyCardKeychainMessage">Selecione a exportação <i>LoyaltyCardKeychain.csv</i> do Loyalty Card Keychain para importar.
+\nPrimeiro crie a exportação no menu \"Importar / exportar\" no Loyalty Card Keychain pressionando \"Exportar\".</string>
+    <string name="importStocard">Importar do Stocard</string>
+    <string name="importCatimaMessage">Selecione a exportação <i>catima.zip</i> do Catima a importar.
+\nPrimeiro crie a exportação no menu \"Importar / exportar\" de outra aplicação Catima pressionando \"Exportar\" nesse menu.</string>
+    <string name="importStocardMessage">Selecione a exportação <i>***-sync.zip</i> do Stocard para importar.
+\nObtenha-o através do e-mail support@stocardapp.com solicitando uma exportação dos seus dados.</string>
+    <string name="importVoucherVault">Importar do Voucher Vault</string>
+    <string name="importVoucherVaultMessage">Selecione a exportação <i>vouchervault.json</i> do Voucher Vault para importar.
+\nCrie-a primeiro pressionando a opção \"Exportar\" no Voucher Vault.</string>
+    <string name="barcodeId">Valor do código de barras</string>
+    <string name="setBarcodeId">Definir o valor do código de barras</string>
+    <string name="unsupportedBarcodeType">Este tipo de código de barras ainda não pode ser mostrado. Pode vir a ser suportado numa versão posterior da aplicação.</string>
+    <string name="wrongValueForBarcodeType">O valor não é válido para o tipo de código de barras selecionado</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Quero partilhar alguns cartões</string>
+    <string name="photos">Fotografias</string>
+    <string name="setFrontImage">Definir imagem frontal</string>
+    <string name="setBackImage">Definir imagem de trás</string>
+    <string name="removeImage">Remover imagem</string>
+    <string name="takePhoto">Tirar uma fotografia</string>
+    <string name="updateBarcodeQuestionTitle">Atualizar o valor do código de barras\?</string>
+    <string name="yes">Sim</string>
+    <string name="no">Não</string>
+    <string name="passwordRequired">Introduza a palavra-passe</string>
+    <string name="exportPassword">Defina uma palavra-passe para proteger a exportação (opcional)</string>
+    <string name="exportPasswordHint">Digite a palavra-passe</string>
+    <string name="failedGeneratingShareURL">Não foi possível gerar uma URL partilhável. Por favor reporte isto aos programadores.</string>
+    <string name="turn_flashlight_on">Ligar lanterna</string>
+    <string name="turn_flashlight_off">Desligar lanterna</string>
+    <string name="settings_locale">Idioma</string>
+    <string name="settings_system_locale">Sistema</string>
+    <string name="selectColor">Selecionar cor</string>
+    <string name="setIcon">Definir ícone</string>
+    <string name="settings_violet_theme">Violeta</string>
+    <string name="settings_blue_theme">Azul</string>
+    <string name="settings_sky_blue_theme">Azul céu</string>
+    <string name="settings_green_theme">Verde</string>
+    <string name="settings_grey_theme">Cinzento</string>
+    <string name="settings_brown_theme">Castanho</string>
+    <string name="app_contributors">Tornado possível por: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="sort">Ordenar</string>
+    <string name="swipeToSwitchImages">Deslize ou pressione prolongadamente para mudar as imagens</string>
+    <string name="sort_by_name">Nome</string>
+    <string name="sort_by_most_recently_used">Mais usados recentemente</string>
+    <string name="sort_by_expiry">Validade</string>
+    <string name="sort_by_balance">Saldo</string>
+    <string name="sort_by">Ordenar por</string>
+    <string name="version_history">Histórico de versões</string>
+    <string name="credits">Créditos</string>
+    <string name="help_translate_this_app">Ajude a traduzir esta aplicação</string>
+    <string name="license">Licença</string>
+    <string name="source_repository">Repositório do código-fonte</string>
+    <string name="on_github">no GitHub</string>
+    <string name="and_data_usage">e utilização de dados</string>
+    <string name="rate_this_app">Avalie esta aplicação</string>
+    <string name="on_google_play">no Google Play</string>
+    <string name="report_error">Reportar erro</string>
+    <string name="translate_platform">no Weblate</string>
+    <plurals name="deleteCardsTitle">
+        <item quantity="one">Eliminar <xliff:g>%d</xliff:g> cartão</item>
+        <item quantity="other">Eliminar <xliff:g>%d</xliff:g> cartões</item>
+    </plurals>
+    <plurals name="deleteCardsConfirmation">
+        <item quantity="one">Eliminar o cartão <xliff:g>%d</xliff:g> permanentemente\?</item>
+        <item quantity="other">Eliminar os cartões <xliff:g>%d</xliff:g> permanentemente\?</item>
+    </plurals>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> cartão</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> cartões</item>
+    </plurals>
+    <string name="action_search">Pesquisa</string>
+    <string name="action_add">Acrescentar</string>
+    <string name="storeName">Nome</string>
+    <string name="note">Nota</string>
+    <string name="cardId">Identificador do cartão</string>
+    <string name="barcodeType">Tipo de código de barras</string>
+    <string name="noBarcode">Sem código de barras</string>
+    <string name="star">Adicionar aos favoritos</string>
+    <string name="unstar">Retirar dos favoritos</string>
+    <string name="cancel">Cancelar</string>
+    <string name="save">Guardar</string>
+    <string name="edit">Editar</string>
+    <string name="delete">Eliminar</string>
+    <string name="confirm">Confirmar</string>
+    <string name="importing">A importar…</string>
+    <string name="exporting">A exportar…</string>
+    <string name="exportOptionExplanation">Os dados serão guardados num local à sua escolha.</string>
+    <string name="importOptionFilesystemTitle">Importar do sistema de ficheiros</string>
+    <string name="importOptionFilesystemButton">Do sistema de ficheiros</string>
+    <string name="intent_import_card_from_url_share_text">Quero partilhar um cartão</string>
+    <string name="enter_group_name">Introduza o nome do grupo</string>
+    <string name="groups">Grupos</string>
+    <string name="group_edit">Editar grupo</string>
+    <string name="group_name_already_in_use">O nome do grupo já está a ser usado</string>
+    <string name="points">Pontos</string>
+    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> não parece ser um saldo válido.</string>
+    <string name="chooseImportType">De onde importar os dados\?</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="privacy_policy">Política de privacidade</string>
+    <string name="settings_theme_color">Cor do tema</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">Rosa</string>
+    <string name="settings_magenta_theme">Magenta</string>
+</resources>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -112,7 +112,7 @@
    <string name="photos">Fotografias</string>
    <string name="passwordRequired">Introduza a palavra-passe</string>
    <string name="settings_green_theme">Verde</string>
-    <string name="settings_grey_theme">Cinza</string>
+    <string name="settings_grey_theme">Cinzento</string>
    <string name="settings_brown_theme">Castanho</string>
    <string name="updateBarcodeQuestionTitle">Atualizar o valor do código de barras\?</string>
    <string name="updateBarcodeQuestionText">Alterou a identificação do cartão. Também quer atualizar o código de barras para usar o mesmo valor\?</string>
@@ -180,7 +180,6 @@
    <string name="settings_blue_theme">Azul</string>
    <string name="app_contributors">Tornado possível por: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="sort">Ordenar</string>
-    <string name="toggleMoreInfo">Alternar mostrar mais informação</string>
    <string name="swipeToSwitchImages">Deslize ou pressione prolongadamente para mudar as imagens</string>
    <string name="sort_by_name">Nome</string>
    <string name="sort_by_most_recently_used">Mais usados recentemente</string>
@@ -220,4 +219,6 @@
    <string name="setIcon">Definir ícone</string>
    <string name="action_show_details">Mostrar detalhes</string>
    <string name="action_hide_details">Ocultar detalhes</string>
+    <string name="shortcutSelectCard">Selecione um cartão</string>
+    <string name="translate_platform">no Weblate</string>
 </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -197,7 +197,6 @@
    <string name="app_contributors">Создано при поддержке: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="noGroupCards">Группа пуста</string>
    <string name="barcodeImageDescriptionWithType">Изображение штрих-кода <xliff:g>%s</xliff:g></string>
-    <string name="toggleMoreInfo">Переключение отображения дополнительной информации</string>
    <string name="swipeToSwitchImages">Смахивание или долгое нажатие для переключения изображений</string>
    <string name="sort_by_expiry">Срок действия</string>
    <string name="sort_by">Сортировать по</string>
@@ -230,4 +229,9 @@
    <string name="action_show_details">Показать детали</string>
    <string name="translate_platform">на Weblate</string>
    <string name="shortcutSelectCard">Выбор карты</string>
+    <string name="options">Параметры</string>
+    <string name="set_scale">Выбор масштаба</string>
+    <string name="hideMoreInfo">Скрыть данные</string>
+    <string name="showMoreInfo">Показать данные</string>
+    <string name="starred">Избранное</string>
 </resources>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -188,7 +188,6 @@
    <string name="settings_catima_theme">Catima</string>
    <string name="settings_theme_color">Temafärg</string>
    <string name="noGroupCards">Denna grupp är tom</string>
-    <string name="toggleMoreInfo">Växla mellan att visa mer info</string>
    <string name="barcodeImageDescriptionWithType">Bild <xliff:g>%s</xliff:g> streckkod</string>
    <string name="swipeToSwitchImages">Svep eller tryck länge för att växla bild</string>
    <string name="reverse">...i omvänd ordning</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
    <string name="swipeToSwitchImages">Resimler arasında geçiş yapmak için kaydırın veya uzun basın</string>
-    <string name="toggleMoreInfo">Daha fazla bilgi göstermeyi aç/kapat</string>
    <string name="app_contributors">Katkıda bulunanlar: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="settings_brown_theme">Kahverengi</string>
    <string name="settings_grey_theme">Gri</string>
@@ -222,4 +221,9 @@
    <string name="action_hide_details">Ayrıntıları gizle</string>
    <string name="translate_platform">Weblate\'de</string>
    <string name="shortcutSelectCard">Kart seç</string>
+    <string name="options">Seçenekler</string>
+    <string name="showMoreInfo">Bilgileri göster</string>
+    <string name="hideMoreInfo">Bilgileri gizle</string>
+    <string name="starred">Yıldızlı</string>
+    <string name="set_scale">Ölçeği ayarla</string>
 </resources>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -196,7 +196,6 @@
    <string name="settings_sky_blue_theme">Небесно-синій</string>
    <string name="app_contributors">Стало можливим завдяки: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="noGroupCards">Пуста група</string>
-    <string name="toggleMoreInfo">Показувати додаткову інформацію</string>
    <string name="barcodeImageDescriptionWithType">Зображення штрих-коду <xliff:g>%s</xliff:g></string>
    <string name="swipeToSwitchImages">Свайп чи довге натискання для зміни зображень</string>
    <string name="sort_by">Сортувати за</string>
@@ -229,4 +228,6 @@
    <string name="action_show_details">Показати деталі</string>
    <string name="action_hide_details">Сховати деталі</string>
    <string name="translate_platform">на Weblate</string>
+    <string name="shortcutSelectCard">Оберіть карту</string>
+    <string name="options">Параметри</string>
 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -201,7 +201,6 @@
    <string name="backImageDescription">卡片 (背面)</string>
    <string name="updateBarcodeQuestionText">您已更新了條碼 ID，是否要更新條碼內容以匹配此 ID？</string>
    <string name="failedGeneratingShareURL">無法建立可分享的 URL，請回報此錯誤。</string>
-    <string name="toggleMoreInfo">切換顯示更多內容</string>
    <string name="swipeToSwitchImages">滑動或長按以切換圖片</string>
    <string name="starImage">收藏標示</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -235,7 +235,8 @@
    <string name="settings_key_brown_theme" translatable="false">brown_theme</string>
    <string name="app_contributors">Made possible by: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="sort">Sort</string>
-    <string name="toggleMoreInfo">Toggle showing more info</string>
+    <string name="showMoreInfo">Show info</string>
+    <string name="hideMoreInfo">Hide info</string>
    <string name="swipeToSwitchImages">Swipe or long press to switch images</string>
    <string name="sort_by_name">Name</string>
    <string name="sort_by_most_recently_used">Most Recently Used</string>
@@ -259,4 +260,7 @@
    <string name="action_hide_details">Hide details</string>
    <string name="translate_platform">on Weblate</string>
    <string name="shortcutSelectCard">Select a card</string>
+    <string name="options">Options</string>
+    <string name="starred">Starred</string>
+    <string name="set_scale">Set scale</string>
 </resources>
--- a/fastlane/metadata/android/bg/title.txt
+++ b/fastlane/metadata/android/bg/title.txt
@@ -0,0 +1 @@
+Catima
--- a/fastlane/metadata/android/cs_CZ/title.txt
+++ b/fastlane/metadata/android/cs_CZ/title.txt
@@ -0,0 +1 @@
+Catima
--- a/fastlane/metadata/android/en-US/changelogs/96.txt
+++ b/fastlane/metadata/android/en-US/changelogs/96.txt
@@ -1 +1,2 @@
- Add CODE 93 support
+- Add CODE 93 support
+- Various minor bugfixes and improvements
--- a/fastlane/metadata/android/en-US/changelogs/97.txt
+++ b/fastlane/metadata/android/en-US/changelogs/97.txt
@@ -0,0 +1,4 @@
+- Fixed pressing the save button multiple times creating multiple entries
+- Lower card header size when hiding details to fit even more cards
+- Restructure edit screen
+- Improve star icon contrast in main view
--- a/fastlane/metadata/android/en-US/changelogs/98.txt
+++ b/fastlane/metadata/android/en-US/changelogs/98.txt
@@ -0,0 +1 @@
+- Fix various TalkBack-related bugs
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png
--- a/fastlane/metadata/android/es-ES/title.txt
+++ b/fastlane/metadata/android/es-ES/title.txt
@@ -1 +1 @@
-Catima — La Billetera Open Source para Tarjetas
+Catima
--- a/fastlane/metadata/android/fi-FI/title.txt
+++ b/fastlane/metadata/android/fi-FI/title.txt
@@ -1 +1 @@
-Catima — Open Source korttilompakko
+Catima
--- a/fastlane/metadata/android/fr-FR/changelogs/94.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/94.txt
@@ -0,0 +1,3 @@
+- Correction du flou des lettres sur les icônes de l'écran principal
+- Correction des icônes disparaissant parfois après sélection
+- Correction des icônes de la barre d'état pouvant être invisibles sous Android 5
--- a/fastlane/metadata/android/fr-FR/changelogs/95.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/95.txt
@@ -0,0 +1 @@
+- Correction du plantage lors du partage de carte
--- a/fastlane/metadata/android/fr-FR/changelogs/96.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/96.txt
@@ -1 +1,2 @@
 - Ajoute la prise en charge de CODE 93
+- Diverses corrections de bogues et améliorations mineures
--- a/fastlane/metadata/android/fr-FR/changelogs/97.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/97.txt
@@ -0,0 +1,4 @@
+- Correction de l'appui répété sur le bouton d'enregistrement créant des entrées multiples
+- Diminution de la taille de l'en-tête de la carte lorsque les détails sont masqués, afin de pouvoir afficher encore plus de cartes
+- Restructuration de l'écran d'édition
+- Amélioration du contraste de l'icône étoile dans la vue principale
--- a/fastlane/metadata/android/lt/title.txt
+++ b/fastlane/metadata/android/lt/title.txt
@@ -0,0 +1 @@
+Catima
--- a/fastlane/metadata/android/nb-NO/changelogs/49.txt
+++ b/fastlane/metadata/android/nb-NO/changelogs/49.txt
@@ -0,0 +1,2 @@
+- Forbedrede oversettelser
+- Små grensesnittsfikser
--- a/fastlane/metadata/android/nb-NO/title.txt
+++ b/fastlane/metadata/android/nb-NO/title.txt
@@ -1 +1 @@
-Catima — for kundekort, billetter og kuponger
+Catima
--- a/fastlane/metadata/android/pt-PT/title.txt
+++ b/fastlane/metadata/android/pt-PT/title.txt
@@ -0,0 +1 @@
+Catima
--- a/fastlane/metadata/android/sv-SE/title.txt
+++ b/fastlane/metadata/android/sv-SE/title.txt
@@ -1 +1 @@
-Catima — Kortplånboken med öppen källkod
+Catima
--- a/fastlane/metadata/android/tr-TR/changelogs/20.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/20.txt
@@ -0,0 +1 @@
+- Bazı Android sürümlerinde (muhtemelen Android 5 ve altı) kurulum sırasında çökmeye geçici çözüm. (https://github.com/brarcher/loyalty-card-locker/pull/184)
--- a/fastlane/metadata/android/tr-TR/changelogs/28.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/28.txt
@@ -0,0 +1,5 @@
+- Eklenen çeviriler:
+  - Lehçe (https://github.com/brarcher/loyalty-card-locker/pull/232)
+  - İspanyolca (https://github.com/brarcher/loyalty-card-locker/pull/232)
+  - Slovakça (https://github.com/brarcher/loyalty-card-locker/pull/232)
+- Çeviriler güncellendi (https://github.com/brarcher/loyalty-card-locker/pull/239)
--- a/fastlane/metadata/android/tr-TR/changelogs/29.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/29.txt
@@ -0,0 +1,2 @@
+- İspanyolca çeviriler düzeltildi (https://github.com/brarcher/loyalty-card-locker/pull/244)
+- Çeviriler güncellendi (https://github.com/brarcher/loyalty-card-locker/pull/244)
--- a/fastlane/metadata/android/tr-TR/changelogs/3.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/3.txt
@@ -0,0 +1,14 @@
+- Artık aşağıdaki 1B ve 2B barkodlar resmi olarak destekleniyor:
+  - AZTEC
+  - CODABAR
+  - CODE_39
+  - CODE_128
+  - DATA_MATRIX
+  - EAN_8
+  - EAN_13
+  - ITF
+  - PDF_417
+  - QR_CODE
+  - UPC_A
+
+- Oluşturulan barkodlar daha büyük, bir tarama aygıtından taranması daha kolay
--- a/fastlane/metadata/android/tr-TR/changelogs/32.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/32.txt
@@ -0,0 +1 @@
+- Barkodu elle girerek yeni kart oluşturma düzeltildi (https://github.com/brarcher/loyalty-card-locker/issues/272)
--- a/fastlane/metadata/android/tr-TR/changelogs/33.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/33.txt
@@ -0,0 +1 @@
+- Çeviriler güncellendi ve yenileri eklendi
--- a/fastlane/metadata/android/tr-TR/changelogs/34.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/34.txt
@@ -0,0 +1 @@
+- Rusça çeviriler güncellendi
--- a/fastlane/metadata/android/tr-TR/changelogs/35.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/35.txt
@@ -0,0 +1,2 @@
+- Uygulama yedeklemeleri etkinleştirildi
+- Fransızca ve Slovence çeviriler güncellendi
--- a/fastlane/metadata/android/tr-TR/changelogs/37.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/37.txt
@@ -0,0 +1 @@
+- Arka plan rengi olmayan kartları paylaşma sorunu düzeltildi (https://github.com/brarcher/loyalty-card-locker/pull/343)
--- a/fastlane/metadata/android/tr-TR/changelogs/42.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/42.txt
@@ -0,0 +1 @@
+- Grup olmadan aramada çökme düzeltildi
--- a/fastlane/metadata/android/tr-TR/changelogs/43.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/43.txt
@@ -0,0 +1,3 @@
+- Düzenleme arayüzü iyileştirildi
+- Başlık metni rengi seçeneği kaldırıldı (artık parlaklığa göre otomatik olarak oluşturuluyor)
+- Çeviriler güncellendi
--- a/fastlane/metadata/android/tr-TR/changelogs/46.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/46.txt
@@ -0,0 +1 @@
+- Ekranlar ve oturumlar arasında etkin grup sekmesini hatırla
--- a/fastlane/metadata/android/tr-TR/changelogs/49.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/49.txt
@@ -0,0 +1,2 @@
+- Çeviriler iyileştirildi
+- Küçük kullanıcı arayüzü düzeltmeleri
--- a/fastlane/metadata/android/tr-TR/changelogs/58.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/58.txt
@@ -0,0 +1 @@
+- Android 7'den önceki sürümlerde çökme düzeltildi
--- a/fastlane/metadata/android/tr-TR/changelogs/59.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/59.txt
@@ -0,0 +1,2 @@
+- Bakiye desteği eklendi
+- Düzenleme görünümünün barkod sekmesi yeniden düzenlendi
--- a/fastlane/metadata/android/tr-TR/changelogs/61.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/61.txt
@@ -0,0 +1,2 @@
+- Bakiye ayrıştırma mantığı iyileştirildi
+- Ana ekranda para birimi ondalık gösterimi düzeltildi
--- a/fastlane/metadata/android/tr-TR/changelogs/62.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/62.txt
@@ -0,0 +1 @@
+- Ayırıcı olarak boşluk kullanan ülkeler için bakiye ayrıştırma düzeltildi
--- a/fastlane/metadata/android/tr-TR/changelogs/71.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/71.txt
@@ -0,0 +1,2 @@
+- Birkaç küçük çeviri ve kullanıcı arayüzü düzeltmesi
+- Android 6'da kart içe aktarma/paylaşmada çökme düzeltildi
--- a/fastlane/metadata/android/tr-TR/changelogs/73.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/73.txt
@@ -0,0 +1 @@
+- Mevcut kartı düzenlerken fotoğraf yükleme düzeltildi
--- a/fastlane/metadata/android/tr-TR/changelogs/96.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/96.txt
@@ -1 +1,2 @@
 - CODE 93 desteği eklendi
+- Çeşitli küçük hata düzeltmeleri ve iyileştirmeler
--- a/fastlane/metadata/android/tr-TR/changelogs/97.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/97.txt
@@ -0,0 +1,4 @@
+- Kaydet düğmesine birden çok basmanın yeni girdiler oluşturması düzeltildi
+- Ayrıntıları gizlerken daha da fazla kart sığdırmak için daha kart başlığı boyutu azaltıldı
+- Düzenleme ekranı yeniden yapılandırıldı
+- Ana görünümde yıldız simgesi karşıtlığı iyileştirildi
--- a/fastlane/metadata/android/tr-TR/changelogs/98.txt
+++ b/fastlane/metadata/android/tr-TR/changelogs/98.txt
@@ -0,0 +1 @@
+- TalkBack ile ilgili çeşitli hatalar düzeltildi
--- a/fastlane/metadata/android/tr-TR/title.txt
+++ b/fastlane/metadata/android/tr-TR/title.txt
@@ -1 +1 @@
-Catima — Özgürce Kart Cüzdanı
+Catima
--- a/fastlane/metadata/android/uk/title.txt
+++ b/fastlane/metadata/android/uk/title.txt
@@ -1 +1 @@
-Catima — Libre гаман для карт
+Catima — гаман для карт
				`@@ -0,0 +1 @@`
				`- Correction du plantage lors du partage de carte`
				`@@ -0,0 +1 @@`
				`- Bazı Android sürümlerinde (muhtemelen Android 5 ve altı) kurulum sırasında çökmeye geçici çözüm. (https://github.com/brarcher/loyalty-card-locker/pull/184)`
				`@@ -0,0 +1 @@`
				`- Barkodu elle girerek yeni kart oluşturma düzeltildi (https://github.com/brarcher/loyalty-card-locker/issues/272)`
				`@@ -0,0 +1 @@`
				`- Çeviriler güncellendi ve yenileri eklendi`
				`@@ -0,0 +1 @@`
				`- Arka plan rengi olmayan kartları paylaşma sorunu düzeltildi (https://github.com/brarcher/loyalty-card-locker/pull/343)`
				`@@ -0,0 +1 @@`
				`- Ekranlar ve oturumlar arasında etkin grup sekmesini hatırla`
				`@@ -0,0 +1 @@`
				`- Android 7'den önceki sürümlerde çökme düzeltildi`
				`@@ -0,0 +1 @@`
				`- Ayırıcı olarak boşluk kullanan ülkeler için bakiye ayrıştırma düzeltildi`
				`@@ -0,0 +1 @@`
				`- Mevcut kartı düzenlerken fotoğraf yükleme düzeltildi`
				`@@ -0,0 +1 @@`
				`- TalkBack ile ilgili çeşitli hatalar düzeltildi`