Release Catima 2.16.0

Fix extreme padding on some barcode types
Merge pull request #834 from CatimaLoyalty/create-pull-request/patch-1646770776
2025-12-24 23:57:53 -05:00 · 2022-03-09 19:27:08 +01:00 · 2022-03-09 19:07:19 +01:00 · 2022-03-08 21:20:24 +01:00 · 2022-03-08 20:19:35 +00:00 · 2022-03-08 20:13:56 +00:00
167 changed files with 515 additions and 401 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog

+## v2.16.0 - 104 (2022-03-09)
+
+- Save card detail expansion state
+- Minor UI fixes
+
+## v2.15.2 - 103 (2022-02-11)
+
+- Fix manual language selection not applying everywhere
+- Fix crash in edit view on regionless locale
+
+## v2.15.1 - 102 (2022-02-10)
+
+- Various minor fixes
+- Fix crash when using Norwegian translation
+
 ## v2.15.0 - 101 (2022-02-06)

 - Fix cropper not using theme colour
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,8 @@ android {
        applicationId "me.hackerchick.catima"
        minSdkVersion 21
        targetSdkVersion 31
-        versionCode 101
-        versionName "2.15.0"
+        versionCode 104
+        versionName "2.16.0"

        vectorDrawables.useSupportLibrary true
        multiDexEnabled true
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -134,7 +134,5 @@
                <action android:name="android.service.controls.ControlsProviderService" />
            </intent-filter>
        </service>
-
    </application>
-
 </manifest>
--- a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
+++ b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
@@ -5,6 +5,7 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -46,7 +47,7 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
    BarcodeImageWriterTask(
            Context context, ImageView imageView, String cardIdString,
            CatimaBarcode barcodeFormat, TextView textView,
-            boolean showFallback, Runnable callback
+            boolean showFallback, Runnable callback, boolean roundCornerPadding
    ) {
        mContext = context;

@@ -60,18 +61,32 @@ public class BarcodeImageWriterTask implements CompatCallable<Bitmap> {
        cardId = cardIdString;
        format = barcodeFormat;

+        int padding = 0;
+        // Some barcodes already have internal whitespace and shouldn't get extra padding
+        // TODO: Get rid of this hack by somehow detecting this extra whitespace
+        if (roundCornerPadding && !barcodeFormat.hasInternalPadding()) {
+            padding = Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, context.getResources().getDisplayMetrics()));
+        }
+
        final int MAX_WIDTH = getMaxWidth(format);

+        int tempImageHeight;
+        int tempImageWidth;
+
        if (imageView.getWidth() < MAX_WIDTH) {
-            imageHeight = imageView.getHeight();
-            imageWidth = imageView.getWidth();
+            tempImageHeight = imageView.getHeight();
+            tempImageWidth = imageView.getWidth();
        } else {
            // Scale down the image to reduce the memory needed to produce it
-            imageWidth = MAX_WIDTH;
+            tempImageWidth = MAX_WIDTH;
            double ratio = (double) MAX_WIDTH / (double) imageView.getWidth();
-            imageHeight = (int) (imageView.getHeight() * ratio);
+            tempImageHeight = (int) (imageView.getHeight() * ratio);
        }

+        // Ensure space for padding if wanted
+        imageWidth = tempImageWidth;
+        imageHeight = tempImageHeight - padding;
+
        this.showFallback = showFallback;
    }

--- a/app/src/main/java/protect/card_locker/BarcodeSelectorAdapter.java
+++ b/app/src/main/java/protect/card_locker/BarcodeSelectorAdapter.java
@@ -76,6 +76,7 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>
        final CatimaBarcode format = CatimaBarcode.fromName(formatType);

        image.setImageBitmap(null);
+        image.setClipToOutline(true);

        if (image.getHeight() == 0) {
            // The size of the ImageView is not yet available as it has not
@@ -89,13 +90,13 @@ public class BarcodeSelectorAdapter extends ArrayAdapter<CatimaBarcodeWithValue>

                            Log.d(TAG, "Generating barcode for type " + formatType);

-                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true);
                            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
                        }
                    });
        } else {
            Log.d(TAG, "Generating barcode for type " + formatType);
-            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getContext(), image, cardId, format, text, true, null, true);
            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
        }
    }
--- a/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
+++ b/app/src/main/java/protect/card_locker/CardShortcutConfigure.java
@@ -4,6 +4,8 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.widget.Toast;

 import androidx.appcompat.app.AppCompatActivity;
@@ -16,9 +18,10 @@ import androidx.recyclerview.widget.RecyclerView;
 /**
 * The configuration screen for creating a shortcut.
 */
-public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
+public class CardShortcutConfigure extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener {
    static final String TAG = "Catima";
    private SQLiteDatabase mDatabase;
+    private LoyaltyCardCursorAdapter mAdapter;

    @Override
    public void onCreate(Bundle bundle) {
@@ -33,6 +36,7 @@ public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyC
        setContentView(R.layout.simple_toolbar_list_activity);
        Toolbar toolbar = findViewById(R.id.toolbar);
        toolbar.setTitle(R.string.shortcutSelectCard);
+        setSupportActionBar(toolbar);

        // If there are no cards, bail
        if (DBHelper.getLoyaltyCardCount(mDatabase) == 0) {
@@ -47,8 +51,8 @@ public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyC
        }

        Cursor cardCursor = DBHelper.getLoyaltyCardCursor(mDatabase);
-        final LoyaltyCardCursorAdapter adapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
-        cardList.setAdapter(adapter);
+        mAdapter = new LoyaltyCardCursorAdapter(this, cardCursor, this);
+        cardList.setAdapter(mAdapter);
    }

    private void onClickAction(int position) {
@@ -65,6 +69,26 @@ public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyC
        finish();
    }

+    @Override
+    public boolean onCreateOptionsMenu(Menu inputMenu) {
+        getMenuInflater().inflate(R.menu.card_details_menu, inputMenu);
+        Utils.updateMenuCardDetailsButtonState(inputMenu.findItem(R.id.action_unfold), mAdapter.showingDetails());
+        return super.onCreateOptionsMenu(inputMenu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem inputItem) {
+        int id = inputItem.getItemId();
+
+        if (id == R.id.action_unfold) {
+            mAdapter.showDetails(!mAdapter.showingDetails());
+            invalidateOptionsMenu();
+
+            return true;
+        }
+
+        return super.onOptionsItemSelected(inputItem);
+    }

    @Override
    public void onRowClicked(int inputPosition) {
--- a/app/src/main/java/protect/card_locker/CatimaBarcode.java
+++ b/app/src/main/java/protect/card_locker/CatimaBarcode.java
@@ -72,6 +72,11 @@ public class CatimaBarcode {
                || mBarcodeFormat == BarcodeFormat.QR_CODE;
    }

+    public boolean hasInternalPadding() {
+        return mBarcodeFormat == BarcodeFormat.PDF_417
+                || mBarcodeFormat == BarcodeFormat.QR_CODE;
+    }
+
    public BarcodeFormat format() {
        return mBarcodeFormat;
    }
--- a/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
@@ -15,7 +15,7 @@ import protect.card_locker.preferences.Settings;

 public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.GroupListItemViewHolder> {
    Settings mSettings;
-    private final Context mContext;
+    public final Context mContext;
    private final GroupAdapterListener mListener;
    SQLiteDatabase mDatabase;

@@ -23,7 +23,7 @@ public class GroupCursorAdapter extends BaseCursorAdapter<GroupCursorAdapter.Gro
        super(inputCursor, DBHelper.LoyaltyCardDbGroups.ORDER);
        setHasStableIds(true);
        mSettings = new Settings(inputContext);
-        mContext = inputContext.getApplicationContext();
+        mContext = inputContext;
        mListener = inputListener;
        mDatabase = new DBHelper(inputContext).getReadableDatabase();

--- a/app/src/main/java/protect/card_locker/LetterBitmap.java
+++ b/app/src/main/java/protect/card_locker/LetterBitmap.java
@@ -10,6 +10,9 @@ import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.text.TextPaint;
+import android.util.Log;
+
+import androidx.core.graphics.PaintCompat;

 /**
 * Original from https://github.com/andOTP/andOTP/blob/master/app/src/main/java/org/shadowice/flocke/andotp/Utilities/LetterBitmap.java
@@ -48,7 +51,6 @@ class LetterBitmap {
    public LetterBitmap(Context context, String displayName, String key, int tileLetterFontSize,
                        int width, int height, Integer backgroundColor, Integer textColor) {
        TextPaint paint = new TextPaint();
-        paint.setTypeface(Typeface.create("sans-serif-light", Typeface.BOLD));

        if (textColor != null) {
            paint.setColor(textColor);
@@ -58,6 +60,8 @@ class LetterBitmap {

        paint.setTextAlign(Paint.Align.CENTER);
        paint.setAntiAlias(true);
+        paint.setTextSize(tileLetterFontSize);
+        paint.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));

        if (backgroundColor == null) {
            mColor = getDefaultColor(context, key);
@@ -66,22 +70,30 @@ class LetterBitmap {
        }

        mBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-        String firstChar = displayName.substring(0, 1);
+        String firstChar = displayName.substring(0, 1).toUpperCase();
+        int firstCharEnd = 2;
+        while (firstCharEnd <= displayName.length()) {
+            // test for the longest render-able string
+            String test = displayName.substring(0, firstCharEnd);
+            if (PaintCompat.hasGlyph(paint, test)) {
+                firstChar = test;
+            }
+            firstCharEnd++;
+        }
+
+        Log.d("LetterBitmap", "using sequence " + firstChar + " to render first char which has length " + firstChar.length());

        final Canvas c = new Canvas();
        c.setBitmap(mBitmap);
        c.drawColor(mColor);

-        char[] firstCharArray = new char[1];
-        firstCharArray[0] = firstChar.toUpperCase().charAt(0);
-        paint.setTextSize(tileLetterFontSize);
-
-        // The bounds that enclose the letter
        Rect bounds = new Rect();
+        paint.getTextBounds(firstChar, 0, firstChar.length(), bounds);
+        c.drawText(firstChar,
+                0, firstChar.length(),
+                width / 2.0f, (height - (bounds.bottom + bounds.top)) / 2.0f
+                , paint);

-        paint.getTextBounds(firstCharArray, 0, 1, bounds);
-        c.drawText(firstCharArray, 0, 1, width / 2.0f, height / 2.0f
-                + (bounds.bottom - bounds.top) / 2.0f, paint);
    }

    /**
--- a/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java
@@ -1,6 +1,7 @@
 package protect.card_locker;

 import android.content.Context;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -35,30 +36,48 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
    private int mCurrentSelectedIndex = -1;
    Settings mSettings;
    boolean mDarkModeEnabled;
-    private final Context mContext;
+    public final Context mContext;
    private final CardAdapterListener mListener;
    protected SparseBooleanArray mSelectedItems;
    protected SparseBooleanArray mAnimationItemsIndex;
    private boolean mReverseAllAnimations = false;
-    private boolean mShowDetails = true;
+    private boolean mShowDetails;

    public LoyaltyCardCursorAdapter(Context inputContext, Cursor inputCursor, CardAdapterListener inputListener) {
        super(inputCursor, DBHelper.LoyaltyCardDbIds.ID);
        setHasStableIds(true);
        mSettings = new Settings(inputContext);
-        mContext = inputContext.getApplicationContext();
+        mContext = inputContext;
        mListener = inputListener;
        mSelectedItems = new SparseBooleanArray();
        mAnimationItemsIndex = new SparseBooleanArray();

        mDarkModeEnabled = Utils.isDarkModeEnabled(inputContext);

+        refreshState();
+
        swapCursor(inputCursor);
    }

+    public void refreshState() {
+        // Retrieve user details preference
+        SharedPreferences cardDetailsPref = mContext.getSharedPreferences(
+                mContext.getString(R.string.sharedpreference_card_details),
+                Context.MODE_PRIVATE);
+        mShowDetails = cardDetailsPref.getBoolean(mContext.getString(R.string.sharedpreference_card_details_show), true);
+    }
+
    public void showDetails(boolean show) {
        mShowDetails = show;
        notifyDataSetChanged();
+
+        // Store in Shared Preference to restore next adapter launch
+        SharedPreferences cardDetailsPref = mContext.getSharedPreferences(
+                mContext.getString(R.string.sharedpreference_card_details),
+                Context.MODE_PRIVATE);
+        SharedPreferences.Editor cardDetailsPrefEditor = cardDetailsPref.edit();
+        cardDetailsPrefEditor.putBoolean(mContext.getString(R.string.sharedpreference_card_details_show), show);
+        cardDetailsPrefEditor.apply();
    }

    public boolean showingDetails() {
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -323,6 +323,7 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
        barcodeIdField = findViewById(R.id.barcodeIdField);
        barcodeTypeField = findViewById(R.id.barcodeTypeField);
        barcodeImage = findViewById(R.id.barcode);
+        barcodeImage.setClipToOutline(true);
        barcodeImageLayout = findViewById(R.id.barcodeLayout);
        barcodeCaptureLayout = findViewById(R.id.barcodeCaptureLayout);
        cardImageFrontHolder = findViewById(R.id.frontImageHolder);
@@ -448,14 +449,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {

                    for (int i = locales.size() - 1; i >= 0; i--) {
                        Locale locale = locales.get(i);
-                        String currencySymbol = Currency.getInstance(locale).getSymbol();
-                        currencyList.remove(currencySymbol);
-                        currencyList.add(0, currencySymbol);
+                        currencyPrioritizeLocaleSymbols(currencyList, locale);
                    }
                } else {
-                    String currencySymbol = Currency.getInstance(mSystemLocale).getSymbol();
-                    currencyList.remove(currencySymbol);
-                    currencyList.add(0, currencySymbol);
+                    currencyPrioritizeLocaleSymbols(currencyList, mSystemLocale);
                }

                currencyList.add(0, getString(R.string.points));
@@ -1453,13 +1450,13 @@ 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, barcodeImageGenerationFinishedCallback);
+                            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback, true);
                            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, barcodeImageGenerationFinishedCallback);
+            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(getApplicationContext(), barcodeImage, cardIdString, barcodeFormat, null, false, barcodeImageGenerationFinishedCallback, true);
            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
        }
    }
@@ -1513,4 +1510,14 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
            throw new UnsupportedOperationException();
        }
    }
+
+    private void currencyPrioritizeLocaleSymbols(ArrayList<String> currencyList, Locale locale) {
+        try {
+            String currencySymbol = Currency.getInstance(locale).getSymbol();
+            currencyList.remove(currencySymbol);
+            currencyList.add(0, currencySymbol);
+        } catch (IllegalArgumentException e) {
+            Log.d(TAG, "Could not get currency data for locale info: " + e);
+        }
+    }
 }
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -278,6 +278,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        storeName = findViewById(R.id.storeName);
        maximizeButton = findViewById(R.id.maximizeButton);
        mainImage = findViewById(R.id.mainImage);
+        mainImage.setClipToOutline(true);
        dotIndicator = findViewById(R.id.dotIndicator);
        minimizeButton = findViewById(R.id.minimizeButton);
        collapsingToolbarLayout = findViewById(R.id.collapsingToolbarLayout);
@@ -304,7 +305,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements

                setCenterGuideline(loyaltyCard.zoomLevel);

-                drawMainImage(mainImageIndex, true);
+                drawMainImage(mainImageIndex, true, isFullscreen);
            }

            @Override
@@ -400,7 +401,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements

    private void adjustLayoutHeights() {
        // use getLayoutParams instead of getHeight when heights are pre-determined in xml! getHeight could return 0 if a View is not inflated
-        if (iconImage.getLayoutParams().height != appBarLayout.getHeight()) {
+        if (appBarLayout.getHeight() != 0 && iconImage.getLayoutParams().height != appBarLayout.getHeight()) {
            Log.d("adjustLayoutHeights", "setting imageIcon height from: " + iconImage.getLayoutParams().height + " to: " + appBarLayout.getHeight());
            iconImage.setLayoutParams(new CoordinatorLayout.LayoutParams(
                    CoordinatorLayout.LayoutParams.MATCH_PARENT, appBarLayout.getHeight())
@@ -807,7 +808,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        }
    }

-    private void drawBarcode() {
+    private void drawBarcode(boolean addPadding) {
        mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
        if (format != null) {
            BarcodeImageWriterTask barcodeWriter = new BarcodeImageWriterTask(
@@ -817,12 +818,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                    format,
                    null,
                    false,
-                    null);
+                    null,
+                    addPadding);
            mTasks.executeTask(TaskHandler.TYPE.BARCODE, barcodeWriter);
        }
    }

-    private void redrawBarcodeAfterResize() {
+    private void redrawBarcodeAfterResize(boolean addPadding) {
        if (format != null) {
            mainImage.getViewTreeObserver().addOnGlobalLayoutListener(
                    new ViewTreeObserver.OnGlobalLayoutListener() {
@@ -831,13 +833,13 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                            mainImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);

                            Log.d(TAG, "ImageView size now known");
-                            drawBarcode();
+                            drawBarcode(addPadding);
                        }
                    });
        }
    }

-    private void drawMainImage(int index, boolean waitForResize) {
+    private void drawMainImage(int index, boolean waitForResize, boolean isFullscreen) {
        if (imageTypes.isEmpty()) {
            mainImage.setVisibility(View.GONE);
            return;
@@ -853,12 +855,19 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        ImageType wantedImageType = imageTypes.get(index);

        if (wantedImageType == ImageType.BARCODE) {
-            if (waitForResize) {
-                redrawBarcodeAfterResize();
+            // Use border in non-fullscreen mode
+            if (!isFullscreen) {
+                mainImage.setBackground(AppCompatResources.getDrawable(this, R.drawable.round_outline));
            } else {
-                drawBarcode();
+                mainImage.setBackgroundColor(Color.WHITE);
            }
-            mainImage.setBackgroundColor(Color.WHITE);
+
+            if (waitForResize) {
+                redrawBarcodeAfterResize(!isFullscreen);
+            } else {
+                drawBarcode(!isFullscreen);
+            }
+
            mainImage.setContentDescription(getString(R.string.barcodeImageDescriptionWithType, format.prettyName()));
        } else if (wantedImageType == ImageType.IMAGE_FRONT) {
            mainImage.setImageBitmap(frontImageBitmap);
@@ -888,7 +897,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements

        mainImageIndex = newIndex;

-        drawMainImage(newIndex, false);
+        drawMainImage(newIndex, false, isFullscreen);
    }

    /**
@@ -904,7 +913,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        if (enabled && !imageTypes.isEmpty()) {
            Log.d(TAG, "Move into fullscreen");

-            drawMainImage(mainImageIndex, true);
+            drawMainImage(mainImageIndex, true, isFullscreen);

            barcodeScaler.setProgress(loyaltyCard.zoomLevel);
            setCenterGuideline(loyaltyCard.zoomLevel);
@@ -925,6 +934,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
            // Or the barcode will be centered instead of on top of the screen
            // Don't ask me why...
            appBarLayout.setVisibility(View.INVISIBLE);
+            iconImage.setVisibility(View.INVISIBLE);
            collapsingToolbarLayout.setVisibility(View.GONE);
            landscapeToolbar.setVisibility(View.GONE);

@@ -949,7 +959,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
            // Reset center guideline
            setCenterGuideline(100);

-            drawMainImage(mainImageIndex, true);
+            drawMainImage(mainImageIndex, true, isFullscreen);

            // Show maximize and hide minimize button and scaler
            maximizeButton.setVisibility(imageTypes.isEmpty() ? View.GONE : View.VISIBLE);
@@ -966,6 +976,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
            // And restore 24dp paddingTop for appBarLayout
            appBarLayout.setVisibility(View.VISIBLE);
            setupOrientation();
+            iconImage.setVisibility(View.VISIBLE);

            // Show other UI elements
            cardIdFieldView.setVisibility(View.VISIBLE);
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -11,7 +11,6 @@ import android.database.CursorIndexOutOfBoundsException;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.GestureDetector;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -29,7 +28,6 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.core.splashscreen.SplashScreen;
 import androidx.recyclerview.widget.RecyclerView;

-import com.google.android.material.color.DynamicColors;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;

@@ -49,6 +47,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    private ActionMode mCurrentActionMode;
    private SearchView mSearchView;
    private GestureDetector mGestureDetector;
+    private int mLoyaltyCardCount = 0;
    protected String mFilter = "";
    protected Object mGroup = null;
    protected DBHelper.LoyaltyCardOrder mOrder = DBHelper.LoyaltyCardOrder.Alpha;
@@ -142,8 +141,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                }

                builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
-                    DBHelper db = new DBHelper(MainActivity.this);
-
                    for (LoyaltyCard loyaltyCard : mAdapter.getSelectedItems()) {
                        Log.e(TAG, "Deleting card: " + loyaltyCard.id);

@@ -155,7 +152,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                    TabLayout.Tab tab = ((TabLayout) findViewById(R.id.groups)).getTabAt(selectedTab);
                    mGroup = tab != null ? tab.getTag() : null;

-                    updateLoyaltyCardList();
+                    updateLoyaltyCardList(true);

                    dialog.dismiss();
                });
@@ -196,7 +193,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                selectedTab = tab.getPosition();
                Log.d("onTabSelected", "Tab Position " + tab.getPosition());
                mGroup = tab.getTag();
-                updateLoyaltyCardList();
+                updateLoyaltyCardList(false);
                // Store active tab in Shared Preference to restore next app launch
                SharedPreferences activeTabPref = getApplicationContext().getSharedPreferences(
                        getString(R.string.sharedpreference_active_tab),
@@ -236,7 +233,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        registerForContextMenu(mCardList);

        mGroup = null;
-        updateLoyaltyCardList();
+        updateLoyaltyCardList(true);

        /*
         * This was added for Huawei, but Huawei is just too much of a fucking pain.
@@ -301,6 +298,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    protected void onResume() {
        super.onResume();

+        mAdapter.refreshState();
+
        if (mCurrentActionMode != null) {
            mAdapter.clearSelections();
            mCurrentActionMode.finish();
@@ -340,7 +339,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
            assert tab != null;
            mGroup = tab.getTag();
        }
-        updateLoyaltyCardList();
+        updateLoyaltyCardList(true);
        // End of active tab logic

        FloatingActionButton addButton = findViewById(R.id.fabAdd);
@@ -366,23 +365,17 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        super.onBackPressed();
    }

-    private void displayCardSetupOptions(boolean shouldShow) {
-        View search = findViewById(R.id.action_search);
-        View folder = findViewById(R.id.action_unfold);
-        View sort = findViewById(R.id.action_sort);
-
-        if (search != null && mSearchView.isIconified()) {
-            search.setVisibility(shouldShow ? View.VISIBLE : View.GONE);
-        }
-        if (folder != null) {
-            folder.setVisibility(shouldShow ? View.VISIBLE : View.GONE);
-        }
-        if (sort != null) {
-            sort.setVisibility(shouldShow ? View.VISIBLE : View.GONE);
+    private void displayCardSetupOptions(Menu menu, boolean shouldShow) {
+        for (int id : new int[]{R.id.action_search, R.id.action_unfold, R.id.action_sort}) {
+            menu.findItem(id).setVisible(shouldShow);
        }
    }

-    private void updateLoyaltyCardList() {
+    private void updateLoyaltyCardCount() {
+        mLoyaltyCardCount = DBHelper.getLoyaltyCardCount(mDatabase);
+    }
+
+    private void updateLoyaltyCardList(boolean updateCount) {
        Group group = null;
        if (mGroup != null) {
            group = (Group) mGroup;
@@ -390,13 +383,18 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard

        mAdapter.swapCursor(DBHelper.getLoyaltyCardCursor(mDatabase, mFilter, group, mOrder, mOrderDirection));

-        if (DBHelper.getLoyaltyCardCount(mDatabase) > 0) {
+        if (updateCount) {
+            updateLoyaltyCardCount();
+            // Update menu icons if necessary
+            invalidateOptionsMenu();
+        }
+
+        if (mLoyaltyCardCount > 0) {
            // We want the cardList to be visible regardless of the filtered match count
            // to ensure that the noMatchingCardsText doesn't end up being shown below
            // the keyboard
            mHelpText.setVisibility(View.GONE);
            mNoGroupCardsText.setVisibility(View.GONE);
-            displayCardSetupOptions(true);

            if (mAdapter.getItemCount() > 0) {
                mCardList.setVisibility(View.VISIBLE);
@@ -416,7 +414,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        } else {
            mCardList.setVisibility(View.GONE);
            mHelpText.setVisibility(View.VISIBLE);
-            displayCardSetupOptions(false);

            mNoMatchingCardsText.setVisibility(View.GONE);
            mNoGroupCardsText.setVisibility(View.GONE);
@@ -457,6 +454,9 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    public boolean onCreateOptionsMenu(Menu inputMenu) {
        getMenuInflater().inflate(R.menu.main_menu, inputMenu);

+        Utils.updateMenuCardDetailsButtonState(inputMenu.findItem(R.id.action_unfold), mAdapter.showingDetails());
+        displayCardSetupOptions(inputMenu, mLoyaltyCardCount > 0);
+
        SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
        if (searchManager != null) {
            mSearchView = (SearchView) inputMenu.findItem(R.id.action_search).getActionView();
@@ -482,7 +482,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                    TabLayout.Tab currentTab = groupsTabLayout.getTabAt(groupsTabLayout.getSelectedTabPosition());
                    mGroup = currentTab != null ? currentTab.getTag() : null;

-                    updateLoyaltyCardList();
+                    updateLoyaltyCardList(false);

                    return true;
                }
@@ -496,23 +496,13 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        int id = inputItem.getItemId();

        if (id == R.id.action_unfold) {
-            boolean shouldShow = !mAdapter.showingDetails();
-
-            if (shouldShow) {
-                inputItem.setIcon(R.drawable.ic_baseline_unfold_less_24);
-                inputItem.setTitle(R.string.action_hide_details);
-            } else {
-                inputItem.setIcon(R.drawable.ic_baseline_unfold_more_24);
-                inputItem.setTitle(R.string.action_show_details);
-            }
-
-            mAdapter.showDetails(shouldShow);
+            mAdapter.showDetails(!mAdapter.showingDetails());
+            invalidateOptionsMenu();

            return true;
        }

        if (id == R.id.action_sort) {
-            TabLayout.Tab tab = ((TabLayout) findViewById(R.id.groups)).getTabAt(selectedTab);
            AtomicInteger currentIndex = new AtomicInteger();
            List<DBHelper.LoyaltyCardOrder> loyaltyCardOrders = Arrays.asList(DBHelper.LoyaltyCardOrder.values());
            for (int i = 0; i < loyaltyCardOrders.size(); i++) {
@@ -592,7 +582,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
        sortPrefEditor.apply();

        // Update card list
-        updateLoyaltyCardList();
+        updateLoyaltyCardList(false);
    }

    @Override
--- a/app/src/main/java/protect/card_locker/ManageGroupActivity.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupActivity.java
@@ -1,12 +1,13 @@
 package protect.card_locker;

-
 import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -156,6 +157,26 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
        return ret;
    }

+    @Override
+    public boolean onCreateOptionsMenu(Menu inputMenu) {
+        getMenuInflater().inflate(R.menu.card_details_menu, inputMenu);
+        Utils.updateMenuCardDetailsButtonState(inputMenu.findItem(R.id.action_unfold), mAdapter.showingDetails());
+        return super.onCreateOptionsMenu(inputMenu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem inputItem) {
+        int id = inputItem.getItemId();
+
+        if (id == R.id.action_unfold) {
+            mAdapter.showDetails(!mAdapter.showingDetails());
+            invalidateOptionsMenu();
+
+            return true;
+        }
+
+        return super.onOptionsItemSelected(inputItem);
+    }

    @Override
    protected void onSaveInstanceState(@NonNull Bundle outState) {
--- a/app/src/main/java/protect/card_locker/Utils.java
+++ b/app/src/main/java/protect/card_locker/Utils.java
@@ -15,6 +15,8 @@ import android.os.LocaleList;
 import android.provider.MediaStore;
 import android.util.Log;
 import android.util.TypedValue;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.widget.Toast;

 import com.google.android.material.color.DynamicColors;
@@ -506,4 +508,14 @@ public class Utils {
        activity.getTheme().resolveAttribute(android.R.attr.colorBackground, typedValue, true);
        activity.findViewById(android.R.id.content).setBackgroundColor(typedValue.data);
    }
+
+    public static void updateMenuCardDetailsButtonState(MenuItem item, boolean currentlyExpanded) {
+        if (currentlyExpanded) {
+            item.setIcon(R.drawable.ic_baseline_unfold_less_24);
+            item.setTitle(R.string.action_hide_details);
+        } else {
+            item.setIcon(R.drawable.ic_baseline_unfold_more_24);
+            item.setTitle(R.string.action_show_details);
+        }
+    }
 }
--- a/app/src/main/res/drawable/round_outline.xml
+++ b/app/src/main/res/drawable/round_outline.xml
@@ -0,0 +1,5 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FFFFFF" />
+    <corners android:radius="10dp" />
+</shape>
--- 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:background="@drawable/round_outline"
        android:importantForAccessibility="no"
        android:layout_width="match_parent"
        android:layout_height="@dimen/barcode_disp_height"
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -73,8 +73,7 @@
                        app:cardCornerRadius="4dp"
                        android:paddingHorizontal="@dimen/inputPadding"
                        app:cardElevation="0dp"
-                        app:cardBackgroundColor="@android:color/transparent"
-                        android:outlineProvider="none">
+                        app:cardBackgroundColor="@android:color/transparent">

                        <ImageView
                            android:id="@+id/thumbnail"
@@ -180,17 +179,18 @@

                <!-- Barcode -->
                <LinearLayout android:orientation="horizontal"
-                    android:padding="10.0dip"
+                    android:layout_marginTop="10.0dp"
+                    android:layout_marginStart="10.0dp"
+                    android:layout_marginEnd="10.0dp"
                    android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:id="@+id/barcodeLayout">
                    <ImageView
+                        android:background="@drawable/round_outline"
                        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>
--- a/app/src/main/res/layout/simple_toolbar_list_activity.xml
+++ b/app/src/main/res/layout/simple_toolbar_list_activity.xml
@@ -3,7 +3,8 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
--- a/app/src/main/res/menu/card_details_menu.xml
+++ b/app/src/main/res/menu/card_details_menu.xml
@@ -0,0 +1,9 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_unfold"
+        android:title="@string/action_hide_details"
+        android:icon="@drawable/ic_baseline_unfold_less_24"
+        app:showAsAction="always"
+        android:visible="true"/>
+</menu>
--- a/app/src/main/res/menu/main_menu.xml
+++ b/app/src/main/res/menu/main_menu.xml
@@ -7,22 +7,25 @@
        android:title="@string/action_search"
        android:icon="@drawable/ic_search_white"
        app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:showAsAction="always|collapseActionView"/>
+        app:showAsAction="always|collapseActionView"
+        android:visible="false"/>
    <item
        android:id="@+id/action_unfold"
        android:title="@string/action_hide_details"
        android:icon="@drawable/ic_baseline_unfold_less_24"
-        app:showAsAction="always"/>
+        app:showAsAction="always"
+        android:visible="false"/>
    <item
        android:id="@+id/action_sort"
        android:title="@string/sort"
        android:icon="@drawable/ic_baseline_sort_24"
-        app:showAsAction="always"/>
+        app:showAsAction="always"
+        android:visible="false"/>
    <item
        android:id="@+id/action_manage_groups"
        android:icon="@drawable/ic_folder_white"
        android:title="@string/groups"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="never"/>
    <item
        android:id="@+id/action_import_export"
        android:icon="@drawable/ic_import_export_white_24dp"
--- a/app/src/main/res/raw/contributors.txt
+++ b/app/src/main/res/raw/contributors.txt
@@ -4,16 +4,16 @@ J. Lavoie
 Allan Nordhøy
 Heimen Stoffels
 solokot
-mondstern
 Katharine Chui
+mondstern
 Oğuz Ersen
 IllusiveMan196
 Altonss
 Petr Novák
 Joel A
+StoyanDimitrov
 Taco
 Gediminas Murauskas
-StoyanDimitrov
 Nyatsuki
 Michael Moroni
 Samantaz Fox
@@ -21,8 +21,8 @@ arno-github
 Ankit Tiwari
 Sergio Paredes
 laralem
-arshbeerSingh
 huuhaa
+arshbeerSingh
 Miha Frangež
 sr093906
 mdvhimself
@@ -30,12 +30,13 @@ Maciej Błędkowski
 Olivia (Zoe)
 Quentin PAGÈS
 betsythefc
+Silvério Santos
 waffshappen
 ati3
 K. Herbert
+Still Hsu
 String E. Fighter
 Yurical
-Silvério Santos
 rr-vesp
 /usr/local/ΕΨΗΕΛΩΝ
 Adolfo Jayme-Barrientos
@@ -49,7 +50,7 @@ Lukas Grassauer
 Marnick L'Eau
 Michalis
 Rosdyana Kusuma
-schirinowski
+umoenks
 Thomas Bertels
 inesre
 lgasp
@@ -65,8 +66,9 @@ Kasina Dheeraj
 Eric
 Flav
 Franciszek Stefan
+Giovanni
 Izzy
-krkk
+Karol Kosek
 bittin
 Marco
 Mattia
@@ -80,7 +82,6 @@ Rohan Babbar
 Ronak Upadhyay
 Rose Liverman
 Simone Dotto
-Still Hsu
 Subhashish Anand
 Tymofii Lytvynenko
 Tjipke van der Heide
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -230,4 +230,5 @@
        <item quantity="other"><xliff:g>%s</xliff:g> точки</item>
    </plurals>
    <string name="settings_oled_dark">Чисто черен фон за тъмната тема</string>
+    <string name="include_if_asking_support">Ако искате да потърсите поддръжка, включете следната информация:</string>
 </resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -230,4 +230,5 @@
        <item quantity="other"><xliff:g>%s</xliff:g> Punkte</item>
    </plurals>
    <string name="settings_oled_dark">Rein schwarzer Hintergrund für dunkles Thema</string>
+    <string name="include_if_asking_support">Wenn Sie Unterstützung anfordern möchten, geben Sie bitte die folgenden Informationen an:</string>
 </resources>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -1,28 +1,28 @@
 <?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="noExternalStoragePermissionError">Salli käyttöoikeus ulkoisen tallennustilan käyttöön voidaksesi tuoda tai viedä kortteja</string>
+    <string name="noExternalStoragePermissionError">Salli käyttöoikeus ulkoisen tallennustilan käyttöön voidaksesi tuoda tai viedä tietoja</string>
    <string name="no">Ei</string>
    <string name="yes">Kyllä</string>
-    <string name="updateBarcodeQuestionText">Vaihdoit kortin ID-tunnuksen. Haluatko päivittää myös viivakoodin käyttämään samaa arvoa\?</string>
+    <string name="updateBarcodeQuestionText">Vaihdoit ID-tunnuksen. Haluatko päivittää myös viivakoodin käyttämään samaa arvoa\?</string>
    <string name="updateBarcodeQuestionTitle">Päivitä viivakoodin arvo\?</string>
    <string name="intent_import_card_from_url_share_multiple_text">Haluan jakaa joitain kortteja kanssasi</string>
-    <string name="copy_to_clipboard_multiple_toast">Kortin tunnukset kopioidaan leikepöydälle</string>
+    <string name="copy_to_clipboard_multiple_toast">ID-tunnukset kopioitu leikepöydälle</string>
    <string name="wrongValueForBarcodeType">Arvo ei ole kelvollinen valitulle viivakoodityypille</string>
    <string name="unsupportedBarcodeType">Tätä viivakoodityyppiä ei voi vielä näyttää. Sitä saatetaan tukea sovelluksen myöhemmässä versiossa.</string>
    <string name="setBarcodeId">Aseta viivakoodin arvo</string>
-    <string name="sameAsCardId">Sama kuin kortin ID-tunnus</string>
+    <string name="sameAsCardId">Sama kuin ID-tunnus</string>
    <string name="barcodeId">Viivakoodin arvo</string>
    <string name="importVoucherVaultMessage">Valitse tuotava <i>vouchervault.json</i>-vienti Voucher Vaultista.
-\nTai luo se painamalla ensin Vie Voucher Vaultissa.</string>
+\nLuo se painamalla ensin Vie Voucher Vaultissa.</string>
    <string name="importVoucherVault">Tuo Voucher Vault varmuuskopiotiedostosta</string>
-    <string name="importLoyaltyCardKeychainMessage">Valitse <i>LoyaltyCardKeychain.csv</i>-vientitietosi Loyalty Card Keychainista tuotavaksi.
+    <string name="importLoyaltyCardKeychainMessage">Valitse tuotava <i>LoyaltyCardKeychain.csv</i>-vientitiedostosi Loyalty Card Keychainista.
 \nTai luo se Loyalty Card Keychainin Import/Export-valikosta painamalla ensin Export (Vie).</string>
    <string name="importLoyaltyCardKeychain">Tuo Loyalty Card Keychain varmuuskopiotiedostosta</string>
-    <string name="importFidmeMessage">Valitse <i>fidme-export-request-xxxxxxxx.zip</i>-vienti FidMe:stä tuotavaksi ja valitse viivakoodityypit manuaalisesti sen jälkeen.
-\nTai luo se FidMe-profiilistasi valitsemalla Tietosuoja ja painamalla ensin Extract my data.</string>
+    <string name="importFidmeMessage">Valitse tuotava <i>fidme-export-request-xxxxxxxx.zip</i>-vientitiedostosi FidMe:stä ja valitse viivakoodityypit manuaalisesti sen jälkeen.
+\nLuo se FidMe-profiilistasi valitsemalla Tietosuoja ja painamalla ensin Extract my data.</string>
    <string name="importFidme">Tuo FidMe varmuuskopiotiedostosta</string>
-    <string name="importCatimaMessage">Valitse tuotava <i>catima.zip</i>-vienti Catimasta.
-\nTai luo se jonkin toisen Catima-sovelluksen Tuo/Vie-valikosta painamalla siellä ensin Vie.</string>
+    <string name="importCatimaMessage">Valitse tuotava <i>catima.zip</i>-vientitiedostosi Catimasta.
+\nLuo se Catima-sovelluksen Tuo/Vie-valikosta painamalla siellä ensin Vie.</string>
    <string name="importCatima">Tuo Catima varmuuskopiotiedostosta</string>
    <string name="accept">Hyväksy</string>
    <string name="privacy_policy_popup_text">Tietosuojaseloste (joidenkin sovelluskauppojen vaatimus):
@@ -30,7 +30,7 @@
 \nMITÄÄN TIETOJA EI KERÄTÄ LAINKAAN, minkä kuka tahansa voi vahvistaa, koska sovelluksemma on vapaa ohjelmisto.</string>
    <string name="privacy_policy">Tietosuojakäytäntö</string>
    <string name="app_loyalty_card_keychain">Kanta-asiakaskortin avainnippu</string>
-    <string name="chooseImportType">Tuo tietoja kohteesta\?</string>
+    <string name="chooseImportType">Tuo tietoja kohteesta</string>
    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> ei vaikuta olevan kelvollinen saldo.</string>
    <string name="points">Pisteet</string>
    <string name="currency">Valuutta</string>
@@ -50,7 +50,7 @@
    <string name="expiryStateSentence">Vanhenee: <xliff:g>%s</xliff:g></string>
    <string name="groupsList">Ryhmät: <xliff:g>%s</xliff:g></string>
    <string name="addFromImage">Valitse kuva galleriasta</string>
-    <string name="addManually">Anna kortin ID-tunnus manuaalisesti</string>
+    <string name="addManually">Anna ID-tunnus manuaalisesti</string>
    <string name="leaveWithoutSaveConfirmation">Poistu tallentamatta\?</string>
    <string name="leaveWithoutSaveTitle">Poistu</string>
    <string name="moveDown">Siirrä alaspäin</string>
@@ -62,13 +62,13 @@
        <item quantity="one"><xliff:g>%d</xliff:g> kortti</item>
        <item quantity="other"><xliff:g>%d</xliff:g> kortit</item>
    </plurals>
-    <string name="noGroups">Napsauta + plus-painiketta lisätäksesi ensin ryhmät luokittelua varten.</string>
+    <string name="noGroups">Napsauta + plus-painiketta lisätäksesi ryhmät luokittelua varten.</string>
    <string name="groups">Ryhmät</string>
    <string name="enter_group_name">Anna ryhmän nimi</string>
-    <string name="exportSuccessful">Korttitietojen vienti valmis</string>
-    <string name="importSuccessful">Korttitietojen tuonti valmis</string>
+    <string name="exportSuccessful">Tiedot viety</string>
+    <string name="importSuccessful">Tiedot tuotu</string>
    <string name="intent_import_card_from_url_share_text">Haluan jakaa kortin kanssasi</string>
-    <string name="settings_disable_lockscreen_while_viewing_card">Estä lukitusnäyttö</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Estä näytön lukitus</string>
    <string name="settings_keep_screen_on">Pidä näyttö päällä</string>
    <string name="settings_lock_barcode_orientation">Lukitse viivakoodin suunta</string>
    <string name="settings_display_barcode_max_brightness">Kirkasta viivakoodinäkymää</string>
@@ -80,19 +80,19 @@
    <string name="settings_category_title_ui">Käyttöliittymä</string>
    <string name="settings">Asetukset</string>
    <string name="starImage">Suosikki tähti</string>
-    <string name="thumbnailDescription">Kortin pikkukuva</string>
-    <string name="copy_to_clipboard_toast">Kortin ID-tunnus kopioitu leikepöydälle</string>
-    <string name="enterBarcodeInstructions">Syötä kortin ID-tunnus ja valitse sen viivakoodityyppi, tai valitse \"Tällä kortilla ei ole viivakoodia\".</string>
+    <string name="thumbnailDescription">Pienoiskuva</string>
+    <string name="copy_to_clipboard_toast">ID-tunnus kopioitu leikepöydälle</string>
+    <string name="enterBarcodeInstructions">Syötä ID-tunnus ja valitse sen viivakoodityyppi, tai valitse \"Ei viivakoodia\".</string>
    <string name="selectBarcodeTitle">Valitse viivakoodi</string>
    <string name="app_resources">Vapaat kolmannen osapuolen resurssit: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="app_libraries">Kolmannen osapuolen Libre-kirjastot: <xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="app_revision_fmt">Muutostiedot: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="debug_version_fmt">Versio: <xliff:g id="version">%s</xliff:g></string>
    <string name="about_title_fmt">Tietoja <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="app_license">Copyleft (käyttäjänoikeus) - vapaa ohjelmisto, lisenssi GPLv3+.</string>
+    <string name="app_license">Copyleft (käyttäjänoikeus) - vapaa ohjelmisto, lisenssi GPLv3+</string>
    <string name="app_copyright_old">Perustuu Loyalty Card Keychain sovellukseen
-\ntekijänoikeus © 2016–2020 Branden Archer.</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Tekijänoikeus © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+\ntekijänoikeus © 2016–2020 Branden Archer</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Tekijänoikeus © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
    <string name="about">Tietoja</string>
    <string name="importOptionApplicationButton">Käytä toista sovellusta</string>
    <string name="importOptionApplicationExplanation">Käytä mitä tahansa sovellusta tai suosikkitiedostonhallintaasi tiedoston avaamiseen.</string>
@@ -103,23 +103,23 @@
    <string name="exportOptionExplanation">Tiedot kirjoitetaan valitsemaasi sijaintiin.</string>
    <string name="exporting">Viedään…</string>
    <string name="importing">Tuodaan…</string>
-    <string name="exportFailed">Kortteja ei voitu viedä</string>
+    <string name="exportFailed">Vienti epäonnistui</string>
    <string name="exportFailedTitle">Vienti epäonnistui</string>
    <string name="exportSuccessfulTitle">Vienti valmis</string>
-    <string name="importFailed">Kortteja ei voitu tuoda</string>
+    <string name="importFailed">Tuonti epäonnistui</string>
    <string name="importFailedTitle">Tuonti epäonnistui</string>
    <string name="importSuccessfulTitle">Tuonti valmis</string>
-    <string name="importExportHelp">Varmuuskopioimalla korttisi, voit siirtää ne toiseen laitteeseen.</string>
+    <string name="importExportHelp">Tietojesi varmuuskopiointi mahdollistaa niiden siirtämisen toiseen laitteeseen.</string>
    <string name="exportName">Vie</string>
    <string name="importExport">Tuo/Vie</string>
    <string name="failedParsingImportUriError">Tuonnin URI: n jäsentäminen epäonnistui</string>
-    <string name="noCardExistsError">Korttia ei löytynyt</string>
-    <string name="noCardIdError">Kortin ID-tunnusta ei annettu</string>
+    <string name="noCardExistsError">Tätä korttia ei löytynyt</string>
+    <string name="noCardIdError">ID-tunnusta ei annettu</string>
    <string name="noStoreError">Nimeä ei annettu</string>
-    <string name="card_ids_copied">Kopioidut korttitunnukset</string>
+    <string name="card_ids_copied">Kopioidut tunnukset</string>
    <string name="noCardsMessage">Lisää ensin kortti</string>
    <string name="cardShortcut">Kortin pikakuvake</string>
-    <string name="scanCardBarcode">Skannaa kortin viivakoodi</string>
+    <string name="scanCardBarcode">Skannaa viivakoodi</string>
    <string name="addCardTitle">Lisää kortti</string>
    <string name="editCardTitle">Muokkaa korttia</string>
    <string name="sendLabel">Lähetä…</string>
@@ -136,7 +136,7 @@
    <string name="unstar">Poista suosikeista</string>
    <string name="star">Lisää suosikkeihin</string>
    <string name="noBarcode">Ei viivakoodia</string>
-    <string name="barcodeNoBarcode">Tällä kortilla ei ole viivakoodia</string>
+    <string name="barcodeNoBarcode">Viivakoodia ei ole</string>
    <string name="barcodeType">Viivakoodin tyyppi</string>
    <string name="cardId">Kortin ID-tunnus</string>
    <string name="note">Lisätieto</string>
@@ -150,8 +150,8 @@
    <string name="setBackImage">Aseta takakuva</string>
    <string name="setFrontImage">Aseta etukuva</string>
    <string name="photos">Valokuvat</string>
-    <string name="backImageDescription">Kortin takakuva</string>
-    <string name="frontImageDescription">Kortin etukuva</string>
+    <string name="backImageDescription">Takakuva</string>
+    <string name="frontImageDescription">Etukuva</string>
    <string name="deleteConfirmation">Poista tämä kortti\?</string>
    <string name="deleteTitle">Poista kortti</string>
    <plurals name="deleteCardsConfirmation">
@@ -168,7 +168,7 @@
    </plurals>
    <string name="importStocard">Tuo Stocardista</string>
    <string name="importStocardMessage">Valitse tuotava <i>***-sync.zip</i>-vienti Stocardista.
-\nTai hanki se lähettämällä sähköpostia osoitteeseen support@stocardapp.com ja pyytämällä tietojesi vientiä.</string>
+\nHanki se lähettämällä sähköpostia osoitteeseen support@stocardapp.com ja pyytämällä tietojesi vientiä.</string>
    <string name="passwordRequired">Ole hyvä ja syötä salasana</string>
    <string name="failedGeneratingShareURL">Ei pystynyt luomaan jaettavaa URL-osoitetta. Ilmoita tästä.</string>
    <string name="turn_flashlight_on">Sytytä taskulamppu</string>
@@ -186,5 +186,49 @@
    <string name="settings_catima_theme">Catima</string>
    <string name="settings_system_locale">Järjestelmä</string>
    <string name="settings_locale">Kieli</string>
-    <string name="noGroupCards">Tämä ryhmä ei sisällä kortteja</string>
+    <string name="noGroupCards">Tämä ryhmä on tyhjä</string>
+    <string name="group_edit">Muokkaa ryhmää</string>
+    <string name="group_name_already_in_use">Ryhmän nimi on jo käytössä</string>
+    <string name="group_name_is_empty">Ryhmän nimi ei voi olla tyhjä</string>
+    <string name="group_updated">Ryhmä päivitetty</string>
+    <string name="editGroup">Muokataan ryhmää: <xliff:g>%s</xliff:g></string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> piste</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> pistettä</item>
+    </plurals>
+    <string name="settings_oled_dark">Musta tausta tummalle teemalle</string>
+    <string name="setIcon">Aseta kuvake</string>
+    <string name="swipeToSwitchImages">Vaihda kuvia pyyhkäisemällä tai painamalla pitkään</string>
+    <string name="sort_by_name">Nimi</string>
+    <string name="sort_by_most_recently_used">Viimeksi käytetyt</string>
+    <string name="sort_by_expiry">Viimeinen voimassaoloaika</string>
+    <string name="sort_by_balance">Saldo</string>
+    <string name="reverse">...käänteisessä järjestyksessä</string>
+    <string name="sort_by">Lajitteluperuste</string>
+    <string name="credits">Krediitit</string>
+    <string name="help_translate_this_app">Auta kääntämään tämä sovellus</string>
+    <string name="license">Lisenssi</string>
+    <string name="source_repository">Lähdekoodivarasto</string>
+    <string name="on_github">GitHubissa</string>
+    <string name="and_data_usage">ja datan käyttö</string>
+    <string name="on_google_play">Google Playssa</string>
+    <string name="report_error">Ilmoita virheestä</string>
+    <string name="action_show_details">Näytä tiedot</string>
+    <string name="action_hide_details">Piilota tiedot</string>
+    <string name="shortcutSelectCard">Valitse kortti</string>
+    <string name="starred">Tähdellä merkityt</string>
+    <string name="options">Vaihtoehdot</string>
+    <string name="set_scale">Säädä kokoa</string>
+    <string name="include_if_asking_support">Jos haluat pyytää tukea, ilmoita seuraavat tiedot:</string>
+    <string name="hideMoreInfo">Piilota tiedot</string>
+    <string name="exportPassword">Aseta salasana suojataksesi vientitiedostosi (valinnainen)</string>
+    <string name="exportPasswordHint">Syötä salasana</string>
+    <string name="showMoreInfo">Näytä tiedot</string>
+    <string name="version_history">Versiohistoria</string>
+    <string name="sort">Lajittele</string>
+    <string name="translate_platform">Weblatessa</string>
+    <string name="selectColor">Valitse väri</string>
+    <string name="rate_this_app">Arvostele tämä sovellus</string>
+    <string name="noGiftCardsGroup">Lisää kortteja ja lisää ne ryhmään täällä.</string>
+    <string name="barcodeImageDescriptionWithType">Image <xliff:g>%s</xliff:g> viivakoodi</string>
 </resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -230,4 +230,5 @@
        <item quantity="other"><xliff:g>%s</xliff:g> points</item>
    </plurals>
    <string name="settings_oled_dark">Fond noir pur pour le thème sombre</string>
+    <string name="include_if_asking_support">Si vous voulez demander de l\'aide, incluez les informations suivantes :</string>
 </resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -230,4 +230,5 @@
        <item quantity="other"><xliff:g>%s</xliff:g> punti</item>
    </plurals>
    <string name="settings_oled_dark">Sfondo nero puro per il tema scuro</string>
+    <string name="include_if_asking_support">Se vuoi richiedere supporto, includi le seguenti informazioni:</string>
 </resources>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -105,7 +105,7 @@
    <string name="currency">Valuta</string>
    <string name="balance">Saldo</string>
    <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
-    <string name="chooseImportType">Importer data fra?</string>
+    <string name="chooseImportType">Importer data fra</string>
    <string name="app_loyalty_card_keychain">Kundekortknippe</string>
    <string name="settings_disable_lockscreen_while_viewing_card">Forhindre skjermlås</string>
    <string name="settings_keep_screen_on">Behold skjerm påslått</string>
@@ -226,8 +226,9 @@
    <string name="showMoreInfo">Vis info</string>
    <string name="hideMoreInfo">Skjul info</string>
    <plurals name="balancePoints">
-        <item quantity="one"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> poeng</item>
-        <item quantity="other"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> poeng</item>
+        <item quantity="one"><xliff:g>%s</xliff:g> poeng</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> poeng</item>
    </plurals>
    <string name="settings_oled_dark">Svart bakgrunn for mørk drakt</string>
-</resources>
+    <string name="include_if_asking_support">Inkluder følgende info hvis du vil ha hjelp:</string>
+</resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -230,4 +230,5 @@
        <item quantity="other"><xliff:g>%s</xliff:g> punten</item>
    </plurals>
    <string name="settings_oled_dark">Zwarte achtergrond gebruiken bij donker thema</string>
+    <string name="include_if_asking_support">Als je ondersteuning wilt, voorzie je verzoek dan van de volgende informatie:</string>
 </resources>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <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="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
@@ -4,11 +4,11 @@
    <string name="importOptionFilesystemExplanation">Escolha um ficheiro específico a partir do sistema de ficheiros.</string>
    <string name="action_search">Pesquisa</string>
    <string name="star">Adicionar aos favoritos</string>
-    <string name="noMatchingGiftCards">Não foi encontrado nada. Tente alterar a sua pesquisa.</string>
+    <string name="noMatchingGiftCards">Sem resultados. Tente alterar a sua pesquisa.</string>
    <string name="storeName">Nome</string>
    <string name="note">Nota</string>
    <string name="barcodeType">Tipo de código de barras</string>
-    <string name="barcodeNoBarcode">Este cartão não tem código de barras</string>
+    <string name="barcodeNoBarcode">Sem código de barras</string>
    <string name="cancel">Cancelar</string>
    <string name="save">Guardar</string>
    <string name="edit">Editar</string>
@@ -29,8 +29,8 @@
    <string name="copy_to_clipboard">Copiar identificador para a área de transferência</string>
    <string name="sendLabel">Enviar…</string>
    <plurals name="selectedCardCount">
-        <item quantity="one"><xliff:g>%d</xliff:g> cartão selecionado</item>
-        <item quantity="other"><xliff:g>%d</xliff:g> cartões selecionados</item>
+        <item quantity="one"><xliff:g>%d</xliff:g> selecionado</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> selecionados</item>
    </plurals>
    <string name="deleteConfirmation">Eliminar este cartão permanentemente\?</string>
    <string name="share">Partilhar</string>
@@ -41,13 +41,13 @@
    <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="noCardExistsError">Não foi possível encontrar o cartão</string>
+    <string name="noCardExistsError">Não foi possível encontrar esse cartão</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="importSuccessful">Dados do cartão importados</string>
-    <string name="noGroups">Primeiro clique no botão + para adicionar grupos para categorização.</string>
-    <string name="noGroupCards">Este grupo não contém cartões</string>
+    <string name="importSuccessful">Dados importados</string>
+    <string name="noGroups">Clique no botão + para adicionar grupos para categorização.</string>
+    <string name="noGroupCards">Este grupo está vazio</string>
    <string name="intent_import_card_from_url_share_text">Quero partilhar um cartão</string>
    <string name="settings_display_barcode_max_brightness">Iluminar o código de barras</string>
    <string name="settings_keep_screen_on">Manter ecrã ligado</string>
@@ -55,7 +55,7 @@
    <string name="groups">Grupos</string>
    <string name="settings_lock_barcode_orientation">Bloquear orientação do código de barras</string>
    <string name="settings_disable_lockscreen_while_viewing_card">Desativar bloqueio do ecrã</string>
-    <string name="exportSuccessful">Dados do cartão exportados</string>
+    <string name="exportSuccessful">Dados exportados</string>
    <string name="all">Todos</string>
    <string name="deleteConfirmationGroup">Eliminar o grupo\?</string>
    <string name="settings">Configurações</string>
@@ -66,28 +66,28 @@
    <string name="settings_dark_theme">Escuro</string>
    <string name="settings_max_font_size_scale">Tamanho máximo da fonte</string>
    <string name="selectBarcodeTitle">Selecionar código de barras</string>
-    <string name="enterBarcodeInstructions">Introduza o identificador do cartão e depois escolha o tipo de código de barras abaixo ou \"Este cartão não tem código de barras\".</string>
-    <string name="copy_to_clipboard_toast">Identificador do cartão copiado para a área de transferência</string>
-    <string name="thumbnailDescription">Miniatura do cartão</string>
+    <string name="enterBarcodeInstructions">Introduza o identificador e depois escolha o tipo de código de barras abaixo ou \"Sem código de barras\".</string>
+    <string name="copy_to_clipboard_toast">Identificador copiado para a área de transferência</string>
+    <string name="thumbnailDescription">Miniatura</string>
    <string name="starImage">Favorito</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="noExternalStoragePermissionError">Conceda primeiro a autorização de acesso ao armazenamento externo para importar ou exportar cartões</string>
-    <string name="importExportHelp">A cópia de segurança dos seus cartões permite-lhe movê-los para outro dispositivo.</string>
+    <string name="noExternalStoragePermissionError">Conceda primeiro a autorização de acesso ao armazenamento externo para importar ou exportar dados</string>
+    <string name="importExportHelp">A cópia de segurança dos seus dados permite-lhe movê-los para outro dispositivo.</string>
    <string name="importSuccessfulTitle">Importado</string>
    <string name="importFailedTitle">A importação falhou</string>
-    <string name="importFailed">Não foi possível importar os cartões</string>
+    <string name="importFailed">Não foi possível importar</string>
    <string name="exportSuccessfulTitle">Exportado</string>
    <string name="exportFailedTitle">A exportação falhou</string>
-    <string name="exportFailed">Não foi possível exportar os cartões</string>
+    <string name="exportFailed">Não foi possível exportar</string>
    <string name="importing">A importar…</string>
    <string name="exporting">A exportar…</string>
    <string name="settings_sky_blue_theme">Azul céu</string>
    <string name="report_error">Reportar erro</string>
    <string name="barcode">Código de barras</string>
-    <string name="chooseImportType">De onde importar os dados\?</string>
+    <string name="chooseImportType">Importar dados de</string>
    <string name="card">Cartão</string>
    <string name="expiryStateSentence">Expiram: <xliff:g>%s</xliff:g></string>
    <string name="app_resources">Recursos livres de terceiros: <xliff:g id="app_resources_list">%s</xliff:g></string>
@@ -97,7 +97,7 @@
    <string name="exportPassword">Defina uma palavra-passe para proteger a exportação (opcional)</string>
    <string name="exportPasswordHint">Digite a palavra-passe</string>
    <string name="setBarcodeId">Definir o valor do código de barras</string>
-    <string name="sameAsCardId">Igual ao identificador do cartão</string>
+    <string name="sameAsCardId">Igual ao identificador</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="importStocardMessage">Selecione a exportação <i>***-sync.zip</i> do Stocard para importar.
@@ -106,15 +106,15 @@
    <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="removeImage">Remover imagem</string>
-    <string name="backImageDescription">Imagem de trás do cartão</string>
-    <string name="frontImageDescription">Imagem frontal do cartão</string>
+    <string name="backImageDescription">Imagem de trás</string>
+    <string name="frontImageDescription">Imagem frontal</string>
    <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">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>
+    <string name="updateBarcodeQuestionText">Alterou o identificador. Também quer atualizar o código de barras para usar o mesmo valor\?</string>
    <string name="no">Não</string>
    <plurals name="groupCardCount">
        <item quantity="one"><xliff:g>%d</xliff:g> cartão</item>
@@ -129,7 +129,7 @@
    <string name="app_revision_fmt">Informação da revisão: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="expiryStateSentenceExpired">Expirados: <xliff:g>%s</xliff:g></string>
    <string name="leaveWithoutSaveConfirmation">Sair sem guardar\?</string>
-    <string name="addManually">Introduzir manualmente o identificador do cartão</string>
+    <string name="addManually">Introduzir manualmente o identificador</string>
    <string name="addFromImage">Selecionar imagem da galeria</string>
    <string name="groupsList">Grupos: <xliff:g>%s</xliff:g></string>
    <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
@@ -163,7 +163,7 @@
    <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="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="copy_to_clipboard_multiple_toast">Identificação do cartão copiado para a área de transferência</string>
+    <string name="copy_to_clipboard_multiple_toast">Identificação copiado para a área de transferência</string>
    <string name="setFrontImage">Definir imagem frontal</string>
    <string name="setBackImage">Definir imagem de trás</string>
    <string name="failedGeneratingShareURL">Não foi possível gerar uma URL partilhável. Por favor reporte isto aos programadores.</string>
@@ -184,7 +184,7 @@
    <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="reverse">Inverter</string>
+    <string name="reverse">…na ordem inversa</string>
    <string name="sort_by">Ordenar por</string>
    <string name="version_history">Histórico de versões</string>
    <string name="credits">Créditos</string>
@@ -206,14 +206,14 @@
        <item quantity="other">Eliminar os cartões <xliff:g>%d</xliff:g> permanentemente\?</item>
    </plurals>
    <string name="ok">OK</string>
-    <string name="card_ids_copied">Identificadores dos cartões copiados</string>
-    <string name="barcodeImageDescriptionWithType">Imagem do código de barras do cartão do tipo <xliff:g>%s</xliff:g></string>
+    <string name="card_ids_copied">Identificadores copiados</string>
+    <string name="barcodeImageDescriptionWithType">Imagem do código de barras <xliff:g>%s</xliff:g></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="group_name_is_empty">O nome do grupo não pode estar vazio</string>
    <string name="group_updated">Grupo atualizado</string>
    <string name="editGroup">A editar grupo: <xliff:g>%s</xliff:g></string>
-    <string name="noGiftCardsGroup">Ainda não tem nenhum cartão de fidelidade. Assim que tenha adicionado alguns, pode atribuí-los ao grupo aqui.</string>
+    <string name="noGiftCardsGroup">Crie alguns cartões e atribua-os depois ao grupo aqui.</string>
    <string name="selectColor">Selecionar cor</string>
    <string name="setIcon">Definir ícone</string>
    <string name="action_show_details">Mostrar detalhes</string>
@@ -225,4 +225,10 @@
    <string name="showMoreInfo">Mostrar info</string>
    <string name="hideMoreInfo">Ocultar informação</string>
    <string name="options">Opções</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> ponto</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> pontos</item>
+    </plurals>
+    <string name="settings_oled_dark">Fundo preto puro para tema negro</string>
+    <string name="include_if_asking_support">Se quiser pedir ajuda, inclua as seguintes informações:</string>
 </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -240,4 +240,5 @@
        <item quantity="other"><xliff:g>%s</xliff:g> баллов</item>
    </plurals>
    <string name="settings_oled_dark">Чёрный фон для тёмной темы</string>
+    <string name="include_if_asking_support">Если вы хотите запросить поддержку, укажите следующую информацию:</string>
 </resources>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -228,4 +228,7 @@
        <item quantity="one"><xliff:g>%s</xliff:g> poäng</item>
        <item quantity="other"><xliff:g>%s</xliff:g> poäng</item>
    </plurals>
+    <string name="set_scale">Justera skala</string>
+    <string name="include_if_asking_support">Om du vill be om hjälp, inkludera då följande information:</string>
+    <string name="settings_oled_dark">Helsvart bakgrund för mörkt tema</string>
 </resources>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -230,4 +230,5 @@
        <item quantity="other"><xliff:g>%s</xliff:g> puan</item>
    </plurals>
    <string name="settings_oled_dark">Koyu tema için saf siyah arka plan</string>
+    <string name="include_if_asking_support">Destek talep etmek istiyorsanız, aşağıdaki bilgileri ekleyin:</string>
 </resources>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -41,7 +41,7 @@
    <string name="accept">Прийняти</string>
    <string name="privacy_policy">Політика конфіденційності</string>
    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="chooseImportType">Імпортувати дані з\?</string>
+    <string name="chooseImportType">Імпортувати дані з</string>
    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> здається, не є дійсним залишком.</string>
    <string name="points">Бали</string>
    <string name="currency">Валюта</string>
@@ -233,4 +233,12 @@
    <string name="starred">Обране</string>
    <string name="set_scale">Зміна масштабу</string>
    <string name="hideMoreInfo">Сховати дані</string>
+    <string name="settings_oled_dark">Повністю чорний фон для темної теми</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> бал</item>
+        <item quantity="few"><xliff:g>%s</xliff:g> бали</item>
+        <item quantity="many"><xliff:g>%s</xliff:g> балів</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> балів</item>
+    </plurals>
+    <string name="include_if_asking_support">Якщо ви хочете отримати техпідтримку, додайте цю інформацію:</string>
 </resources>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -3,15 +3,17 @@
    <string name="app_revision_url">https://github.com/CatimaLoyalty/Android/releases</string>
    <string name="action_search">搜尋</string>
    <string name="action_add">新增</string>
-    <string name="noGiftCards">點選 + 按鈕以新增卡片\n或從 ⋮ 選單中匯入卡片</string>
-    <string name="noMatchingGiftCards">沒有找到任何東西。試試其他關鍵字。</string>
+    <string name="noGiftCards">點選 + 按鈕以新增卡片，或從 ⋮ 選單中匯入卡片。</string>
+    <string name="noMatchingGiftCards">找不到相關結果。試試其他關鍵字。</string>
    <string name="storeName">名稱</string>
    <string name="note">註記</string>
    <string name="cardId">卡片 ID</string>
    <string name="barcodeType">條碼種類</string>
-    <string name="barcodeNoBarcode">此卡片沒有可用的條碼</string>
+    <string name="barcodeNoBarcode">沒有可用的條碼</string>
    <string name="noBarcode">無條碼</string>
-    <string name="privacy_policy_popup_text">隱私權政策（某些應用程式商店需要此條目）:  我們並不會收集任何資料！任何人都可以檢視我們的原始碼並驗證這點。</string>
+    <string name="privacy_policy_popup_text">隱私權政策（某些應用程式商店需要此條目）: 
+\n
+\n我們並不會收集任何資料！任何人都可以檢視我們的原始碼並驗證這點。</string>
    <string name="star">新增至收藏</string>
    <string name="app_license">公共版權 (Copylefted) 的自由軟體，許可 GPLv3+</string>
    <string name="unstar">從收藏中移除</string>
@@ -25,22 +27,22 @@
    <string name="accept">接受</string>
    <string name="addCardTitle">新增卡片</string>
    <string name="addFromImage">從圖庫中選擇圖片</string>
-    <string name="addManually">手動輸入卡片 ID</string>
+    <string name="addManually">手動輸入 ID</string>
    <string name="all">全部</string>
    <string name="balance">餘額</string>
    <string name="balanceSentence">餘額: <xliff:g>%s</xliff:g></string>
    <string name="app_copyright_old">基於 Loyalty Card Keychain\n著作權所有 © 2016–2020 Branden Archer</string>
    <string name="barcode">條碼</string>
    <string name="barcodeId">條碼內容</string>
-    <string name="barcodeImageDescriptionWithType">條碼種類 <xliff:g>%s</xliff:g> 的圖片</string>
+    <string name="barcodeImageDescriptionWithType">圖片為 <xliff:g>%s</xliff:g> 的條碼</string>
    <string name="card">卡片</string>
-    <string name="card_ids_copied">已複製卡片 ID(s)</string>
+    <string name="card_ids_copied">已複製 ID(s)</string>
    <string name="cardShortcut">卡片捷徑</string>
    <string name="chooseExpiryDate">選擇逾期日期</string>
-    <string name="chooseImportType">從哪裡匯入資料？</string>
+    <string name="chooseImportType">從地點匯入資料</string>
    <string name="copy_to_clipboard">已複製 ID 至剪貼簿中</string>
-    <string name="copy_to_clipboard_multiple_toast">已複製多個卡片 ID 至剪貼簿中</string>
-    <string name="copy_to_clipboard_toast">已複製卡片 ID 至剪貼簿中</string>
+    <string name="copy_to_clipboard_multiple_toast">已複製多個 ID 至剪貼簿中</string>
+    <string name="copy_to_clipboard_toast">已複製 ID 至剪貼簿中</string>
    <string name="credits">貢獻者</string>
    <string name="currency">幣別</string>
    <string name="debug_version_fmt">版本：<xliff:g id="version">%s</xliff:g></string>
@@ -50,29 +52,29 @@
    <string name="editBarcode">編輯條碼</string>
    <string name="editCardTitle">編輯圖片</string>
    <string name="enter_group_name">輸入群組名稱</string>
-    <string name="enterBarcodeInstructions">輸入卡片 ID、選擇條碼種類、或選擇「此卡片沒有可用的條碼」。</string>
+    <string name="enterBarcodeInstructions">輸入 ID、選擇條碼種類、或選擇「此卡片沒有可用的條碼」。</string>
    <string name="errorReadingImage">無法讀取此圖片</string>
    <string name="expiryDate">逾期日期</string>
    <string name="expiryStateSentence">逾期於：<xliff:g>%s</xliff:g></string>
    <string name="expiryStateSentenceExpired">已逾期：<xliff:g>%s</xliff:g></string>
-    <string name="exportFailed">無法匯出卡片</string>
+    <string name="exportFailed">無法進行匯出</string>
    <string name="exportFailedTitle">匯出失敗</string>
    <string name="exporting">匯出中…</string>
    <string name="exportName">匯出</string>
    <string name="exportOptionExplanation">資料將寫至您所選的位置。</string>
    <string name="exportPassword">透過密碼保護您的匯出檔 (選用)</string>
    <string name="exportPasswordHint">輸入密碼</string>
-    <string name="exportSuccessful">已匯出卡片資訊</string>
+    <string name="exportSuccessful">已匯出資料</string>
    <string name="exportSuccessfulTitle">已匯出</string>
    <string name="failedOpeningFileManager">請先安裝檔案管理員。</string>
    <string name="failedParsingImportUriError">無法讀取匯入 URI</string>
-    <string name="frontImageDescription">卡片 (正面)</string>
+    <string name="frontImageDescription">正面圖片</string>
    <string name="groups">群組</string>
    <string name="groupsList">群組：<xliff:g>%s</xliff:g></string>
    <string name="help_translate_this_app">幫助翻譯本程式</string>
    <string name="importExport">匯入/匯出</string>
    <string name="importFailedTitle">匯入失敗</string>
-    <string name="importFailed">無法匯入卡片</string>
+    <string name="importFailed">無法匯入資料</string>
    <string name="importing">匯入中…</string>
    <string name="importSuccessfulTitle">已匯入</string>
    <string name="intent_import_card_from_url_share_multiple_text">我想要分享些卡片給你</string>
@@ -83,8 +85,8 @@
    <string name="never">永不</string>
    <string name="no">否</string>
    <string name="noBarcodeFound">找不到可用的條碼</string>
-    <string name="noCardExistsError">無法找到卡片</string>
-    <string name="noCardIdError">尚未輸入卡片 ID</string>
+    <string name="noCardExistsError">無法找到此卡片</string>
+    <string name="noCardIdError">尚未輸入 ID</string>
    <string name="noCardsMessage">請先新增卡片</string>
    <string name="sort">排列</string>
    <string name="settings_catima_theme">Catima</string>
@@ -100,7 +102,7 @@
    <string name="sort_by_most_recently_used">最近使用</string>
    <string name="sort_by_expiry">逾期日期</string>
    <string name="sort_by_balance">餘額</string>
-    <string name="reverse">反序</string>
+    <string name="reverse">...以反序排列</string>
    <string name="sort_by">排列方式</string>
    <string name="version_history">版本歷史</string>
    <string name="source_repository">原始碼版本庫</string>
@@ -110,7 +112,7 @@
    <string name="on_google_play">於 Google Play</string>
    <string name="report_error">回報錯誤</string>
    <string name="setBarcodeId">設定條碼內容</string>
-    <string name="sameAsCardId">與卡片 ID 相同</string>
+    <string name="sameAsCardId">與 ID 相同</string>
    <string name="photos">圖片</string>
    <string name="setFrontImage">設定正面圖片</string>
    <string name="setBackImage">設定背面圖片</string>
@@ -127,7 +129,7 @@
    <string name="app_contributors">感謝以下貢獻者: <xliff:g id="app_contributors">%s</xliff:g></string>
    <string name="privacy_policy">隱私權政策</string>
    <plurals name="selectedCardCount">
-        <item quantity="other">已選取 <xliff:g>%d</xliff:g> 張卡片</item>
+        <item quantity="other">已選取 <xliff:g>%d</xliff:g></item>
    </plurals>
    <plurals name="deleteCardsTitle">
        <item quantity="other">刪除 <xliff:g>%d</xliff:g> 張卡片</item>
@@ -142,8 +144,8 @@
    <string name="share">分享</string>
    <string name="settings_system_theme">系統主題</string>
    <string name="settings_theme">主題</string>
-    <string name="thumbnailDescription">卡片縮圖</string>
-    <string name="noGroupCards">此群組中無任何卡片</string>
+    <string name="thumbnailDescription">縮圖</string>
+    <string name="noGroupCards">此群組為空</string>
    <string name="settings_category_title_ui">用戶界面</string>
    <string name="settings_max_font_size_scale">最大字體大小</string>
    <string name="settings_light_theme">淺色</string>
@@ -152,17 +154,17 @@
    <string name="settings_lock_barcode_orientation">鎖定條碼螢幕方向</string>
    <string name="settings_keep_screen_on">螢幕恆亮</string>
    <string name="settings_disable_lockscreen_while_viewing_card">防止螢幕鎖定</string>
-    <string name="importSuccessful">已匯入卡片資訊</string>
+    <string name="importSuccessful">已匯入資料</string>
    <string name="moveUp">往上移動</string>
    <string name="moveDown">往下移動</string>
    <string name="lockScreen">禁止旋轉</string>
    <string name="unlockScreen">允許旋轉</string>
    <string name="ok">OK</string>
    <string name="sendLabel">送出…</string>
-    <string name="scanCardBarcode">掃描卡片條碼</string>
+    <string name="scanCardBarcode">掃描條碼</string>
    <string name="noStoreError">尚未輸入卡片名稱</string>
-    <string name="importExportHelp">備份您的卡片以將這些卡片移至其他裝置中。</string>
-    <string name="noExternalStoragePermissionError">在匯入及匯出卡片前，請先允許外部儲存裝置存取權限</string>
+    <string name="importExportHelp">備份您的資料以將其轉移至其他裝置中。</string>
+    <string name="noExternalStoragePermissionError">在匯入及匯出資料前，請先允許外部儲存裝置存取權限</string>
    <string name="importOptionFilesystemTitle">自檔案系統中匯入</string>
    <string name="importOptionFilesystemExplanation">自檔案系統中選取檔案。</string>
    <string name="importOptionFilesystemButton">自檔案系統</string>
@@ -174,7 +176,7 @@
    <string name="importVoucherVaultMessage">選取您自 Voucher Vault 匯出的 <i>vouchervault.json</i> 檔案以進行匯入。
 \n請您先透過 Voucher Vault 進行匯出。</string>
    <string name="importStocard">自 Stocard 中匯入</string>
-    <string name="importStocardMessage">>選取您自 Stocard 匯出的  <i>***-sync.zip</i> 檔案以進行匯入。
+    <string name="importStocardMessage">&gt;選取您自 Stocard 匯出的  <i>***-sync.zip</i> 檔案以進行匯入。
 \n請您寫封 Email 至 support@stocardapp.com 索取您的資料。</string>
    <string name="importLoyaltyCardKeychain">自 Loyalty Card Keychain 中匯入</string>
    <string name="importLoyaltyCardKeychainMessage">選取您自 Loyalty Card Keychain <i>LoyaltyCardKeychain.csv</i> 檔案以進行匯入。
@@ -191,15 +193,37 @@
    <string name="app_libraries">第三方自由函示庫：<xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="app_resources">第三方自由資源：<xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="selectBarcodeTitle">選擇條碼</string>
-    <string name="noGroups">請先點選 + 加號按鈕新增群組。</string>
+    <string name="noGroups">請點選 + 加號按鈕新增群組。</string>
    <string name="moveBarcodeToTopOfScreen">將條碼移至螢幕上方</string>
    <string name="moveBarcodeToCenterOfScreen">將條碼移至螢幕中央</string>
    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
    <string name="unsupportedBarcodeType">尚支援此條碼種類，但未來版本的應用程式可能會支援此條碼種類。</string>
    <string name="wrongValueForBarcodeType">條碼內容不適用於此條碼種類</string>
-    <string name="backImageDescription">卡片 (背面)</string>
-    <string name="updateBarcodeQuestionText">您已更新了條碼 ID，是否要更新條碼內容以匹配此 ID？</string>
+    <string name="backImageDescription">背面圖片</string>
+    <string name="updateBarcodeQuestionText">您已更新了 ID，是否要更新條碼內容以匹配此 ID？</string>
    <string name="failedGeneratingShareURL">無法建立可分享的 URL，請回報此錯誤。</string>
    <string name="swipeToSwitchImages">滑動或長按以切換圖片</string>
    <string name="starImage">收藏標示</string>
+    <string name="noGiftCardsGroup">建立一些卡片，然後將它們分配到這個群組中。</string>
+    <string name="showMoreInfo">顯示資訊</string>
+    <string name="hideMoreInfo">隱藏資訊</string>
+    <string name="action_show_details">顯示詳情</string>
+    <string name="shortcutSelectCard">選擇卡片</string>
+    <string name="starred">已收藏</string>
+    <plurals name="balancePoints">
+        <item quantity="other"><xliff:g>%s</xliff:g> 個點數</item>
+    </plurals>
+    <string name="selectColor">選擇顏色</string>
+    <string name="setIcon">設定圖示</string>
+    <string name="group_edit">編輯群組</string>
+    <string name="group_name_already_in_use">此群組名稱已存在</string>
+    <string name="group_name_is_empty">群組名稱不能為空</string>
+    <string name="group_updated">已更新群組</string>
+    <string name="editGroup">編輯群組中：<xliff:g>%s</xliff:g></string>
+    <string name="settings_oled_dark">使用深色主題時，使用純黑色背景</string>
+    <string name="action_hide_details">隱藏詳情</string>
+    <string name="translate_platform">於 Weblate</string>
+    <string name="options">選項</string>
+    <string name="set_scale">設定大小</string>
+    <string name="include_if_asking_support">如果您想請求協助，請附上以下訊息：</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -115,6 +115,8 @@
    <string name="sharedpreference_sort" translatable="false">sharedpreference_sort</string>
    <string name="sharedpreference_sort_order" translatable="false">sharedpreference_sort_order</string>
    <string name="sharedpreference_sort_direction" translatable="false">sharedpreference_sort_direction</string>
+    <string name="sharedpreference_card_details" translatable="false">sharedpreference_card_details</string>
+    <string name="sharedpreference_card_details_show" translatable="false">sharedpreference_card_details_show</string>
    <string name="intent_import_card_from_url_share_text">I want to share a card with you</string>
    <string name="intent_import_card_from_url_host_catima_app" translatable="false">catima.app</string>
    <string name="intent_import_card_from_url_path_prefix_catima_app" translatable="false">/share</string>
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -313,6 +313,24 @@ public class LoyaltyCardViewActivityTest {
        }
    }

+    @Test
+    @Config(qualifiers="de")
+    public void noCrashOnRegionlessLocale() {
+        ActivityController activityController = Robolectric.buildActivity(LoyaltyCardEditActivity.class).create();
+
+        LoyaltyCardEditActivity activity = (LoyaltyCardEditActivity) activityController.get();
+        final Context context = activity.getApplicationContext();
+
+        activityController.start();
+        activityController.visible();
+        activityController.resume();
+
+        shadowOf(getMainLooper()).idle();
+
+        // Check default settings
+        checkAllFields(activity, ViewMode.ADD_CARD, "", "", context.getString(R.string.never), "0", context.getString(R.string.points), "", context.getString(R.string.sameAsCardId), context.getString(R.string.noBarcode), null, null);
+    }
+
    @Test
    public void noDataLossOnResumeOrRotate() {
        registerMediaStoreIntentHandler();
--- a/fastlane/metadata/android/bg/short_description.txt
+++ b/fastlane/metadata/android/bg/short_description.txt
@@ -1 +1 @@
-За вашите щрихкодове, членства, програми за лоялност, талони и билети.
+За щрихкодове, членства, програми за лоялност, талони и билети.
--- a/fastlane/metadata/android/cs-CZ/changelogs/10.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/10.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/100.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/100.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/101.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/101.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/11.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/11.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/12.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/12.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/13.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/13.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/14.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/14.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/15.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/15.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/16.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/16.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/17.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/17.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/18.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/18.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/19.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/19.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/2.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/2.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/20.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/20.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/21.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/21.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/22.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/22.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/23.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/23.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/24.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/24.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/25.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/25.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/26.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/26.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/27.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/27.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/28.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/28.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/29.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/29.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/3.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/3.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/30.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/30.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/31.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/31.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/32.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/32.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/33.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/33.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/34.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/34.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/35.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/35.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/36.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/36.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/37.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/37.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/38.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/38.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/39.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/39.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/4.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/4.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/40.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/41.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/41.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/42.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/42.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/43.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/43.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/44.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/44.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/45.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/45.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/46.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/46.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/47.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/47.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/48.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/48.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/49.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/49.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/5.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/5.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/50.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/50.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/51.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/51.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/52.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/52.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/54.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/54.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/55.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/55.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/56.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/56.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/57.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/57.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/58.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/58.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/59.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/59.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/6.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/6.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/61.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/61.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/62.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/62.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/63.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/63.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/64.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/64.txt
--- a/fastlane/metadata/android/cs-CZ/changelogs/66.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/66.txt
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sylvia van Os	54fc1e9106	Release Catima 2.16.0	2022-03-09 19:27:08 +01:00
Sylvia van Os	1ce4216584	Fix extreme padding on some barcode types	2022-03-09 19:07:19 +01:00
Sylvia van Os	78d0bc7bb7	Merge pull request #834 from CatimaLoyalty/create-pull-request/patch-1646770776 Update Fastlane changelogs	2022-03-08 21:20:24 +01:00
bors[bot]	fc4bb134a9	Update Fastlane changelogs	2022-03-08 20:19:35 +00:00
bors[bot]	cecfcd4714	Merge #833 833: Padding improvements r=TheLastProject a=TheLastProject Fixes #823 Sadly, it also caused a new regression, cutting off part of the card ID if you use AZTEC and a photo... \| Before \| After \| \| - \| - \| \| ![image](https://user-images.githubusercontent.com/1885159/157125003-e336fef8-4dbe-4f75-8d00-908bced3e533.png) \| ![image](https://user-images.githubusercontent.com/1885159/157125032-41f3e8ac-9fca-4f21-9a0e-df955670814a.png) \| Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>	2022-03-08 20:13:56 +00:00
Sylvia van Os	c3364d4592	Update CHANGELOG	2022-03-08 21:12:50 +01:00
Sylvia van Os	df29abbebd	Fix weird UI glitch No, I don't understand why this works. Black magic, I guess.	2022-03-08 21:10:28 +01:00
Sylvia van Os	d4f30f798b	Update screenshots	2022-03-08 20:33:46 +01:00
Sylvia van Os	61578a6016	Consistency improvements	2022-03-08 19:56:42 +01:00
Sylvia van Os	13695b5c37	Padding improvements	2022-03-07 22:57:42 +01:00
Sylvia van Os	97d1dcc7eb	Merge pull request #830 from CatimaLoyalty/create-pull-request/patch-1646543770 Update contributors	2022-03-06 10:41:00 +01:00
TheLastProject	5efea8c1e8	Update contributors	2022-03-06 05:16:09 +00:00
bors[bot]	c2607cc6a2	Merge #829 829: Translations update from Hosted Weblate r=TheLastProject a=weblate Translations update from [Hosted Weblate](https://hosted.weblate.org) for [Catima/Android](https://hosted.weblate.org/projects/catima/catima/). It also includes following components: * [Catima/Android (Fastlane)](https://hosted.weblate.org/projects/catima/fastlane/) Current translation status: ![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg) Co-authored-by: Joel A <joeax910@student.liu.se>	2022-03-04 06:52:28 +00:00
Joel A	6c70e77a75	Translated using Weblate (Swedish) Currently translated at 100.0% (243 of 243 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/sv/	2022-03-04 04:58:38 +01:00
bors[bot]	d67c896ffe	Merge #828 828: Translations update from Hosted Weblate r=TheLastProject a=weblate Translations update from [Hosted Weblate](https://hosted.weblate.org) for [Catima/Android](https://hosted.weblate.org/projects/catima/catima/). It also includes following components: * [Catima/Android (Fastlane)](https://hosted.weblate.org/projects/catima/fastlane/) Current translation status: ![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg) Co-authored-by: Giovanni Donisi <giovannidonisi0701@gmail.com>	2022-02-27 14:59:06 +00:00
Giovanni Donisi	c821040c25	Translated using Weblate (Italian) Currently translated at 100.0% (243 of 243 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/	2022-02-27 15:54:58 +01:00
Sylvia van Os	946a56e921	Merge pull request #827 from CatimaLoyalty/create-pull-request/patch-1645937169 Update contributors	2022-02-27 09:10:05 +01:00
TheLastProject	b1ea2c4687	Update contributors	2022-02-27 04:46:09 +00:00
bors[bot]	745dd109fb	Merge #825 825: Translations update from Hosted Weblate r=TheLastProject a=weblate Translations update from [Hosted Weblate](https://hosted.weblate.org) for [Catima/Android](https://hosted.weblate.org/projects/catima/catima/). It also includes following components: * [Catima/Android (Fastlane)](https://hosted.weblate.org/projects/catima/fastlane/) Current translation status: ![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg) Co-authored-by: IllusiveMan196 <hamsterrv@gmail.com> Co-authored-by: huuhaa <huuhaa.tm+gitlab@gmail.com> Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>	2022-02-22 14:03:38 +00:00
Oğuz Ersen	9f047f3dbd	Translated using Weblate (Turkish) Currently translated at 59.2% (61 of 103 strings) Translation: Catima/Android (Fastlane) Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/tr/	2022-02-22 14:55:20 +01:00
huuhaa	68afe746eb	Translated using Weblate (Finnish) Currently translated at 2.9% (3 of 103 strings) Translation: Catima/Android (Fastlane) Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/fi/	2022-02-22 14:55:20 +01:00
huuhaa	ebd3b0f7f5	Translated using Weblate (Finnish) Currently translated at 100.0% (243 of 243 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/fi/	2022-02-22 14:55:20 +01:00
IllusiveMan196	163de3653e	Translated using Weblate (Ukrainian) Currently translated at 25.2% (26 of 103 strings) Translation: Catima/Android (Fastlane) Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/uk/	2022-02-22 14:55:20 +01:00
IllusiveMan196	1507694bae	Translated using Weblate (Ukrainian) Currently translated at 100.0% (243 of 243 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/uk/	2022-02-22 14:55:20 +01:00
Sylvia van Os	6d134009be	Merge pull request #819 from Kethen/emoji_icon emoji icons, color theme in short-cut selection menu	2022-02-20 18:11:31 +01:00
Sylvia van Os	c1d2a30931	Merge pull request #821 from Kethen/edit_view_card_icon_corner proper clipping for card icon inside edit view	2022-02-20 18:05:57 +01:00
Sylvia van Os	e5cb6fa1a7	Merge pull request #822 from weblate/weblate-catima-catima Translations update from Hosted Weblate	2022-02-20 17:13:42 +01:00
Joel A	2188280ada	Translated using Weblate (Swedish) Currently translated at 99.5% (240 of 241 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/sv/	2022-02-20 16:58:40 +01:00
Katharine Chui	fdc8cb0adf	proper clipping for card icon inside edit view	2022-02-20 20:33:25 +08:00
Sylvia van Os	b79286d1a6	Merge pull request #820 from CatimaLoyalty/create-pull-request/patch-1645334167 Update contributors	2022-02-20 12:49:42 +01:00
Katharine Chui	d9f0ea8346	emoji icons, color theme in short-cut selection menu	2022-02-20 19:16:43 +08:00
TheLastProject	a262120bc3	Update contributors	2022-02-20 05:16:06 +00:00
Sylvia van Os	446131a87d	Merge pull request #817 from Kethen/card_view_color_fix #803 cardView appbar icon fix	2022-02-19 17:02:57 +01:00
Sylvia van Os	3466ba6591	Merge pull request #818 from CatimaLoyalty/create-pull-request/patch-1645281896 Update Fastlane changelogs	2022-02-19 15:46:35 +01:00
TheLastProject	5b3c6559b4	Update Fastlane changelogs	2022-02-19 14:44:56 +00:00
Sylvia van Os	4680b53f86	Save card details expansion state	2022-02-19 15:44:35 +01:00
Katharine Chui	8423ea9b59	in cardView, hide iconImage manually instead of relying on appBarLayout height	2022-02-19 21:31:16 +08:00
Sylvia van Os	1d8b2d82ed	Remove duplicate translation	2022-02-16 23:54:08 +01:00
Sylvia van Os	784bd299e8	Fastlane fixes	2022-02-16 23:41:43 +01:00
bors[bot]	c8df7a7a2e	Merge #814 814: Translations update from Hosted Weblate r=TheLastProject a=weblate Translations update from [Hosted Weblate](https://hosted.weblate.org) for [Catima/Android](https://hosted.weblate.org/projects/catima/catima/). It also includes following components: * [Catima/Android (Fastlane)](https://hosted.weblate.org/projects/catima/fastlane/) Current translation status: ![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg) Co-authored-by: 109247019824 <stoyan@gmx.com> Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com> Co-authored-by: ssantos <ssantos@web.de>	2022-02-14 21:58:54 +00:00
ssantos	cec2058f49	Translated using Weblate (Portuguese) Currently translated at 6.8% (7 of 102 strings) Translation: Catima/Android (Fastlane) Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/pt/	2022-02-14 22:56:59 +01:00
Oğuz Ersen	c910a96005	Translated using Weblate (Turkish) Currently translated at 57.8% (59 of 102 strings) Translation: Catima/Android (Fastlane) Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/tr/	2022-02-14 22:56:59 +01:00
109247019824	f3c7a75963	Translated using Weblate (Bulgarian) Currently translated at 3.9% (4 of 102 strings) Translation: Catima/Android (Fastlane) Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/bg/	2022-02-14 22:56:59 +01:00
Sylvia van Os	04e0b9ba34	Merge pull request #813 from CatimaLoyalty/create-pull-request/patch-1644729316 Update contributors	2022-02-13 09:40:03 +01:00
TheLastProject	1b8e9e4d7c	Update contributors	2022-02-13 05:15:15 +00:00
bors[bot]	7a556e320b	Merge #812 812: Translations update from Hosted Weblate r=TheLastProject a=weblate Translations update from [Hosted Weblate](https://hosted.weblate.org) for [Catima/Android](https://hosted.weblate.org/projects/catima/catima/). It also includes following components: * [Catima/Android (Fastlane)](https://hosted.weblate.org/projects/catima/fastlane/) Current translation status: ![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg) Co-authored-by: 109247019824 <stoyan@gmx.com>	2022-02-11 20:10:27 +00:00
109247019824	db706a02d3	Translated using Weblate (Bulgarian) Currently translated at 100.0% (241 of 241 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/bg/	2022-02-11 20:55:41 +01:00
Sylvia van Os	8e452ed6bd	Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker	2022-02-11 20:04:50 +01:00
Sylvia van Os	a9e574a9b4	Release Catima 2.15.2	2022-02-11 20:04:38 +01:00
Sylvia van Os	f24d11403c	Merge pull request #810 from CatimaLoyalty/create-pull-request/patch-1644601552 Update Fastlane changelogs	2022-02-11 19:46:45 +01:00
TheLastProject	e1c658ac2a	Update Fastlane changelogs	2022-02-11 17:45:52 +00:00
Sylvia van Os	a5901700b4	Fix crash in edit activity on locale without region	2022-02-11 18:45:28 +01:00
Sylvia van Os	bf4cd7a961	Merge pull request #807 from CatimaLoyalty/create-pull-request/patch-1644529031 Update Fastlane changelogs	2022-02-10 22:37:35 +01:00
TheLastProject	79ca5196d0	Update Fastlane changelogs	2022-02-10 21:37:10 +00:00
Sylvia van Os	b24d641aa6	Fix manual language selection not applying anywhere	2022-02-10 22:36:51 +01:00
Sylvia van Os	84051555b6	Release Catima 2.15.1	2022-02-10 17:39:39 +01:00
Sylvia van Os	48ff57d0fc	Merge pull request #802 from CatimaLoyalty/create-pull-request/patch-1644510077 Update Fastlane changelogs	2022-02-10 17:23:42 +01:00
TheLastProject	3a6828b34b	Update Fastlane changelogs	2022-02-10 16:21:16 +00:00
Sylvia van Os	efd36d061f	Update CHANGELOG	2022-02-10 17:20:52 +01:00
bors[bot]	a5ef8ae914	Merge #801 801: Translations update from Hosted Weblate r=TheLastProject a=weblate Translations update from [Hosted Weblate](https://hosted.weblate.org) for [Catima/Android](https://hosted.weblate.org/projects/catima/catima/). It also includes following components: * [Catima/Android (Fastlane)](https://hosted.weblate.org/projects/catima/fastlane/) Current translation status: ![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg) Co-authored-by: Allan Nordhøy <epost@anotheragency.no>	2022-02-10 11:14:04 +00:00
Allan Nordhøy	37ce61646b	Translated using Weblate (Norwegian Bokmål) Currently translated at 98.7% (238 of 241 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/	2022-02-10 12:13:15 +01:00
bors[bot]	5e59315017	Merge #799 799: Translations update from Hosted Weblate r=TheLastProject a=weblate Translations update from [Hosted Weblate](https://hosted.weblate.org) for [Catima/Android](https://hosted.weblate.org/projects/catima/catima/). It also includes following components: * [Catima/Android (Fastlane)](https://hosted.weblate.org/projects/catima/fastlane/) Current translation status: ![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg) Co-authored-by: Heimen Stoffels <vistausss@fastmail.com> Co-authored-by: solokot <solokot@gmail.com> Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com> Co-authored-by: SC <lalocas@protonmail.com> Co-authored-by: Still Hsu <dev@stillu.cc>	2022-02-09 16:50:40 +00:00
Still Hsu	fbed1348aa	Translated using Weblate (Chinese (Traditional)) Currently translated at 3.9% (4 of 101 strings) Translation: Catima/Android (Fastlane) Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/zh_Hant/	2022-02-09 15:57:11 +01:00
Still Hsu	438e9f09a3	Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (241 of 241 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/zh_Hant/	2022-02-09 15:57:11 +01:00
SC	aee9176518	Translated using Weblate (Portuguese) Currently translated at 100.0% (241 of 241 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/pt/	2022-02-09 15:57:11 +01:00
Oğuz Ersen	70f7768cee	Translated using Weblate (Turkish) Currently translated at 58.4% (59 of 101 strings) Translation: Catima/Android (Fastlane) Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/tr/	2022-02-09 15:57:11 +01:00
solokot	bf7e35c361	Translated using Weblate (Russian) Currently translated at 100.0% (241 of 241 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/	2022-02-09 15:57:11 +01:00
Heimen Stoffels	71a6fb2f56	Translated using Weblate (Dutch) Currently translated at 100.0% (241 of 241 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/	2022-02-09 15:57:11 +01:00
Sylvia van Os	8d799fce26	Fix fastlane directory names	2022-02-08 22:02:38 +01:00
bors[bot]	ae6e98b876	Merge #798 798: Translations update from Hosted Weblate r=TheLastProject a=weblate Translations update from [Hosted Weblate](https://hosted.weblate.org) for [Catima/Android](https://hosted.weblate.org/projects/catima/catima/). It also includes following components: * [Catima/Android (Fastlane)](https://hosted.weblate.org/projects/catima/fastlane/) Current translation status: ![Weblate translation status](https://hosted.weblate.org/widgets/catima/-/catima/horizontal-auto.svg) Co-authored-by: Altons <marsupilami450@gmail.com> Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>	2022-02-07 16:38:06 +00:00
Oğuz Ersen	44d8597fa5	Translated using Weblate (Turkish) Currently translated at 100.0% (241 of 241 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/tr/	2022-02-07 12:56:29 +01:00
Altons	de47b7b1d2	Translated using Weblate (French) Currently translated at 100.0% (241 of 241 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/	2022-02-07 12:56:29 +01:00
Altons	631d65708e	Translated using Weblate (German) Currently translated at 100.0% (241 of 241 strings) Translation: Catima/Android Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/	2022-02-07 12:56:29 +01:00
Sylvia van Os	62ffcbc948	Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker	2022-02-06 22:53:09 +01:00
Sylvia van Os	14ef3086a4	Make spotBugs happy	2022-02-06 22:52:55 +01:00
Sylvia van Os	011b0f7ecc	Merge pull request #796 from CatimaLoyalty/create-pull-request/patch-1644183457 Update Fastlane changelogs	2022-02-06 22:37:56 +01:00
TheLastProject	89eaac12d5	Update Fastlane changelogs	2022-02-06 21:37:37 +00:00
Sylvia van Os	2fbe5a821c	Fix main menu item hiding logic	2022-02-06 22:37:21 +01:00