Release Catima 2.20.0

Merge pull request #1042 from weblate/weblate-catima-catima
Translations update from Hosted Weblate
2025-12-25 16:17:53 -05:00 · 2022-09-21 18:54:19 +02:00 · 2022-09-21 18:41:06 +02:00 · 2022-09-21 18:34:34 +02:00 · 2022-09-21 18:28:57 +02:00 · 2022-09-21 18:28:54 +02:00
238 changed files with 1638 additions and 692 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog

+## v2.20.0 - 114
+
+- Add Monochrome icon for Android 13
+- Improve first launch screen
+- Fidme import fixes
+
+## v2.19.0 - 113
+
+- Add previous and next buttons to the loyalty card view
+- Fix foreground colour on edit button
+- Replace floppy disk save icon with checkmark
+
 ## v2.18.2 - 112

 - Make the possibility to set a custom header more visible
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,8 @@ android {
        applicationId "me.hackerchick.catima"
        minSdkVersion 21
        targetSdkVersion 31
-        versionCode 112
-        versionName "2.18.2"
+        versionCode 114
+        versionName "2.20.0"

        vectorDrawables.useSupportLibrary true
        multiDexEnabled true
@@ -98,7 +98,7 @@ dependencies {
    implementation 'org.apache.commons:commons-csv:1.9.0'
    implementation 'com.jaredrummler:colorpicker:1.1.0'
    implementation 'com.github.invissvenska:NumberPickerPreference:1.0.4'
-    implementation 'net.lingala.zip4j:zip4j:2.11.1'
+    implementation 'net.lingala.zip4j:zip4j:2.11.2'

 // SpotBugs
    implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'
@@ -106,7 +106,7 @@ dependencies {
 // Testing
    testImplementation 'androidx.test:core:1.4.0'
    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.robolectric:robolectric:4.8.1'
+    testImplementation 'org.robolectric:robolectric:4.8.2'
 }

 tasks.withType(SpotBugsTask) {
--- a/app/src/main/java/protect/card_locker/AboutActivity.java
+++ b/app/src/main/java/protect/card_locker/AboutActivity.java
@@ -1,5 +1,6 @@
 package protect.card_locker;

+import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -9,6 +10,7 @@ import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
+import android.widget.Toast;

 import java.io.BufferedReader;
 import java.io.IOException;
@@ -63,6 +65,7 @@ public class AboutActivity extends CatimaAppCompatActivity implements View.OnCli
        USED_LIBRARIES.add(new ThirdPartyInfo("Color Picker", "https://github.com/jaredrummler/ColorPicker", "Apache 2.0"));
        USED_LIBRARIES.add(new ThirdPartyInfo("Commons CSV", "https://commons.apache.org/proper/commons-csv/", "Apache 2.0"));
        USED_LIBRARIES.add(new ThirdPartyInfo("NumberPickerPreference", "https://github.com/invissvenska/NumberPickerPreference", "GNU LGPL 3.0"));
+        USED_LIBRARIES.add(new ThirdPartyInfo("uCrop", "https://github.com/Yalantis/uCrop", "Apache 2.0"));
        USED_LIBRARIES.add(new ThirdPartyInfo("Zip4j", "https://github.com/srikanth-lingala/zip4j", "Apache 2.0"));
        USED_LIBRARIES.add(new ThirdPartyInfo("ZXing", "https://github.com/zxing/zxing", "Apache 2.0"));
        USED_LIBRARIES.add(new ThirdPartyInfo("ZXing Android Embedded", "https://github.com/journeyapps/zxing-android-embedded", "Apache 2.0"));
@@ -166,7 +169,12 @@ public class AboutActivity extends CatimaAppCompatActivity implements View.OnCli

        Intent intent = new Intent(Intent.ACTION_VIEW);
        intent.setData(Uri.parse(url));
-        startActivity(intent);
+        try {
+            startActivity(intent);
+        } catch (ActivityNotFoundException e) {
+            Toast.makeText(this, R.string.failedToOpenUrl, Toast.LENGTH_LONG).show();
+            Log.e(TAG, "No activity found to handle intent", e);
+        }
    }

 }
--- a/app/src/main/java/protect/card_locker/DBHelper.java
+++ b/app/src/main/java/protect/card_locker/DBHelper.java
@@ -361,7 +361,7 @@ public class DBHelper extends SQLiteOpenHelper {
            final SQLiteDatabase database, final String store, final String note, final Date expiry,
            final BigDecimal balance, final Currency balanceType, final String cardId,
            final String barcodeId, final CatimaBarcode barcodeType, final Integer headerColor,
-            final int starStatus, final Long lastUsed,final int archiveStatus) {
+            final int starStatus, final Long lastUsed, final int archiveStatus) {
        database.beginTransaction();

        // Card
@@ -426,7 +426,7 @@ public class DBHelper extends SQLiteOpenHelper {
            SQLiteDatabase database, final int id, final String store, final String note,
            final Date expiry, final BigDecimal balance, final Currency balanceType,
            final String cardId, final String barcodeId, final CatimaBarcode barcodeType,
-            final Integer headerColor) {
+            final Integer headerColor, final int starStatus, final Long lastUsed, final int archiveStatus) {
        database.beginTransaction();

        // Card
@@ -440,6 +440,10 @@ public class DBHelper extends SQLiteOpenHelper {
        contentValues.put(LoyaltyCardDbIds.BARCODE_ID, barcodeId);
        contentValues.put(LoyaltyCardDbIds.BARCODE_TYPE, barcodeType != null ? barcodeType.name() : null);
        contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
+        contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
+        contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
+        contentValues.put(LoyaltyCardDbIds.ARCHIVE_STATUS, archiveStatus);
+
        int rowsUpdated = database.update(LoyaltyCardDbIds.TABLE, contentValues,
                whereAttrs(LoyaltyCardDbIds.ID), withArgs(id));

--- a/app/src/main/java/protect/card_locker/LoyaltyCard.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCard.java
@@ -36,7 +36,8 @@ public class LoyaltyCard implements Parcelable {
    public LoyaltyCard(final int id, final String store, final String note, final Date expiry,
                       final BigDecimal balance, final Currency balanceType, final String cardId,
                       @Nullable final String barcodeId, @Nullable final CatimaBarcode barcodeType,
-                       @Nullable final Integer headerColor, final int starStatus, final long lastUsed, final int zoomLevel,final int archiveStatus) {
+                       @Nullable final Integer headerColor, final int starStatus,
+                       final long lastUsed, final int zoomLevel, final int archiveStatus) {
        this.id = id;
        this.store = store;
        this.note = note;
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -207,7 +207,9 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                (CatimaBarcode) (fieldName == LoyaltyCardField.barcodeType ? value : loyaltyCard.barcodeType),
                (Integer) (fieldName == LoyaltyCardField.headerColor ? value : loyaltyCard.headerColor),
                (int) (fieldName == LoyaltyCardField.starStatus ? value : loyaltyCard.starStatus),
-                Utils.getUnixTime(), 100, (int) (fieldName == LoyaltyCardField.archiveStatus ? value : loyaltyCard.archiveStatus)
+                0, // Unimportant, always set to null in doSave so the DB updates it to the current timestamp
+                100, // Unimportant, not updated in doSave, defaults to 100 for new cards
+                (int) (fieldName == LoyaltyCardField.archiveStatus ? value : loyaltyCard.archiveStatus)
        );
    }

@@ -975,16 +977,12 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);

        if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-            try {
-                if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_FRONT) {
-                    takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_FRONT);
-                } else if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_BACK) {
-                    takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_BACK);
-                } else if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_ICON) {
-                    takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_ICON);
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
+            if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_FRONT) {
+                takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_FRONT);
+            } else if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_BACK) {
+                takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_BACK);
+            } else if (requestCode == PERMISSION_REQUEST_CAMERA_IMAGE_ICON) {
+                takePhotoForCard(Utils.CARD_IMAGE_FROM_CAMERA_ICON);
            }
        }
    }
@@ -1220,6 +1218,10 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
                            callable.call();
                        } catch (Exception e) {
                            e.printStackTrace();
+
+                            // Rethrow as NoSuchElementException
+                            // This isn't really true, but a View.OnClickListener doesn't allow throwing other types
+                            throw new NoSuchElementException(e.getMessage());
                        }
                    })
                    .show();
@@ -1316,35 +1318,34 @@ public class LoyaltyCardEditActivity extends CatimaAppCompatActivity {
            selectedGroups.add((Group) chip.getTag());
        }

-        if (updateLoyaltyCard) {   //update of "starStatus" not necessary, since it cannot be changed in this activity (only in ViewActivity)
-            DBHelper.updateLoyaltyCard(mDatabase, loyaltyCardId, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor);
-            try {
-                Utils.saveCardImage(this, (Bitmap) cardImageFront.getTag(), loyaltyCardId, ImageLocationType.front);
-                Utils.saveCardImage(this, (Bitmap) cardImageBack.getTag(), loyaltyCardId, ImageLocationType.back);
-                Utils.saveCardImage(this, (Bitmap) thumbnail.getTag(), loyaltyCardId, ImageLocationType.icon);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-            }
-            Log.i(TAG, "Updated " + loyaltyCardId + " to " + cardId);
+        // Both update and new card save with lastUsed set to null
+        // This makes the DBHelper set it to the current date
+        // So that new and edited card are always on top when sorting by recently used
+        if (updateLoyaltyCard) {
+            DBHelper.updateLoyaltyCard(mDatabase, loyaltyCardId, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor, tempLoyaltyCard.starStatus, null, tempLoyaltyCard.archiveStatus);
        } else {
-            loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor, 0, tempLoyaltyCard.lastUsed,0);
-            try {
-                Utils.saveCardImage(this, (Bitmap) cardImageFront.getTag(), loyaltyCardId, ImageLocationType.front);
-                Utils.saveCardImage(this, (Bitmap) cardImageBack.getTag(), loyaltyCardId, ImageLocationType.back);
-                Utils.saveCardImage(this, (Bitmap) thumbnail.getTag(), loyaltyCardId, ImageLocationType.icon);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-            }
+            loyaltyCardId = (int) DBHelper.insertLoyaltyCard(mDatabase, tempLoyaltyCard.store, tempLoyaltyCard.note, tempLoyaltyCard.expiry, tempLoyaltyCard.balance, tempLoyaltyCard.balanceType, tempLoyaltyCard.cardId, tempLoyaltyCard.barcodeId, tempLoyaltyCard.barcodeType, tempLoyaltyCard.headerColor, 0, null, 0);
        }

+        try {
+            Utils.saveCardImage(this, (Bitmap) cardImageFront.getTag(), loyaltyCardId, ImageLocationType.front);
+            Utils.saveCardImage(this, (Bitmap) cardImageBack.getTag(), loyaltyCardId, ImageLocationType.back);
+            Utils.saveCardImage(this, (Bitmap) thumbnail.getTag(), loyaltyCardId, ImageLocationType.icon);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        Log.i(TAG, "Set " + loyaltyCardId + " to " + cardId + " (update: " + updateLoyaltyCard + ")");
+
        DBHelper.setLoyaltyCardGroups(mDatabase, loyaltyCardId, selectedGroups);

        ShortcutHelper.updateShortcuts(this, DBHelper.getLoyaltyCard(mDatabase, loyaltyCardId));

-        if(duplicateFromLoyaltyCardId){
+        if (duplicateFromLoyaltyCardId) {
            Intent intent = new Intent(getApplicationContext(), MainActivity.class);
            startActivity(intent);
        }
+
        finish();
    }

--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -8,10 +8,15 @@ import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Outline;
+import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
 import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
+import android.text.util.Linkify;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.GestureDetector;
@@ -19,7 +24,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.ViewOutlineProvider;
 import android.view.ViewTreeObserver;
 import android.view.Window;
@@ -31,9 +35,22 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;

+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.Guideline;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.graphics.BlendModeColorFilterCompat;
+import androidx.core.graphics.BlendModeCompat;
+import androidx.core.graphics.ColorUtils;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.widget.TextViewCompat;
+
 import com.google.android.material.appbar.AppBarLayout;
-import com.google.android.material.bottomsheet.BottomSheetBehavior;
-import com.google.android.material.color.MaterialColors;
+import com.google.android.material.bottomappbar.BottomAppBar;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;

 import java.io.UnsupportedEncodingException;
@@ -43,20 +60,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.content.res.AppCompatResources;
-import androidx.appcompat.widget.AppCompatTextView;
-import androidx.appcompat.widget.Toolbar;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.constraintlayout.widget.Guideline;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import androidx.core.content.ContextCompat;
-import androidx.core.graphics.ColorUtils;
-import androidx.core.graphics.drawable.DrawableCompat;
-import androidx.core.widget.NestedScrollView;
-import androidx.core.widget.TextViewCompat;
 import protect.card_locker.async.TaskHandler;
 import protect.card_locker.preferences.Settings;

@@ -68,14 +71,10 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
    CoordinatorLayout coordinatorLayout;
    ConstraintLayout mainLayout;
    TextView cardIdFieldView;
-    BottomSheetBehavior behavior;
-    LinearLayout bottomSheet;
-    NestedScrollView bottomSheetContentWrapper;
-    ImageView bottomSheetButton;
-    TextView noteView;
-    TextView groupsView;
-    TextView balanceView;
-    TextView expiryView;
+    BottomAppBar bottomAppBar;
+    ImageButton bottomAppBarInfoButton;
+    ImageButton bottomAppBarPreviousButton;
+    ImageButton bottomAppBarNextButton;
    AppCompatTextView storeName;
    ImageButton maximizeButton;
    ImageView mainImage;
@@ -84,10 +83,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
    View collapsingToolbarLayout;
    AppBarLayout appBarLayout;
    ImageView iconImage;
+    Toolbar portraitToolbar;
    Toolbar landscapeToolbar;

    int loyaltyCardId;
+    ArrayList<Integer> cardList;
+
    LoyaltyCard loyaltyCard;
+    List<Group> loyaltyCardGroups;
    boolean rotationEnabled;
    SQLiteDatabase database;
    ImportURIHelper importURIHelper;
@@ -113,11 +116,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
    private ImageView[] dots;
    boolean isBarcodeSupported = true;

-    int bottomSheetState;
-
    static final String STATE_IMAGEINDEX = "imageIndex";
    static final String STATE_FULLSCREEN = "isFullscreen";
-    static final String STATE_BOTTOMSHEET = "bottomSheetState";

    private final int HEADER_FILTER_ALPHA = 127;

@@ -207,6 +207,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
    private void extractIntentFields(Intent intent) {
        final Bundle b = intent.getExtras();
        loyaltyCardId = b != null ? b.getInt("id") : 0;
+        cardList = b != null ? b.getIntegerArrayList("cardList") : null;
        Log.d(TAG, "View activity: id=" + loyaltyCardId);
    }

@@ -227,6 +228,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        Drawable unwrappedIcon = AppCompatResources.getDrawable(this, icon);
        assert unwrappedIcon != null;
        Drawable wrappedIcon = DrawableCompat.wrap(unwrappedIcon);
+        wrappedIcon.mutate();
        if (dark) {
            DrawableCompat.setTint(wrappedIcon, Color.BLACK);
        } else {
@@ -249,6 +251,25 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements

    @Override
    protected void onCreate(Bundle savedInstanceState) {
+        if (savedInstanceState == null) {
+            Bundle incomingIntentExtras = getIntent().getExtras();
+
+            if (incomingIntentExtras == null) {
+                Toast.makeText(this, R.string.noCardExistsError, Toast.LENGTH_LONG).show();
+                finish();
+                return;
+            }
+
+            int transitionRight = incomingIntentExtras.getInt("transition_right", -1);
+            if (transitionRight == 1) {
+                // right side transition
+                overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left);
+            } else if (transitionRight == 0) {
+                // left side transition
+                overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right);
+            }
+        }
+
        super.onCreate(savedInstanceState);

        settings = new Settings(this);
@@ -267,10 +288,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        if (savedInstanceState != null) {
            mainImageIndex = savedInstanceState.getInt(STATE_IMAGEINDEX);
            isFullscreen = savedInstanceState.getBoolean(STATE_FULLSCREEN);
-            bottomSheetState = savedInstanceState.getInt(STATE_BOTTOMSHEET);
        }

-
        extractIntentFields(getIntent());

        setContentView(R.layout.loyalty_card_view_layout);
@@ -281,13 +300,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        coordinatorLayout = findViewById(R.id.coordinator_layout);
        mainLayout = findViewById(R.id.mainLayout);
        cardIdFieldView = findViewById(R.id.cardIdView);
-        bottomSheet = findViewById(R.id.bottom_sheet);
-        bottomSheetContentWrapper = findViewById(R.id.bottomSheetContentWrapper);
-        bottomSheetButton = findViewById(R.id.bottomSheetButton);
-        noteView = findViewById(R.id.noteView);
-        groupsView = findViewById(R.id.groupsView);
-        balanceView = findViewById(R.id.balanceView);
-        expiryView = findViewById(R.id.expiryView);
        storeName = findViewById(R.id.storeName);
        maximizeButton = findViewById(R.id.maximizeButton);
        mainImage = findViewById(R.id.mainImage);
@@ -296,9 +308,15 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        minimizeButton = findViewById(R.id.minimizeButton);
        collapsingToolbarLayout = findViewById(R.id.collapsingToolbarLayout);
        appBarLayout = findViewById(R.id.app_bar_layout);
+        bottomAppBar = findViewById(R.id.bottom_app_bar);
        iconImage = findViewById(R.id.icon_image);
+        portraitToolbar = findViewById(R.id.toolbar);
        landscapeToolbar = findViewById(R.id.toolbar_landscape);

+        bottomAppBarInfoButton = findViewById(R.id.button_show_info);
+        bottomAppBarPreviousButton = findViewById(R.id.button_previous);
+        bottomAppBarNextButton = findViewById(R.id.button_next);
+
        barcodeImageGenerationFinishedCallback = () -> {
            if (!(boolean) mainImage.getTag()) {
                mainImage.setVisibility(View.GONE);
@@ -363,33 +381,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        });
        editButton.bringToFront();

-        behavior = BottomSheetBehavior.from(bottomSheet);
-        behavior.addBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
-            @Override
-            public void onStateChanged(@NonNull View bottomSheet, int newState) {
-                changeUiToBottomSheetState(newState);
-            }
-
-            @Override
-            public void onSlide(@NonNull View bottomSheet, float slideOffset) {
-            }
-        });
-
-        bottomSheetButton.setOnClickListener(v -> {
-            if (behavior.getState() == BottomSheetBehavior.STATE_EXPANDED) {
-                behavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
-            } else {
-                behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
-            }
-        });
-
-        appBarLayout.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
-            @Override
-            public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
-                adjustLayoutHeights();
-            }
-        });
-
        appBarLayout.setOutlineProvider(new ViewOutlineProvider() {
            @Override
            public void getOutline(View view, Outline outline) {
@@ -398,61 +389,144 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
            }
        });

+        bottomAppBarInfoButton.setOnClickListener(view -> showInfoDialog());
+        bottomAppBarPreviousButton.setOnClickListener(view -> prevNextCard(false));
+        bottomAppBarNextButton.setOnClickListener(view -> prevNextCard(true));
+
        mGestureDetector = new GestureDetector(this, this);
        View.OnTouchListener gestureTouchListener = (v, event) -> mGestureDetector.onTouchEvent(event);
        mainImage.setOnTouchListener(gestureTouchListener);
-    }

-    private void changeUiToBottomSheetState(int newState) {
-        if (newState == BottomSheetBehavior.STATE_DRAGGING) {
-            editButton.hide();
-        } else if (newState == BottomSheetBehavior.STATE_EXPANDED) {
-            bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_down_24);
-            bottomSheetButton.setContentDescription(getString(R.string.hideMoreInfo));
-            mainLayout.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS);
-            editButton.hide();
-        } else if (newState == BottomSheetBehavior.STATE_COLLAPSED) {
-            bottomSheetButton.setImageResource(R.drawable.ic_baseline_arrow_drop_up_24);
-            bottomSheetButton.setContentDescription(getString(R.string.showMoreInfo));
-            mainLayout.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);
-            if (!isFullscreen) {
-                editButton.show();
-            }
-
-            // Scroll bottomsheet content back to top
-            bottomSheetContentWrapper.setScrollY(0);
-        }
-        bottomSheetState = newState;
-    }
-
-    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 (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())
-            );
-        }
-        int bottomSheetHeight = getResources().getDisplayMetrics().heightPixels - appBarLayout.getHeight() - bottomSheetButton.getLayoutParams().height;
-        ViewGroup.LayoutParams params = bottomSheetContentWrapper.getLayoutParams();
-        if (params.height != bottomSheetHeight || params.width != LinearLayout.LayoutParams.MATCH_PARENT) {
-            // XXX android 5 - 9 has so much quirks with setting bottomSheetContent height
-            // just invalidate the wrapper works on 10 onward
-            // bottomSheetContentWrapper.invalidate();
-            // The below worked on android 5 but not 6, reloading the card then it breaks again on 6, entirely random :(
-            // for (int i = 0; i < bottomSheetContentWrapper.getChildCount(); i++) {
-            //     bottomSheetContentWrapper.getChildAt(i).invalidate();
-            // }
-            // since it's basically allergic to getting enlarged then shrunk again, and setting it at all when fullscreen makes no sense
-            if (!isFullscreen) {
-                Log.d("adjustLayoutHeights", "setting bottomSheet height from: " + params.height + " to: " + bottomSheetHeight);
-                bottomSheetContentWrapper.setLayoutParams(
-                        new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, bottomSheetHeight)
+        appBarLayout.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+            @Override
+            public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+                iconImage.setLayoutParams(new CoordinatorLayout.LayoutParams(
+                        CoordinatorLayout.LayoutParams.MATCH_PARENT, appBarLayout.getHeight())
                );
+                iconImage.setClipBounds(new Rect(left, top, right, bottom));
            }
+        });
+    }
+
+    private SpannableStringBuilder padSpannableString(SpannableStringBuilder spannableStringBuilder) {
+        if (spannableStringBuilder.length() > 0) {
+            spannableStringBuilder.append("\n\n");
+        }
+
+        return spannableStringBuilder;
+    }
+
+    private boolean hasBalance(LoyaltyCard loyaltyCard) {
+        return !loyaltyCard.balance.equals(new BigDecimal(0));
+    }
+
+    private void showInfoDialog() {
+        AlertDialog.Builder infoDialog = new AlertDialog.Builder(this);
+
+        TextView infoTitleView = new TextView(this);
+        infoTitleView.setPadding(20, 20, 20, 20);
+        infoTitleView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
+        infoTitleView.setText(loyaltyCard.store);
+        infoDialog.setCustomTitle(infoTitleView);
+        infoDialog.setTitle(loyaltyCard.store);
+
+        TextView infoTextview = new TextView(this);
+        infoTextview.setPadding(20, 0, 20, 0);
+        infoTextview.setAutoLinkMask(Linkify.ALL);
+        infoTextview.setTextIsSelectable(true);
+
+        SpannableStringBuilder infoText = new SpannableStringBuilder();
+        if (!loyaltyCard.note.isEmpty()) {
+            infoText.append(loyaltyCard.note);
+        }
+
+        if (loyaltyCardGroups.size() > 0) {
+            List<String> groupNames = new ArrayList<>();
+            for (Group group : loyaltyCardGroups) {
+                groupNames.add(group._id);
+            }
+
+            padSpannableString(infoText);
+            infoText.append(getString(R.string.groupsList, TextUtils.join(", ", groupNames)));
+        }
+
+        if (hasBalance(loyaltyCard)) {
+            padSpannableString(infoText);
+            infoText.append(getString(R.string.balanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)));
+        }
+
+        if (loyaltyCard.expiry != null) {
+            String formattedExpiry = DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry);
+
+            padSpannableString(infoText);
+            if (Utils.hasExpired(loyaltyCard.expiry)) {
+                int start = infoText.length();
+
+                infoText.append(getString(R.string.expiryStateSentenceExpired, formattedExpiry));
+                infoText.setSpan(new ForegroundColorSpan(Color.RED), start, infoText.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+            } else {
+                infoText.append(getString(R.string.expiryStateSentence, formattedExpiry));
+            }
+        }
+
+        infoTextview.setText(infoText);
+
+        infoDialog.setView(infoTextview);
+        infoDialog.setPositiveButton(R.string.ok, (dialogInterface, i) -> dialogInterface.dismiss());
+        infoDialog.create().show();
+    }
+
+    private void setBottomAppBarButtonState() {
+        if (!loyaltyCard.note.isEmpty() || !loyaltyCardGroups.isEmpty() || hasBalance(loyaltyCard) || loyaltyCard.expiry != null) {
+            bottomAppBarInfoButton.setVisibility(View.VISIBLE);
+        } else {
+            bottomAppBarInfoButton.setVisibility(View.GONE);
+        }
+
+        if (cardList == null || cardList.size() == 1) {
+            bottomAppBarPreviousButton.setVisibility(View.GONE);
+            bottomAppBarNextButton.setVisibility(View.GONE);
+        } else {
+            bottomAppBarPreviousButton.setVisibility(View.VISIBLE);
+            bottomAppBarNextButton.setVisibility(View.VISIBLE);
        }
    }

+    private void prevNextCard(boolean next) {
+        // If we're in RTL layout, we want the "left" button to be "next" instead of "previous"
+        // So we swap next around
+        boolean transitionRight = next;
+        if (getResources().getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
+            next = !next;
+        }
+
+        int cardListPosition = cardList.indexOf(loyaltyCardId);
+
+        if (next) {
+            if (cardListPosition == cardList.size() - 1) {
+                cardListPosition = 0;
+            } else {
+                cardListPosition = cardListPosition + 1;
+            }
+        } else {
+            if (cardListPosition == 0) {
+                cardListPosition = cardList.size() - 1;
+            } else {
+                cardListPosition = cardListPosition - 1;
+            }
+        }
+
+        loyaltyCardId = cardList.get(cardListPosition);
+
+        // Restart activity with new card id and index
+        Intent intent = getIntent();
+        Bundle b = intent.getExtras();
+        b.putInt("id", loyaltyCardId);
+        b.putInt("transition_right", transitionRight ? 1 : 0);
+        intent.putExtras(b);
+        intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        startActivity(intent);
+    }

    @Override
    public void onNewIntent(Intent intent) {
@@ -466,7 +540,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
    public void onSaveInstanceState(Bundle savedInstanceState) {
        savedInstanceState.putInt(STATE_IMAGEINDEX, mainImageIndex);
        savedInstanceState.putBoolean(STATE_FULLSCREEN, isFullscreen);
-        savedInstanceState.putInt(STATE_BOTTOMSHEET, bottomSheetState);
        super.onSaveInstanceState(savedInstanceState);
    }

@@ -508,6 +581,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
            return;
        }

+        loyaltyCardGroups = DBHelper.getLoyaltyCardGroups(database, loyaltyCardId);
+
        setupOrientation();

        format = loyaltyCard.barcodeType;
@@ -519,56 +594,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                settings.getFontSizeMin(settings.getLargeFont()), settings.getFontSizeMax(settings.getLargeFont()),
                1, TypedValue.COMPLEX_UNIT_SP);

-        if (loyaltyCard.note.length() > 0) {
-            noteView.setVisibility(View.VISIBLE);
-            noteView.setText(loyaltyCard.note);
-            noteView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        } else {
-            noteView.setVisibility(View.GONE);
-        }
-
-        List<Group> loyaltyCardGroups = DBHelper.getLoyaltyCardGroups(database, loyaltyCardId);
-
-        if (loyaltyCardGroups.size() > 0) {
-            List<String> groupNames = new ArrayList<>();
-            for (Group group : loyaltyCardGroups) {
-                groupNames.add(group._id);
-            }
-
-            groupsView.setVisibility(View.VISIBLE);
-            groupsView.setText(getString(R.string.groupsList, TextUtils.join(", ", groupNames)));
-            groupsView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        } else {
-            groupsView.setVisibility(View.GONE);
-        }
-
-        if (!loyaltyCard.balance.equals(new BigDecimal(0))) {
-            balanceView.setVisibility(View.VISIBLE);
-            balanceView.setText(getString(R.string.balanceSentence, Utils.formatBalance(this, loyaltyCard.balance, loyaltyCard.balanceType)));
-            balanceView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        } else {
-            balanceView.setVisibility(View.GONE);
-        }
-
-        if (loyaltyCard.expiry != null) {
-            expiryView.setVisibility(View.VISIBLE);
-
-            int expiryString = R.string.expiryStateSentence;
-            if (Utils.hasExpired(loyaltyCard.expiry)) {
-                expiryString = R.string.expiryStateSentenceExpired;
-                expiryView.setTextColor(Color.RED);
-            }
-            expiryView.setText(getString(expiryString, DateFormat.getDateInstance(DateFormat.LONG).format(loyaltyCard.expiry)));
-            expiryView.setTextSize(settings.getFontSizeMax(settings.getMediumFont()));
-        } else {
-            expiryView.setVisibility(View.GONE);
-        }
-        expiryView.setTag(loyaltyCard.expiry);
-
-        if (!isFullscreen) {
-            makeBottomSheetVisibleIfUseful();
-        }
-
        storeName.setText(loyaltyCard.store);
        storeName.setTextSize(settings.getFontSizeMax(settings.getLargeFont()));
        TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration(
@@ -600,22 +625,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        barcodeScaler.setThumbTintList(ColorStateList.valueOf(darkenedColor));
        maximizeButton.setBackgroundColor(darkenedColor);
        minimizeButton.setBackgroundColor(darkenedColor);
-        bottomSheetButton.setBackgroundColor(darkenedColor);
+        bottomAppBar.setBackgroundColor(darkenedColor);
        maximizeButton.setColorFilter(textColor);
        minimizeButton.setColorFilter(textColor);
-        bottomSheetButton.setColorFilter(textColor);
        int complementaryColor = Utils.getComplementaryColor(darkenedColor);
        editButton.setBackgroundTintList(ColorStateList.valueOf(complementaryColor));
        Drawable editButtonIcon = editButton.getDrawable();
        editButtonIcon.mutate();
-        int colorPrimary = MaterialColors.getColor(this, R.attr.colorPrimary, ContextCompat.getColor(this, R.color.md_theme_light_primary));
-        int colorOnPrimary = MaterialColors.getColor(this, R.attr.colorOnPrimary, ContextCompat.getColor(this, R.color.md_theme_light_onPrimary));
-        boolean darkMode = Utils.isDarkModeEnabled(this);
-        if (Utils.needsDarkForeground(complementaryColor)) {
-            editButtonIcon.setTint(darkMode ? colorOnPrimary : colorPrimary);
-        } else {
-            editButtonIcon.setTint(darkMode ? colorPrimary : colorOnPrimary);
-        }
+        editButtonIcon.setTint(Utils.needsDarkForeground(complementaryColor) ? Color.BLACK : Color.WHITE);
        editButton.setImageDrawable(editButtonIcon);

        Bitmap icon = Utils.retrieveCardImage(this, loyaltyCard.id, ImageLocationType.icon);
@@ -639,6 +656,11 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
            actionBar.setHomeAsUpIndicator(getIcon(R.drawable.home_arrow_back_white, backgroundNeedsDarkIcons));
        }

+        fixImageButtonColor(bottomAppBarInfoButton);
+        fixImageButtonColor(bottomAppBarPreviousButton);
+        fixImageButtonColor(bottomAppBarNextButton);
+        setBottomAppBarButtonState();
+
        // Make notification area light if dark icons are needed
        if (Build.VERSION.SDK_INT >= 23) {
            window.getDecorView().setSystemUiVisibility(backgroundNeedsDarkIcons ? View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR : 0);
@@ -675,16 +697,17 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
            imageTypes.add(ImageType.IMAGE_BACK);
        }

-        setDotIndicator(darkMode);
+        setDotIndicator(Utils.isDarkModeEnabled(this));

        setFullscreen(isFullscreen);

-        // restore bottomSheet UI states from changing orientation
-        changeUiToBottomSheetState(bottomSheetState);
-
        DBHelper.updateLoyaltyCardLastUsed(database, loyaltyCard.id);
    }

+    private void fixImageButtonColor(ImageButton imageButton) {
+        imageButton.setColorFilter(BlendModeColorFilterCompat.createBlendModeColorFilterCompat(backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE, BlendModeCompat.SRC_ATOP));
+    }
+
    @Override
    public void onBackPressed() {
        if (isFullscreen) {
@@ -698,14 +721,12 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
        getMenuInflater().inflate(R.menu.card_view_menu, menu);
-        loyaltyCard = DBHelper.getLoyaltyCard(database, loyaltyCardId);
        starred = loyaltyCard.starStatus != 0;

-        if(loyaltyCard.archiveStatus != 0){
+        if (loyaltyCard.archiveStatus != 0) {
            menu.findItem(R.id.action_unarchive).setVisible(true);
            menu.findItem(R.id.action_archive).setVisible(false);
-        }
-        else{
+        } else {
            menu.findItem(R.id.action_unarchive).setVisible(false);
            menu.findItem(R.id.action_archive).setVisible(true);
        }
@@ -734,75 +755,75 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
    public boolean onOptionsItemSelected(MenuItem item) {
        int id = item.getItemId();

-        switch (id) {
-            case android.R.id.home:
+        if (id == android.R.id.home) {
+            finish();
+        } else if (id == R.id.action_share) {
+            try {
+                importURIHelper.startShareIntent(Arrays.asList(loyaltyCard));
+            } catch (UnsupportedEncodingException e) {
+                Toast.makeText(LoyaltyCardViewActivity.this, R.string.failedGeneratingShareURL, Toast.LENGTH_LONG).show();
+                e.printStackTrace();
+            }
+
+            return true;
+        } else if (id == R.id.action_duplicate) {
+            Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
+            Bundle bundle = new Bundle();
+            bundle.putInt("id", loyaltyCardId);
+            bundle.putBoolean("duplicateId", true);
+            intent.putExtras(bundle);
+            startActivity(intent);
+
+            return true;
+        } else if (id == R.id.action_star_unstar) {
+            starred = !starred;
+            DBHelper.updateLoyaltyCardStarStatus(database, loyaltyCardId, starred ? 1 : 0);
+
+            // Re-init loyaltyCard with new data from DB
+            onResume();
+
+            return true;
+        } else if (id == R.id.action_archive) {
+            DBHelper.updateLoyaltyCardArchiveStatus(database, loyaltyCardId, 1);
+            Toast.makeText(LoyaltyCardViewActivity.this, R.string.archived, Toast.LENGTH_LONG).show();
+
+            // Re-init loyaltyCard with new data from DB
+            onResume();
+
+            return true;
+        } else if (id == R.id.action_unarchive) {
+            DBHelper.updateLoyaltyCardArchiveStatus(database, loyaltyCardId, 0);
+            Toast.makeText(LoyaltyCardViewActivity.this, R.string.unarchived, Toast.LENGTH_LONG).show();
+
+            // Re-init loyaltyCard with new data from DB
+            onResume();
+
+            return true;
+        } else if (id == R.id.action_delete) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            builder.setTitle(R.string.deleteTitle);
+            builder.setMessage(R.string.deleteConfirmation);
+            builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
+                Log.e(TAG, "Deleting card: " + loyaltyCardId);
+
+                DBHelper.deleteLoyaltyCard(database, LoyaltyCardViewActivity.this, loyaltyCardId);
+
+                ShortcutHelper.removeShortcut(LoyaltyCardViewActivity.this, loyaltyCardId);
+
                finish();
-                break;
+                dialog.dismiss();
+            });
+            builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+            AlertDialog dialog = builder.create();
+            dialog.show();

-            case R.id.action_share:
-                try {
-                    importURIHelper.startShareIntent(Arrays.asList(loyaltyCard));
-                } catch (UnsupportedEncodingException e) {
-                    Toast.makeText(LoyaltyCardViewActivity.this, R.string.failedGeneratingShareURL, Toast.LENGTH_LONG).show();
-                    e.printStackTrace();
-                }
-                return true;
-
-            case R.id.action_duplicate:
-                loyaltyCard = DBHelper.getLoyaltyCard(database, loyaltyCardId);
-                Intent intent = new Intent(getApplicationContext(), LoyaltyCardEditActivity.class);
-                Bundle bundle = new Bundle();
-                bundle.putInt("id", loyaltyCardId);
-                bundle.putBoolean("duplicateId", true);
-                intent.putExtras(bundle);
-                startActivity(intent);
-                return true;
-
-            case R.id.action_star_unstar:
-                starred = !starred;
-                DBHelper.updateLoyaltyCardStarStatus(database, loyaltyCardId, starred ? 1 : 0);
-                invalidateOptionsMenu();
-                return true;
-
-            case R.id.action_archive:
-                DBHelper.updateLoyaltyCardArchiveStatus(database, loyaltyCardId, 1);
-                Toast.makeText(LoyaltyCardViewActivity.this, R.string.archived, Toast.LENGTH_LONG).show();
-                invalidateOptionsMenu();
-                return true;
-
-            case R.id.action_unarchive:
-                DBHelper.updateLoyaltyCardArchiveStatus(database, loyaltyCardId, 0);
-                Toast.makeText(LoyaltyCardViewActivity.this, R.string.unarchived, Toast.LENGTH_LONG).show();
-                invalidateOptionsMenu();
-                return true;
-
-            case R.id.action_delete:
-                AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                builder.setTitle(R.string.deleteTitle);
-                builder.setMessage(R.string.deleteConfirmation);
-                builder.setPositiveButton(R.string.confirm, (dialog, which) -> {
-                    Log.e(TAG, "Deleting card: " + loyaltyCardId);
-
-                    DBHelper.deleteLoyaltyCard(database, LoyaltyCardViewActivity.this, loyaltyCardId);
-
-                    ShortcutHelper.removeShortcut(LoyaltyCardViewActivity.this, loyaltyCardId);
-
-                    finish();
-                    dialog.dismiss();
-                });
-                builder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
-                AlertDialog dialog = builder.create();
-                dialog.show();
-
-                return true;
+            return true;
        }

        return super.onOptionsItemSelected(item);
    }

    private void setupOrientation() {
-        Toolbar portraitToolbar = findViewById(R.id.toolbar);
-
        int orientation = getResources().getConfiguration().orientation;
        if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
            Log.d(TAG, "Detected landscape mode");
@@ -831,14 +852,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
        }
    }

-    private void makeBottomSheetVisibleIfUseful() {
-        if (noteView.getVisibility() == View.VISIBLE || groupsView.getVisibility() == View.VISIBLE || balanceView.getVisibility() == View.VISIBLE || expiryView.getVisibility() == View.VISIBLE) {
-            bottomSheet.setVisibility(View.VISIBLE);
-        } else {
-            bottomSheet.setVisibility(View.GONE);
-        }
-    }
-
    private void drawBarcode(boolean addPadding) {
        mTasks.flushTaskList(TaskHandler.TYPE.BARCODE, true, false, false);
        if (format != null) {
@@ -979,10 +992,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
            }

            // Hide toolbars
-            //
-            // Appbar needs to be invisible and have padding removed
-            // 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);
@@ -990,12 +999,8 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements

            // Hide other UI elements
            cardIdFieldView.setVisibility(View.GONE);
-            bottomSheet.setVisibility(View.GONE);
-            behavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
-            editButton.hide();
-
-            // android 5-9, avoid padding growing on top of bottomSheet
-            coordinatorLayout.removeView(bottomSheet);
+            bottomAppBar.setVisibility(View.GONE);
+            editButton.setVisibility(View.GONE);

            // Set Android to fullscreen mode
            getWindow().getDecorView().setSystemUiVisibility(
@@ -1023,15 +1028,14 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
            }

            // Show appropriate toolbar
-            // And restore 24dp paddingTop for appBarLayout
            appBarLayout.setVisibility(View.VISIBLE);
            setupOrientation();
            iconImage.setVisibility(View.VISIBLE);

            // Show other UI elements
            cardIdFieldView.setVisibility(View.VISIBLE);
-            makeBottomSheetVisibleIfUseful();
-            editButton.show();
+            editButton.setVisibility(View.VISIBLE);
+            bottomAppBar.setVisibility(View.VISIBLE);

            // Unset fullscreen mode
            getWindow().getDecorView().setSystemUiVisibility(
@@ -1039,11 +1043,6 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
                            & ~View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
                            & ~View.SYSTEM_UI_FLAG_FULLSCREEN
            );
-
-            // android 5-9, avoid padding growing on top of bottomSheet
-            if (bottomSheet.getParent() != coordinatorLayout) {
-                coordinatorLayout.addView(bottomSheet);
-            }
        }

        Log.d("setFullScreen", "Is full screen enabled? " + enabled + " Zoom Level = " + barcodeScaler.getProgress());
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -17,6 +17,7 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.CheckBox;
+import android.widget.TextView;
 import android.widget.Toast;

 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -36,6 +37,16 @@ import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.splashscreen.SplashScreen;
 import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.tabs.TabLayout;
+
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
 import protect.card_locker.preferences.SettingsActivity;

 public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCardCursorAdapter.CardAdapterListener, GestureDetector.OnGestureListener {
@@ -54,7 +65,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
    protected DBHelper.LoyaltyCardOrderDirection mOrderDirection = DBHelper.LoyaltyCardOrderDirection.Ascending;
    protected int selectedTab = 0;
    private RecyclerView mCardList;
-    private View mHelpText;
+    private View mHelpSection;
    private View mNoMatchingCardsText;
    private View mNoGroupCardsText;

@@ -272,12 +283,11 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard

        View.OnTouchListener gestureTouchListener = (v, event) -> mGestureDetector.onTouchEvent(event);

-        mHelpText = findViewById(R.id.helpText);
+        mHelpSection = findViewById(R.id.helpSection);
        mNoMatchingCardsText = findViewById(R.id.noMatchingCardsText);
        mNoGroupCardsText = findViewById(R.id.noGroupCardsText);
        mCardList = findViewById(R.id.list);

-        mHelpText.setOnTouchListener(gestureTouchListener);
        mNoMatchingCardsText.setOnTouchListener(gestureTouchListener);
        mCardList.setOnTouchListener(gestureTouchListener);
        mNoGroupCardsText.setOnTouchListener(gestureTouchListener);
@@ -451,7 +461,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
            // 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);
+            mHelpSection.setVisibility(View.GONE);
            mNoGroupCardsText.setVisibility(View.GONE);

            if (mAdapter.getItemCount() > 0) {
@@ -470,8 +480,14 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                }
            }
        } else {
+            if (mArchiveMode) {
+                // If an user deletes the last card in archive mode, we should close the activity
+                // This will move us back to the main view
+                finish();
+            }
+
            mCardList.setVisibility(View.GONE);
-            mHelpText.setVisibility(View.VISIBLE);
+            mHelpSection.setVisibility(View.VISIBLE);

            mNoMatchingCardsText.setVisibility(View.GONE);
            mNoGroupCardsText.setVisibility(View.GONE);
@@ -556,6 +572,7 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                }
            });
        }
+
        if(!mArchiveMode) {
            if (DBHelper.getArchivedCardsCount(mDatabase) == 0) {
                inputMenu.findItem(R.id.action_archived).setVisible(false);
@@ -630,6 +647,15 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
            return true;
        }

+        if (id == R.id.action_archived) {
+            Intent i = new Intent(getApplicationContext(), MainActivity.class);
+            Bundle bundle = new Bundle();
+            bundle.putBoolean("archiveMode", true);
+            i.putExtras(bundle);
+            startActivity(i);
+            return true;
+        }
+
        if (id == R.id.action_import_export) {
            Intent i = new Intent(getApplicationContext(), ImportExportActivity.class);
            startActivity(i);
@@ -648,15 +674,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
            return true;
        }

-        if(id == R.id.action_archived){
-            Intent i = new Intent(getApplicationContext(), MainActivity.class);
-            Bundle bundle = new Bundle();
-            bundle.putBoolean("archiveMode", true);
-            i.putExtras(bundle);
-            startActivity(i);
-            return true;
-        }
-

        return super.onOptionsItemSelected(inputItem);
    }
@@ -850,15 +867,22 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
                return;
            }

-            Intent i = new Intent(this, LoyaltyCardViewActivity.class);
-            i.setAction("");
+            Intent intent = new Intent(this, LoyaltyCardViewActivity.class);
+            intent.setAction("");
            final Bundle b = new Bundle();
            b.putInt("id", loyaltyCard.id);
-            i.putExtras(b);
+
+            ArrayList<Integer> cardList = new ArrayList<>();
+            for (int i = 0; i < mAdapter.getItemCount(); i++) {
+                cardList.add(mAdapter.getCard(i).id);
+            }
+
+            b.putIntegerArrayList("cardList", cardList);
+            intent.putExtras(b);

            ShortcutHelper.updateShortcuts(MainActivity.this, loyaltyCard);

-            startActivity(i);
+            startActivity(intent);
        }
    }
 }
--- a/app/src/main/java/protect/card_locker/ManageGroupActivity.java
+++ b/app/src/main/java/protect/card_locker/ManageGroupActivity.java
@@ -35,7 +35,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana

    protected Group mGroup = null;
    private RecyclerView mCardList;
-    private TextView mHelpText;
+    private TextView noGroupCardsText;
    private EditText mGroupNameText;

    private boolean mGroupNameNotInUse;
@@ -49,7 +49,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana

        mDatabase = new DBHelper(this).getWritableDatabase();

-        mHelpText = findViewById(R.id.helpText);
+        noGroupCardsText = findViewById(R.id.noGroupCardsText);
        mCardList = findViewById(R.id.list);
        FloatingActionButton saveButton = findViewById(R.id.fabSave);

@@ -133,7 +133,7 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana
            finish();
        });
        // this setText is here because content_main.xml is reused from main activity
-        mHelpText.setText(getResources().getText(R.string.noGiftCardsGroup));
+        noGroupCardsText.setText(getResources().getText(R.string.noGiftCardsGroup));
        updateLoyaltyCardList();
    }

@@ -191,10 +191,10 @@ public class ManageGroupActivity extends CatimaAppCompatActivity implements Mana

        if (mAdapter.getItemCount() == 0) {
            mCardList.setVisibility(View.GONE);
-            mHelpText.setVisibility(View.VISIBLE);
+            noGroupCardsText.setVisibility(View.VISIBLE);
        } else {
            mCardList.setVisibility(View.VISIBLE);
-            mHelpText.setVisibility(View.GONE);
+            noGroupCardsText.setVisibility(View.GONE);
        }
    }

--- a/app/src/main/java/protect/card_locker/importexport/FidmeImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/FidmeImporter.java
@@ -110,7 +110,10 @@ public class FidmeImporter implements Importer {
        // The ID is called reference
        String cardId = CSVHelpers.extractString("Reference", record, "");
        if (cardId.isEmpty()) {
-            throw new FormatException("No card ID listed, but is required");
+            // Fidme deletes the card id if a card is expired
+            // Because Catima considers the card id a required field, we ignore these expired cards
+            // https://github.com/CatimaLoyalty/Android/issues/1005
+            return;
        }

        // Sadly, Fidme exports don't contain the card type
--- a/app/src/main/res/anim/slide_in_left.xml
+++ b/app/src/main/res/anim/slide_in_left.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- https://stackoverflow.com/questions/5151591/android-left-to-right-slide-animation/5151774#5151774 -->
+    <translate
+        android:duration="200"
+        android:fromXDelta="-100%"
+        android:fromYDelta="0%"
+        android:toXDelta="0%"
+        android:toYDelta="0%" />
+</set>
--- a/app/src/main/res/anim/slide_in_right.xml
+++ b/app/src/main/res/anim/slide_in_right.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- https://stackoverflow.com/questions/5151591/android-left-to-right-slide-animation/5151774#5151774 -->
+    <translate
+        android:duration="200"
+        android:fromXDelta="100%"
+        android:fromYDelta="0%"
+        android:toXDelta="0%"
+        android:toYDelta="0%" />
+</set>
--- a/app/src/main/res/anim/slide_out_left.xml
+++ b/app/src/main/res/anim/slide_out_left.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- https://stackoverflow.com/questions/5151591/android-left-to-right-slide-animation/5151774#5151774 -->
+    <translate
+        android:duration="200"
+        android:fromXDelta="0%"
+        android:fromYDelta="0%"
+        android:toXDelta="-100%"
+        android:toYDelta="0%" />
+</set>
--- a/app/src/main/res/anim/slide_out_right.xml
+++ b/app/src/main/res/anim/slide_out_right.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- https://stackoverflow.com/questions/5151591/android-left-to-right-slide-animation/5151774#5151774 -->
+    <translate
+        android:duration="200"
+        android:fromXDelta="0%"
+        android:fromYDelta="0%"
+        android:toXDelta="100%"
+        android:toYDelta="0%" />
+</set>
--- a/app/src/main/res/drawable/ic_baseline_chevron_left_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_chevron_left_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_baseline_chevron_right_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_chevron_right_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_baseline_info_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_info_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_launcher_monochrome.xml
+++ b/app/src/main/res/drawable/ic_launcher_monochrome.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M53.26,40.92l14.35,-6.39l2.86,6.42"
+      android:strokeAlpha="0.4"
+      android:fillAlpha="0.4"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M36.14,40.95l2.86,-6.42l14.24,6.34"
+      android:strokeAlpha="0.4"
+      android:fillAlpha="0.4"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M40.01,37.17l7.73,3.44H38.48l1.53,-3.44m26.58,0 l1.53,3.44H58.86l7.73,-3.44M39,34.53l-2.86,6.42v1.66H70.47V40.95L67.61,34.53 53.27,40.92l-0.02,-0.05L39,34.53Z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M74.07,51.23l4.93,1.41l-6.44,22.48l-37.61,-10.79l39.13,0l0,-13.11z"
+      android:strokeAlpha="0.7"
+      android:fillAlpha="0.7"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M34.94,40.95C31.66,40.95 29,46.19 29,52.64s2.66,11.69 5.94,11.69L74.07,64.34L74.07,40.95ZM41.21,51.08 L40.15,50.02 44.43,45.74 48.71,50.02 47.65,51.08 44.43,47.86ZM58.02,56.56a3.11,3.11 0,0 1,-2.93 2.05,3.15 3.15,0 0,1 -0.55,-0.05 3.11,3.11 0,0 1,-1.83 -1.04,3.12 3.12,0 0,1 -5.3,-0.96 0.75,0.75 0,0 1,1.41 -0.51,1.62 1.62,0 0,0 3.14,-0.55 0.75,0.75 0,0 1,1.5 0,1.62 1.62,0 0,0 3.14,0.55 0.75,0.75 0,0 1,1.41 0.51ZM64.14,51.08 L60.92,47.86L57.71,51.08l-1.06,-1.06 4.28,-4.28 4.28,4.28Z"/>
+</vector>
--- a/app/src/main/res/drawable/save_24dp.xml
+++ b/app/src/main/res/drawable/save_24dp.xml
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
-</vector>
--- a/app/src/main/res/layout/activity_manage_group.xml
+++ b/app/src/main/res/layout/activity_manage_group.xml
@@ -7,14 +7,15 @@
    android:layout_height="match_parent"
    android:fitsSystemWindows="true"
    tools:context="protect.card_locker.ManageGroupActivity">
+
    <com.google.android.material.floatingactionbutton.FloatingActionButton
        android:id="@+id/fabSave"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="end|bottom"
-        app:srcCompat="@drawable/save_24dp"
+        android:layout_margin="16dp"
        android:contentDescription="@string/save"
-        android:layout_margin="16dp" />
+        app:srcCompat="@drawable/ic_done" />
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -9,14 +9,33 @@
    tools:context="protect.card_locker.MainActivity"
    tools:showIn="@layout/main_activity">

-    <TextView
-        style="@style/AppTheme.TextView.NoData"
-        android:id="@+id/helpText"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:text="@string/noGiftCards"
-        android:visibility="gone"/>
+    <LinearLayout
+        android:id="@+id/helpSection"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="184dp"
+            android:scaleType="fitCenter"
+            android:src="@drawable/ic_launcher_foreground" />
+
+        <TextView
+            style="@style/TextAppearance.Material3.HeadlineLarge"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/welcome" />
+
+        <TextView
+            style="@style/AppTheme.TextView.NoData"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/noGiftCards"/>
+    </LinearLayout>

    <TextView
        style="@style/AppTheme.TextView.NoData"
@@ -26,7 +45,7 @@
        android:gravity="center"
        android:text="@string/noMatchingGiftCards"
        android:visibility="gone"/>
-    
+
    <TextView
        style="@style/AppTheme.TextView.NoData"
        android:id="@+id/noGroupCardsText"
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -12,9 +12,9 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="end|bottom"
-        app:srcCompat="@drawable/save_24dp"
+        android:layout_margin="16dp"
        android:contentDescription="@string/save"
-        android:layout_margin="16dp" />
+        app:srcCompat="@drawable/ic_done" />

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
--- a/app/src/main/res/layout/loyalty_card_view_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_view_layout.xml
@@ -8,239 +8,6 @@
    android:layout_height="fill_parent"
    android:fitsSystemWindows="true">

-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fabEdit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom"
-        app:srcCompat="@drawable/ic_mode_edit_white_24dp"
-        android:contentDescription="@string/edit"
-        android:layout_margin="16dp" />
-
-    <FrameLayout
-        android:clipChildren="false"
-        android:clipToPadding="false"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/mainLayout"
-            android:layout_width="fill_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/centerGuideline"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_constraintGuide_percent="0.5"/>
-
-            <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/scalerGuideline"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_constraintGuide_percent="0.75"/>
-
-            <ImageButton
-                android:id="@+id/maximizeButton"
-                android:visibility="gone"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginEnd="15.0dip"
-                android:layout_marginTop="10dp"
-                android:padding="0dp"
-                app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
-                android:contentDescription="@string/moveBarcodeToTopOfScreen"
-                app:tint="?attr/colorOnPrimary"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toTopOf="@+id/mainImage"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                android:background="?attr/colorPrimary" />
-
-            <ImageView
-                android:id="@+id/mainImage"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:orientation="horizontal"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginEnd="15.0dip"
-                app:layout_constraintBottom_toTopOf="@+id/centerGuideline"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/maximizeButton"/>
-
-            <ImageButton
-                android:id="@+id/minimizeButton"
-                android:visibility="gone"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginEnd="15.0dip"
-                android:layout_marginTop="10dp"
-                android:padding="0dp"
-                app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
-                android:contentDescription="@string/moveBarcodeToCenterOfScreen"
-                app:tint="?attr/colorOnPrimary"
-                app:layout_constraintTop_toBottomOf="@+id/mainImage"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                android:background="?attr/colorPrimary" />
-
-            <LinearLayout
-                android:id="@+id/dotIndicator"
-                android:visibility="gone"
-                android:gravity="center_vertical"
-                android:layout_gravity="center_vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginEnd="15.0dip"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/minimizeButton"/>
-
-            <SeekBar
-                android:contentDescription="@string/set_scale"
-                android:id="@+id/barcodeScaler"
-                android:visibility="gone"
-                android:max="100"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="@dimen/inputPadding"
-                android:layout_marginStart="15.0dip"
-                android:layout_marginEnd="15.0dip"
-                app:layout_constraintTop_toBottomOf="@+id/scalerGuideline"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <TextView
-                android:id="@+id/cardIdView"
-                android:enabled="true"
-                android:textIsSelectable="true"
-                android:focusable="true"
-                android:longClickable="true"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginLeft="10.0dip"
-                android:layout_marginRight="10.0dip"
-                android:paddingBottom="80dp"
-                app:layout_constraintTop_toBottomOf="@+id/dotIndicator"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                android:textAlignment="center"
-                app:autoSizeTextType="uniform"
-                app:autoSizeMinTextSize="@dimen/singleCardCardIdTextSizeMin"
-                app:autoSizeMaxTextSize="@dimen/singleCardCardIdTextSizeMax"
-                android:ellipsize="end"/>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <View
-            android:id="@+id/drop_shadow_actionbar"
-            android:layout_width="fill_parent"
-            android:layout_height="5.0dip"
-            android:layout_gravity="top"/>
-    </FrameLayout>
-
-    <LinearLayout
-        android:id="@+id/bottom_sheet"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?android:colorBackground"
-        android:orientation="vertical"
-        android:paddingTop="0px"
-        android:visibility="gone"
-        app:behavior_hideable="false"
-        app:behavior_peekHeight="80dp"
-        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-        tools:visibility="visible">
-
-        <ImageButton
-            android:id="@+id/bottomSheetButton"
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:layout_gravity="top|start"
-            android:contentDescription="@string/showMoreInfo"
-            android:scaleType="fitCenter"
-            app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
-            app:tint="?attr/colorOnPrimary"
-            android:background="?attr/colorPrimary" />
-
-        <androidx.core.widget.NestedScrollView
-            android:id="@+id/bottomSheetContentWrapper"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/noteView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:autoLink="all"
-                    android:enabled="true"
-                    android:focusable="true"
-                    android:gravity="center"
-                    android:longClickable="true"
-                    android:padding="20dp"
-                    android:textIsSelectable="true"
-                    android:textSize="@dimen/singleCardNoteTextSizeMin" />
-
-                <TextView
-                    android:id="@+id/groupsView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:enabled="true"
-                    android:focusable="true"
-                    android:gravity="center"
-                    android:longClickable="true"
-                    android:padding="20dp"
-                    android:textIsSelectable="true"
-                    android:textSize="@dimen/singleCardNoteTextSizeMin" />
-
-                <TextView
-                    android:id="@+id/balanceView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:enabled="true"
-                    android:focusable="true"
-                    android:gravity="center"
-                    android:longClickable="true"
-                    android:padding="20dp"
-                    android:textIsSelectable="true"
-                    android:textSize="@dimen/singleCardNoteTextSizeMin" />
-
-                <TextView
-                    android:id="@+id/expiryView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:enabled="true"
-                    android:focusable="true"
-                    android:gravity="center"
-                    android:longClickable="true"
-                    android:padding="20dp"
-                    android:textIsSelectable="true"
-                    android:textSize="@dimen/singleCardNoteTextSizeMin" />
-            </LinearLayout>
-        </androidx.core.widget.NestedScrollView>
-    </LinearLayout>
-
-
    <com.google.android.material.appbar.AppBarLayout
        android:id="@+id/app_bar_layout"
        android:layout_width="fill_parent"
@@ -249,8 +16,7 @@
        android:clipChildren="false"
        android:clipToPadding="false"
        android:fitsSystemWindows="true"
-        android:weightSum="1.0"
-        >
+        android:weightSum="1.0">

        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar_landscape"
@@ -310,5 +76,202 @@
        app:srcCompat="@drawable/ic_launcher_foreground"
        tools:ignore="ContentDescription" />

+    <FrameLayout
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/mainLayout"
+            android:layout_width="fill_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/centerGuideline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0.5"/>
+
+            <androidx.constraintlayout.widget.Guideline
+                android:id="@+id/scalerGuideline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                app:layout_constraintGuide_percent="0.75"/>
+
+            <ImageButton
+                android:id="@+id/maximizeButton"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginStart="15.0dip"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="15.0dip"
+                android:background="?attr/colorPrimary"
+                android:contentDescription="@string/moveBarcodeToTopOfScreen"
+                android:padding="0dp"
+                android:visibility="gone"
+                app:layout_constraintBottom_toTopOf="@+id/mainImage"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:srcCompat="@drawable/ic_baseline_arrow_drop_up_24"
+                app:tint="?attr/colorOnPrimary"
+                tools:visibility="visible" />
+
+            <ImageView
+                android:id="@+id/mainImage"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:orientation="horizontal"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginStart="15.0dip"
+                android:layout_marginEnd="15.0dip"
+                app:layout_constraintBottom_toTopOf="@+id/centerGuideline"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/maximizeButton"/>
+
+            <ImageButton
+                android:id="@+id/minimizeButton"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:layout_marginStart="15.0dip"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="15.0dip"
+                android:background="?attr/colorPrimary"
+                android:contentDescription="@string/moveBarcodeToCenterOfScreen"
+                android:padding="0dp"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/mainImage"
+                app:srcCompat="@drawable/ic_baseline_arrow_drop_down_24"
+                app:tint="?attr/colorOnPrimary"
+                tools:visibility="visible" />
+
+            <LinearLayout
+                android:id="@+id/dotIndicator"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="15.0dip"
+                android:layout_marginTop="10dp"
+                android:layout_marginEnd="15.0dip"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/minimizeButton"
+                tools:visibility="visible" />
+
+            <SeekBar
+                android:id="@+id/barcodeScaler"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/inputPadding"
+                android:layout_marginStart="15.0dip"
+                android:layout_marginEnd="15.0dip"
+                android:contentDescription="@string/set_scale"
+                android:max="100"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/scalerGuideline" />
+
+            <TextView
+                android:id="@+id/cardIdView"
+                android:enabled="true"
+                android:textIsSelectable="true"
+                android:focusable="true"
+                android:longClickable="true"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_marginLeft="10.0dip"
+                android:layout_marginRight="10.0dip"
+                android:paddingBottom="80dp"
+                app:layout_constraintTop_toBottomOf="@+id/dotIndicator"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                android:textAlignment="center"
+                app:autoSizeTextType="uniform"
+                app:autoSizeMinTextSize="@dimen/singleCardCardIdTextSizeMin"
+                app:autoSizeMaxTextSize="@dimen/singleCardCardIdTextSizeMax"
+                android:ellipsize="end"/>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <View
+            android:id="@+id/drop_shadow_actionbar"
+            android:layout_width="fill_parent"
+            android:layout_height="5.0dip"
+            android:layout_gravity="top"/>
+    </FrameLayout>
+
+    <com.google.android.material.bottomappbar.BottomAppBar
+        android:id="@+id/bottom_app_bar"
+        style="@style/Widget.MaterialComponents.BottomAppBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:background="?attr/colorPrimary"
+        app:contentInsetLeft="0dp"
+        app:contentInsetStart="0dp"
+        app:contentInsetRight="0dp"
+        app:contentInsetEnd="0dp"
+        app:fabAlignmentMode="center">
+
+        <ImageButton
+            android:id="@+id/button_previous"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="left"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_baseline_chevron_left_24"
+            android:tooltipText="@string/previousCard"
+            android:visibility="gone" />
+
+        <ImageButton
+            android:id="@+id/button_show_info"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="start"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_baseline_info_24"
+            android:tooltipText="@string/showMoreInfo"
+            android:visibility="gone" />
+
+        <ImageButton
+            android:id="@+id/button_next"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="right"
+            android:paddingStart="12dp"
+            android:paddingEnd="12dp"
+            android:background="@android:color/transparent"
+            android:src="@drawable/ic_baseline_chevron_right_24"
+            android:tooltipText="@string/nextCard"
+            android:visibility="gone" />
+
+    </com.google.android.material.bottomappbar.BottomAppBar>
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fabEdit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/ic_mode_edit_white_24dp"
+        android:contentDescription="@string/edit"
+        app:layout_anchor="@id/bottom_app_bar" />

 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@color/ic_launcher_background"/>
    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@color/ic_launcher_background"/>
    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>
--- a/app/src/main/res/raw/contributors.txt
+++ b/app/src/main/res/raw/contributors.txt
@@ -4,24 +4,24 @@ J. Lavoie
 Allan Nordhøy
 solokot
 Heimen Stoffels
-Katharine Chui
 Oğuz Ersen
+Katharine Chui
 mondstern
-Altonss
 IllusiveMan196
+Altonss
 StoyanDimitrov
 Petr Novák
 Joel A
+Michael Moroni
 Taco
 Gediminas Murauskas
+SlavekB
 Nyatsuki
-Michael Moroni
 Samantaz Fox
+laralem
 arno-github
 Ankit Tiwari
 Sergio Paredes
-laralem
-SlavekB
 huuhaa
 arshbeerSingh
 Quentin PAGÈS
@@ -35,8 +35,10 @@ betsythefc
 Silvério Santos
 waffshappen
 ati3
+Giovanni
 Jane Kong
 K. Herbert
+Magnitudee
 Still Hsu
 String E. Fighter
 Yurical
@@ -51,32 +53,47 @@ Astrohops1
 Clonewayx
 D. Domig
 Diego
-Giovanni
+Fede Pujol
 Lukas Grassauer
 Marnick L'Eau
 Michalis
+Michał
+Neko Nekowazarashi
 Rosdyana Kusuma
 umoenks
 Thomas Bertels
 Runner
+ce i moa
 inesre
 lgasp
 phlostically
 Aditya Das
 Asier
 Kevin Sicong Jiang
+tfuxu
+Ahmed Saleh
 Airat
+Alexander Ivanov
 sNiXx
+Ashish Yadav
 BMN
 Biren
+Booc Sylvan
+Colgrave
+Csaba
 Mylou53
+danieluhrinyi
 Kasina Dheeraj
+Donno
 Eric
 Flav
 Franciszek Stefan
 Grzegorz
+HowITsDone
 Izzy
-Karol Kosek
+Jean-Baptiste
+Jean-Luc Tibaux
+krkk
 bittin
 Marco
 Mattia
@@ -93,11 +110,14 @@ Rose Liverman
 Samarth Asthan
 Simone Dotto
 Subhashish Anand
-darkodo
+Titas Pažereckas
+Tom Sawyer
+Tony C
 Tymofii Lytvynenko
 Vancha March
 Yevgeny M
 Avik Kundu
+gbonaspetti
 opsik
 pooyanazari
 psa-jforestier
@@ -105,3 +125,5 @@ Robin
 sergio
 Marcus
 techwebpd
+tygyh
+unstartdev
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -269,4 +269,6 @@
    <string name="action_show_details">اظهر التفاصيل</string>
    <string name="on_google_play">على Google Play</string>
    <string name="settings_theme_color">لون المظهر</string>
+    <string name="previousCard">السابق</string>
+    <string name="nextCard">التالي</string>
 </resources>
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -245,4 +245,12 @@
        <item quantity="one"><xliff:g>%1$d</xliff:g> карта (<xliff:g id="archivedCount">%2$d</xliff:g> архивирана)</item>
        <item quantity="other"><xliff:g>%1$d</xliff:g> карти (<xliff:g id="archivedCount">%2$d</xliff:g> архивирани)</item>
    </plurals>
+    <string name="previousCard">Предишна</string>
+    <string name="nextCard">Следваща</string>
+    <string name="failedToOpenUrl">Първо инсталирайте уеб браузър</string>
+    <string name="welcome">Добре дошли при Катима</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Преглед на архива (<xliff:g>%1$d</xliff:g> карта)</item>
+        <item quantity="other">Преглед на архива (<xliff:g>%1$d</xliff:g> карти)</item>
+    </plurals>
 </resources>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -251,4 +251,13 @@
        <item quantity="few"><xliff:g>%1$d</xliff:g> karty (<xliff:g id="archivedCount">%2$d</xliff:g> archivované)</item>
        <item quantity="other"><xliff:g>%1$d</xliff:g> karet (<xliff:g id="archivedCount">%2$d</xliff:g> archivovaných)</item>
    </plurals>
+    <string name="previousCard">Předchozí</string>
+    <string name="nextCard">Následující</string>
+    <string name="failedToOpenUrl">Nejprve nainstalujte webový prohlížeč</string>
+    <string name="welcome">Vítejte v Catima</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Zobrazit archiv (<xliff:g>%1$d</xliff:g> karta)</item>
+        <item quantity="few">Zobrazit archiv (<xliff:g>%1$d</xliff:g> karty)</item>
+        <item quantity="other">Zobrazit archiv (<xliff:g>%1$d</xliff:g> karet)</item>
+    </plurals>
 </resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -245,4 +245,12 @@
        <item quantity="other"><xliff:g>%1$d</xliff:g> Karten (<xliff:g id="archivedCount">%2$d</xliff:g> archiviert)</item>
    </plurals>
    <string name="failedLaunchingPhotoPicker">Es konnte keine unterstützte Galerie-Anwendung gefunden werden</string>
+    <string name="previousCard">Vorherige</string>
+    <string name="nextCard">Nächste</string>
+    <string name="failedToOpenUrl">Installieren Sie zunächst einen Webbrowser</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Archiv ansehen (<xliff:g>%1$d</xliff:g> Karte)</item>
+        <item quantity="other">Archiv ansehen (<xliff:g>%1$d</xliff:g> Karten)</item>
+    </plurals>
+    <string name="welcome">Willkommen bei Catima</string>
 </resources>
--- a/app/src/main/res/values-enm/strings.xml
+++ b/app/src/main/res/values-enm/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -1,4 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="barcode">Código de barras</string>
+    <string name="ok">OK</string>
+    <string name="barcodeNoBarcode">No hay código de barra</string>
+    <string name="storeName">Nombre</string>
+    <string name="cancel">Cancelar</string>
+    <string name="action_search">Buscar</string>
+    <string name="action_add">Agregar</string>
+    <string name="importFailedTitle">Error al importar</string>
+    <string name="deleteConfirmation">¿Desea eliminar la tarjeta permanentemente\?</string>
+    <string name="exportSuccessfulTitle">Exportado</string>
+    <string name="exportFailedTitle">Error en la exportación</string>
+    <string name="exportFailed">No se pudo exportar</string>
+    <string name="noBarcode">Sin código de barra</string>
+    <string name="edit">Editar</string>
+    <string name="noGiftCards">Pulsa el botón + para agregar una tarjeta de regalo, o importa desde el menú.</string>
+    <string name="noGiftCardsGroup">Crea tarjetas de regalo, y asignales un grupo.</string>
+    <string name="note">Nota</string>
+    <string name="unstar">Borrar de favoritos</string>
+    <string name="importExport">Importar/Exportar</string>
+    <string name="exportName">Exportar</string>
+    <string name="importExportHelp">Crear una copia de seguridad de sus datos, permite moverlos hacia otro dispositivo.</string>
+    <string name="importing">Importando…</string>
+    <string name="exporting">Exportando…</string>
+    <string name="save">Guardar</string>
+    <string name="failedParsingImportUriError">No se pudo procesar la URI importada</string>
+    <string name="copy_to_clipboard">Copiar ID al portapapeles</string>
+    <string name="barcodeType">Tipo de código de barra</string>
+    <string name="confirm">Confirmar</string>
+    <string name="sendLabel">Enviando…</string>
+    <string name="noCardsMessage">Agregar tarjeta al principio</string>
+    <string name="noMatchingGiftCards">Sin resultados. Intente cambiando su búsqueda.</string>
+    <string name="noCardExistsError">No se ha podido encontrar la tarjeta</string>
+    <string name="cardId">ID Tarjeta</string>
+    <string name="star">Agregar a favoritos</string>
+    <string name="delete">Eliminar</string>
+    <string name="deleteTitle">Eliminar tarjeta</string>
+    <string name="share">Compartir</string>
+    <string name="addCardTitle">Agregar tarjeta</string>
+    <string name="scanCardBarcode">Escanear código de barra</string>
+    <string name="cardShortcut">Acceso rápido de tarjeta</string>
+    <string name="editCardTitle">Editar tarjeta</string>
+    <string name="card_ids_copied">ID(s) Copiado(s)</string>
+    <string name="importSuccessfulTitle">Importado</string>
+    <string name="importFailed">No se pudo importar</string>
 </resources>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -4,14 +4,14 @@
    <string name="noGiftCards">Pulse el botón «+» para añadir una tarjeta, o importe algunas del menú ⋮.</string>
    <string name="storeName">Nombre</string>
    <string name="note">Nota</string>
-    <string name="cardId">Id. de tarjeta</string>
+    <string name="cardId">ID. de tarjeta</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="ok">Aceptar</string>
-    <string name="copy_to_clipboard">Copiar id. en portapapeles</string>
+    <string name="copy_to_clipboard">Copiar ID. en portapapeles</string>
    <string name="sendLabel">Enviar…</string>
    <string name="editCardTitle">Editar tarjeta</string>
    <string name="addCardTitle">Añadir tarjeta</string>
@@ -21,18 +21,18 @@
    <string name="noStoreError">No se proporcionó ningún nombre</string>
    <string name="noCardIdError">Id. de tarjeta no especificado</string>
    <string name="noCardExistsError">No se ha podido encontrar la tarjeta</string>
-    <string name="importExport">Importar/exportar</string>
+    <string name="importExport">Importar/Exportar</string>
    <string name="exportName">Exportar</string>
-    <string name="importExportHelp">El respaldo le permite transferir sus tarjetas a otro dispositivo.</string>
+    <string name="importExportHelp">El respaldo le permite transferir sus datos a otro dispositivo.</string>
    <string name="importSuccessfulTitle">Importado</string>
    <string name="importFailedTitle">Falló la importación</string>
-    <string name="importFailed">No se han podido importar tarjetas</string>
+    <string name="importFailed">No se han podido importar</string>
    <string name="exportSuccessfulTitle">Exportado</string>
    <string name="exportFailedTitle">Falló la exportación</string>
-    <string name="exportFailed">No se han podido exportar las tarjetas</string>
+    <string name="exportFailed">No se han podido exportar</string>
    <string name="importing">Importando…</string>
    <string name="exporting">Exportando…</string>
-    <string name="noExternalStoragePermissionError">Otorgar permiso de almacenamiento para importar o exportar tarjetas</string>
+    <string name="noExternalStoragePermissionError">Otorgar permiso de almacenamiento para importar o exportar datos</string>
    <string name="importOptionFilesystemTitle">Importar desde el sistema de archivos</string>
    <string name="importOptionFilesystemExplanation">Elegir un archivo concreto del sistema de archivos.</string>
    <string name="importOptionFilesystemButton">Desde el sistema de archivos</string>
@@ -40,14 +40,14 @@
    <string name="importOptionApplicationExplanation">Use una aplicación o su gestor de archivos favoritos para abrir un archivo.</string>
    <string name="importOptionApplicationButton">Utilizar otra aplicación</string>
    <string name="about">Acerca de</string>
-    <string name="app_license">Programa libre con «copyleft», disponible en virtud de la licencia GPLv3+.</string>
+    <string name="app_license">Programa libre con «copyleft», disponible en virtud de la licencia GPLv3+</string>
    <string name="about_title_fmt">Acerca de <xliff:g id="app_name">%s</xliff:g></string>
    <string name="debug_version_fmt">Versión: <xliff:g id="version">%s</xliff:g></string>
    <string name="settings">Ajustes</string>
    <string name="settings_category_title_ui">Interfaz de usuario</string>
    <string name="settings_display_barcode_max_brightness">Iluminar vista del código de barras</string>
-    <string name="exportSuccessful">Datos de las tarjetas exportados</string>
-    <string name="importSuccessful">Datos de las tarjetas importados</string>
+    <string name="exportSuccessful">Datos exportados</string>
+    <string name="importSuccessful">Datos importados</string>
    <string name="intent_import_card_from_url_share_text">Quiero compartirte una tarjeta</string>
    <string name="settings_dark_theme">Oscuro</string>
    <string name="settings_light_theme">Claro</string>
@@ -55,26 +55,26 @@
    <string name="settings_theme">Tema</string>
    <string name="enterBarcodeInstructions">Introduzca el identificador de tarjeta y seleccione el código de barras que se utilizará, o de lo contrario, elija «Esta tarjeta no tiene código de barras».</string>
    <string name="app_copyright_old">Basado en Loyalty Card Keychain
-\nderechos de autor © 2016-2020 de Branden Archer.</string>
+\nderechos de autor © 2016-2020 de Branden Archer</string>
    <string name="exportOptionExplanation">Los datos se guardarán en la ubicación que elija.</string>
    <string name="failedParsingImportUriError">No se pudo procesar el URI de importación</string>
    <string name="share">Compartir</string>
    <string name="barcodeNoBarcode">Esta tarjeta no tiene código de barras</string>
    <string name="barcodeType">Tipo de código de barras</string>
-    <string name="noMatchingGiftCards">Sin resultados. Pruebe modificando su búsqueda.</string>
+    <string name="noMatchingGiftCards">Sin resultados. Intente cambiar su búsqueda.</string>
    <string name="action_search">Buscar</string>
    <string name="app_revision_fmt">Información de la revisión: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="noGroups">Primero pulse en el botón «+» para añadir grupos de categorización.</string>
-    <string name="starImage">Favorito</string>
-    <string name="thumbnailDescription">Miniatura de la tarjeta</string>
-    <string name="copy_to_clipboard_toast">Se copió la id. de tarjeta en el portapapeles</string>
+    <string name="noGroups">Pulse en el botón «+» para añadir grupos de categorización.</string>
+    <string name="starImage">Estrella favorita</string>
+    <string name="thumbnailDescription">Miniatura</string>
+    <string name="copy_to_clipboard_toast">Se copió la ID en el portapapeles</string>
    <string name="selectBarcodeTitle">Seleccionar el código de barras</string>
    <string name="unstar">Eliminar de favoritos</string>
    <string name="noBarcode">Sin código de barras</string>
    <string name="enter_group_name">Introducir nombre del grupo</string>
    <string name="groups">Grupos</string>
    <string name="groupsList">Grupos: <xliff:g>%s</xliff:g></string>
-    <string name="addManually">Introducir el id. de la tarjeta manualmente</string>
+    <string name="addManually">Introducir la ID manualmente</string>
    <string name="leaveWithoutSaveConfirmation">¿Quiere abandonar sin guardar\?</string>
    <string name="leaveWithoutSaveTitle">Salir</string>
    <string name="moveDown">Bajar</string>
@@ -98,7 +98,7 @@
    <string name="card">Tarjeta</string>
    <string name="expiryStateSentenceExpired">Expirado: <xliff:g>%s</xliff:g></string>
    <string name="expiryStateSentence">Expira: <xliff:g>%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Derechos de autor © 2019-<xliff:g>%d</xliff:g> de Sylvia van Os.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Derechos de autor © 2019-<xliff:g>%d</xliff:g> de Sylvia van Os</string>
    <string name="app_resources">Recursos de terceros libres: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="app_libraries">Bibliotecas de terceros libres: <xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="settings_max_font_size_scale">Tam. de fuente máximo</string>
@@ -146,7 +146,7 @@
 \nNINGÚN DATO SE RECOPILA, cualquiera puede confirmar ya que nuestra aplicación es software libre.</string>
    <string name="privacy_policy">Política de privacidad</string>
    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-    <string name="chooseImportType">¿De dónde importar datos\?</string>
+    <string name="chooseImportType">Importar datos de</string>
    <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> no tendría un saldo válido.</string>
    <string name="currency">Moneda</string>
    <string name="balance">Saldo</string>
@@ -161,7 +161,7 @@
        <item quantity="other"><xliff:g>%d</xliff:g> tarjetas seleccionadas</item>
    </plurals>
    <string name="deleteTitle">Eliminar la tarjeta</string>
-    <string name="deleteConfirmation">¿Quiere eliminar esta tarjeta\?</string>
+    <string name="deleteConfirmation">¿Quiere eliminar permanentemente esta tarjeta\?</string>
    <plurals name="deleteCardsConfirmation">
        <item quantity="one">¿Borrar esta tarjeta <xliff:g>%d</xliff:g> permanentemente\?</item>
        <item quantity="other">¿Borrar estas tarjetas <xliff:g>%d</xliff:g> permanentemente\?</item>
@@ -183,5 +183,18 @@
    <string name="settings_catima_theme">Catima</string>
    <string name="settings_system_locale">Sistema</string>
    <string name="settings_locale">Lengua</string>
-    <string name="noGroupCards">Este grupo no contiene ninguna tarjeta</string>
+    <string name="noGroupCards">Este grupo está vacío</string>
+    <string name="settings_landscape_orientation">Horizontal</string>
+    <plurals name="balancePoints">
+        <item quantity="one"><xliff:g>%s</xliff:g> punto</item>
+        <item quantity="other"><xliff:g>%s</xliff:g> puntos</item>
+    </plurals>
+    <string name="barcodeImageDescriptionWithType">Imagen <xliff:g>%s</xliff:g> código de barras</string>
+    <string name="settings_card_orientation">Orientación del código de barras</string>
+    <string name="settings_portrait_orientation">Formato vertical</string>
+    <string name="group_edit">Editar grupo</string>
+    <string name="group_updated">Grupo actualizado</string>
+    <string name="noGiftCardsGroup">Cree algunas tarjetas y luego asígnelas al grupo aquí.</string>
+    <string name="settings_follow_system_orientation">Seguir sistema</string>
+    <string name="settings_lock_on_opening_orientation">Bloqueo a la orientación utilizada al abrir la tarjeta</string>
 </resources>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -243,4 +243,6 @@
        <item quantity="other"><xliff:g>%1$d</xliff:g> korttia (<xliff:g id="archivedCount">%2$d</xliff:g> arkistoitu)</item>
    </plurals>
    <string name="duplicateCard">Duplikaatti</string>
+    <string name="previousCard">Edellinen</string>
+    <string name="nextCard">Seuraava</string>
 </resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -84,6 +84,7 @@
    <string name="moveUp">Monter</string>
    <plurals name="groupCardCount">
        <item quantity="one"><xliff:g>%d</xliff:g> carte</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> cartes</item>
        <item quantity="other"><xliff:g>%d</xliff:g> cartes</item>
    </plurals>
    <string name="groupsList">Groupes : <xliff:g>%s</xliff:g></string>
@@ -158,16 +159,19 @@
    <string name="failedGeneratingShareURL">Impossible de générer une URL partageable. Veuillez signaler ceci.</string>
    <plurals name="selectedCardCount">
        <item quantity="one"><xliff:g>%d</xliff:g> sélectionnée</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> sélectionnées</item>
        <item quantity="other"><xliff:g>%d</xliff:g> sélectionnées</item>
    </plurals>
    <string name="deleteTitle">Supprimer la carte</string>
    <string name="deleteConfirmation">Supprimer cette carte \?</string>
    <plurals name="deleteCardsConfirmation">
        <item quantity="one">Supprimer cette <xliff:g>%d</xliff:g> carte définitivement \?</item>
+        <item quantity="many">Supprimer ces <xliff:g>%d</xliff:g> cartes définitivement \?</item>
        <item quantity="other">Supprimer ces <xliff:g>%d</xliff:g> cartes définitivement \?</item>
    </plurals>
    <plurals name="deleteCardsTitle">
        <item quantity="one">Supprimer <xliff:g>%d</xliff:g> carte</item>
+        <item quantity="many">Supprimer <xliff:g>%d</xliff:g> cartes</item>
        <item quantity="other">Supprimer <xliff:g>%d</xliff:g> cartes</item>
    </plurals>
    <string name="settings_system_locale">Système</string>
@@ -224,6 +228,7 @@
    <string name="hideMoreInfo">Masquer les infos</string>
    <plurals name="balancePoints">
        <item quantity="one"><xliff:g>%s</xliff:g> point</item>
+        <item quantity="many"><xliff:g>%s</xliff:g> points</item>
        <item quantity="other"><xliff:g>%s</xliff:g> points</item>
    </plurals>
    <string name="settings_oled_dark">Fond noir pour le thème sombre</string>
@@ -243,6 +248,16 @@
    <string name="failedLaunchingPhotoPicker">Impossible de trouver une application de galerie prise en charge</string>
    <plurals name="groupCardCountWithArchived">
        <item quantity="one"><xliff:g>%1$d</xliff:g> carte (<xliff:g id="archivedCount">%2$d</xliff:g> archivée)</item>
+        <item quantity="many"><xliff:g>%1$d</xliff:g> cartes (<xliff:g id="archivedCount">%2$d</xliff:g> archivées)</item>
        <item quantity="other"><xliff:g>%1$d</xliff:g> cartes (<xliff:g id="archivedCount">%2$d</xliff:g> archivées)</item>
    </plurals>
+    <string name="nextCard">Suivant</string>
+    <string name="previousCard">Précédent</string>
+    <string name="failedToOpenUrl">Installez d\'abord un navigateur web</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Voir les archives (<xliff:g>%1$d</xliff:g> carte)</item>
+        <item quantity="many">Voir les archives (<xliff:g>%1$d</xliff:g> cartes)</item>
+        <item quantity="other">Voir les archives (<xliff:g>%1$d</xliff:g> cartes)</item>
+    </plurals>
+    <string name="welcome">Bienvenue dans Catima</string>
 </resources>
--- a/app/src/main/res/values-he-rIL/strings.xml
+++ b/app/src/main/res/values-he-rIL/strings.xml
@@ -39,7 +39,6 @@
    <string name="cardShortcut">קיצור דרך</string>
    <string name="noCardsMessage">תחילה הוסף כרטיס</string>
    <string name="card_ids_copied">מזהי כרטיס הועתקו</string>
-    <string name="barcodeImageDescriptionWithType"></string>
    <string name="noStoreError">לא הוכנס שם חנות</string>
    <string name="noCardExistsError">כרטיס לא נמצא</string>
    <string name="importExport">ייבוא/ייצוא</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -226,4 +226,25 @@
 \nSEMMILYEN ADATGYŰJTÉS NINCS, amit bárki ellenőrizhet, lévén hogy az app gáttalan szoftver.</string>
    <string name="importFidmeMessage">Válassza ki a <i>fidme-export-request-xxxxxx.zip</i> nevű FidMe exportot, majd importálja be és válassza a manuális vonalkód opciót utána.
 \nEzt a FidMe-ben megtalálja a profiljában az Adat Védelem résznél ha rányom az Adataim Kivonata linkre.</string>
+    <string name="settings_card_orientation">Vonalkód tájolás</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> kártya (<xliff:g id="archivedCount">%2$d</xliff:g> archiválva)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> kártyák (<xliff:g id="archivedCount">%2$d</xliff:g> archiválva)</item>
+    </plurals>
+    <string name="noUnarchivedCardsMessage">Nincs archiválatlan kártya</string>
+    <string name="failedToOpenUrl">Először telepíts egy webböngészőt</string>
+    <string name="failedLaunchingPhotoPicker">Nem található támogatott képnézegető app</string>
+    <string name="previousCard">Előző</string>
+    <string name="nextCard">Következő</string>
+    <string name="settings_portrait_orientation">Álló</string>
+    <string name="settings_follow_system_orientation">Rendszer követése</string>
+    <string name="settings_lock_on_opening_orientation">A használt tájolás zárolása kártya használatakor</string>
+    <string name="settings_landscape_orientation">Fekvő</string>
+    <string name="settings_oled_dark">Tiszta fekete háttér sötét témánál</string>
+    <string name="include_if_asking_support">Ha támogatást szeretnél igénybe venni, oszd meg az alábbi információkat:</string>
+    <string name="archive">Archivál</string>
+    <string name="unarchive">Archiválás megszüntetése</string>
+    <string name="archived">Kártya archiválása</string>
+    <string name="archiveList">Archivál</string>
+    <string name="duplicateCard">Másolat</string>
 </resources>
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -16,7 +16,7 @@
    <string name="sort_by_name">Nama</string>
    <string name="sort_by_balance">Saldo</string>
    <string name="sort_by">Sortir dengan</string>
-    <string name="sort">Sortir</string>
+    <string name="sort">Urut</string>
    <string name="credits">Kredit</string>
    <string name="license">Lisensi</string>
    <string name="settings">Pengaturan</string>
@@ -27,8 +27,8 @@
    <string name="share">Bagikan</string>
    <string name="editCardTitle">Ubah Kartu</string>
    <string name="addCardTitle">Tambah Kartu</string>
-    <string name="scanCardBarcode">Pindai Kartu Barcode</string>
-    <string name="barcodeNoBarcode">Kartu ini tidak memiliki barcode</string>
+    <string name="scanCardBarcode">Pindai Barcode</string>
+    <string name="barcodeNoBarcode">Tidak ada barcode</string>
    <string name="cancel">Batalkan</string>
    <string name="importExport">Import/Ekspor</string>
    <string name="settings_category_title_ui">Tampilan Pengguna</string>
@@ -39,15 +39,15 @@
    <string name="barcode">Barcode</string>
    <string name="chooseExpiryDate">Pilih masa berlaku</string>
    <string name="noBarcodeFound">Barcode tidak ditemukan</string>
-    <string name="errorReadingImage">TIdak dapat membaca gambar</string>
+    <string name="errorReadingImage">Tidak dapat membaca gambar</string>
    <string name="balance">Saldo</string>
    <string name="currency">Mata uang</string>
-    <string name="chooseImportType">Impor data dari?</string>
+    <string name="chooseImportType">Impor data dari</string>
    <string name="accept">Terima</string>
    <string name="importCatima">Impor dari Catima</string>
    <string name="importFidme">Impor dari FidMe</string>
    <string name="barcodeId">Nilai barcode</string>
-    <string name="sameAsCardId">Sama denga kartu ID</string>
+    <string name="sameAsCardId">Sama dengan ID</string>
    <string name="setBarcodeId">Tentukan nilai barcode</string>
    <string name="photos">Foto</string>
    <string name="setFrontImage">Atur gambar bagian depan</string>
@@ -75,12 +75,12 @@
    <string name="takePhoto">Ambil foto</string>
    <string name="removeImage">Hapus gambar</string>
    <string name="setBackImage">Atur gambar bagian belakang</string>
-    <string name="intent_import_card_from_url_share_multiple_text">Saya ingin berbagi kartu dengan anda</string>
-    <string name="noGiftCards">Klik tanda + tombol tambah untuk menambahkan kartu, atau mengimpor beberapa kartu melalui menu ⋮ terlebih dahulu.</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Saya ingin berbagi kartu dengan Anda</string>
+    <string name="noGiftCards">Klik tanda + tombol tambah untuk menambahkan kartu, atau mengimpor beberapa kartu melalui ⋮ menu.</string>
    <string name="noMatchingGiftCards">Tidak menemukan apapun. Coba untuk mengubah pencarian anda.</string>
    <string name="noBarcode">Bukan barcode</string>
    <string name="confirm">Konfirmasi</string>
-    <string name="copy_to_clipboard">Salin ID</string>
+    <string name="copy_to_clipboard">Salin ID ke papan klip</string>
    <string name="sendLabel">Kirim…</string>
    <string name="noCardsMessage">Tambah kartu terlebih dahulu</string>
    <string name="noStoreError">Nama masih kosong</string>
@@ -90,13 +90,13 @@
    <string name="exportName">Ekspor</string>
    <string name="importSuccessfulTitle">Sudah diimpor</string>
    <string name="importFailedTitle">Impor gagal</string>
-    <string name="importFailed">Tidak dapat mengimpor kartu</string>
+    <string name="importFailed">Tidak dapat mengimpor</string>
    <string name="exportSuccessfulTitle">Sudah diekspor</string>
    <string name="exportFailedTitle">Ekspor gagal</string>
-    <string name="exportFailed">Tidak dapat mengekspor kartu</string>
+    <string name="exportFailed">Tidak dapat mengekspor</string>
    <string name="importing">Mengimpor…</string>
    <string name="exporting">Mengekspor…</string>
-    <string name="noExternalStoragePermissionError">Berikan izin penyimpanan eksternal untuk mengimpor atau mengekspor kartu terlebih dahulu</string>
+    <string name="noExternalStoragePermissionError">Berikan izin penyimpanan eksternal untuk mengimpor atau mengekspor data</string>
    <string name="exportOptionExplanation">Data akan ditulis ke lokasi pilihan Anda.</string>
    <string name="importOptionFilesystemTitle">Impor dari sistem</string>
    <string name="importOptionFilesystemExplanation">Pilih file dari sistem.</string>
@@ -114,9 +114,9 @@
    <string name="app_revision_fmt">Info Revisi: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_libraries">Pustaka pihak ketiga gratis: <xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="app_resources">Sumber daya pihak ketiga gratis: <xliff:g id="app_resources_list">%s</xliff:g></string>
-    <string name="enterBarcodeInstructions">Masukkan ID kartu, dan pilih jenis barcodenya di bawah atau \"Kartu ini tidak memiliki barcode\".</string>
-    <string name="copy_to_clipboard_toast">ID kartu telah disalin</string>
-    <string name="thumbnailDescription">Gambar tampilan untuk kartu</string>
+    <string name="enterBarcodeInstructions">Masukkan ID, dan pilih jenis barcode di bawah ini, atau \"Tidak ada barcode\".</string>
+    <string name="copy_to_clipboard_toast">ID disalin ke papan klip</string>
+    <string name="thumbnailDescription">Gambar tampilan</string>
    <string name="starImage">Favorit</string>
    <string name="settings_light_theme">Terang</string>
    <string name="settings_dark_theme">Gelap</string>
@@ -125,18 +125,18 @@
    <string name="settings_keep_screen_on">Biarkan layar menyala</string>
    <string name="settings_disable_lockscreen_while_viewing_card">Mencegah layar menyala</string>
    <string name="intent_import_card_from_url_share_text">Saya ingin berbagi kartu dengan anda</string>
-    <string name="importSuccessful">Data kartu terimpor</string>
-    <string name="exportSuccessful">Data kartu terekspor</string>
+    <string name="importSuccessful">Data terimpor</string>
+    <string name="exportSuccessful">Data terekspor</string>
    <string name="enter_group_name">Masukan nama grup</string>
    <string name="groups">Grup</string>
-    <string name="noGroups">Klik pada tombol tambah + untuk menambahkan grup atau kategori terlebih dahulu.</string>
-    <string name="noGroupCards">Grup ini tidak memilik kartu</string>
+    <string name="noGroups">Klik pada tombol tambah + untuk menambahkan grup untuk pengkategorian.</string>
+    <string name="noGroupCards">Grup ini kosong</string>
    <string name="deleteConfirmationGroup">Hapus grup?</string>
-    <string name="failedOpeningFileManager">Instal aplikasi pengelola file terlebih dahulu.</string>
+    <string name="failedOpeningFileManager">Pasang aplikasi pengelola berkas terlebih dahulu.</string>
    <string name="moveUp">Pindah ke atas</string>
    <string name="moveDown">Pindah ke bawah</string>
    <string name="leaveWithoutSaveConfirmation">Keluar tanpa menyimpan?</string>
-    <string name="addManually">Masukan ID kartu</string>
+    <string name="addManually">Masukan ID</string>
    <string name="addFromImage">Pilih gambar dari galeri</string>
    <string name="groupsList">Grup: <xliff:g>%s</xliff:g></string>
    <string name="expiryStateSentence">Masa ber: <xliff:g>%s</xliff:g></string>
@@ -169,11 +169,11 @@
 \nBuat dengan menekan Ekspor di Vault Voucher terlebih dahulu.</string>
    <string name="unsupportedBarcodeType">Jenis barcode ini belum dapat ditampilkan. Ini mungkin didukung di versi aplikasi yang lebih baru.</string>
    <string name="wrongValueForBarcodeType">Nilai tidak berlaku untuk jenis barcode yang dipilih</string>
-    <string name="copy_to_clipboard_multiple_toast">ID kartu telah disalin</string>
-    <string name="frontImageDescription">Gambar depan kartu</string>
-    <string name="backImageDescription">Gambar belakang kartu</string>
+    <string name="copy_to_clipboard_multiple_toast">ID disalin ke papan klip</string>
+    <string name="frontImageDescription">Gambar depan</string>
+    <string name="backImageDescription">Gambar belakang</string>
    <string name="updateBarcodeQuestionTitle">Perbarui barcode?</string>
-    <string name="updateBarcodeQuestionText">Anda mengubah ID kartu. Apakah Anda juga ingin memperbarui barcode untuk menggunakan nilai yang sama?</string>
+    <string name="updateBarcodeQuestionText">Anda mengubah ID. Apakah Anda juga ingin memperbarui barcode untuk menggunakan nilai yang sama\?</string>
    <string name="passwordRequired">Silahkan masukan kata sandi</string>
    <string name="exportPassword">Tetapkan kata sandi untuk melindungi ekspor anda (opsional)</string>
    <string name="failedGeneratingShareURL">Tidak dapat membuat alamat berbagi. Mohon laporkan ini.</string>
@@ -188,8 +188,8 @@
    <string name="on_google_play">di Google Play</string>
    <string name="cardShortcut">Pintasan kartu</string>
    <string name="card_ids_copied">ID kartu yang tersalin</string>
-    <string name="barcodeImageDescriptionWithType">Gambar dari jenis barcode <xliff:g>%s</xliff:g></string>
-    <string name="importExportHelp">Mencadangkan kartu memungkinkan anda memindahkannya ke perangkat lain.</string>
+    <string name="barcodeImageDescriptionWithType">Gambar <xliff:g>%s</xliff:g> barcode</string>
+    <string name="importExportHelp">Mencadangkan data anda memungkinkan memindahkannya ke perangkat lain.</string>
    <plurals name="selectedCardCount">
        <item quantity="other"><xliff:g>%d</xliff:g> kartu dipilih</item>
    </plurals>
@@ -202,4 +202,44 @@
    <plurals name="deleteCardsTitle">
        <item quantity="other">Hapus <xliff:g>%d</xliff:g> kartu</item>
    </plurals>
-</resources>
+    <string name="editGroup">Menyunting Grup: <xliff:g>%s</xliff:g></string>
+    <string name="selectColor">Pilih warna</string>
+    <string name="noGiftCardsGroup">Buat beberapa kartu, kemudian masukkan mereka ke grup di sini.</string>
+    <string name="group_name_already_in_use">Nama grup telah dipakai</string>
+    <string name="setIcon">Atur ikon</string>
+    <string name="settings_oled_dark">Latar belakang gelap gulita untuk tema gelap</string>
+    <string name="group_edit">Sunting Grup</string>
+    <string name="group_name_is_empty">Nama grup tidak boleh kosong</string>
+    <string name="group_updated">Grup diperbarui</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="other"><xliff:g>%1$d</xliff:g> kartu (<xliff:g id="archivedCount">%2$d</xliff:g> diarsipkan)</item>
+    </plurals>
+    <string name="translate_platform">di Weblate</string>
+    <string name="action_show_details">Tampilkan detail</string>
+    <string name="action_hide_details">Sembunyikan detail</string>
+    <string name="welcome">Selamat datang di Catima</string>
+    <string name="failedToOpenUrl">Install browser web terlebih dahulu</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="other">Lihat arsip (<xliff:g>%1$d</xliff:g> kartu)</item>
+    </plurals>
+    <string name="failedLaunchingPhotoPicker">Tidak dapat menemukan aplikasi galeri yang didukung</string>
+    <string name="previousCard">Sebelumnya</string>
+    <string name="nextCard">Berikutnya</string>
+    <string name="settings_card_orientation">Orientasi Barcode</string>
+    <string name="settings_follow_system_orientation">Ikuti sistem</string>
+    <string name="settings_portrait_orientation">Potret</string>
+    <string name="settings_landscape_orientation">Lanskap</string>
+    <string name="settings_lock_on_opening_orientation">Kunci ke orientasi yang digunakan saat membuka kartu</string>
+    <plurals name="balancePoints">
+        <item quantity="other"><xliff:g>%s</xliff:g> poin</item>
+    </plurals>
+    <string name="showMoreInfo">Tampilkan informasi</string>
+    <string name="hideMoreInfo">Sembunyikan informasi</string>
+    <string name="shortcutSelectCard">Pilih kartu</string>
+    <string name="set_scale">Atur skala</string>
+    <string name="include_if_asking_support">Jika anda ingin meminta bantuan, sertakan informasi berikut:</string>
+    <string name="duplicateCard">Duplikat</string>
+    <string name="archive">Arsip</string>
+    <string name="archived">Kartu diarsipkan</string>
+    <string name="archiveList">Arsip</string>
+</resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -85,6 +85,7 @@
    <string name="noBarcode">Nessun codice a barre</string>
    <plurals name="groupCardCount">
        <item quantity="one"><xliff:g>%d</xliff:g> carta</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> carte</item>
        <item quantity="other"><xliff:g>%d</xliff:g> carte</item>
    </plurals>
    <string name="parsingBalanceFailed"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> non sembra un saldo corretto.</string>
@@ -158,16 +159,19 @@
    <string name="failedGeneratingShareURL">Impossibile generare un URL condivisibile. Si prega di segnalarlo.</string>
    <plurals name="selectedCardCount">
        <item quantity="one"><xliff:g>%d</xliff:g> selezionata</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> selezionate</item>
        <item quantity="other"><xliff:g>%d</xliff:g> selezionate</item>
    </plurals>
    <string name="deleteTitle">Rimuovi la carta</string>
    <string name="deleteConfirmation">Eliminare questa carta\?</string>
    <plurals name="deleteCardsConfirmation">
        <item quantity="one">Eliminare definitivamente questa <xliff:g>%d</xliff:g> carta\?</item>
+        <item quantity="many">Eliminare definitivamente queste <xliff:g>%d</xliff:g> carte\?</item>
        <item quantity="other">Eliminare definitivamente queste <xliff:g>%d</xliff:g> carte\?</item>
    </plurals>
    <plurals name="deleteCardsTitle">
        <item quantity="one">Elimina <xliff:g>%d</xliff:g> carta</item>
+        <item quantity="many">Elimina <xliff:g>%d</xliff:g> carte</item>
        <item quantity="other">Elimina <xliff:g>%d</xliff:g> carte</item>
    </plurals>
    <string name="settings_system_locale">Sistema</string>
@@ -224,6 +228,7 @@
    <string name="hideMoreInfo">Nascondi info</string>
    <plurals name="balancePoints">
        <item quantity="one"><xliff:g>%s</xliff:g> punto</item>
+        <item quantity="many"><xliff:g>%s</xliff:g> punti</item>
        <item quantity="other"><xliff:g>%s</xliff:g> punti</item>
    </plurals>
    <string name="settings_oled_dark">Sfondo nero puro per il tema scuro</string>
@@ -237,12 +242,22 @@
    <string name="noUnarchivedCardsMessage">Non esistono schede non archiviate</string>
    <string name="unarchived">Carta non archiviata</string>
    <string name="archived">Carta archiviata</string>
-    <string name="settings_portrait_orientation">Ritratto</string>
-    <string name="settings_landscape_orientation">Paesaggio</string>
-    <string name="settings_lock_on_opening_orientation">Blocco da utilizzare per l\'apertura della carta</string>
+    <string name="settings_portrait_orientation">Verticale</string>
+    <string name="settings_landscape_orientation">Orizzontale</string>
+    <string name="settings_lock_on_opening_orientation">Blocca sull\'orientamento utilizzato all\'apertura della carta</string>
    <string name="failedLaunchingPhotoPicker">Impossibile trovare un\'app galleria supportata</string>
    <plurals name="groupCardCountWithArchived">
        <item quantity="one"><xliff:g>%1$d</xliff:g> scheda (<xliff:g id="archivedCount">%2$d</xliff:g> archiviata)</item>
+        <item quantity="many"><xliff:g>%1$d</xliff:g> schede (<xliff:g id="archivedCount">%2$d</xliff:g> archiviate)</item>
        <item quantity="other"><xliff:g>%1$d</xliff:g> schede (<xliff:g id="archivedCount">%2$d</xliff:g> archiviate)</item>
    </plurals>
+    <string name="previousCard">Precedente</string>
+    <string name="nextCard">Successivo</string>
+    <string name="welcome">Benvenuti su Catima</string>
+    <string name="failedToOpenUrl">Installa prima un browser web</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Visualizza archivio (<xliff:g>%1$d</xliff:g> scheda)</item>
+        <item quantity="many">Visualizza archivio (<xliff:g>%1$d</xliff:g> carta)</item>
+        <item quantity="other">Visualizza archivio (<xliff:g>%1$d</xliff:g> carte)</item>
+    </plurals>
 </resources>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -219,4 +219,5 @@
    <string name="selectColor">Pasirinkti spalvą</string>
    <string name="action_hide_details">Paslėpti informaciją</string>
    <string name="action_show_details">Rodyti išsamią informaciją</string>
+    <string name="settings_card_orientation">Brūkšninio kodo orientacija</string>
 </resources>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -240,4 +240,17 @@
    <string name="archiveList">Arkiv</string>
    <string name="settings_follow_system_orientation">Følg systemet</string>
    <string name="settings_portrait_orientation">Stående</string>
+    <string name="failedLaunchingPhotoPicker">Fant ikke noe støttet galleriprogram</string>
+    <string name="previousCard">Forrige</string>
+    <string name="nextCard">Neste</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> kort (<xliff:g id="archivedCount">%2$d</xliff:g> arkivert)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> kort (<xliff:g id="archivedCount">%2$d</xliff:g> arkivert)</item>
+    </plurals>
+    <string name="failedToOpenUrl">Installer en nettleser først</string>
+    <string name="welcome">Velkommen til Catima</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Vis arkiv (<xliff:g>%1$d</xliff:g> kort)</item>
+        <item quantity="other">Vis arkiv (<xliff:g>%1$d</xliff:g> kort)</item>
+    </plurals>
 </resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -245,4 +245,12 @@
        <item quantity="one"><xliff:g>%1$d</xliff:g> kaart (<xliff:g id="archivedCount">%2$d</xliff:g> gearchiveerd)</item>
        <item quantity="other"><xliff:g>%1$d</xliff:g> kaarten (<xliff:g id="archivedCount">%2$d</xliff:g> gearchiveerd)</item>
    </plurals>
+    <string name="previousCard">Vorige</string>
+    <string name="nextCard">Volgende</string>
+    <string name="welcome">Welkom bij Catima</string>
+    <string name="failedToOpenUrl">Installeer een webbrowser</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Archief bekijken (<xliff:g>%1$d</xliff:g> kaart)</item>
+        <item quantity="other">Archief bekijken (<xliff:g>%1$d</xliff:g> kaarten)</item>
+    </plurals>
 </resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -250,4 +250,13 @@
    <string name="unarchived">Karta odarchiwizowana</string>
    <string name="archiveList">Archiwum</string>
    <string name="noUnarchivedCardsMessage">Nie istnieją żadne niezarchiwizowane karty</string>
-</resources>
+    <string name="failedLaunchingPhotoPicker">Nie można odnaleźć aplikacji galerii</string>
+    <string name="previousCard">Poprzedni</string>
+    <string name="nextCard">Następny</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> karta (<xliff:g id="archivedCount">%2$d</xliff:g> zarchiwizowana)</item>
+        <item quantity="few"><xliff:g>%1$d</xliff:g> karty (<xliff:g id="archivedCount">%2$d</xliff:g> zarchwizowane)</item>
+        <item quantity="many"><xliff:g>%1$d</xliff:g> kart (<xliff:g id="archivedCount">%2$d</xliff:g> zarchwizowanych)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> kart (<xliff:g id="archivedCount">%2$d</xliff:g> zarchwizowanych)</item>
+    </plurals>
+</resources>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -12,7 +12,7 @@
    <string name="cancel">Cancelar</string>
    <string name="save">Guardar</string>
    <string name="edit">Editar</string>
-    <string name="noGiftCards">Clique no botão + para adicionar um cartão ou importe um no botão do menu ⋮</string>
+    <string name="noGiftCards">Clique no botão + para adicionar um cartão ou importe um no botão do menu ⋮.</string>
    <string name="noBarcode">Sem código de barras</string>
    <string name="unstar">Retirar dos favoritos</string>
    <string name="importOptionFilesystemButton">Do sistema de ficheiros</string>
@@ -28,6 +28,7 @@
    <string name="sendLabel">Enviar…</string>
    <plurals name="selectedCardCount">
        <item quantity="one"><xliff:g>%d</xliff:g> selecionado</item>
+        <item quantity="many"><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>
@@ -115,6 +116,7 @@
    <string name="no">Não</string>
    <plurals name="groupCardCount">
        <item quantity="one"><xliff:g>%d</xliff:g> cartão</item>
+        <item quantity="many"><xliff:g>%d</xliff:g> cartões</item>
        <item quantity="other"><xliff:g>%d</xliff:g> cartões</item>
    </plurals>
    <string name="importOptionFilesystemTitle">Importar do sistema de ficheiros</string>
@@ -196,10 +198,12 @@
    <string name="noCardIdError">Nenhum identificador inserido</string>
    <plurals name="deleteCardsTitle">
        <item quantity="one">Eliminar <xliff:g>%d</xliff:g> cartão</item>
+        <item quantity="many">Eliminar <xliff:g>%d</xliff:g> cartões</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="many">Eliminar os cartões <xliff:g>%d</xliff:g> permanentemente\?</item>
        <item quantity="other">Eliminar os cartões <xliff:g>%d</xliff:g> permanentemente\?</item>
    </plurals>
    <string name="ok">OK</string>
@@ -224,6 +228,7 @@
    <string name="options">Opções</string>
    <plurals name="balancePoints">
        <item quantity="one"><xliff:g>%s</xliff:g> ponto</item>
+        <item quantity="many"><xliff:g>%s</xliff:g> pontos</item>
        <item quantity="other"><xliff:g>%s</xliff:g> pontos</item>
    </plurals>
    <string name="settings_oled_dark">Fundo preto puro para tema negro</string>
@@ -242,7 +247,17 @@
    <string name="noUnarchivedCardsMessage">Não existem cartões desarquivados</string>
    <plurals name="groupCardCountWithArchived">
        <item quantity="one"><xliff:g>%1$d</xliff:g> cartão (<xliff:g id="archivedCount">%2$d</xliff:g> arquivado)</item>
+        <item quantity="many"><xliff:g>%1$d</xliff:g> cartões (<xliff:g id="archivedCount">%2$d</xliff:g> arquivados)</item>
        <item quantity="other"><xliff:g>%1$d</xliff:g> cartões (<xliff:g id="archivedCount">%2$d</xliff:g> arquivados)</item>
    </plurals>
    <string name="failedLaunchingPhotoPicker">Não foi encontrada nenhuma aplicação de galeria de imagens</string>
+    <string name="nextCard">Próximo</string>
+    <string name="previousCard">Anterior</string>
+    <string name="failedToOpenUrl">Instale primeiro um navegador da Internet</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Ver arquivo (<xliff:g>%1$d</xliff:g> cartão)</item>
+        <item quantity="many">Ver arquivo (<xliff:g>%1$d</xliff:g> cartões)</item>
+        <item quantity="other">Ver arquivo (<xliff:g>%1$d</xliff:g> cartões)</item>
+    </plurals>
+    <string name="welcome">Bem-vindo ao Catima</string>
 </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -257,4 +257,14 @@
        <item quantity="many"><xliff:g>%1$d</xliff:g> карт (<xliff:g id="archivedCount">%2$d</xliff:g> архивировано)</item>
        <item quantity="other"><xliff:g>%1$d</xliff:g> карт (<xliff:g id="archivedCount">%2$d</xliff:g> архивировано)</item>
    </plurals>
+    <string name="nextCard">Следующая</string>
+    <string name="previousCard">Предыдущая</string>
+    <string name="welcome">Добро пожаловать в Catima</string>
+    <string name="failedToOpenUrl">Сначала необходимо установить браузер</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Просмотр архива (<xliff:g>%1$d</xliff:g> карта)</item>
+        <item quantity="few">Просмотр архива (<xliff:g>%1$d</xliff:g> карты)</item>
+        <item quantity="many">Просмотр архива (<xliff:g>%1$d</xliff:g> карт)</item>
+        <item quantity="other">Просмотр архива (<xliff:g>%1$d</xliff:g> карт)</item>
+    </plurals>
 </resources>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -19,7 +19,7 @@
        <item quantity="one"><xliff:g>%d</xliff:g> valt</item>
        <item quantity="other"><xliff:g>%d</xliff:g> valda</item>
    </plurals>
-    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
+    <string name="app_loyalty_card_keychain">Nyckelring för bonuskort</string>
    <string name="importLoyaltyCardKeychainMessage">Välj den exporterade <i>LoyaltyCardKeychain.csv</i> från Loyalty Card Keychain som du vill importera.
 \nSkapa den från Import/Export-menyn i Loyalty Card Keychain först genom att trycka på Exportera.</string>
    <string name="importVoucherVaultMessage">Välj den exporterade <i>vouchervault.json</i> från Voucher Vault som du vill importera.
@@ -120,8 +120,8 @@
    </plurals>
    <string name="deleteConfirmation">Ta bort detta kort permanent\?</string>
    <plurals name="deleteCardsTitle">
-        <item quantity="one">Ta bort <xliff:g>%d</xliff:g> kort</item>
-        <item quantity="other">Ta bort <xliff:g>%d</xliff:g> kort</item>
+        <item quantity="one">Radera <xliff:g>%d</xliff:g> kort</item>
+        <item quantity="other">Radera <xliff:g>%d</xliff:g> kort</item>
    </plurals>
    <string name="deleteTitle">Ta bort kort</string>
    <string name="confirm">Bekräfta</string>
@@ -228,4 +228,29 @@
    <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>
+    <string name="failedLaunchingPhotoPicker">Kunde inte hitta kompatibelt bildprogram</string>
+    <string name="settings_card_orientation">Streckkodsriktning</string>
+    <string name="settings_portrait_orientation">Porträtt</string>
+    <string name="settings_landscape_orientation">Landskap</string>
+    <string name="settings_lock_on_opening_orientation">Lås aktuell riktning när kort öppnas</string>
+    <string name="unarchive">Ta tillbaks från arkiv</string>
+    <string name="archived">Kort arkiverat</string>
+    <string name="archiveList">Arkivet</string>
+    <string name="settings_follow_system_orientation">Spårsystem</string>
+    <string name="duplicateCard">Kopiera</string>
+    <string name="unarchived">Kort återläst från arkiv</string>
+    <string name="nextCard">Nästa</string>
+    <string name="archive">Arkivera</string>
+    <string name="previousCard">Föregående</string>
+    <string name="noUnarchivedCardsMessage">Inga ej arkiverade kort finns</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="one"><xliff:g>%1$d</xliff:g> kort (<xliff:g id="archivedCount">%2$d</xliff:g> arkiverat)</item>
+        <item quantity="other"><xliff:g>%1$d</xliff:g> kort (<xliff:g id="archivedCount">%2$d</xliff:g> arkiverade)</item>
+    </plurals>
+    <string name="failedToOpenUrl">Installera en webbläsare först</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Visa arkiv (<xliff:g>%1$d</xliff:g> card)</item>
+        <item quantity="other">Visa arkiv (<xliff:g>%1$d</xliff:g> cards)</item>
+    </plurals>
+    <string name="welcome">Välkommen till Catima</string>
 </resources>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -245,4 +245,12 @@
        <item quantity="one"><xliff:g>%1$d</xliff:g> kart (<xliff:g id="archivedCount">%2$d</xliff:g> tane arşivlendi)</item>
        <item quantity="other"><xliff:g>%1$d</xliff:g> kart (<xliff:g id="archivedCount">%2$d</xliff:g> tane arşivlendi)</item>
    </plurals>
+    <string name="previousCard">Önceki</string>
+    <string name="nextCard">Sonraki</string>
+    <string name="failedToOpenUrl">Önce bir web tarayıcısı kurun</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Arşivi görüntüle (<xliff:g>%1$d</xliff:g> kart)</item>
+        <item quantity="other">Arşivi görüntüle (<xliff:g>%1$d</xliff:g> kart)</item>
+    </plurals>
+    <string name="welcome">Catima\'ya Hoş Geldiniz</string>
 </resources>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -257,4 +257,14 @@
        <item quantity="other"><xliff:g>%1$d</xliff:g> карт (<xliff:g id="archivedCount">%2$d</xliff:g> заархівовано)</item>
    </plurals>
    <string name="failedLaunchingPhotoPicker">Підтримувану програму галереї не знайдено</string>
+    <string name="previousCard">Попередня</string>
+    <string name="nextCard">Наступна</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">Переглянути архів (<xliff:g>%1$d</xliff:g> картка)</item>
+        <item quantity="few">Переглянути архів (<xliff:g>%1$d</xliff:g> картки)</item>
+        <item quantity="many">Переглянути архів (<xliff:g>%1$d</xliff:g> картки)</item>
+        <item quantity="other">Переглянути архів (<xliff:g>%1$d</xliff:g> картки)</item>
+    </plurals>
+    <string name="failedToOpenUrl">Спочатку встановіть браузер</string>
+    <string name="welcome">Ласкаво просимо до Катіма</string>
 </resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -215,4 +215,32 @@
    <string name="exportPassword">设置密码来保护导出的内容（可选）</string>
    <string name="settings_magenta_theme">紫红</string>
    <string name="settings_violet_theme">紫色</string>
+    <string name="action_show_details">显示详情</string>
+    <string name="action_hide_details">隐藏详情</string>
+    <string name="set_scale">设置大小</string>
+    <string name="app_contributors">因他们而存在: <xliff:g id="app_contributors">%s</xliff:g></string>
+    <string name="and_data_usage">和数据使用方法</string>
+    <string name="failedLaunchingPhotoPicker">找不到支持的图库应用</string>
+    <string name="previousCard">前一张</string>
+    <string name="nextCard">下一张</string>
+    <string name="settings_card_orientation">条形码朝向</string>
+    <string name="settings_landscape_orientation">横向</string>
+    <string name="settings_follow_system_orientation">跟随系统</string>
+    <string name="settings_lock_on_opening_orientation">使用上次打开卡片时的朝向</string>
+    <string name="settings_portrait_orientation">竖向</string>
+    <plurals name="groupCardCountWithArchived">
+        <item quantity="other"><xliff:g>%1$d</xliff:g> 张卡 (<xliff:g id="archivedCount">%2$d</xliff:g> 张已归档)</item>
+    </plurals>
+    <string name="license">许可证</string>
+    <string name="credits">鸣谢</string>
+    <string name="starred">已收藏</string>
+    <string name="duplicateCard">创建副本</string>
+    <string name="archive">归档</string>
+    <string name="unarchive">移出归档</string>
+    <string name="archived">卡片已归档</string>
+    <string name="unarchived">卡片未归档</string>
+    <string name="archiveList">已归档卡</string>
+    <string name="noUnarchivedCardsMessage">没有未归档卡</string>
+    <string name="failedToOpenUrl">先安装一个浏览器</string>
+    <string name="welcome">欢迎使用Catima</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -290,4 +290,12 @@
        <item quantity="one"><xliff:g>%1$d</xliff:g> card (<xliff:g id="archivedCount">%2$d</xliff:g> archived)</item>
        <item quantity="other"><xliff:g>%1$d</xliff:g> cards (<xliff:g id="archivedCount">%2$d</xliff:g> archived)</item>
    </plurals>
-</resources>
+    <string name="previousCard">Previous</string>
+    <string name="nextCard">Next</string>
+    <string name="failedToOpenUrl">Install a web browser first</string>
+    <plurals name="viewArchivedCardsWithCount">
+        <item quantity="one">View archive (<xliff:g>%1$d</xliff:g> card)</item>
+        <item quantity="other">View archive (<xliff:g>%1$d</xliff:g> cards)</item>
+    </plurals>
+    <string name="welcome">Welcome to Catima</string>
+</resources>
--- a/app/src/test/java/protect/card_locker/DatabaseTest.java
+++ b/app/src/test/java/protect/card_locker/DatabaseTest.java
@@ -75,7 +75,7 @@ public class DatabaseTest {
        assertTrue(result);
        assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));

-        result = DBHelper.updateLoyaltyCard(mDatabase, 1, "store1", "note1", null, new BigDecimal("10.00"), Currency.getInstance("EUR"), "cardId1", null, CatimaBarcode.fromBarcode(BarcodeFormat.AZTEC), DEFAULT_HEADER_COLOR);
+        result = DBHelper.updateLoyaltyCard(mDatabase, 1, "store1", "note1", null, new BigDecimal("10.00"), Currency.getInstance("EUR"), "cardId1", null, CatimaBarcode.fromBarcode(BarcodeFormat.AZTEC), DEFAULT_HEADER_COLOR, 0, null, 0);
        assertTrue(result);
        assertEquals(1, DBHelper.getLoyaltyCardCount(mDatabase));

@@ -125,7 +125,7 @@ public class DatabaseTest {
        assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));

        boolean result = DBHelper.updateLoyaltyCard(mDatabase, 1, "store1", "note1", null, new BigDecimal("0"), null, "cardId1",
-                null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR);
+                null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), DEFAULT_HEADER_COLOR, 0, null, 0);
        assertEquals(false, result);
        assertEquals(0, DBHelper.getLoyaltyCardCount(mDatabase));
    }
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -27,6 +27,7 @@ import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;

+import com.google.android.material.bottomappbar.BottomAppBar;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.textfield.MaterialAutoCompleteTextView;
@@ -381,7 +382,7 @@ public class LoyaltyCardViewActivityTest {
            Currency currency = Currency.getInstance("EUR");
            Date expiryDate = new Date();
            Bitmap frontBitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.circle);
-            Bitmap backBitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.save_24dp);
+            Bitmap backBitmap = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_done);

            storeField.setText("correct store");
            noteField.setText("correct note");
@@ -1194,9 +1195,8 @@ public class LoyaltyCardViewActivityTest {

        assertEquals(false, activity.isFinishing());

-        ImageView mainImage = activity.findViewById(R.id.mainImage);
        View collapsingToolbarLayout = activity.findViewById(R.id.collapsingToolbarLayout);
-        View bottomSheet = activity.findViewById(R.id.bottom_sheet);
+        BottomAppBar bottomAppBar = activity.findViewById(R.id.bottom_app_bar);
        ImageButton maximizeButton = activity.findViewById(R.id.maximizeButton);
        ImageButton minimizeButton = activity.findViewById(R.id.minimizeButton);
        LinearLayout dotIndicator = activity.findViewById(R.id.dotIndicator);
@@ -1210,7 +1210,7 @@ public class LoyaltyCardViewActivityTest {

        // Elements should be visible (except minimize button and scaler)
        assertEquals(View.VISIBLE, collapsingToolbarLayout.getVisibility());
-        assertEquals(View.VISIBLE, bottomSheet.getVisibility());
+        assertEquals(View.VISIBLE, bottomAppBar.getVisibility());
        assertEquals(View.VISIBLE, maximizeButton.getVisibility());
        assertEquals(View.GONE, minimizeButton.getVisibility());
        assertEquals(View.VISIBLE, editButton.getVisibility());
@@ -1228,7 +1228,7 @@ public class LoyaltyCardViewActivityTest {

        // Elements should not be visible (except minimize button and scaler)
        assertEquals(View.GONE, collapsingToolbarLayout.getVisibility());
-        assertEquals(View.GONE, bottomSheet.getVisibility());
+        assertEquals(View.GONE, bottomAppBar.getVisibility());
        assertEquals(View.GONE, maximizeButton.getVisibility());
        assertEquals(View.VISIBLE, minimizeButton.getVisibility());
        assertEquals(View.GONE, editButton.getVisibility());
@@ -1242,7 +1242,7 @@ public class LoyaltyCardViewActivityTest {
        assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY, uiOptions);
        assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN, uiOptions);
        assertEquals(View.VISIBLE, collapsingToolbarLayout.getVisibility());
-        assertEquals(View.VISIBLE, bottomSheet.getVisibility());
+        assertEquals(View.VISIBLE, bottomAppBar.getVisibility());
        assertEquals(View.VISIBLE, maximizeButton.getVisibility());
        assertEquals(View.GONE, minimizeButton.getVisibility());
        assertEquals(View.VISIBLE, editButton.getVisibility());
@@ -1256,7 +1256,7 @@ public class LoyaltyCardViewActivityTest {
        assertEquals(uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY, uiOptions);
        assertEquals(uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN, uiOptions);
        assertEquals(View.GONE, collapsingToolbarLayout.getVisibility());
-        assertEquals(View.GONE, bottomSheet.getVisibility());
+        assertEquals(View.GONE, bottomAppBar.getVisibility());
        assertEquals(View.GONE, maximizeButton.getVisibility());
        assertEquals(View.VISIBLE, minimizeButton.getVisibility());
        assertEquals(View.GONE, editButton.getVisibility());
@@ -1270,7 +1270,7 @@ public class LoyaltyCardViewActivityTest {
        assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY, uiOptions);
        assertNotEquals(uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN, uiOptions);
        assertEquals(View.VISIBLE, collapsingToolbarLayout.getVisibility());
-        assertEquals(View.VISIBLE, bottomSheet.getVisibility());
+        assertEquals(View.VISIBLE, bottomAppBar.getVisibility());
        assertEquals(View.VISIBLE, maximizeButton.getVisibility());
        assertEquals(View.GONE, minimizeButton.getVisibility());
        assertEquals(View.VISIBLE, editButton.getVisibility());
@@ -1299,9 +1299,8 @@ public class LoyaltyCardViewActivityTest {

        assertEquals(false, activity.isFinishing());

-        ImageView barcodeImage = activity.findViewById(R.id.barcode);
        View collapsingToolbarLayout = activity.findViewById(R.id.collapsingToolbarLayout);
-        View bottomSheet = activity.findViewById(R.id.bottom_sheet);
+        BottomAppBar bottomAppBar = activity.findViewById(R.id.bottom_app_bar);
        ImageButton maximizeButton = activity.findViewById(R.id.maximizeButton);
        ImageButton minimizeButton = activity.findViewById(R.id.minimizeButton);
        FloatingActionButton editButton = activity.findViewById(R.id.fabEdit);
@@ -1314,7 +1313,7 @@ public class LoyaltyCardViewActivityTest {

        // Elements should be visible (except minimize/maximize buttons and barcode and scaler)
        assertEquals(View.VISIBLE, collapsingToolbarLayout.getVisibility());
-        assertEquals(View.VISIBLE, bottomSheet.getVisibility());
+        assertEquals(View.VISIBLE, bottomAppBar.getVisibility());
        assertEquals(View.GONE, maximizeButton.getVisibility());
        assertEquals(View.GONE, minimizeButton.getVisibility());
        assertEquals(View.VISIBLE, editButton.getVisibility());
--- a/app/src/test/java/protect/card_locker/MainActivityTest.java
+++ b/app/src/test/java/protect/card_locker/MainActivityTest.java
@@ -7,6 +7,7 @@ import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Color;
 import android.view.Menu;
 import android.view.View;
+import android.widget.LinearLayout;
 import android.widget.TextView;

 import com.google.android.material.tabs.TabLayout;
@@ -41,8 +42,8 @@ public class MainActivityTest {
        Activity activity = Robolectric.setupActivity(MainActivity.class);
        assertNotNull(activity);

-        TextView helpText = activity.findViewById(R.id.helpText);
-        assertEquals(View.VISIBLE, helpText.getVisibility());
+        LinearLayout helpSection = activity.findViewById(R.id.helpSection);
+        assertEquals(View.VISIBLE, helpSection.getVisibility());

        TextView noMatchingCardsText = activity.findViewById(R.id.noMatchingCardsText);
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
@@ -64,6 +65,7 @@ public class MainActivityTest {
        assertEquals("Sort", menu.findItem(R.id.action_sort).getTitle().toString());
        assertEquals("Hide details", menu.findItem(R.id.action_unfold).getTitle().toString());
        assertEquals("Groups", menu.findItem(R.id.action_manage_groups).getTitle().toString());
+        assertEquals("Archive", menu.findItem(R.id.action_archived).getTitle().toString());
        assertEquals("Import/Export", menu.findItem(R.id.action_import_export).getTitle().toString());
        assertEquals("About", menu.findItem(R.id.action_about).getTitle().toString());
        assertEquals("Settings", menu.findItem(R.id.action_settings).getTitle().toString());
@@ -87,7 +89,7 @@ public class MainActivityTest {
        activityController.start();
        activityController.resume();

-        TextView helpText = mainActivity.findViewById(R.id.helpText);
+        LinearLayout helpSection = mainActivity.findViewById(R.id.helpSection);
        TextView noMatchingCardsText = mainActivity.findViewById(R.id.noMatchingCardsText);
        RecyclerView list = mainActivity.findViewById(R.id.list);

@@ -96,14 +98,14 @@ public class MainActivityTest {
        SQLiteDatabase database = TestHelpers.getEmptyDb(mainActivity).getWritableDatabase();
        DBHelper.insertLoyaltyCard(database, "store", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 0, null,0);

-        assertEquals(View.VISIBLE, helpText.getVisibility());
+        assertEquals(View.VISIBLE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.GONE, list.getVisibility());

        activityController.pause();
        activityController.resume();

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.VISIBLE, list.getVisibility());

@@ -122,7 +124,7 @@ public class MainActivityTest {
        activityController.resume();
        activityController.visible();

-        TextView helpText = mainActivity.findViewById(R.id.helpText);
+        LinearLayout helpSection = mainActivity.findViewById(R.id.helpSection);
        TextView noMatchingCardsText = mainActivity.findViewById(R.id.noMatchingCardsText);
        RecyclerView list = mainActivity.findViewById(R.id.list);

@@ -134,7 +136,7 @@ public class MainActivityTest {
        DBHelper.insertLoyaltyCard(database, "storeD", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 1, null,0);
        DBHelper.insertLoyaltyCard(database, "storeC", "note", null, new BigDecimal("0"), null, "cardId", null, CatimaBarcode.fromBarcode(BarcodeFormat.UPC_A), Color.BLACK, 1, null,0);

-        assertEquals(View.VISIBLE, helpText.getVisibility());
+        assertEquals(View.VISIBLE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.GONE, list.getVisibility());

@@ -142,7 +144,7 @@ public class MainActivityTest {
        activityController.resume();
        activityController.visible();

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.VISIBLE, list.getVisibility());

@@ -217,7 +219,7 @@ public class MainActivityTest {
        activityController.start();
        activityController.resume();

-        TextView helpText = mainActivity.findViewById(R.id.helpText);
+        LinearLayout helpSection = mainActivity.findViewById(R.id.helpSection);
        TextView noMatchingCardsText = mainActivity.findViewById(R.id.noMatchingCardsText);
        RecyclerView list = mainActivity.findViewById(R.id.list);
        TabLayout groupTabs = mainActivity.findViewById(R.id.groups);
@@ -234,7 +236,7 @@ public class MainActivityTest {
        activityController.pause();
        activityController.resume();

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.VISIBLE, list.getVisibility());

@@ -245,7 +247,7 @@ public class MainActivityTest {
        activityController.pause();
        activityController.resume();

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.VISIBLE, list.getVisibility());

@@ -257,7 +259,7 @@ public class MainActivityTest {
        activityController.pause();
        activityController.resume();

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.VISIBLE, list.getVisibility());

@@ -266,7 +268,7 @@ public class MainActivityTest {
        // Switch back to all groups
        groupTabs.selectTab(groupTabs.getTabAt(0));

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.VISIBLE, list.getVisibility());

@@ -277,7 +279,7 @@ public class MainActivityTest {
        activityController.pause();
        activityController.resume();

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.VISIBLE, list.getVisibility());

@@ -289,7 +291,7 @@ public class MainActivityTest {
        activityController.pause();
        activityController.resume();

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.VISIBLE, list.getVisibility());

@@ -298,7 +300,7 @@ public class MainActivityTest {
        // Switch back to all groups
        groupTabs.selectTab(groupTabs.getTabAt(0));

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.VISIBLE, list.getVisibility());

@@ -309,7 +311,7 @@ public class MainActivityTest {
        activityController.pause();
        activityController.resume();

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.VISIBLE, list.getVisibility());

@@ -321,7 +323,7 @@ public class MainActivityTest {
        activityController.pause();
        activityController.resume();

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.VISIBLE, list.getVisibility());

@@ -330,7 +332,7 @@ public class MainActivityTest {
        // Switch back to all groups
        groupTabs.selectTab(groupTabs.getTabAt(0));

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.VISIBLE, list.getVisibility());

@@ -341,7 +343,7 @@ public class MainActivityTest {
        activityController.pause();
        activityController.resume();

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.VISIBLE, list.getVisibility());

@@ -355,7 +357,7 @@ public class MainActivityTest {

        shadowOf(getMainLooper()).idle();

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.VISIBLE, noMatchingCardsText.getVisibility());
        assertEquals(View.GONE, list.getVisibility());

@@ -364,7 +366,7 @@ public class MainActivityTest {
        // Switch back to all groups
        groupTabs.selectTab(groupTabs.getTabAt(0));

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.VISIBLE, list.getVisibility());

@@ -377,7 +379,7 @@ public class MainActivityTest {

        shadowOf(getMainLooper()).idle();

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.VISIBLE, noMatchingCardsText.getVisibility());
        assertEquals(View.GONE, list.getVisibility());

@@ -391,7 +393,7 @@ public class MainActivityTest {

        shadowOf(getMainLooper()).idle();

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.VISIBLE, noMatchingCardsText.getVisibility());
        assertEquals(View.GONE, list.getVisibility());

@@ -400,7 +402,7 @@ public class MainActivityTest {
        // Switch back to all groups
        groupTabs.selectTab(groupTabs.getTabAt(0));

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.VISIBLE, noMatchingCardsText.getVisibility());
        assertEquals(View.GONE, list.getVisibility());

@@ -413,7 +415,7 @@ public class MainActivityTest {

        shadowOf(getMainLooper()).idle();

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.VISIBLE, list.getVisibility());

@@ -427,7 +429,7 @@ public class MainActivityTest {

        shadowOf(getMainLooper()).idle();

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.VISIBLE, list.getVisibility());

@@ -436,7 +438,7 @@ public class MainActivityTest {
        // Switch back to all groups
        groupTabs.selectTab(groupTabs.getTabAt(0));

-        assertEquals(View.GONE, helpText.getVisibility());
+        assertEquals(View.GONE, helpSection.getVisibility());
        assertEquals(View.GONE, noMatchingCardsText.getVisibility());
        assertEquals(View.VISIBLE, list.getVisibility());

--- a/app/src/test/res/protect/card_locker/fidme.zip
+++ b/app/src/test/res/protect/card_locker/fidme.zip
--- a/fastlane/metadata/android/bg/changelogs/113.txt
+++ b/fastlane/metadata/android/bg/changelogs/113.txt
@@ -0,0 +1,3 @@
+- Добавяне на битон за предишна и следваща карта
+- Поправяне на цвета на текста на бутона за редактиране
+- Заменяне на пиктограмата с флопи диск с отметка
--- a/fastlane/metadata/android/cs-CZ/changelogs/111.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/111.txt
@@ -1,2 +1,7 @@
- Oprava, aby vlastní motiv byl správně aplikován na hlavní obrazovku
+- Podpora arabštiny
 - Zobrazení počtu archivovaných karet v přehledu skupin
+- Oprava chyby analýzy zůstatku (znemožnit uložení karet, které jsou v arabštině a ostatních jazycích, s ne-západními čísly)
+- Oprava, aby vlastní motiv byl správně aplikován na hlavní obrazovku
+- Vylepšeno zobrazení vybraných karet
+- Oprava havárie při opuštění zobrazení karty v rozvržení RTL pro karty s vypršením nebo zůstatkem
+- Oprava šipky zpět v zobrazení karty, která ukazuje nesprávný směr v rozvržení RTL
--- a/fastlane/metadata/android/cs-CZ/changelogs/112.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/112.txt
@@ -0,0 +1 @@
+- Umožnit nastavit vlastní záhlaví více viditelnější
--- a/fastlane/metadata/android/cs-CZ/changelogs/113.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/113.txt
@@ -0,0 +1,3 @@
+- Do zobrazení věrnostních karet přidána tlačítka Předchozí a Následující
+- Oprava barvy popředí na tlačítku Upravit
+- Nahrazena ikona uložení z diskety na značku zaškrtnutí
--- a/fastlane/metadata/android/cs-CZ/changelogs/114.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/114.txt
@@ -0,0 +1,3 @@
+- Přidána černobílá ikona pro Android 13
+- Vylepšení obrazovky prvního spuštění
+- Opravy importu z Fidme
--- a/fastlane/metadata/android/de-DE/changelogs/10.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/10.txt
@@ -0,0 +1,3 @@
+- Der Standard-Import/Export-Dateiname wurde geändert. (Pull #84 (https://github.com/brarcher/loyalty-card-locker/pull/84))
+- Korrektur der Zeichenkette auf der Import/Export-Seite. (pull #87 (https://github.com/brarcher/loyalty-card-locker/pull/87))
+- Verbessertes Layout der Kartenansichtsseite. Der Text sollte leichter zu lesen sein und kann mit einem langen Klick ausgewählt werden. (pull #91 (https://github.com/brarcher/loyalty-card-locker/pull/91))
--- a/fastlane/metadata/android/de-DE/changelogs/101.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/101.txt
@@ -1,3 +1,3 @@
 - Korrektur des Zuschneidesystems, das die Farbe des Themas nicht berücksichtigt hat
- Behebung kleinerer Fehler beim Thema
+- Behebung kleinerer Fehler beim Farb-Thema
 - Rein schwarzes Dunkelthema für OLED-Bildschirme hinzugefügt
--- a/fastlane/metadata/android/de-DE/changelogs/102.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/102.txt
@@ -0,0 +1,2 @@
+- Verschiedene kleinere Korrekturen
+- Absturz bei Verwendung der norwegischen Übersetzung behoben
--- a/fastlane/metadata/android/de-DE/changelogs/103.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/103.txt
@@ -0,0 +1,2 @@
+- Manuelle Sprachauswahl wird nicht mehr überall angewendet
+- Behebt Absturz in der Bearbeitungsansicht bei regionslosem Gebietsschema
--- a/fastlane/metadata/android/de-DE/changelogs/104.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/104.txt
@@ -0,0 +1,2 @@
+- Speichern des Status der Kartenerweiterung
+- Kleinere UI-Korrekturen
--- a/fastlane/metadata/android/de-DE/changelogs/106.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/106.txt
@@ -0,0 +1 @@
+- Einige Zeichenfolgen werden nun als ein einziges Zeichen angezeigt
--- a/fastlane/metadata/android/de-DE/changelogs/107.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/107.txt
@@ -0,0 +1 @@
+- Korrekturen beim Stocard-Import
--- a/fastlane/metadata/android/de-DE/changelogs/108.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/108.txt
@@ -0,0 +1,5 @@
+- Funktion zum Duplizieren von Karten hinzufügen
+- Die Wahl des Verfallsdatums vor 1970 nicht mehr zulassen (hat sowieso nie funktioniert)
+- Unterstützung für die Archivierung von Karten hinzufügen
+- Löschen von der Bearbeitung in die Ansicht verschieben
+- Entfernen des Symbols für die Rotationssperre zugunsten einer neuen Einstellung für die Rotationssperre
--- a/fastlane/metadata/android/de-DE/changelogs/109.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/109.txt
@@ -0,0 +1 @@
+- Falsche Textfarbe auf der Schaltfläche "Kein Barcode" korrigiert
--- a/fastlane/metadata/android/de-DE/changelogs/11.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/11.txt
@@ -0,0 +1,5 @@
+- Wenn Sie eine Karten-ID bearbeiten, füllen Sie die vorhandene ID zu Beginn aus. (Pull #94 (https://github.com/brarcher/loyalty-card-locker/pull/94))
+- Begrenzen Sie die Breite der erzeugten Barcodes, um die Speichernutzung und Fehler durch Speicherüberschreitung zu reduzieren. (Pull #103 (https://github.com/brarcher/loyalty-card-locker/pull/103))
+- Ändern Sie beim Bearbeiten einer Karte die Schaltfläche "Karte eingeben" in "Karte bearbeiten", wenn bereits eine Karten-ID existiert. (Pull #104 (https://github.com/brarcher/loyalty-card-locker/pull/104))
+- Ändern Sie das Farbschema so, dass es weicher und mit dem App-Symbol kompatibel ist, und ändern Sie das Layout beim Anzeigen einer Karte so, dass es übersichtlicher ist. (Pull #107 (https://github.com/brarcher/loyalty-card-locker/pull/107))
+- Hinzufügen eines Intro-Assistenten, der beim ersten Start der App gestartet wird. (Pull #108 (https://github.com/brarcher/loyalty-card-locker/pull/108))
--- a/fastlane/metadata/android/de-DE/changelogs/111.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/111.txt
@@ -0,0 +1,7 @@
+- Unterstützung der arabischen Sprache
+- Anzeige der archivierten Kartenanzahl in der Gruppenübersicht
+- Behebung von Fehlern bei der Gleichgewichtsanalyse (dadurch konnten Karten in Arabisch und anderen Sprachen mit nicht-westlichen Zahlen nicht gespeichert werden)
+- Benutzerdefiniertes Thema wird nicht korrekt auf den Hauptbildschirm angewendet
+- Verbesserte Anzeige der ausgewählten Karten
+- Behebung des Absturzes beim Verlassen der Kartenansicht in RTL-Layouts für Karten mit Ablaufdatum oder Guthaben
+- Der Rückwärtspfeil in der Kartenansicht zeigt in RTL-Layouts nicht mehr in die falsche Richtung
--- a/fastlane/metadata/android/de-DE/changelogs/112.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/112.txt
@@ -0,0 +1 @@
+- Die Möglichkeit, eine benutzerdefinierte Kopfzeile einzustellen, sollte besser sichtbar sein
--- a/fastlane/metadata/android/de-DE/changelogs/113.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/113.txt
@@ -0,0 +1,3 @@
+- Hinzufügen der Schaltflächen "Vorheriges" und "Nächstes" in der Treuekartenansicht
+- Vordergrundfarbe der Schaltfläche "Bearbeiten" korrigieren
+- Disketten-Sicherungssymbol durch Häkchen ersetzen
--- a/fastlane/metadata/android/de-DE/changelogs/114.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/114.txt
@@ -0,0 +1 @@
+- Monochromes Symbol für Android 13 wurde hinzugefügt
--- a/fastlane/metadata/android/de-DE/changelogs/12.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/12.txt
@@ -0,0 +1 @@
+- Verhinderung eines Absturzes beim Drehen des Bildschirms beim ersten Start des Intro-Assistenten.
--- a/fastlane/metadata/android/de-DE/changelogs/13.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/13.txt
@@ -0,0 +1,2 @@
+- Eine Änderung in v0.11 reduzierte die Speichernutzung beim Zeichnen von Barcodes, wirkte sich aber auf die Barcode-Abmessungen aus. Dies wurde nun geändert, um die Barcode-Abmessungen beizubehalten und gleichzeitig die Speichernutzung zu reduzieren. (Pull #126 (https://github.com/brarcher/loyalty-card-locker/pull/126))
+- Aktualisierung der deutschen und französischen Übersetzungen. (pull #122 (https://github.com/brarcher/loyalty-card-locker/pull/122), pull #124 (https://github.com/brarcher/loyalty-card-locker/pull/124), pull #125 (https://github.com/brarcher/loyalty-card-locker/pull/125))
--- a/fastlane/metadata/android/de-DE/changelogs/14.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/14.txt
@@ -0,0 +1,3 @@
+- Hinzufügen einer Menüoption zum Sperren der Bildschirmdrehung, wenn eine Karte angezeigt wird. Wenn sie gesperrt ist, wird der Bildschirm in seine "natürliche" Ausrichtung übergehen und eine weitere Bildschirmdrehung wird blockiert (Pull #128 (https://github.com/brarcher/loyalty-card-locker/pull/128))
+- Wenn eine Karte auf dem Hauptbildschirm ausgewählt wird, aber nicht geladen werden kann, schlägt die Anwendung fehl und gibt eine Meldung aus. (Pull #132 (https://github.com/brarcher/loyalty-card-locker/pull/132))
+- Der Fall, dass Layout-IDs für den Intro-Assistenten nicht gefunden werden konnten, wurde behoben. (pull #128 (https://github.com/brarcher/loyalty-card-locker/pull/128))
--- a/fastlane/metadata/android/de-DE/changelogs/15.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/15.txt
@@ -0,0 +1,2 @@
+- Unterstützung für App-Verknüpfungen hinzufügen (Android 7.1+), wobei die zuletzt verwendeten Karten als Verknüpfungen erscheinen. (Pull #145 (https://github.com/brarcher/loyalty-card-locker/pull/145))
+- Hinzufügen eines Widgets, das wie eine angeheftete App-Verknüpfung funktioniert, um Geräte zu unterstützen, die unter Android 7.1 laufen (pull #142 (https://github.com/brarcher/loyalty-card-locker/pull/142))
--- a/fastlane/metadata/android/de-DE/changelogs/16.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/16.txt
@@ -0,0 +1,5 @@
+- Unterstützung für das Hinzufügen von Shortcuts zum Startbildschirm beim Hinzufügen oder Bearbeiten einer Karte. (Pull #155 (https://github.com/brarcher/loyalty-card-locker/pull/155))
+- Widget entfernen, da es ein schlechter Ersatz für Shortcuts war. (Pull #155 (https://github.com/brarcher/loyalty-card-locker/pull/155))
+- Exportieren von Backups unter Android 7+ korrigiert. (pull #153 (https://github.com/brarcher/loyalty-card-locker/pull/153))
+- Genauere Angabe des Mime-Typs beim Exportieren von Sicherungsdaten. (pull #156 (https://github.com/brarcher/loyalty-card-locker/pull/156))
+- Behebt einen Fehler, bei dem eine Karte nicht bearbeitet werden konnte. (pull #155 (https://github.com/brarcher/loyalty-card-locker/pull/155))
--- a/fastlane/metadata/android/de-DE/changelogs/17.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/17.txt
@@ -0,0 +1,2 @@
+- Hinzufügen von Unterstützung für das Hinzufügen von Treuekarten-Verknüpfungen über den Launcher/Homescreen. (Pull #161 (https://github.com/brarcher/loyalty-card-locker/pull/161))
+- Entfernen Sie die Unterstützung für das Hinzufügen von Treuekartenverknüpfungen aus der App selbst. Damit entfällt die Notwendigkeit für die Verknüpfungsberechtigung. (Pull #163 (https://github.com/brarcher/loyalty-card-locker/pull/163))
--- a/fastlane/metadata/android/de-DE/changelogs/18.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/18.txt
@@ -0,0 +1,2 @@
+- Behebung eines Problems unter Android SDK 24+, bei dem die Verwendung der Importoption der Dateiauswahl zu einem Absturz führte. (Pull #170 (https://github.com/brarcher/loyalty-card-locker/pull/170))
+- Neues Symbol und Farbschema. (Pull #171 (https://github.com/brarcher/loyalty-card-locker/pull/171))
--- a/fastlane/metadata/android/de-DE/changelogs/19.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/19.txt
@@ -0,0 +1,3 @@
+- Behebung eines Absturzes beim Importieren bestimmter Arten von beschädigten CSV-Dateien. (Pull #177 (https://github.com/brarcher/loyalty-card-locker/pull/177))
+- Behebt den Import von Backups direkt aus dem Dateisystem. (Pull #180 (https://github.com/brarcher/loyalty-card-locker/pull/180))
+- Behebung des Problems beim Importieren von Sicherungen von bestimmten Arten von Inhaltsanbietern. (pull #179 (https://github.com/brarcher/loyalty-card-locker/pull/179))
--- a/fastlane/metadata/android/de-DE/changelogs/2.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/2.txt
@@ -0,0 +1,3 @@
+- Italienische Übersetzungen
+- Unterstützung für alle 1D-Barcodetypen. (Ursprünglich wurden nur Produkt-1D-Barcodes unterstützt)
+- Hinzufügen der erforderlichen Kamerazulassung, die ursprünglich fehlte.
--- a/fastlane/metadata/android/de-DE/changelogs/20.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/20.txt
@@ -0,0 +1 @@
+- Workaround-Absturz während der Installation auf einigen Android-Versionen (wahrscheinlich Android 5 und darunter). (Pull #184 (https://github.com/brarcher/loyalty-card-locker/pull/184))
--- a/fastlane/metadata/android/de-DE/changelogs/21.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/21.txt
@@ -0,0 +1,2 @@
+- Verbessertes Layout für die Kartenliste. (Pull #188 (https://github.com/brarcher/loyalty-card-locker/pull/188))
+- Verbessertes Layout beim Betrachten einer Karte. (Pull #190 (https://github.com/brarcher/loyalty-card-locker/pull/190))
--- a/fastlane/metadata/android/de-DE/changelogs/22.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/22.txt
@@ -0,0 +1 @@
+- Änderungen in der Kartenansicht, um die Notiz anzuzeigen, die Karten-ID mehrzeilig werden zu lassen und den Namen des Geschäfts anzuzeigen. (Pull #197 (https://github.com/brarcher/loyalty-card-locker/pull/197))
--- a/fastlane/metadata/android/de-DE/changelogs/23.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/23.txt
@@ -0,0 +1,3 @@
+- Hinzufügen von Leerzeichen am Anfang/Ende von Barcodes. (Pull #200 (https://github.com/brarcher/loyalty-card-locker/pull/200))
+- Hinzufügen von Optionen zur Konfiguration der Farben für die Schrift und den Hintergrund des Geschäftsnamens. (Pull #203 (https://github.com/brarcher/loyalty-card-locker/pull/203))
+- Hinzufügen von Optionen zur Anpassung der Schriftgröße auf der Seite mit den Kartenlisten und der Einzelkartenseite. (pull #204 (https://github.com/brarcher/loyalty-card-locker/pull/204))
--- a/fastlane/metadata/android/de-DE/changelogs/24.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/24.txt
@@ -0,0 +1,4 @@
+- Übersetzungen aktualisieren. (Pull #208 (https://github.com/brarcher/loyalty-card-locker/pull/208))
+- Aktualisierung der Barcode-Darstellung: (pull #209 (https://github.com/brarcher/loyalty-card-locker/pull/209))
+  - Die Kartenansicht wird neu geladen, wenn der Bildschirm gedreht wird, so dass das Barcodebild die richtige Größe hat.
+  - Rendering von 1D-Barcodes in einem größeren Raum, so dass sie den Bildschirm besser ausfüllen können.
--- a/fastlane/metadata/android/de-DE/changelogs/25.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/25.txt
@@ -0,0 +1,2 @@
+- Verringert den Platz in der Kopfzeile bei der Anzeige einer Karte. (Pull #213 (https://github.com/brarcher/loyalty-card-locker/pull/213))
+- Signalton beim Scannen eines Barcodes abschalten. (Pull #216 (https://github.com/brarcher/loyalty-card-locker/pull/216))
--- a/fastlane/metadata/android/de-DE/changelogs/26.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/26.txt
@@ -0,0 +1 @@
+- Verhindert einen Absturz, wenn das Rendern eines Barcodes den Speicher der Anwendung erschöpft. (Pull #219 (https://github.com/brarcher/loyalty-card-locker/pull/219))
--- a/fastlane/metadata/android/de-DE/changelogs/27.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/27.txt
@@ -0,0 +1,2 @@
+- Min. SDK von 17 auf 15 reduziert. (Pull #226 (https://github.com/brarcher/loyalty-card-locker/pull/226))
+– Entfernen Sie die Verwendung der Legacy-Apache-Bibliothek, die nur in Komponententests verwendet wird, aber nicht mehr benötigt wird. (Pull #225 (https://github.com/brarcher/loyalty-card-locker/pull/225))
--- a/fastlane/metadata/android/de-DE/changelogs/28.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/28.txt
@@ -0,0 +1,5 @@
+- Übersetzungen hinzugefügt
+  - Polnisch (Pull #232 (https://github.com/brarcher/loyalty-card-locker/pull/232))
+  - Spanisch (pull #232 (https://github.com/brarcher/loyalty-card-locker/pull/232))
+  - Slowakisch (Pull #232 (https://github.com/brarcher/loyalty-card-locker/pull/232))
+- Aktualisierte Übersetzungen (Pull #239 (https://github.com/brarcher/loyalty-card-locker/pull/239))
--- a/fastlane/metadata/android/de-DE/changelogs/29.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/29.txt
@@ -0,0 +1,2 @@
+- Spanische Übersetzungen korrigieren (Pull #244 (https://github.com/brarcher/loyalty-card-locker/pull/244))
+- Übersetzungen aktualisieren (Pull #244 (https://github.com/brarcher/loyalty-card-locker/pull/244))
--- a/fastlane/metadata/android/de-DE/changelogs/3.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/3.txt
@@ -0,0 +1,14 @@
+- Unterstützt jetzt offiziell die folgende Liste von 1D- und 2D-Barcodes:
+  - AZTEC
+  - CODABAR
+  - CODE_39
+  - CODE_128
+  - DATA_MATRIX
+  - EAN_8
+  - EAN_13
+  - ITF
+  - PDF_417
+  - QR_CODE
+  - UPC_A
+
+- Die erzeugten Barcodes sind größer und lassen sich leichter mit einem Scangerät einlesen.
--- a/fastlane/metadata/android/de-DE/changelogs/30.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/30.txt
@@ -0,0 +1,4 @@
+- Hinzufügen einer Einstellung zur Steuerung der Bildschirmhelligkeit bei der Anzeige eines Barcodes (Pull #259 (https://github.com/brarcher/loyalty-card-locker/pull/259))
+- Griechische Übersetzungen hinzufügen (Pull #252 (https://github.com/brarcher/loyalty-card-locker/pull/252))
+- Hinzufügen von slowenischen Übersetzungen (Pull #260 (https://github.com/brarcher/loyalty-card-locker/pull/260))
+- Übersetzungen aktualisieren (pull #260 (https://github.com/brarcher/loyalty-card-locker/pull/260), pull #254 (https://github.com/brarcher/loyalty-card-locker/pull/254))
--- a/fastlane/metadata/android/de-DE/changelogs/31.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/31.txt
@@ -0,0 +1,2 @@
+- Sortieren der Kartenliste ohne Berücksichtigung der Groß-/Kleinschreibung (Pull #266 (https://github.com/brarcher/loyalty-card-locker/pull/266))
+- Einstellung zum Sperren der Ausrichtung für alle Karten hinzufügen (Pull #269 (https://github.com/brarcher/loyalty-card-locker/pull/269))
--- a/fastlane/metadata/android/de-DE/changelogs/32.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/32.txt
@@ -0,0 +1 @@
+- Die Erstellung einer neuen Karte durch manuelle Eingabe des Barcodes wurde korrigiert (issue #272 (https://github.com/brarcher/loyalty-card-locker/issues/272))
--- a/fastlane/metadata/android/de-DE/changelogs/33.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/33.txt
@@ -0,0 +1 @@
+- Übersetzungen aktualisieren und hinzufügen
--- a/fastlane/metadata/android/de-DE/changelogs/34.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/34.txt
@@ -0,0 +1 @@
+- Aktualisierung der russischen Übersetzungen
--- a/fastlane/metadata/android/de-DE/changelogs/35.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/35.txt
@@ -0,0 +1,2 @@
+- App-Backups wurden ermöglicht
+- Aktualisierung der französischen und slowenischen Übersetzungen
--- a/fastlane/metadata/android/de-DE/changelogs/36.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/36.txt
@@ -0,0 +1,14 @@
+- Hinzufügen der Möglichkeit, nach einer Karte zu suchen (#320 (https://github.com/brarcher/loyalty-card-locker/pull/320))
+- Hinzufügen der Möglichkeit, Treuekarten weiterzugeben und zu empfangen (#321 (https://github.com/brarcher/loyalty-card-locker/pull/321))
+- Unterstützung des dunklen Modus (#322 (https://github.com/brarcher/loyalty-card-locker/pull/322))
+- Treuekarten können jetzt barcodefrei sein (d.h. keinen Barcode haben) (#324 (https://github.com/brarcher/loyalty-card-locker/pull/324))
+- Notizen können sich über mehrere Zeilen erstrecken (#326 (https://github.com/brarcher/loyalty-card-locker/pull/326))
+- Verbesserungen bei der Größe von Notizen (#319 (https://github.com/brarcher/loyalty-card-locker/pull/319))
+- Verbesserung der Sichtbarkeit von Benachrichtigungen und App-Symbolen (#330 (https://github.com/brarcher/loyalty-card-locker/pull/330))
+- Update des Ziel-SDK auf Android 10
+- Verbessert die folgenden Übersetzungen:
+  - Deutsch
+  - Italienisch
+  - Niederländisch
+  - Polnisch
+  - Russisch
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`- Umožnit nastavit vlastní záhlaví více viditelnější`
				`@@ -0,0 +1 @@`
				`- Einige Zeichenfolgen werden nun als ein einziges Zeichen angezeigt`
				`@@ -0,0 +1 @@`
				`- Falsche Textfarbe auf der Schaltfläche "Kein Barcode" korrigiert`
				`@@ -0,0 +1 @@`
				`- Die Möglichkeit, eine benutzerdefinierte Kopfzeile einzustellen, sollte besser sichtbar sein`
				`@@ -0,0 +1 @@`
				`- Monochromes Symbol für Android 13 wurde hinzugefügt`
				`@@ -0,0 +1 @@`
				`- Verhinderung eines Absturzes beim Drehen des Bildschirms beim ersten Start des Intro-Assistenten.`
				`@@ -0,0 +1 @@`
				`- Workaround-Absturz während der Installation auf einigen Android-Versionen (wahrscheinlich Android 5 und darunter). (Pull #184 (https://github.com/brarcher/loyalty-card-locker/pull/184))`
				`@@ -0,0 +1 @@`
				`- Änderungen in der Kartenansicht, um die Notiz anzuzeigen, die Karten-ID mehrzeilig werden zu lassen und den Namen des Geschäfts anzuzeigen. (Pull #197 (https://github.com/brarcher/loyalty-card-locker/pull/197))`
				`@@ -0,0 +1 @@`
				`- Verhindert einen Absturz, wenn das Rendern eines Barcodes den Speicher der Anwendung erschöpft. (Pull #219 (https://github.com/brarcher/loyalty-card-locker/pull/219))`
				`@@ -0,0 +1 @@`
				`- Die Erstellung einer neuen Karte durch manuelle Eingabe des Barcodes wurde korrigiert (issue #272 (https://github.com/brarcher/loyalty-card-locker/issues/272))`