Release Catima 2.7.1

Update Fastlane changelogs

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gradle" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## v2.7.1 - 86 (2021-10-07)
+
+- Improve search with spaces
+
+## v2.7.0 - 85 (2021-10-05)
+
+Android 4.4 is no longer supported starting with this release. If you want to use Catima on Android 4.4, please use version 2.6.1.
+
+- Improved Android 12 support
+- Improved about screen
+- Search now ignores accents
+
 ## v2.6.1 - 84 (2021-09-25)
 
 - Minor bugfixes and improvements

app/build.gradle

@@ -16,10 +16,10 @@ android {
 
     defaultConfig {
         applicationId "me.hackerchick.catima"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 31
-        versionCode 84
-        versionName "2.6.1"
+        versionCode 86
+        versionName "2.7.1"
 
         vectorDrawables.useSupportLibrary true
         multiDexEnabled true
@@ -80,21 +80,25 @@ android {
 
 dependencies {
 // AndroidX
+    implementation "androidx.multidex:multidex:2.0.1"
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
     implementation 'androidx.exifinterface:exifinterface:1.3.3'
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'com.google.android.material:material:1.4.0'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
+// Splash Screen
+    implementation 'androidx.core:core-splashscreen:1.0.0-alpha02'
+
 // Third-party
-    implementation 'com.journeyapps:zxing-android-embedded:4.1.0@aar'
+    implementation 'com.journeyapps:zxing-android-embedded:4.2.0@aar'
     implementation 'com.google.zxing:core:3.4.1'
-    implementation 'org.apache.commons:commons-csv:1.8'
+    implementation 'org.apache.commons:commons-csv:1.9.0'
     implementation 'com.jaredrummler:colorpicker:1.1.0'
     implementation 'com.github.invissvenska:NumberPickerPreference:1.0.3'
-    implementation 'net.lingala.zip4j:zip4j:2.8.0'
+    implementation 'net.lingala.zip4j:zip4j:2.9.0'
 
 // SpotBugs
     implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0'

app/src/main/AndroidManifest.xml

@@ -17,7 +17,7 @@
         android:name="android.hardware.camera.autofocus"
         android:required="false" />
 
-    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
+    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android"/>
 
     <application
         android:name=".LoyaltyCardLockerApplication"
@@ -29,7 +29,7 @@
         <activity
             android:name="protect.card_locker.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/SplashTheme"
+            android:theme="@style/Theme.App.Starting"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -37,6 +37,7 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+
         <activity
             android:name=".AboutActivity"
             android:label="@string/about"

app/src/main/java/protect/card_locker/AboutActivity.java

@@ -1,11 +1,13 @@
 package protect.card_locker;
 
+import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Bundle;
-import android.text.method.LinkMovementMethod;
 import android.util.Log;
 import android.view.MenuItem;
+import android.view.View;
 import android.widget.TextView;
 
 import java.io.BufferedReader;
@@ -17,12 +19,15 @@ import java.util.Calendar;
 import java.util.List;
 
 import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.text.HtmlCompat;
 
-public class AboutActivity extends CatimaAppCompatActivity
+public class AboutActivity extends CatimaAppCompatActivity implements View.OnClickListener
 {
     private static final String TAG = "Catima";
+    ConstraintLayout version_history, translate, license, repo, privacy, error, credits, rate;
 
     @Override
     protected void onCreate(Bundle savedInstanceState)
@@ -93,39 +98,82 @@ public class AboutActivity extends CatimaAppCompatActivity
             Log.w(TAG, "Package name not found", e);
         }
 
+        TextView copyright = findViewById(R.id.credits_sub);
+        copyright.setText(String.format(getString(R.string.app_copyright_fmt), year));
+        TextView vHistory = findViewById(R.id.version_history_sub);
+        vHistory.setText(String.format(getString(R.string.debug_version_fmt), version));
+
         setTitle(String.format(getString(R.string.about_title_fmt), appName));
 
-        TextView aboutTextView = findViewById(R.id.aboutText);
-        aboutTextView.setText(HtmlCompat.fromHtml(String.format(getString(R.string.debug_version_fmt), version) +
-                "<br/><br/>" +
-                String.format(getString(R.string.app_revision_fmt),
-                        "<a href=\"" + getString(R.string.app_revision_url) + "\">" +
-                                "GitHub" +
-                                "</a>") +
-                "<br/><br/>" +
-                String.format(getString(R.string.app_copyright_fmt), year) +
-                "<br/><br/>" +
-                getString(R.string.app_copyright_old) +
-                "<br/><br/>" +
-                getString(R.string.app_license) +
-                "<br/><br/>" +
-                String.format(getString(R.string.app_contributors), contributors.toString()) +
-                "<br/><br/>" +
-                String.format(getString(R.string.app_libraries), libs.toString()) +
-                "<br/><br/>" +
-                String.format(getString(R.string.app_resources), resources.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
-        aboutTextView.setMovementMethod(LinkMovementMethod.getInstance());
+        version_history = findViewById(R.id.version_history);
+        translate = findViewById(R.id.translate);
+        license = findViewById(R.id.license);
+        repo = findViewById(R.id.repo);
+        privacy = findViewById(R.id.privacy);
+        error = findViewById(R.id.report_error);
+        credits = findViewById(R.id.credits);
+        rate = findViewById(R.id.rate);
+
+        version_history.setOnClickListener(this);
+        translate.setOnClickListener(this);
+        license.setOnClickListener(this);
+        repo.setOnClickListener(this);
+        privacy.setOnClickListener(this);
+        error.setOnClickListener(this);
+        rate.setOnClickListener(this);
+
+        StringBuilder contributorInfo = new StringBuilder();
+        contributorInfo.append(HtmlCompat.fromHtml(String.format(getString(R.string.app_contributors), contributors.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+        contributorInfo.append("\n\n");
+        contributorInfo.append(getString(R.string.app_copyright_old));
+        contributorInfo.append("\n\n");
+        contributorInfo.append(HtmlCompat.fromHtml(String.format(getString(R.string.app_libraries), libs.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+        contributorInfo.append("\n\n");
+        contributorInfo.append(HtmlCompat.fromHtml(String.format(getString(R.string.app_resources), resources.toString()), HtmlCompat.FROM_HTML_MODE_COMPACT));
+
+        credits.setOnClickListener(view -> new AlertDialog.Builder(this)
+                .setTitle(R.string.credits)
+                .setMessage(contributorInfo.toString())
+                .setPositiveButton(R.string.ok, (dialogInterface, i) -> {})
+                .show());
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item)
     {
         int id = item.getItemId();
-
         if (id == android.R.id.home) {
             finish();
         }
-
         return super.onOptionsItemSelected(item);
     }
+
+    @Override
+    public void onClick(View view) {
+        int id = view.getId();
+
+        String url;
+        if (id == R.id.version_history) {
+            url = "https://catima.app/changelog/";
+        } else if (id == R.id.translate) {
+            url = "https://hosted.weblate.org/engage/catima/";
+        } else if (id == R.id.license) {
+            url = "https://github.com/TheLastProject/Catima/blob/master/LICENSE";
+        } else if (id == R.id.repo) {
+            url = "https://github.com/TheLastProject/Catima/";
+        } else if (id == R.id.privacy) {
+            url = "https://catima.app/privacy-policy/";
+        } else if (id == R.id.report_error) {
+            url = "https://github.com/TheLastProject/Catima/issues";
+        } else if (id == R.id.rate) {
+            url = "https://play.google.com/store/apps/details?id=me.hackerchick.catima";
+        } else {
+            return;
+        }
+
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setData(Uri.parse(url));
+        startActivity(intent);
+    }
+
 }

app/src/main/java/protect/card_locker/CardShortcutConfigure.java

@@ -76,10 +76,6 @@ public class CardShortcutConfigure extends AppCompatActivity implements LoyaltyC
         finish();
     }
 
-    @Override
-    public void onIconClicked(int inputPosition) {
-        onClickAction(inputPosition);
-    }
 
     @Override
     public void onRowClicked(int inputPosition) {

app/src/main/java/protect/card_locker/DBHelper.java

@@ -7,6 +7,7 @@ import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
+import android.text.TextUtils;
 
 import java.io.FileNotFoundException;
 import java.math.BigDecimal;
@@ -20,7 +21,7 @@ public class DBHelper extends SQLiteOpenHelper
 {
     public static final String DATABASE_NAME = "Catima.db";
     public static final int ORIGINAL_DATABASE_VERSION = 1;
-    public static final int DATABASE_VERSION = 11;
+    public static final int DATABASE_VERSION = 12;
 
     public static class LoyaltyCardDbGroups
     {
@@ -54,6 +55,14 @@ public class DBHelper extends SQLiteOpenHelper
         public static final String groupID = "groupId";
     }
 
+    public static class LoyaltyCardDbFTS
+    {
+        public static final String TABLE = "fts";
+        public static final String ID = "rowid"; // This should NEVER be changed
+        public static final String STORE = "store";
+        public static final String NOTE = "note";
+    }
+
     public enum LoyaltyCardOrder {
         Alpha,
         LastUsed,
@@ -78,13 +87,13 @@ public class DBHelper extends SQLiteOpenHelper
     public void onCreate(SQLiteDatabase db)
     {
         // create table for card groups
-        db.execSQL("create table " + LoyaltyCardDbGroups.TABLE + "(" +
+        db.execSQL("CREATE TABLE " + LoyaltyCardDbGroups.TABLE + "(" +
                 LoyaltyCardDbGroups.ID + " TEXT primary key not null," +
                 LoyaltyCardDbGroups.ORDER + " INTEGER DEFAULT '0')");
 
         // create table for cards
         // Balance is TEXT and not REAL to be able to store a BigDecimal without precision loss
-        db.execSQL("create table " + LoyaltyCardDbIds.TABLE + "(" +
+        db.execSQL("CREATE TABLE " + LoyaltyCardDbIds.TABLE + "(" +
                 LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
                 LoyaltyCardDbIds.STORE + " TEXT not null," +
                 LoyaltyCardDbIds.NOTE + " TEXT not null," +
@@ -99,23 +108,26 @@ public class DBHelper extends SQLiteOpenHelper
                 LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0')");
 
         // create associative table for cards in groups
-        db.execSQL("create table " + LoyaltyCardDbIdsGroups.TABLE + "(" +
+        db.execSQL("CREATE TABLE " + LoyaltyCardDbIdsGroups.TABLE + "(" +
                 LoyaltyCardDbIdsGroups.cardID + " INTEGER," +
                 LoyaltyCardDbIdsGroups.groupID + " TEXT," +
                 "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID +"))");
+
+        // create FTS search table
+        db.execSQL("CREATE VIRTUAL TABLE " + LoyaltyCardDbFTS.TABLE + " USING fts4(" +
+                LoyaltyCardDbFTS.STORE + ", " + LoyaltyCardDbFTS.NOTE + ", " +
+                "tokenize=unicode61);");
     }
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion)
     {
-        // Upgrade from version 1 to version 2
         if(oldVersion < 2 && newVersion >= 2)
         {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.NOTE + " TEXT not null default ''");
         }
 
-        // Upgrade from version 2 to version 3
         if(oldVersion < 3 && newVersion >= 3)
         {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
@@ -124,26 +136,23 @@ public class DBHelper extends SQLiteOpenHelper
                     + " ADD COLUMN " + LoyaltyCardDbIds.HEADER_TEXT_COLOR + " INTEGER");
         }
 
-        // Upgrade from version 3 to version 4
         if(oldVersion < 4 && newVersion >= 4)
         {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.STAR_STATUS + " INTEGER DEFAULT '0'");
         }
 
-        // Upgrade from version 4 to version 5
         if(oldVersion < 5 && newVersion >= 5)
         {
-            db.execSQL("create table " + LoyaltyCardDbGroups.TABLE + "(" +
+            db.execSQL("CREATE TABLE " + LoyaltyCardDbGroups.TABLE + "(" +
                     LoyaltyCardDbGroups.ID + " TEXT primary key not null)");
 
-            db.execSQL("create table " + LoyaltyCardDbIdsGroups.TABLE + "(" +
+            db.execSQL("CREATE TABLE " + LoyaltyCardDbIdsGroups.TABLE + "(" +
                     LoyaltyCardDbIdsGroups.cardID + " INTEGER," +
                     LoyaltyCardDbIdsGroups.groupID + " TEXT," +
                     "primary key (" + LoyaltyCardDbIdsGroups.cardID + "," + LoyaltyCardDbIdsGroups.groupID +"))");
         }
 
-        // Upgrade from version 5 to 6
         if(oldVersion < 6 && newVersion >= 6)
         {
             db.execSQL("ALTER TABLE " + LoyaltyCardDbGroups.TABLE
@@ -219,7 +228,7 @@ public class DBHelper extends SQLiteOpenHelper
 
             db.execSQL("DROP TABLE " + LoyaltyCardDbIds.TABLE);
 
-            db.execSQL("create table " + LoyaltyCardDbIds.TABLE + "(" +
+            db.execSQL("CREATE TABLE " + LoyaltyCardDbIds.TABLE + "(" +
                     LoyaltyCardDbIds.ID + " INTEGER primary key autoincrement," +
                     LoyaltyCardDbIds.STORE + " TEXT not null," +
                     LoyaltyCardDbIds.NOTE + " TEXT not null," +
@@ -269,6 +278,63 @@ public class DBHelper extends SQLiteOpenHelper
             db.execSQL("ALTER TABLE " + LoyaltyCardDbIds.TABLE
                     + " ADD COLUMN " + LoyaltyCardDbIds.LAST_USED + " INTEGER DEFAULT '0'");
         }
+
+        if(oldVersion < 12 && newVersion >= 12)
+        {
+            db.execSQL("CREATE VIRTUAL TABLE " + LoyaltyCardDbFTS.TABLE + " USING fts4(" +
+                    LoyaltyCardDbFTS.STORE + ", " + LoyaltyCardDbFTS.NOTE + ", " +
+                    "tokenize=unicode61);");
+
+            Cursor cursor = db.rawQuery("SELECT * FROM " + LoyaltyCardDbIds.TABLE + ";", null, null);
+
+            cursor.moveToFirst();
+
+            while (cursor.moveToNext()) {
+                LoyaltyCard loyaltyCard = LoyaltyCard.toLoyaltyCard(cursor);
+                insertFTS(db, loyaltyCard.id, loyaltyCard.store, loyaltyCard.note);
+            }
+        }
+    }
+
+    private ContentValues generateFTSContentValues(final int id, final String store, final String note) {
+        // FTS on Android is severely limited and can only search for word starting with a certain string
+        // So for each word, we grab every single substring
+        // This makes it possible to find Décathlon by searching both de and cat, for example
+
+        ContentValues ftsContentValues = new ContentValues();
+
+        StringBuilder storeString = new StringBuilder();
+        for (String word : store.split(" ")) {
+            for (int i = 0; i < word.length(); i++) {
+                storeString.append(word);
+                storeString.append(" ");
+                word = word.substring(1);
+            }
+        }
+
+        StringBuilder noteString = new StringBuilder();
+        for (String word : note.split(" ")) {
+            for (int i = 0; i < word.length(); i++) {
+                noteString.append(word);
+                noteString.append(" ");
+                word = word.substring(1);
+            }
+        }
+
+        ftsContentValues.put(LoyaltyCardDbFTS.ID, id);
+        ftsContentValues.put(LoyaltyCardDbFTS.STORE, storeString.toString());
+        ftsContentValues.put(LoyaltyCardDbFTS.NOTE, noteString.toString());
+
+        return ftsContentValues;
+    }
+
+    private void insertFTS(final SQLiteDatabase db, final int id, final String store, final String note) {
+        db.insert(LoyaltyCardDbFTS.TABLE, null, generateFTSContentValues(id, store, note));
+    }
+
+    private void updateFTS(final SQLiteDatabase db, final int id, final String store, final String note) {
+        db.update(LoyaltyCardDbFTS.TABLE, generateFTSContentValues(id, store, note),
+                whereAttrs(LoyaltyCardDbFTS.ID), withArgs(id));
     }
 
     public long insertLoyaltyCard(final String store, final String note, final Date expiry,
@@ -278,6 +344,9 @@ public class DBHelper extends SQLiteOpenHelper
                                   final int starStatus, final Long lastUsed)
     {
         SQLiteDatabase db = getWritableDatabase();
+        db.beginTransaction();
+
+        // Card
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.STORE, store);
         contentValues.put(LoyaltyCardDbIds.NOTE, note);
@@ -290,7 +359,15 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
-        return db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
+        long id = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
+
+        // FTS
+        insertFTS(db, (int) id, store, note);
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+
+        return id;
     }
 
     public long insertLoyaltyCard(final SQLiteDatabase db, final String store,
@@ -300,6 +377,9 @@ public class DBHelper extends SQLiteOpenHelper
                                   final Integer headerColor, final int starStatus,
                                   final Long lastUsed)
     {
+        db.beginTransaction();
+
+        // Card
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.STORE, store);
         contentValues.put(LoyaltyCardDbIds.NOTE, note);
@@ -312,7 +392,15 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
-        return db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
+        long id = db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
+
+        // FTS
+        insertFTS(db, (int) id, store, note);
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+
+        return id;
     }
 
     public long insertLoyaltyCard(final SQLiteDatabase db, final int id, final String store,
@@ -322,6 +410,9 @@ public class DBHelper extends SQLiteOpenHelper
                                   final Integer headerColor, final int starStatus,
                                   final Long lastUsed)
     {
+        db.beginTransaction();
+
+        // Card
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.ID, id);
         contentValues.put(LoyaltyCardDbIds.STORE, store);
@@ -335,7 +426,15 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         contentValues.put(LoyaltyCardDbIds.STAR_STATUS, starStatus);
         contentValues.put(LoyaltyCardDbIds.LAST_USED, lastUsed != null ? lastUsed : Utils.getUnixTime());
-        return db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
+        db.insert(LoyaltyCardDbIds.TABLE, null, contentValues);
+
+        // FTS
+        insertFTS(db, id, store, note);
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+
+        return id;
     }
 
     public boolean updateLoyaltyCard(final int id, final String store, final String note,
@@ -345,6 +444,9 @@ public class DBHelper extends SQLiteOpenHelper
                                      final Integer headerColor)
     {
         SQLiteDatabase db = getWritableDatabase();
+        db.beginTransaction();
+
+        // Card
         ContentValues contentValues = new ContentValues();
         contentValues.put(LoyaltyCardDbIds.STORE, store);
         contentValues.put(LoyaltyCardDbIds.NOTE, note);
@@ -357,6 +459,13 @@ public class DBHelper extends SQLiteOpenHelper
         contentValues.put(LoyaltyCardDbIds.HEADER_COLOR, headerColor);
         int rowsUpdated = db.update(LoyaltyCardDbIds.TABLE, contentValues,
                 whereAttrs(LoyaltyCardDbIds.ID), withArgs(id));
+
+        // FTS
+        updateFTS(db, id, store, note);
+
+        db.setTransactionSuccessful();
+        db.endTransaction();
+
         return (rowsUpdated == 1);
     }
 
@@ -472,6 +581,11 @@ public class DBHelper extends SQLiteOpenHelper
                 whereAttrs(LoyaltyCardDbIdsGroups.cardID),
                 withArgs(id));
 
+        // Delete FTS table entries
+        db.delete(LoyaltyCardDbFTS.TABLE,
+                whereAttrs(LoyaltyCardDbFTS.ID),
+                withArgs(id));
+
         // Also wipe card images associated with this card
         try {
             Utils.saveCardImage(mContext, null, id, true);
@@ -520,9 +634,7 @@ public class DBHelper extends SQLiteOpenHelper
      * @param order
      * @return Cursor
      */
-    public Cursor getLoyaltyCardCursor(final String filter, Group group, LoyaltyCardOrder order, LoyaltyCardOrderDirection direction) {
-        String actualFilter = String.format("%%%s%%", filter);
-        String[] selectionArgs = { actualFilter, actualFilter };
+    public Cursor getLoyaltyCardCursor(String filter, Group group, LoyaltyCardOrder order, LoyaltyCardOrderDirection direction) {
         StringBuilder groupFilter = new StringBuilder();
         String limitString = "";
 
@@ -536,7 +648,7 @@ public class DBHelper extends SQLiteOpenHelper
                 groupFilter.append("AND (");
 
                 for (int i = 0; i < allowedIds.size(); i++) {
-                    groupFilter.append(LoyaltyCardDbIds.ID + " = ").append(allowedIds.get(i));
+                    groupFilter.append(LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.ID + " = ").append(allowedIds.get(i));
                     if (i != allowedIds.size() - 1) {
                         groupFilter.append(" OR ");
                     }
@@ -549,39 +661,29 @@ public class DBHelper extends SQLiteOpenHelper
 
         String orderField = getFieldForOrder(order);
 
-        return db.rawQuery("select * from " + LoyaltyCardDbIds.TABLE +
-                " WHERE (" + LoyaltyCardDbIds.STORE + "  LIKE ? " +
-                " OR " + LoyaltyCardDbIds.NOTE + " LIKE ? )" +
+        return db.rawQuery("SELECT " + LoyaltyCardDbIds.TABLE + ".* FROM " + LoyaltyCardDbIds.TABLE +
+                " JOIN " + LoyaltyCardDbFTS.TABLE +
+                " ON " + LoyaltyCardDbFTS.TABLE + "." + LoyaltyCardDbFTS.ID + " = " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.ID +
+                (filter.trim().isEmpty() ? " " : " AND " + LoyaltyCardDbFTS.TABLE + " MATCH ? ") +
                 groupFilter.toString() +
-                " ORDER BY " + LoyaltyCardDbIds.STAR_STATUS + " DESC, " +
-                " (CASE WHEN " + orderField + " IS NULL THEN 1 ELSE 0 END), " +
-                orderField + " COLLATE NOCASE " + getDbDirection(order, direction) + ", " +
-                LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC " +
-                limitString, selectionArgs, null);
+                " ORDER BY " + LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STAR_STATUS + " DESC, " +
+                " (CASE WHEN " + LoyaltyCardDbIds.TABLE + "." + orderField + " IS NULL THEN 1 ELSE 0 END), " +
+                LoyaltyCardDbIds.TABLE + "." + orderField + " COLLATE NOCASE " + getDbDirection(order, direction) + ", " +
+                LoyaltyCardDbIds.TABLE + "." + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC " +
+                limitString, filter.trim().isEmpty() ? null : new String[] { TextUtils.join("* ", filter.split(" ")) + '*' }, null);
     }
 
+    /**
+     * Returns the amount of loyalty cards.
+     *
+     * @return Integer
+     */
     public int getLoyaltyCardCount()
     {
         SQLiteDatabase db = getReadableDatabase();
         return (int) DatabaseUtils.queryNumEntries(db, LoyaltyCardDbIds.TABLE);
     }
 
-    /**
-     * Returns the amount of loyalty cards with the filter text in either the store or note.
-     *
-     * @param filter
-     * @return Integer
-     */
-    public int getLoyaltyCardCount(String filter)
-    {
-        String actualFilter = String.format("%%%s%%", filter);
-
-        SQLiteDatabase db = getReadableDatabase();
-        return (int) DatabaseUtils.queryNumEntries(db, LoyaltyCardDbIds.TABLE,
-                LoyaltyCardDbIds.STORE + " LIKE ? " +
-                " OR " + LoyaltyCardDbIds.NOTE + " LIKE ? ", withArgs(actualFilter, actualFilter));
-    }
-
     /**
      * Returns a cursor to all groups.
      *

app/src/main/java/protect/card_locker/ImportExportActivity.java

@@ -20,6 +20,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
@@ -405,6 +406,8 @@ public class ImportExportActivity extends CatimaAppCompatActivity
 
                 Log.e(TAG, "Starting file export with: " + uri.toString());
                 startExport(writer, uri);
+
+                writer.close();
             }
             else
             {
@@ -421,9 +424,11 @@ public class ImportExportActivity extends CatimaAppCompatActivity
                 Log.e(TAG, "Starting file import with: " + uri.toString());
 
                 startImport(reader, uri, importDataFormat, password);
+
+                reader.close();
             }
         }
-        catch(FileNotFoundException e)
+        catch(IOException e)
         {
             Log.e(TAG, "Failed to import/export file: " + uri.toString(), e);
             if (requestCode == CHOOSE_EXPORT_LOCATION)

app/src/main/java/protect/card_locker/LoyaltyCardCursorAdapter.java

@@ -128,7 +128,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
 
     private void applyClickEvents(LoyaltyCardListItemViewHolder inputHolder, final int inputPosition)
     {
-        inputHolder.mThumbnailContainer.setOnClickListener(inputView -> mListener.onIconClicked(inputPosition));
         inputHolder.mRow.setOnClickListener(inputView -> mListener.onRowClicked(inputPosition));
         inputHolder.mInformationContainer.setOnClickListener(inputView -> mListener.onRowClicked(inputPosition));
 
@@ -238,7 +237,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
 
     public interface CardAdapterListener
     {
-        void onIconClicked(int inputPosition);
         void onRowClicked(int inputPosition);
         void onRowLongClicked(int inputPosition);
     }
@@ -249,7 +247,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         public TextView mStoreField, mNoteField, mBalanceField, mExpiryField;
         public LinearLayout mInformationContainer;
         public ImageView mCardIcon, mStarIcon;
-        public CardView mThumbnailContainer;
         public MaterialCardView mRow;
         public View mDivider;
         public RelativeLayout mThumbnailFrontContainer, mThumbnailBackContainer;
@@ -257,7 +254,6 @@ public class LoyaltyCardCursorAdapter extends BaseCursorAdapter<LoyaltyCardCurso
         public LoyaltyCardListItemViewHolder(View inputView)
         {
             super(inputView);
-            mThumbnailContainer = inputView.findViewById(R.id.thumbnail_container);
             mRow = inputView.findViewById(R.id.row);
             mDivider = inputView.findViewById(R.id.info_divider);
             mThumbnailFrontContainer = inputView.findViewById(R.id.thumbnail_front);

app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java

@@ -531,10 +531,7 @@ public class LoyaltyCardViewActivity extends CatimaAppCompatActivity implements
         {
             window.getDecorView().setSystemUiVisibility(backgroundNeedsDarkIcons ? View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR : 0);
         }
-        if(Build.VERSION.SDK_INT >= 21)
-        {
-            window.setStatusBarColor(Color.TRANSPARENT);
-        }
+        window.setStatusBarColor(Color.TRANSPARENT);
 
         // Set shadow colour of store text so even same color on same color would be readable
         storeName.setShadowLayer(1, 1, 1, backgroundNeedsDarkIcons ? Color.BLACK : Color.WHITE);

app/src/main/java/protect/card_locker/MainActivity.java

@@ -17,7 +17,6 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.CheckBox;
-import android.widget.CompoundButton;
 import android.widget.Toast;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -33,6 +32,7 @@ import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
+import androidx.core.splashscreen.SplashScreen;
 import androidx.recyclerview.widget.RecyclerView;
 import protect.card_locker.preferences.SettingsActivity;
 
@@ -183,8 +183,8 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
     @Override
     protected void onCreate(Bundle inputSavedInstanceState)
     {
-        setTheme(R.style.AppTheme_NoActionBar);
         super.onCreate(inputSavedInstanceState);
+        SplashScreen.installSplashScreen(this);
         setTitle(R.string.app_name);
         setContentView(R.layout.main_activity);
         Toolbar toolbar = findViewById(R.id.toolbar);
@@ -398,16 +398,17 @@ 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
-            mCardList.setVisibility(View.VISIBLE);
             mHelpText.setVisibility(View.GONE);
             mNoGroupCardsText.setVisibility(View.GONE);
             if(mAdapter.getItemCount() > 0)
             {
+                mCardList.setVisibility(View.VISIBLE);
                 mNoMatchingCardsText.setVisibility(View.GONE);
             }
             else
             {
-                if(!mFilter.isEmpty()) {
+                mCardList.setVisibility(View.GONE);
+                if (!mFilter.isEmpty()) {
                     // Actual Empty Search Result
                     mNoMatchingCardsText.setVisibility(View.VISIBLE);
                     mNoGroupCardsText.setVisibility(View.GONE);
@@ -460,14 +461,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         groupsTabLayout.setVisibility(View.VISIBLE);
     }
 
-    private void openPrivacyPolicy() {
-        Intent browserIntent = new Intent(
-                Intent.ACTION_VIEW,
-                Uri.parse("https://catima.app/privacy-policy")
-        );
-        startActivity(browserIntent);
-    }
-
     @Override
     public boolean onCreateOptionsMenu(Menu inputMenu)
     {
@@ -580,12 +573,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
             return true;
         }
 
-        if(id == R.id.action_privacy_policy)
-        {
-            openPrivacyPolicy();
-            return true;
-        }
-
         if (id == R.id.action_about)
         {
             Intent i = new Intent(getApplicationContext(), AboutActivity.class);
@@ -729,16 +716,6 @@ public class MainActivity extends CatimaAppCompatActivity implements LoyaltyCard
         }
     }
 
-    @Override
-    public void onIconClicked(int inputPosition)
-    {
-        if (mCurrentActionMode == null)
-        {
-            mCurrentActionMode = startSupportActionMode(mCurrentActionModeCallback);
-        }
-
-        toggleSelection(inputPosition);
-    }
 
     @Override
     public void onRowClicked(int inputPosition)

app/src/main/java/protect/card_locker/importexport/StocardImporter.java

@@ -116,14 +116,14 @@ public class StocardImporter implements Importer
                                     .substring("/loyalty-card-providers/".length())
                         );
 
-                        try {
+                        if (jsonObject.has("input_barcode_format")) {
                             loyaltyCardHashMap = appendToLoyaltyCardHashMap(
                                     loyaltyCardHashMap,
                                     cardName,
                                     "barcodeType",
                                     jsonObject.getString("input_barcode_format")
                             );
-                        } catch (JSONException ignored) {}
+                        }
                     }
                 } else if (fileName.endsWith("notes/default.json")) {
                     loyaltyCardHashMap = appendToLoyaltyCardHashMap(

app/src/main/res/drawable/background_splash.xml

@@ -1,7 +0,0 @@
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/ic_launcher_background"/>
-    <item android:gravity="center"
-        android:width="256dp"
-        android:height="256dp"
-        android:drawable="@drawable/ic_launcher_foreground" />
-</layer-list>

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

@@ -22,21 +22,333 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_marginTop="?attr/actionBarSize"
-        android:orientation="vertical"
         android:padding="10dp">
 
-        <TextView
-            android:id="@+id/aboutText"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:linksClickable="true"
-            android:singleLine="false"
-            android:focusable="true" />
+            android:orientation="vertical">
 
-    </LinearLayout>
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/version_history"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="8dp">
 
+                <TextView
+                    android:id="@+id/version_history_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:padding="2dp"
+                    android:text="@string/version_history"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/version_history_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="2dp"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/version_history_main" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/credits"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="8dp">
+
+                <TextView
+                    android:id="@+id/credits_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:padding="2dp"
+                    android:text="@string/credits"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/credits_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="2dp"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/credits_main" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/translate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="8dp">
+
+                <TextView
+                    android:id="@+id/translate_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:padding="2dp"
+                    android:text="@string/help_translate_this_app"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/license"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="8dp">
+
+                <TextView
+                    android:id="@+id/license_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:padding="2dp"
+                    android:text="@string/license"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/license_sub"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="2dp"
+                    android:text="@string/app_license"
+                    android:layout_marginEnd="20dp"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/license_main"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/repo"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="8dp">
+
+                <TextView
+                    android:id="@+id/repo_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:padding="2dp"
+                    android:text="@string/source_repository"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/repo_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="2dp"
+                    android:text="@string/on_github"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/repo_main" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/privacy"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="8dp">
+
+                <TextView
+                    android:id="@+id/privacy_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:padding="2dp"
+                    android:text="@string/privacy_policy"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/privacy_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="2dp"
+                    android:text="@string/and_data_usage"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/privacy_main" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/rate"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="8dp">
+
+                <TextView
+                    android:id="@+id/rate_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:padding="2dp"
+                    android:text="@string/rate_this_app"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/rate_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="2dp"
+                    android:text="@string/on_google_play"
+                    android:textSize="16sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/rate_main" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:padding="8dp"
+                android:id="@+id/report_error"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/report_error_main"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:padding="2dp"
+                    android:text="@string/report_error"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="18sp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/report_error_sub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintTop_toBottomOf="@id/report_error_main"
+                    app:layout_constraintStart_toStartOf="parent"
+                    android:textSize="16sp"
+                    android:text="@string/on_github"
+                    android:padding="2dp"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/arrow"
+                    android:textColor="@color/colorSecondaryText"
+                    android:textSize="20sp"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </LinearLayout>
+    </ScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/menu/main_menu.xml

@@ -27,10 +27,6 @@
         android:id="@+id/action_settings"
         android:title="@string/settings"
         app:showAsAction="never"/>
-    <item
-        android:id="@+id/action_privacy_policy"
-        android:title="@string/privacy_policy"
-        app:showAsAction="never"/>
     <item
         android:id="@+id/action_about"
         android:title="@string/about"

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

@@ -10,13 +10,13 @@ Gediminas Murauskas
 IllusiveMan196
 Joel A
 Samantaz Fox
+Nyatsuki
 arno-github
 Sergio Paredes
 StoyanDimitrov
-Nyatsuki
+Oğuz Ersen
 Petr Novák
 arshbeerSingh
-Oğuz Ersen
 huuhaa
 Michael Moroni
 betsythefc
@@ -52,6 +52,7 @@ Mattia
 pbeckmann
 Peer Beckmann
 QuangDNguyen2211
+Rohan Babbar 
 Rose Liverman
 Simone Dotto
 Subhashish Anand

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

@@ -24,7 +24,7 @@
         <item quantity="other"><xliff:g>%d</xliff:g> карти</item>
     </plurals>
     <string name="failedOpeningFileManager">Инсталирайте приложение за управление на файлове.</string>
-    <string name="app_license">Свободен софтуер с авторски права, лицензиран под GPLv3+.</string>
+    <string name="app_license">Свободен софтуер с авторски права, лицензиран под GPLv3+</string>
     <string name="frontImageDescription">Снимка на предната страна на карта</string>
     <string name="backImageDescription">Снимка на задната страна на карта</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> не изглежда истинска наличност.</string>
@@ -52,7 +52,7 @@
     <string name="barcodeId">Стойност на щрихкода</string>
     <string name="importLoyaltyCardKeychain">Внасяне от Loyalty Card Keychain</string>
     <string name="importFidmeMessage">Изберете файла <i>fidme-export-request-xxxxxx.zip</i>, предварително изнесен от FidMe и ръчно изберете вида на щрихкодовете.
-\nИли създайте такъв файл от Data Protection в менюто на профила във FidMe и изберете „Extract my data“.</string>
+\nСъздайте такъв файл от Data Protection в менюто на профила във FidMe и изберете „Extract my data“.</string>
     <string name="importFidme">Внасяне от FidMe</string>
     <string name="exportOptionExplanation">Данните ще бъдат запазени на място по ваш избор.</string>
     <string name="accept">Приемане</string>
@@ -116,7 +116,7 @@
     <string name="exportName">Изнасяне</string>
     <string name="importExport">Внасяне/изнасяне</string>
     <string name="sendLabel">Изпращане…</string>
-    <string name="scanCardBarcode">Сканиране на щрихкод от карта</string>
+    <string name="scanCardBarcode">Снемане на щрихкод от карта</string>
     <string name="editCardTitle">Редактиране на карта</string>
     <string name="share">Споделя</string>
     <string name="copy_to_clipboard">Копира идентификатора в междинната памет</string>
@@ -124,7 +124,7 @@
     <string name="importSuccessful">Картите са внесени успешно</string>
     <string name="chooseImportType">От къде ще внесете\?</string>
     <string name="importCatimaMessage">Изберете файла <i>catima.zip</i>, предварително изнесен от Catima.
-\nИли създайте такъв файл от меню Внасяне/изнасяне от друго устройство със Catima като изберете Изнасяне.</string>
+\nСъздайте такъв файл от меню Внасяне/изнасяне от друго устройство с Catima като изберете Изнасяне.</string>
     <string name="importOptionApplicationTitle">От друго приложение</string>
     <string name="importOptionFilesystemButton">Избиране от файлова система</string>
     <string name="importOptionFilesystemExplanation">Изберете определен файл от файловата система.</string>
@@ -133,9 +133,9 @@
     <string name="app_revision_fmt">Компилация: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="debug_version_fmt">Издание: <xliff:g id="version">%s</xliff:g></string>
     <string name="about_title_fmt">Относно <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Всички права запазени © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Всички права запазени © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="app_copyright_old">На основата на Loyalty Card Keychain
-\nвсички права запазени © 2016–2020 Branden Archer.</string>
+\nвсички права запазени © 2016–2020 Branden Archer</string>
     <string name="about">Относно</string>
     <string name="importOptionFilesystemTitle">Внасяне от файловата система</string>
     <string name="importCatima">Внасяне от Catima</string>
@@ -156,11 +156,11 @@
     <string name="importStocard">Внасяне от Stocard</string>
     <string name="importVoucherVault">Внасяне от Voucher Vault</string>
     <string name="importVoucherVaultMessage">Изберете файла <i>vouchervault.json</i>, предварително изнесен от Voucher Vault.
-\nИли създайте такъв файл от меню Изнасяне от Voucher Vault.</string>
-    <string name="importStocardMessage">Изберете вашия <i>***-sync.zip</i> експорт от Stocard, за да го импортирате.
-\nИли го получете, като изпратите имейл на support@stocardapp.com с искане за експорт на вашите данни.</string>
+\nСъздайте такъв файл от меню „Export“ във Voucher Vault.</string>
+    <string name="importStocardMessage">Изберете файла <i>***-sync.zip</i>, предварително изнесен от Stocard.
+\nПолучете го като изпратите писмо на support@stocardapp.com с искане за изнасяне вашите данни.</string>
     <string name="importLoyaltyCardKeychainMessage">Изберете файла <i>LoyaltyCardKeychain.csv</i>, предварително изнесен от Loyalty Card Keychain.
-\nИли създайте такъв файл от меню Внасяне/изнасяне от друго устройство със Loyalty Card Keychain като изберете Изнасяне.</string>
+\nСъздайте такъв файл от меню Внасяне/изнасяне от друго устройство с Loyalty Card Keychain като изберете Изнасяне.</string>
     <string name="failedParsingImportUriError">Препратката не може да бъде анализирана за внасяне</string>
     <string name="card_ids_copied">[не превеждай този низ, https://github.com/TheLastProject/Catima/issues/278]</string>
     <string name="failedGeneratingShareURL">Грешка при създаване на адрес за споделяне. Изпратете доклад за дефект.</string>
@@ -198,4 +198,14 @@
     <string name="sort_by_most_recently_used">Последно използване</string>
     <string name="sort_by_name">Наименование</string>
     <string name="sort">Сортиране</string>
+    <string name="credits">Заслуги</string>
+    <string name="license">Лиценз</string>
+    <string name="source_repository">Хранилище на изходния код</string>
+    <string name="on_github">в GitHub</string>
+    <string name="rate_this_app">Оценете приложението</string>
+    <string name="report_error">Докладване на грешка</string>
+    <string name="version_history">История на изданията</string>
+    <string name="on_google_play">в Google Play</string>
+    <string name="and_data_usage">и използване на данни</string>
+    <string name="help_translate_this_app">Помогнете за превода на приложението</string>
 </resources>

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

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="save">Snimi</string>
+    <string name="cancel">Odustani</string>
+    <string name="unstar">Ukloni sve omiljene</string>
+    <string name="star">Omiljene</string>
+    <string name="barcodeNoBarcode">Ova kartica nema barkode</string>
+    <string name="barcodeType">Barcode tip</string>
+    <string name="note">Bilježnica</string>
+    <string name="storeName">Ime</string>
+    <string name="noMatchingGiftCards">Nisam našao ništa. Pokušaj promijeniti pretragu.</string>
+    <string name="noGiftCards">Kliknite + Plus dugme da dodate kartu ili uvozite nešto iz menija prvo.</string>
+    <string name="action_add">Dodaj</string>
+    <string name="all">Sve</string>
+    <string name="noGroupCards">Ova grupa ne sadrži nikakve karte</string>
+    <string name="noGroups">Kliknite + Plus dugme da dodate grupe za kategorizaciju prvo.</string>
+    <string name="groups">Grupe</string>
+    <string name="enter_group_name">Unesite ime grupe</string>
+    <string name="exportSuccessful">Podaci o kartama izvožen</string>
+    <string name="importSuccessful">Uvezeni podaci o kartama</string>
+    <string name="intent_import_card_from_url_share_text">Želim podijeliti čestitku s tobom</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Spriječi zaključavanje ekrana</string>
+    <string name="settings_keep_screen_on">Zadrži ekran</string>
+    <string name="settings_lock_barcode_orientation">Zaključaj barcode orjentacija</string>
+    <string name="settings_max_font_size_scale">Max. veliäťina fonta</string>
+    <string name="settings_light_theme">Svjetlo</string>
+    <string name="settings_system_theme">Sistem</string>
+    <string name="settings_theme">Tema</string>
+    <string name="settings_category_title_ui">Korisničko okruženje</string>
+    <string name="starImage">Omiljena zvijezda</string>
+    <string name="importCatima">Uvezi iz Catima</string>
+    <string name="importLoyaltyCardKeychain">Uvezi iz Loyalty Card Keychain</string>
+    <string name="importStocard">Uvezi iz Stokarda</string>
+    <string name="importVoucherVault">Uvezi iz trezora vaučer</string>
+    <string name="barcodeId">Barcode vrijednost</string>
+    <string name="sameAsCardId">Isto kao i kartica</string>
+    <string name="setBarcodeId">Postavi vrijednost za bar kod</string>
+    <string name="unsupportedBarcodeType">Ovaj bar kod još nije prikazan. Ona može biti podržana u kasnijoj verziji app.</string>
+    <string name="wrongValueForBarcodeType">Izabrana vrijednost nije izvršna</string>
+    <string name="copy_to_clipboard_multiple_toast">IDs kartica kopiran u clipboard</string>
+    <string name="intent_import_card_from_url_share_multiple_text">Želim podijeliti karte s tobom</string>
+    <string name="frontImageDescription">Slika kartice</string>
+    <string name="backImageDescription">Slika pozadine kartice</string>
+    <string name="photos">Slike</string>
+    <string name="setFrontImage">Postavi naslovnu sliku</string>
+    <string name="setBackImage">Vrati sliku</string>
+    <string name="removeImage">Ukloni sliku</string>
+    <string name="takePhoto">Slikaj</string>
+    <string name="updateBarcodeQuestionTitle">Ažurirati bar kod vrijednost\?</string>
+    <string name="updateBarcodeQuestionText">Promijenio si auto. Da li želite ažurirati bar kod koristiti istu vrijednost\?</string>
+    <string name="yes">Da</string>
+    <string name="no">Ne.</string>
+    <string name="passwordRequired">Upišite šifru</string>
+    <string name="failedGeneratingShareURL">Ne mogu generisati oštriji URL. Molim vas, prijavite ovo.</string>
+    <string name="turn_flashlight_on">Upali lampu</string>
+    <string name="turn_flashlight_off">Ugasi lampu</string>
+    <string name="settings_locale">Jezik</string>
+    <string name="settings_system_locale">Sistem</string>
+    <string name="settings_theme_color">Boja teme</string>
+    <string name="settings_catima_theme">Catima</string>
+    <string name="settings_pink_theme">Ružičasto</string>
+    <string name="settings_magenta_theme">Ljubičasto</string>
+    <string name="settings_violet_theme">Ljubičasto</string>
+    <string name="settings_blue_theme">Plavo</string>
+    <string name="settings_sky_blue_theme">Nebo plavo</string>
+    <string name="settings_green_theme">Zeleno</string>
+    <string name="settings_brown_theme">Braun</string>
+    <string name="sort">Poništi sortiranje</string>
+    <string name="toggleMoreInfo">Uključi savjete</string>
+    <string name="swipeToSwitchImages">Swipe ili long press za prebacivanje slika</string>
+    <string name="sort_by_name">Ime</string>
+    <string name="sort_by_most_recently_used">Nedavno Korišten</string>
+    <string name="sort_by_expiry">Sajam</string>
+    <string name="reverse">Rikverc</string>
+    <string name="sort_by">Sortiraj</string>
+    <string name="noCardExistsError">Nisam mogao pronaći karticu</string>
+    <string name="noStoreError">Nije uneseno ime</string>
+    <string name="card_ids_copied">Kopiran ID kartice(s)</string>
+    <string name="noCardsMessage">Dodaj prvo kartu</string>
+    <string name="addCardTitle">Dodaj Kartu</string>
+    <string name="editCardTitle">Izmijeni Karticu</string>
+    <string name="sendLabel">Pošalji…</string>
+    <string name="share">Podijeli</string>
+    <string name="copy_to_clipboard">Kopiraj ID u clipboard</string>
+    <string name="deleteConfirmation">Izbriši trajno ovu karticu\?</string>
+    <string name="unlockScreen">Odblokalna Rotacija</string>
+    <string name="confirm">Potvrdi</string>
+    <string name="delete">Obriši</string>
+    <string name="edit">Izmijeni</string>
+</resources>

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

@@ -37,7 +37,7 @@
     <string name="importOptionApplicationExplanation">K otevření souboru použijte libovolnou aplikaci nebo svého oblíbeného správce souborů.</string>
     <string name="importOptionApplicationButton">Použijte jinou aplikaci</string>
     <string name="about">O aplikaci</string>
-    <string name="app_license">Copylefted libre software, licencovaný GPLv3+.</string>
+    <string name="app_license">Copylefted libre software, licencovaný GPLv3+</string>
     <string name="about_title_fmt">O aplikaci <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Verze: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Informace o revizi: <xliff:g id="app_revision_url">%s</xliff:g></string>
@@ -55,7 +55,7 @@
     <string name="app_resources">Zdroje třetích stran Libre: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Libre knihovny třetích stran: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_copyright_old">Na základě Loyalty Card Keychain
-\ncopyright © 2016–2020 Branden Archer.</string>
+\ncopyright © 2016–2020 Branden Archer</string>
     <string name="exportOptionExplanation">Data budou zapsána na místo podle vašeho výběru.</string>
     <string name="failedParsingImportUriError">Nelze analyzovat import URI</string>
     <string name="noCardExistsError">Nelze najít kartu</string>
@@ -138,19 +138,19 @@
     <string name="setBarcodeId">Nastavení hodnoty čárového kódu</string>
     <string name="sameAsCardId">Stejné jako ID karty</string>
     <string name="importVoucherVaultMessage">Vyberte svůj <i>vouchervault.json</i> export z Voucher Vault, který chcete importovat.
-\nNebo jej vytvořte tak, že nejprve stisknete tlačítko Exportovat v aplikaci Voucher Vault.</string>
+\nVytvořte jej tak, že nejprve stisknete tlačítko Exportovat v aplikaci Voucher Vault.</string>
     <string name="importVoucherVault">Import z Voucher Vault</string>
     <string name="importStocardMessage">Vyberte svůj <i>***-sync.zip</i> export z aplikace Stocard, který chcete importovat.
-\nNebo jej získáte zasláním e-mailu na adresu support@stocardapp.com s žádostí o export vašich dat.</string>
+\nZískejte ji zasláním e-mailu na adresu support@stocardapp.com s žádostí o export vašich dat.</string>
     <string name="importStocard">Import ze Stocard</string>
     <string name="importLoyaltyCardKeychainMessage">Vyberte export <i>LoyaltyCardKeychain.csv</i> z klíčenky věrnostních karet, který chcete importovat.
-\nNebo jej vytvořte z nabídky Import/Export v Loyalty Card Keychain tak, že tam nejprve stisknete tlačítko Exportovat.</string>
+\nVytvořte jej z nabídky Import/Export v Loyalty Card Keychain tak, že tam nejprve stisknete tlačítko Exportovat.</string>
     <string name="importLoyaltyCardKeychain">Import z Loyalty Card Keychain</string>
-    <string name="importFidmeMessage">Vyberte svůj <i>fidme-export-request-xxxxxx.zip</i> export z FidMe k importu a poté vyberte typy čárových kódů ručně. 
-\nNebo jej vytvořte ze svého profilu FidMe tak, že nejprve zvolíte možnost Ochrana dat a poté stisknete tlačítko Extract moje data.</string>
+    <string name="importFidmeMessage">Vyberte svůj <i>fidme-export-request-xxxxxx.zip</i> export z FidMe k importu a poté vyberte typy čárových kódů ručně.
+\nVytvořte jej ze svého profilu FidMe tak, že nejprve zvolíte možnost Ochrana dat a poté stisknete tlačítko Extract moje data.</string>
     <string name="importFidme">Import z FidMe</string>
     <string name="importCatimaMessage">Vyberte export <i>catima.zip</i> z programu Catima, který chcete importovat.
-\nNebo jej vytvořte z nabídky Import/Export jiné aplikace Catima tak, že v ní nejprve stisknete tlačítko Exportovat.</string>
+\nVytvořte jej z nabídky Import/Export jiné aplikace Catima tak, že v ní nejprve stisknete tlačítko Exportovat.</string>
     <string name="importCatima">Import z Catima</string>
     <string name="accept">Přijmout</string>
     <string name="privacy_policy_popup_text">Oznámení o zásadách ochrany osobních údajů (vyžadováno některými obchody s aplikacemi):
@@ -184,7 +184,7 @@
     <string name="exportSuccessful">Data karty exportována</string>
     <string name="settings_display_barcode_max_brightness">Rozjasněné zobrazení čárového kódu</string>
     <string name="starImage">Oblíbená hvězda</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <plurals name="selectedCardCount">
         <item quantity="one">Vybrána <xliff:g>%d</xliff:g> karta</item>
         <item quantity="few">Vybrány <xliff:g>%d</xliff:g> karty</item>
@@ -202,4 +202,14 @@
     <string name="toggleMoreInfo">Přepnout zobrazení dalších informací</string>
     <string name="sort">Seřadit</string>
     <string name="barcodeImageDescriptionWithType">Obrázek čárového kódu karty typu <xliff:g>%s</xliff:g></string>
+    <string name="version_history">Historie verzí</string>
+    <string name="rate_this_app">Ohodnoťte tuto aplikaci</string>
+    <string name="and_data_usage">a využití dat</string>
+    <string name="credits">Kredity</string>
+    <string name="on_github">na GitHubu</string>
+    <string name="source_repository">Úložiště zdrojů</string>
+    <string name="license">Licence</string>
+    <string name="help_translate_this_app">Pomozte s překladem této aplikace</string>
+    <string name="report_error">Nahlásit chybu</string>
+    <string name="on_google_play">na Google Play</string>
 </resources>

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

@@ -47,4 +47,43 @@
     <string name="exportFailed">Kunne ikke eksportere kort</string>
     <string name="importing">Importere…</string>
     <string name="exporting">Eksportere…</string>
+    <string name="settings_dark_theme">Mørk</string>
+    <string name="settings_light_theme">Lys</string>
+    <string name="settings_theme">Tema</string>
+    <string name="settings_category_title_ui">Brugergrænseflade</string>
+    <string name="settings">Indstillinger</string>
+    <string name="starImage">Favorit stjerne</string>
+    <string name="thumbnailDescription">Miniaturebillede til kort</string>
+    <string name="copy_to_clipboard_toast">Kort-ID kopieret til udklipsholderen</string>
+    <string name="enterBarcodeInstructions">Indtast kortets ID, og vælg enten kortets stregkodetype nedenfor, eller \"Dette kort har ingen stregkode\".</string>
+    <string name="selectBarcodeTitle">Vælg stregkode</string>
+    <string name="app_copyright_old">Baseret på Loyalty Card Keychain
+\ncopyright © 2016-2020 Branden Archer.</string>
+    <string name="about">Om</string>
+    <string name="importOptionApplicationButton">Brug en anden app</string>
+    <string name="importOptionApplicationExplanation">Brug en hvilken som helst app eller din foretrukne filhåndtering til at åbne en fil.</string>
+    <string name="importOptionApplicationTitle">Brug en anden app</string>
+    <string name="noCardsMessage">Tilføj først et kort</string>
+    <string name="cardShortcut">Kort genvej</string>
+    <string name="importOptionFilesystemButton">Fra filsystemet</string>
+    <string name="importOptionFilesystemExplanation">Vælg en bestemt fil fra filsystemet.</string>
+    <string name="importOptionFilesystemTitle">Import fra filsystem</string>
+    <string name="exportOptionExplanation">Dataene skrives til en placering efter eget valg.</string>
+    <string name="noExternalStoragePermissionError">Giv først tilladelse til ekstern lagring til at importere eller eksportere kort</string>
+    <string name="failedParsingImportUriError">Kunne ikke analysere import-URI\'en</string>
+    <string name="noCardExistsError">Kunne ikke finde kort</string>
+    <string name="noCardIdError">Der er ikke angivet noget kort-ID</string>
+    <string name="noStoreError">Intet navn angivet</string>
+    <string name="deleteConfirmationGroup">Slet gruppe\?</string>
+    <string name="all">Alle</string>
+    <string name="noGroupCards">Denne gruppe indeholder ikke nogen kort</string>
+    <string name="noGroups">Klik på + plus-knappen for først at tilføje grupper til kategorisering.</string>
+    <string name="groups">Grupper</string>
+    <string name="enter_group_name">Indtast gruppenavn</string>
+    <string name="exportSuccessful">Eksporterede kortdata</string>
+    <string name="importSuccessful">Kortdata importeret</string>
+    <string name="intent_import_card_from_url_share_text">Jeg vil dele et kort med jer</string>
+    <string name="settings_disable_lockscreen_while_viewing_card">Forebyg låseskærm</string>
+    <string name="settings_keep_screen_on">LHold skærm tændt</string>
+    <string name="settings_lock_barcode_orientation">Lås stregkode-orientering</string>
 </resources>

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

@@ -42,7 +42,7 @@
     <string name="importOptionApplicationExplanation">Utilisez le gestionnaire de fichiers de votre choix pour importer un fichier.</string>
     <string name="importOptionApplicationButton">Utiliser une autre application</string>
     <string name="about">À propos</string>
-    <string name="app_license">Logiciel libre à copyleft, sous licence GPLv3+.</string>
+    <string name="app_license">Logiciel libre à copyleft, sous licence GPLv3+</string>
     <string name="about_title_fmt">À propos de <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Version : <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Notes de version : <xliff:g id="app_revision_url">%s</xliff:g></string>
@@ -62,7 +62,7 @@
     <string name="settings_theme">Thème</string>
     <string name="enterBarcodeInstructions">Entrez l’identifiant de la carte et choisissez le type de code-barres ci-dessous, ou « Cette carte n’a pas de code-barres ».</string>
     <string name="app_copyright_old">Basé sur Loyalty Card Keychain
-\ncopyright © 2016-2020 Branden Archer.</string>
+\ncopyright © 2016-2020 Branden Archer</string>
     <string name="exportOptionExplanation">Les données seront exportées vers l\'emplacement de votre choix.</string>
     <string name="failedParsingImportUriError">Impossible d\'analyser l\'URI d\'importation</string>
     <string name="share">Partager</string>
@@ -116,16 +116,16 @@
     <string name="settings_disable_lockscreen_while_viewing_card">Empêcher le verrouillage de l’écran</string>
     <string name="settings_keep_screen_on">Garder l’écran allumé</string>
     <string name="importVoucherVaultMessage">Sélectionnez votre exportation <i>vouchervault.json</i> de Voucher Vault à importer.
-\nOu créez-la en appuyant d’abord sur Exporter dans Voucher Vault.</string>
+\nCréez-la en appuyant d’abord sur Exporter dans Voucher Vault.</string>
     <string name="importVoucherVault">Importer depuis Voucher Vault</string>
     <string name="importLoyaltyCardKeychainMessage">Sélectionnez votre exportation <i>LoyaltyCardKeychain.csv</i> à partir de Loyalty Card Keychain pour l’importer.
-\nOu créez-la à partir du menu Importer/Exporter du Loyalty Card Keychain en appuyant d’abord sur Exporter.</string>
+\nCréez-la à partir du menu Importer/Exporter du Loyalty Card Keychain en appuyant d’abord sur Exporter.</string>
     <string name="importLoyaltyCardKeychain">Importer depuis Loyalty Card Keychain</string>
     <string name="importFidmeMessage">Sélectionnez votre exportation <i>fidme-export-request-xxxxxx.zip</i> de FidMe pour l’importer, puis sélectionnez manuellement les types de codes-barres.
-\nOu créez-la à partir de votre profil FidMe en choisissant Protection des données, puis en cliquant sur Extraire mes données d’abord.</string>
+\nCréez-la à partir de votre profil FidMe en choisissant Protection des données, puis en cliquant sur Extraire mes données d’abord.</string>
     <string name="importFidme">Importer depuis FidMe</string>
     <string name="importCatimaMessage">Sélectionnez votre exportation <i>catima.zip</i> depuis Catima à importer.
-\nOu créez-la à partir du menu Importer/Exporter d’une autre application Catima en appuyant d’abord sur Exporter.</string>
+\nCréez-la à partir du menu Importer/Exporter d’une autre application Catima en appuyant d’abord sur Exporter.</string>
     <string name="importCatima">Importer depuis Catima</string>
     <string name="addFromImage">Sélectionner dans la galerie</string>
     <string name="errorReadingImage">Impossible de lire l\'image</string>
@@ -138,7 +138,7 @@
     <string name="wrongValueForBarcodeType">La valeur n\'est pas valide pour le type de code-barres sélectionné</string>
     <string name="app_resources">Ressources tierces libres : <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Bibliothèques tierces libres : <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="intent_import_card_from_url_share_multiple_text">Je veux partager des cartes avec vous</string>
     <string name="copy_to_clipboard_multiple_toast">Identifiants des cartes copiés dans le presse-papiers</string>
     <string name="card_ids_copied">Num. de la carte copié(s)</string>
@@ -155,7 +155,7 @@
     <string name="frontImageDescription">Image recto de la carte</string>
     <string name="passwordRequired">Veuillez entrer le mot de passe</string>
     <string name="importStocardMessage">Sélectionnez votre exportation <i>***-sync.zip</i> de Stocard pour l’importer.
-\nVous pouvez aussi l’obtenir en envoyant un courriel à support@stocardapp.com pour demander une exportation de vos données.</string>
+\nVous pouvez l’obtenir en envoyant un courriel à support@stocardapp.com pour demander une exportation de vos données.</string>
     <string name="importStocard">Importer depuis Stocard</string>
     <string name="turn_flashlight_off">Éteindre la lampe de poche</string>
     <string name="turn_flashlight_on">Allumer la lampe de poche</string>
@@ -198,4 +198,14 @@
     <string name="sort_by_most_recently_used">Les plus récemment utilisées</string>
     <string name="sort_by_name">Nom</string>
     <string name="sort_by_balance">Solde</string>
+    <string name="report_error">Signaler une erreur</string>
+    <string name="on_google_play">sur Google Play</string>
+    <string name="rate_this_app">Notez cette app</string>
+    <string name="and_data_usage">utilisation des données</string>
+    <string name="on_github">sur GitHub</string>
+    <string name="source_repository">Dépôt source</string>
+    <string name="license">Licence</string>
+    <string name="help_translate_this_app">Aidez à traduire cette app</string>
+    <string name="credits">Contributeurs</string>
+    <string name="version_history">Historique des versions</string>
 </resources>

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

@@ -187,4 +187,10 @@
     <string name="settings_locale">言語</string>
     <string name="noGroupCards">このグループにはカードがありません</string>
     <string name="swipeToSwitchImages">画像を切り替えるには長押し、またはスワイプ</string>
+    <string name="sort_by">並び替え</string>
+    <string name="sort_by_balance">残高</string>
+    <string name="sort_by_expiry">期限</string>
+    <string name="sort_by_most_recently_used">最近使用したカード</string>
+    <string name="sort_by_name">名前</string>
+    <string name="sort">ソート</string>
 </resources>

app/src/main/res/values-nb-rNO/strings.xml

@@ -11,7 +11,7 @@
     <string name="edit">Rediger</string>
     <string name="delete">Slett</string>
     <string name="confirm">Bekreft</string>
-    <string name="lockScreen">Ingen rotering</string>
+    <string name="lockScreen">Skru av rotering</string>
     <string name="unlockScreen">Skru på rotering</string>
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Kopier ID til utklippstavle</string>
@@ -24,7 +24,7 @@
     <string name="noStoreError">Navn ikke angitt</string>
     <string name="noCardIdError">Ingen kort-ID innskrevet</string>
     <string name="noCardExistsError">Kunne ikke finne kort</string>
-    <string name="importExport">Import/eksport</string>
+    <string name="importExport">Importer/eksporter</string>
     <string name="exportName">Eksporter</string>
     <string name="importExportHelp">Sikkerhetskopiering av kort lar deg flytte dem til en annen enhet.</string>
     <string name="importSuccessfulTitle">Importert</string>
@@ -40,11 +40,11 @@
     <string name="importOptionFilesystemTitle">Importer fra filsystem</string>
     <string name="importOptionFilesystemExplanation">Velg spesifikk fil fra filsystemet.</string>
     <string name="importOptionFilesystemButton">Fra filsystem</string>
-    <string name="importOptionApplicationTitle">Bruk et annet program</string>
-    <string name="importOptionApplicationExplanation">Bruk hvilket som helst program, eller din favoritt-filutforsker for å åpne en fil.</string>
-    <string name="importOptionApplicationButton">Bruk et annet program</string>
+    <string name="importOptionApplicationTitle">Bruk en annen app</string>
+    <string name="importOptionApplicationExplanation">Bruk en hvilken som helst app, eller din favoritt-filutforsker for å åpne en fil.</string>
+    <string name="importOptionApplicationButton">Bruk en annen app</string>
     <string name="about">Om</string>
-    <string name="app_license">Gemenhetslig fri programvare, lisensiert GPLv3+.</string>
+    <string name="app_license">Copyleft fri programvare, lisensiert under GPLv3+.</string>
     <string name="about_title_fmt">Om <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versjon: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Utgivelsesinfo: <xliff:g id="app_revision_url">%s</xliff:g></string>
@@ -74,13 +74,13 @@
     <string name="unstar">Fjern fra favoritter</string>
     <string name="star">Legg til i favoritter</string>
     <string name="noGroups">Klikk på «+»- (pluss)-tegnet for å legge til grupper for kategorisering først.</string>
-    <string name="deleteConfirmationGroup">Slett gruppe\?</string>
+    <string name="deleteConfirmationGroup">Slett gruppe?</string>
     <string name="all">Alle</string>
     <string name="groups">Grupper</string>
     <string name="enter_group_name">Skriv inn gruppenavn</string>
     <string name="noBarcode">Ingen strekkode</string>
     <string name="failedOpeningFileManager">Installer en filbehandler først.</string>
-    <string name="leaveWithoutSaveConfirmation">Forlat uten å lagre\?</string>
+    <string name="leaveWithoutSaveConfirmation">Forlat uten å lagre?</string>
     <string name="leaveWithoutSaveTitle">Avslutt</string>
     <string name="addManually">Skriv inn kort-ID manuelt</string>
     <string name="moveDown">Flytt nedover</string>
@@ -106,13 +106,13 @@
     <string name="balance">Saldo</string>
     <string name="balancePoints"><xliff:g>%s</xliff:g> poeng</string>
     <string name="balanceSentence">Saldo: <xliff:g>%s</xliff:g></string>
-    <string name="chooseImportType">Importer data fra\?</string>
+    <string name="chooseImportType">Importer data fra?</string>
     <string name="app_loyalty_card_keychain">Kundekortknippe</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Forhindre skjermlås</string>
     <string name="settings_keep_screen_on">Behold skjerm påslått</string>
     <string name="privacy_policy_popup_text">Personvernspraksis-notis (påkrevd av noen programbutikker):
 \n
-\nINGEN DATA SAMLES INN, noe alle kan bekreftes siden programmet vårt er fri programvare.</string>
+\nINGEN DATA SAMLES INN I DET HELE TATT, noe alle kan bekreftes siden programmet vårt er fri programvare.</string>
     <string name="accept">Godta</string>
     <string name="privacy_policy">Personvernspraksis</string>
     <string name="importFidme">Importer fra FidMe</string>
@@ -132,8 +132,6 @@
     <string name="importLoyaltyCardKeychain">Importer fra Kundekortknippe</string>
     <string name="importFidmeMessage">Velg din <i>fidme-eksport-be-xxxxxx.zip</i> eksporter fra FidMe til å importere, og velg strekkode typer manuelt etterpå.
 \nEller lage den fra FidMe profil ved å velge Beskyttelse av Data og deretter trykke Trekke ut dataene mine første.</string>
-    <string name="importCatimaMessage">Finn en fil som antagelig heter <i>Catima.csv</i> å importere.
-\nEller opprett den i Import/eksport-menyen i et annet Catima-program ved å trykke «Eksporter» der først.</string>
     <string name="settings_max_font_size_scale">Maks. skriftstørrelse</string>
     <string name="wrongValueForBarcodeType">Verdien er ikke gyldig for valgt strekkodetype</string>
     <string name="intent_import_card_from_url_share_multiple_text">Jeg vil dele noen kort med deg</string>
@@ -142,10 +140,10 @@
     <string name="app_libraries">Frie tredjepartsbibliotek: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="card_ids_copied">Kopierte kort-ID(er)</string>
     <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Opphavsrett © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
-    <string name="updateBarcodeQuestionText">Du har endret kortets ID. Ønsker du å også oppdatere strekkoden til samme verdi\?</string>
+    <string name="updateBarcodeQuestionText">Du har endret kortets ID. Ønsker du å også oppdatere strekkoden til samme verdi?</string>
     <string name="no">Nei</string>
     <string name="yes">Ja</string>
-    <string name="updateBarcodeQuestionTitle">Oppdater strekkodeverdi\?</string>
+    <string name="updateBarcodeQuestionTitle">Oppdater strekkodeverdi?</string>
     <string name="takePhoto">Ta et bilde</string>
     <string name="removeImage">Fjern bilde</string>
     <string name="setBackImage">Sett bakside</string>
@@ -162,10 +160,10 @@
         <item quantity="one"><xliff:g>%d</xliff:g> kort valgt</item>
         <item quantity="other"><xliff:g>%d</xliff:g> korten valgt</item>
     </plurals>
-    <string name="deleteConfirmation">Slett dette kortet for godt\?</string>
+    <string name="deleteConfirmation">Slett dette kortet for godt?</string>
     <plurals name="deleteCardsConfirmation">
-        <item quantity="one">Slett dette kortet for godt\?</item>
-        <item quantity="other">Slett disse <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> kortene for godt\?</item>
+        <item quantity="one">Slett dette kortet for godt?</item>
+        <item quantity="other">Slett disse <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%s</xliff:g> kortene for godt?</item>
     </plurals>
     <string name="turn_flashlight_on">Skru på lommelykten</string>
     <string name="turn_flashlight_off">Skru av lommelykten</string>
@@ -191,4 +189,21 @@
     <string name="toggleMoreInfo">Veksle visning av mer info</string>
     <string name="barcodeImageDescriptionWithType">Bilde av kortstrekkode av typen <xliff:g>%s</xliff:g></string>
     <string name="swipeToSwitchImages">Dra eller hold lenge for å bygge bilder</string>
-</resources>
+    <string name="sort_by">Sorter etter</string>
+    <string name="reverse">Vend</string>
+    <string name="sort_by_balance">Saldo</string>
+    <string name="sort_by_expiry">Utløp</string>
+    <string name="sort_by_most_recently_used">Nyligst brukt</string>
+    <string name="sort_by_name">Navn</string>
+    <string name="sort">Sorter</string>
+    <string name="help_translate_this_app">Hjelp med å oversette denne appen</string>
+    <string name="license">Lisens</string>
+    <string name="version_history">Versjonshistorikk</string>
+    <string name="importCatimaMessage">Velg din <i>catima.zip</i> fra Catima å importere. Eller lag den fra Importer/Eksporter-menyen i en annen Catima-app ved å trykke på \"Eksporter\" der først</string>
+    <string name="source_repository">Kildekode</string>
+    <string name="on_github">på GitHub</string>
+    <string name="and_data_usage">og bruk av data</string>
+    <string name="rate_this_app">Vurder denne appen</string>
+    <string name="on_google_play">på Google Play</string>
+    <string name="report_error">Rapporter feil</string>
+</resources>

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

@@ -49,7 +49,7 @@
     <string name="importOptionApplicationExplanation">Open een bestand middels een app of je favoriete bestandsbeheerder.</string>
     <string name="importOptionApplicationButton">Andere app gebruiken</string>
     <string name="about">Over</string>
-    <string name="app_license">Vrije software, uitgebracht onder de GPLv3-licentie.</string>
+    <string name="app_license">Vrije software, uitgebracht onder de GPLv3+-licentie</string>
     <string name="about_title_fmt">Over <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Versie: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Versie-informatie: <xliff:g id="app_revision_url">%s</xliff:g></string>
@@ -74,8 +74,8 @@
     <string name="groups">Groepen</string>
     <string name="enter_group_name">Voer een groepsnaam in</string>
     <string name="starImage">Favoriete ster</string>
-    <string name="app_copyright_old">Gebaseerd op Loyalty Card Keychain,
-\ncopyright ©2016–2020 Branden Archer.</string>
+    <string name="app_copyright_old">Gebaseerd op Klantenkaartkluis,
+\ncopyright ©2016–2020 Branden Archer</string>
     <string name="unstar">Verwijderen uit favorieten</string>
     <string name="star">Toevoegen aan favorieten</string>
     <string name="addManually">Kaartnummer handmatig invoeren</string>
@@ -138,7 +138,7 @@
     <string name="wrongValueForBarcodeType">Deze waarde komt niet overeen met het gekozen barcodetype</string>
     <string name="app_resources">Vrije externe bronnen: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Vrije externe bibliotheken: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Auteursrecht © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Auteursrecht © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="intent_import_card_from_url_share_multiple_text">Ik wil kaarten met je delen</string>
     <string name="copy_to_clipboard_multiple_toast">De kaart-id\'s zijn gekopieerd naar het klembord</string>
     <string name="card_ids_copied">De kaart-id‘s zijn gekopieerd</string>
@@ -198,4 +198,14 @@
     <string name="sort_by_most_recently_used">Op onlangs gebruikt</string>
     <string name="sort_by_name">Op naam</string>
     <string name="sort">Sorteren</string>
-</resources>
+    <string name="report_error">Fout melden</string>
+    <string name="on_google_play">in Google Play</string>
+    <string name="rate_this_app">Beoordeel deze app</string>
+    <string name="and_data_usage">en gegevensgebruik</string>
+    <string name="on_github">op GitHub</string>
+    <string name="source_repository">Broncode</string>
+    <string name="license">Licentie</string>
+    <string name="help_translate_this_app">Help deze app te vertalen</string>
+    <string name="credits">Met dank aan</string>
+    <string name="version_history">Versiegeschiedenis</string>
+</resources>

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

@@ -8,4 +8,20 @@
     <string name="noGiftCards">Faceți clic pe butonul + plus pentru a adăuga o carte sau importați mai întâi câteva din meniul ⋮.</string>
     <string name="action_add">Adăugați</string>
     <string name="action_search">Căutare</string>
+    <string name="sendLabel">Trimiteți…</string>
+    <string name="share">Împărtășiți</string>
+    <string name="copy_to_clipboard">Copiați ID-ul în clipboard</string>
+    <string name="deleteConfirmation">Să șterg definitiv acest card\?</string>
+    <string name="deleteTitle">Ștergeți cardul</string>
+    <string name="unlockScreen">Deblocarea rotației</string>
+    <string name="lockScreen">Rotația blocurilor</string>
+    <string name="confirm">Confirmați</string>
+    <string name="delete">Ștergeți</string>
+    <string name="edit">Editați</string>
+    <string name="save">Salvați</string>
+    <string name="cancel">Anulează</string>
+    <string name="unstar">Eliminați din favorite</string>
+    <string name="star">Adaugă la favorite</string>
+    <string name="noBarcode">Fără cod de bare</string>
+    <string name="barcodeNoBarcode">Acest card nu are cod de bare</string>
 </resources>

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

@@ -9,7 +9,7 @@
     <string name="cardId">Номер карты</string>
     <string name="barcodeType">Тип штрих-кода</string>
     <string name="barcodeNoBarcode">Эта карта без штрих-кода</string>
-    <string name="cancel">Отменить</string>
+    <string name="cancel">Отмена</string>
     <string name="save">Сохранить</string>
     <string name="edit">Изменить</string>
     <string name="delete">Удалить карту</string>
@@ -49,7 +49,7 @@
     <string name="importOptionApplicationExplanation">Используйте любое приложение или ваш любимый файловый менеджер, чтобы открыть файл.</string>
     <string name="importOptionApplicationButton">Использовать другое приложение</string>
     <string name="about">О приложении</string>
-    <string name="app_license">Авторское лево свободного программного обеспечения, лицензия GPLv3+.</string>
+    <string name="app_license">Авторское лево свободного программного обеспечения, лицензия GPLv3+</string>
     <string name="about_title_fmt">О приложении <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Версия: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Информация о версиях: <xliff:g id="app_revision_url">%s</xliff:g></string>
@@ -74,7 +74,7 @@
     <string name="importSuccessful">Данные карт успешно импортированы</string>
     <string name="starImage">Звезда избранного</string>
     <string name="app_copyright_old">На основе Loyalty Card Keychain
-\nавторские права © 2016–2020 Branden Archer.</string>
+\nавторские права © 2016–2020 Branden Archer</string>
     <string name="unstar">Удалить из избранного</string>
     <string name="star">Добавить в избранное</string>
     <string name="noBarcode">Нет штрих-кода</string>
@@ -117,16 +117,16 @@
         <item quantity="other"><xliff:g>%d</xliff:g> карт</item>
     </plurals>
     <string name="accept">Принять</string>
-    <string name="importVoucherVaultMessage">Выберите файл для импортирования, именуемый <i>vouchervault.json</i>.
-\nФайл экспорта можно создать в приложении Voucher Vault, нажав кнопку \"Экспорт\".</string>
+    <string name="importVoucherVaultMessage">Выберите для импортирования файл <i>vouchervault.json</i>.
+\nФайл можно создать в приложении Voucher Vault, нажав кнопку \"Экспорт\".</string>
     <string name="importVoucherVault">Импорт из Voucher Vault</string>
-    <string name="importFidmeMessage">Выберите файл для импортирования, именуемый <i>fidme-export-request-xxxxxx.zip</i>, а затем вручную укажите типы штрих-кодов.
-\nФайл экспорта можно создать в приложении FidMe, перейдя в свой профиль, выбрав функцию \"Защита данных\", и затем нажав кнопку \"Извлечь мои данные\".</string>
-    <string name="importLoyaltyCardKeychainMessage">Выберите файл экспорта, именуемый <i>LoyaltyCardKeychain.csv</i>.
-\nФайл экспорта можно создать в приложении Loyalty Card Keychain, перейдя в меню \"Импорт/Экспорт\" и нажав кнопку \"Экспорт\".</string>
+    <string name="importFidmeMessage">Выберите для импортирования файл <i>fidme-export-request-xxxxxx.zip</i>, а затем вручную укажите типы штрих-кодов.
+\nФайл можно создать в приложении FidMe, перейдя в свой профиль, выбрав функцию \"Защита данных\", и затем нажав кнопку \"Извлечь мои данные\".</string>
+    <string name="importLoyaltyCardKeychainMessage">Выберите для импортирования файл <i>LoyaltyCardKeychain.csv</i>.
+\nФайл можно создать в приложении Loyalty Card Keychain, перейдя в меню \"Импорт/Экспорт\" и нажав кнопку \"Экспорт\".</string>
     <string name="importLoyaltyCardKeychain">Импорт из Loyalty Card Keychain</string>
-    <string name="importCatimaMessage">Выберите файл для импортирования, именуемый <i>Catima.zip</i>.
-\nФайл экспорта можно создать в другой копии Catima, перейдя в меню \"Импорт/Экспорт\" и нажав кнопку \"Экспорт\".</string>
+    <string name="importCatimaMessage">Выберите для импортирования файл <i>Catima.zip</i>.
+\nФайл можно создать в другой копии Catima, перейдя в меню \"Импорт/Экспорт\" и нажав кнопку \"Экспорт\".</string>
     <string name="importFidme">Импорт из FidMe</string>
     <string name="importCatima">Импорт из Catima</string>
     <string name="errorReadingImage">Невозможно считать изображение</string>
@@ -140,7 +140,7 @@
     <string name="wrongValueForBarcodeType">Недопустимое значение для выбранного типа штрих-кода</string>
     <string name="app_resources">Свободные сторонние ресурсы: <xliff:g id="app_resources_list">%s</xliff:g></string>
     <string name="app_libraries">Свободные сторонние библиотеки: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Авторские права © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Авторские права © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="intent_import_card_from_url_share_multiple_text">Поделиться картами</string>
     <string name="card_ids_copied">Скопированные номера карт</string>
     <string name="copy_to_clipboard_multiple_toast">Номера карт скопированы в буфер обмена</string>
@@ -155,7 +155,7 @@
     <string name="backImageDescription">Задняя сторона карты</string>
     <string name="frontImageDescription">Лицевая сторона карты</string>
     <string name="photos">Фотографии</string>
-    <string name="importStocardMessage">Выберите файл <i>***-sync.zip</i> для импортирования.
+    <string name="importStocardMessage">Выберите для импортирования файл <i>***-sync.zip</i>.
 \nЭтот файл можно получить по электронной почте от support@stocardapp.com, предварительно запросив экспорт ваших данных.</string>
     <string name="passwordRequired">Введите пароль</string>
     <string name="importStocard">Импорт из Stocard</string>
@@ -206,4 +206,14 @@
     <string name="sort_by_most_recently_used">Частота использования</string>
     <string name="sort_by_name">Название</string>
     <string name="sort">Сортировка</string>
+    <string name="credits">Благодарности</string>
+    <string name="version_history">История версий</string>
+    <string name="on_github">на GitHub</string>
+    <string name="rate_this_app">Оценить приложение</string>
+    <string name="and_data_usage">и использование данных</string>
+    <string name="report_error">Отчёт об ошибке</string>
+    <string name="on_google_play">в Google Play</string>
+    <string name="source_repository">Исходный код</string>
+    <string name="license">Лицензия</string>
+    <string name="help_translate_this_app">Помощь в переводе приложения</string>
 </resources>

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

@@ -38,19 +38,19 @@
     <string name="sameAsCardId">Kart numarasıyla aynı</string>
     <string name="barcodeId">Barkod değeri</string>
     <string name="importVoucherVaultMessage">İçe aktarmak için Voucher Vault\'tan dışa aktardığınız <i>vouchervault.json</i> dosyasını seçin.
-\nVeya önce Voucher Vault\'ta \"Dışa aktar\" düğmesine basarak bir tane oluşturun.</string>
+\nÖnce Voucher Vault\'ta \"Dışa aktar\" düğmesine basarak bir tane oluşturun.</string>
     <string name="importVoucherVault">Voucher Vault\'tan içe aktar</string>
     <string name="importStocardMessage">İçe aktarmak için Stocard\'dan dışa aktardığınız <i>***-sync.zip</i> dosyasını seçin.
-\nVeya support@stocardapp.com adresine e-posta göndererek verilerinizin dışa aktarılmasını isteyerek edinin.</string>
+\nsupport@stocardapp.com adresine e-posta göndererek verilerinizin dışa aktarılmasını isteyerek edinin.</string>
     <string name="importStocard">Stocard\'dan içe aktar</string>
     <string name="importLoyaltyCardKeychainMessage">İçe aktarmak için Loyalty Card Keychain\'den dışa aktardığınız <i>LoyaltyCardKeychain.csv</i> dosyasını seçin.
-\nVeya Loyalty Card Keychain uygulamasının İçe/Dışa aktar menüsündeki \"Dışa aktar\" düğmesine basarak bir tane oluşturun.</string>
+\nLoyalty Card Keychain uygulamasının İçe/Dışa aktar menüsündeki \"Dışa aktar\" düğmesine basarak bir tane oluşturun.</string>
     <string name="importLoyaltyCardKeychain">Loyalty Card Keychain\'den içe aktar</string>
     <string name="importFidmeMessage">FidMe\'den içe aktarmak için dışa aktardığınız <i>fidme-export-request-xxxxxx.zip</i> dosyasını seçin ve ardından barkod türlerini elle seçin.
-\nVeya FidMe profilinizden Veri Koruma seçeneğini seçip ardından \"Verilerimi çıkar\" düğmesine basarak bir tane oluşturun.</string>
+\nFidMe profilinizden Veri Koruma seçeneğini seçip ardından \"Verilerimi çıkar\" düğmesine basarak bir tane oluşturun.</string>
     <string name="importFidme">FidMe\'den içe aktar</string>
     <string name="importCatimaMessage">İçe aktarmak için Catima\'dan dışa aktardığınız <i>catima.zip</i> dosyasını seçin.
-\nVeya başka bir Catima uygulamasının İçe/Dışa aktar menüsündeki \"Dışa aktar\" düğmesine basarak bir tane oluşturun.</string>
+\nBaşka bir Catima uygulamasının İçe/Dışa aktar menüsündeki \"Dışa aktar\" düğmesine basarak bir tane oluşturun.</string>
     <string name="importCatima">Catima\'dan içe aktar</string>
     <string name="accept">Kabul et</string>
     <string name="privacy_policy_popup_text">Gizlilik politikası bildirimi (bazı uygulama mağazaları için gerekli):
@@ -119,10 +119,10 @@
     <string name="app_revision_fmt">Değişiklik Bilgileri: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="debug_version_fmt">Sürüm: <xliff:g id="version">%s</xliff:g></string>
     <string name="about_title_fmt"><xliff:g id="app_name">%s</xliff:g> hakkında</string>
-    <string name="app_license">GPLv3+ altında lisanslanan copyleft özgür yazılım.</string>
+    <string name="app_license">GPLv3+ altında lisanslanan copyleft özgür yazılım</string>
     <string name="app_copyright_old">Loyalty Card Keychain temel alınmıştır
-\nTelif Hakkı © 2016–2020 Branden Archer.</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Telif Hakkı © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+\nTelif Hakkı © 2016–2020 Branden Archer</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Telif Hakkı © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="about">Hakkında</string>
     <string name="importOptionApplicationButton">Başka bir uygulama kullan</string>
     <string name="importOptionApplicationExplanation">Bir dosyayı açmak için herhangi bir uygulamayı veya en sevdiğiniz dosya yöneticisini kullanın.</string>
@@ -198,4 +198,14 @@
     <string name="sort_by_most_recently_used">En Son Kullanılan</string>
     <string name="sort_by_name">Ad</string>
     <string name="sort">Sırala</string>
+    <string name="report_error">Hata Bildir</string>
+    <string name="on_google_play">Google Play\'de</string>
+    <string name="rate_this_app">Bu uygulamayı değerlendir</string>
+    <string name="and_data_usage">ve veri kullanımı</string>
+    <string name="on_github">GitHub\'da</string>
+    <string name="source_repository">Kaynak Deposu</string>
+    <string name="license">Lisans</string>
+    <string name="help_translate_this_app">Bu uygulamayı çevirmeye yardımcı olun</string>
+    <string name="credits">Emeği Geçenler</string>
+    <string name="version_history">Sürüm Geçmişi</string>
 </resources>

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

@@ -27,20 +27,20 @@
     <string name="sameAsCardId">Таке ж як ID картки</string>
     <string name="barcodeId">Значення штрих-коду</string>
     <string name="importVoucherVaultMessage">Оберіть Voucher Vault експорт-файл названий <i>vouchervault.json</i> для імпортування.
-\nЧи створіть його натиснувши \"Експорт\" у Voucher Vault.</string>
+\nСтворіть його натиснувши \"Експорт\" у Voucher Vault.</string>
     <string name="importVoucherVault">Імпорт з Voucher Vault</string>
     <string name="importLoyaltyCardKeychainMessage">Знайдіть файл названий <i>LoyaltyCardKeychain.csv</i> для імпортування.
-\nЧи створіть його у меню імпорту/експорту Loyalty Card Keychain натиснувши \"Експорт\".</string>
+\nСтворіть його у меню імпорту/експорту Loyalty Card Keychain натиснувши \"Експорт\".</string>
     <string name="importCatimaMessage">Оберіть експорт-файл названий <i>catima.zip</i> для імпортування.
-\nЧи створіть його з меню імпорту/експорту у іншій Catima, натиснувши \"Експорт\".</string>
+\nСтворіть його з меню імпорту/експорту у іншій Catima, натиснувши \"Експорт\".</string>
     <string name="importLoyaltyCardKeychain">Імпорт з Loyalty Card Keychain</string>
     <string name="importFidmeMessage">Оберіть FidMe експорт-файл названий <i>fidme-export-request-xxxxxx.zip</i> для імпортування і оберіть типи штрих-кодів вручну пізніше.
-\nЧи створіть його у вашому FidMe профілі обравши \"Захист даних -&gt; Витяг даних\".</string>
+\nСтворіть його у вашому FidMe профілі обравши \"Захист даних -&gt; Витяг даних\".</string>
     <string name="importFidme">Імпорт з FidMe</string>
     <string name="importCatima">Імпорт з Catima</string>
     <string name="accept">Прийняти</string>
     <string name="privacy_policy">Політика конфіденційності</string>
-    <string name="app_loyalty_card_keychain">Брелок картки лояльності</string>
+    <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
     <string name="chooseImportType">Імпортувати дані з\?</string>
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> здається, не є дійсним залишком.</string>
     <string name="points">Бали</string>
@@ -82,7 +82,7 @@
     <string name="settings_max_font_size_scale">Макс. розмір шрифту</string>
     <string name="settings_dark_theme">Темна</string>
     <string name="settings_light_theme">Світла</string>
-    <string name="settings_system_theme">Система</string>
+    <string name="settings_system_theme">Системна</string>
     <string name="settings_theme">Тема</string>
     <string name="settings_category_title_ui">Інтерфейс користувача</string>
     <string name="settings">Налаштування</string>
@@ -96,17 +96,17 @@
     <string name="app_revision_fmt">Інформація про випуск: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="debug_version_fmt">Версія: <xliff:g id="version">%s</xliff:g></string>
     <string name="about_title_fmt">Про <xliff:g id="app_name">%s</xliff:g></string>
-    <string name="app_license">Копілефт вільне програмне забезпечення, ліцензоване під GPLv3+.</string>
+    <string name="app_license">Копілефт вільне програмне забезпечення, ліцензоване під GPLv3+</string>
     <string name="app_copyright_old">Створено на основі Loyalty Card Keychain
-\nавторські права © 2016–2020 Branden Archer.</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Авторські права © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
+\nавторські права © 2016–2020 Branden Archer</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Авторські права © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
     <string name="about">Про програму</string>
     <string name="importOptionApplicationButton">Використайте іншу програму</string>
     <string name="importOptionApplicationExplanation">Використайте іншу програму чи ваш улюблений файл-менеджер для відкриття файлу.</string>
-    <string name="importOptionApplicationTitle">Використати іншу програму</string>
-    <string name="importOptionFilesystemButton">З провідника</string>
+    <string name="importOptionApplicationTitle">З іншої програми</string>
+    <string name="importOptionFilesystemButton">Обрати файл</string>
     <string name="importOptionFilesystemExplanation">Оберіть файл у провіднику.</string>
-    <string name="importOptionFilesystemTitle">Імпорт з провідника</string>
+    <string name="importOptionFilesystemTitle">Імпорт з файлу</string>
     <string name="exportOptionExplanation">Дані буде записано до локації обраної вами.</string>
     <string name="noExternalStoragePermissionError">Надайте дозвіл на доступ до пам\'яті пристрою для імпорту чи експорту карток</string>
     <string name="exporting">Експортуємо…</string>
@@ -156,11 +156,11 @@
     <string name="removeImage">Видалити зображення</string>
     <string name="setBackImage">Встановити зображення тильної сторони</string>
     <string name="setFrontImage">Встановити зображення лицьової сторони</string>
-    <string name="photos">Фотографії</string>
+    <string name="photos">Фото</string>
     <string name="backImageDescription">Тильна сторона карти</string>
     <string name="frontImageDescription">Лицьова сторона карти</string>
     <string name="importStocardMessage">Виберіть експорт <i> ***-sync.zip </i> зі Stocard для імпорту.
-\nАбо отримайте його, надіславши електронною поштою support@stocardapp.com з проханням експортувати ваші дані.</string>
+\nОтримайте його, надіславши електронною поштою support@stocardapp.com з проханням експортувати ваші дані.</string>
     <string name="importStocard">Імпорт із Stocard</string>
     <plurals name="selectedCardCount">
         <item quantity="one">Обрано: <xliff:g>%d</xliff:g> карта</item>
@@ -199,4 +199,21 @@
     <string name="toggleMoreInfo">Показувати додаткову інформацію</string>
     <string name="barcodeImageDescriptionWithType">Зображення штрих-коду карти типу <xliff:g>%s</xliff:g></string>
     <string name="swipeToSwitchImages">Свайп чи довге натискання для зміни зображень</string>
+    <string name="sort_by">Сортувати за</string>
+    <string name="reverse">Зворотній порядок</string>
+    <string name="sort_by_balance">Баланс</string>
+    <string name="sort_by_expiry">Термін дії</string>
+    <string name="sort_by_most_recently_used">Часто використовувані</string>
+    <string name="sort_by_name">Назва</string>
+    <string name="sort">Сортування</string>
+    <string name="version_history">Історія версій</string>
+    <string name="help_translate_this_app">Допомогти з перекладом програми</string>
+    <string name="license">Ліцензія</string>
+    <string name="source_repository">Вихідний код</string>
+    <string name="on_github">на GitHub</string>
+    <string name="and_data_usage">та використання даних</string>
+    <string name="credits">Подяки</string>
+    <string name="rate_this_app">Оцінити програму</string>
+    <string name="on_google_play">у Google Play</string>
+    <string name="report_error">Повідомити про помилку</string>
 </resources>

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

@@ -1,27 +1,21 @@
-<resources
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"
-    xmlns:tools="http://schemas.android.com/tools">
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" xmlns:tools="http://schemas.android.com/tools">
     <string name="action_search">Search</string>
     <string name="action_add">Add</string>
     <plurals name="selectedCardCount">
         <item quantity="one"><xliff:g>%d</xliff:g> card selected</item>
         <item quantity="other"><xliff:g>%d</xliff:g> cards selected</item>
     </plurals>
-
     <string name="noGiftCards">Click the + plus button to add a card, or import some from the ⋮ menu first.</string>
     <string name="noMatchingGiftCards">Didn\'t find anything. Try changing your search.</string>
-
     <string name="storeName">Name</string>
     <string name="note">Note</string>
     <string name="cardId">Card ID</string>
     <string name="barcodeType">Barcode type</string>
     <string name="barcodeNoBarcode">This card has no barcode</string>
     <string name="noBarcode">No barcode</string>
-
     <string name="star">Add to favorites</string>
     <string name="unstar">Remove from favorites</string>
-
     <string name="cancel">Cancel</string>
     <string name="save">Save</string>
     <string name="edit">Edit</string>
@@ -48,16 +42,14 @@
     <string name="ok">OK</string>
     <string name="copy_to_clipboard">Copy ID to clipboard</string>
     <string name="share">Share</string>
-    <string name="sendLabel">Send&#8230;</string>
+    <string name="sendLabel">Send…</string>
     <string name="editCardTitle">Edit Card</string>
     <string name="addCardTitle">Add Card</string>
     <string name="scanCardBarcode">Scan Card Barcode</string>
     <string name="cardShortcut">Card Shortcut</string>
     <string name="noCardsMessage">Add a card first</string>
     <string name="card_ids_copied">Copied Card ID(s)</string>
-
     <string name="barcodeImageDescriptionWithType">Image of card barcode of type <xliff:g>%s</xliff:g></string>
-
     <string name="noStoreError">No name entered</string>
     <string name="noCardIdError">No card ID entered</string>
     <string name="noCardExistsError">Could not find card</string>
@@ -71,8 +63,8 @@
     <string name="exportSuccessfulTitle">Exported</string>
     <string name="exportFailedTitle">Export failed</string>
     <string name="exportFailed">Could not export cards</string>
-    <string name="importing">Importing&#8230;</string>
-    <string name="exporting">Exporting&#8230;</string>
+    <string name="importing">Importing…</string>
+    <string name="exporting">Exporting…</string>
     <string name="noExternalStoragePermissionError">Grant external storage permission to import or export cards first</string>
     <string name="exportOptionExplanation">The data will be written to a location of your choice.</string>
     <string name="importOptionFilesystemTitle">Import from filesystem</string>
@@ -81,25 +73,20 @@
     <string name="importOptionApplicationTitle">Use another app</string>
     <string name="importOptionApplicationExplanation">Use any app or your favorite file manager to open a file.</string>
     <string name="importOptionApplicationButton">Use another app</string>
-
     <string name="about">About</string>
-    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
-    <string name="app_copyright_old">Based on Loyalty Card Keychain\ncopyright © 2016–2020 Branden Archer.</string>
-    <string name="app_license">Copylefted libre software, licensed GPLv3+.</string>
+    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Copyright © 2019–<xliff:g>%d</xliff:g> Sylvia van Os</string>
+    <string name="app_copyright_old">Based on Loyalty Card Keychain\ncopyright © 2016–2020 Branden Archer</string>
+    <string name="app_license">Copylefted libre software, licensed GPLv3+</string>
     <string name="about_title_fmt">About <xliff:g id="app_name">%s</xliff:g></string>
     <string name="debug_version_fmt">Version: <xliff:g id="version">%s</xliff:g></string>
     <string name="app_revision_fmt">Revision Info: <xliff:g id="app_revision_url">%s</xliff:g></string>
     <string name="app_libraries">Libre third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>
     <string name="app_resources">Libre third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
-
     <string name="selectBarcodeTitle">Select Barcode</string>
-    <string name="enterBarcodeInstructions">Enter the card ID, and either pick its barcode type below, or &#8220;This card has no barcode&#8221;.</string>
-
+    <string name="enterBarcodeInstructions">Enter the card ID, and either pick its barcode type below, or “This card has no barcode”.</string>
     <string name="copy_to_clipboard_toast">Card ID copied to clipboard</string>
-
     <string name="thumbnailDescription">Thumbnail for card</string>
     <string name="starImage">Favorite star</string>
-
     <string name="settings">Settings</string>
     <string name="settings_category_title_ui">User interface</string>
     <string name="settings_theme">Theme</string>
@@ -112,7 +99,6 @@
     <string name="settings_key_dark_theme" translatable="false">dark</string>
     <string name="settings_key_max_font_size_scale" translatable="false">pref_max_font_size_scale</string>
     <string name="settings_max_font_size_scale">Max. font size</string>
-
     <string name="settings_display_barcode_max_brightness">Brighten barcode view</string>
     <string name="settings_key_display_barcode_max_brightness" translatable="false">pref_display_card_max_brightness</string>
     <string name="settings_lock_barcode_orientation">Lock barcode orientation</string>
@@ -121,14 +107,11 @@
     <string name="settings_key_keep_screen_on" translatable="false">pref_keep_screen_on</string>
     <string name="settings_disable_lockscreen_while_viewing_card">Prevent lock screen</string>
     <string name="settings_key_disable_lockscreen_while_viewing_card" translatable="false">pref_disable_lockscreen_while_viewing_card</string>
-
     <string name="sharedpreference_active_tab" translatable="false">sharedpreference_active_tab</string>
     <string name="sharedpreference_privacy_policy_shown" translatable="false">sharedpreference_privacy_policy_shown</string>
     <string name="sharedpreference_sort" translatable="false">sharedpreference_sort</string>
     <string name="sharedpreference_sort_order" translatable="false">sharedpreference_sort_order</string>
     <string name="sharedpreference_sort_direction" translatable="false">sharedpreference_sort_direction</string>
-
-
     <string name="intent_import_card_from_url_share_text">I want to share a card with you</string>
     <string name="intent_import_card_from_url_host_catima_app" translatable="false">catima.app</string>
     <string name="intent_import_card_from_url_path_prefix_catima_app" translatable="false">/share</string>
@@ -138,7 +121,6 @@
     <string name="intent_import_card_from_url_path_prefix_brarcher" translatable="false">/loyalty-card-locker/share</string>
     <string name="importSuccessful">Card data imported</string>
     <string name="exportSuccessful">Card data exported</string>
-
     <string name="enter_group_name">Enter group name</string>
     <string name="groups">Groups</string>
     <string name="noGroups">Click the + plus button to add groups for categorization first.</string>
@@ -147,7 +129,6 @@
         <item quantity="one"><xliff:g>%d</xliff:g> card</item>
         <item quantity="other"><xliff:g>%d</xliff:g> cards</item>
     </plurals>
-
     <string name="all">All</string>
     <string name="deleteConfirmationGroup">Delete group?</string>
     <string name="failedOpeningFileManager">Install a file manager first.</string>
@@ -162,7 +143,6 @@
     <string name="expiryStateSentenceExpired">Expired: <xliff:g>%s</xliff:g></string>
     <string name="balanceSentence">Balance: <xliff:g>%s</xliff:g></string>
     <string name="balancePoints"><xliff:g>%s</xliff:g> points</string>
-
     <string name="card">Card</string>
     <string name="barcode">Barcode</string>
     <string name="editBarcode">Edit barcode</string>
@@ -171,31 +151,32 @@
     <string name="chooseExpiryDate">Choose expiry date</string>
     <string name="moveBarcodeToTopOfScreen">Move the barcode to the top of the screen</string>
     <string name="moveBarcodeToCenterOfScreen">Center the barcode on the screen</string>
-
     <string name="noBarcodeFound">No barcode was found</string>
     <string name="errorReadingImage">Could not read the image</string>
-
     <string name="balance">Balance</string>
     <string name="currency">Currency</string>
     <string name="points">Points</string>
-
     <string name="parsingBalanceFailed"><xliff:g>%s</xliff:g> does not seem to be a valid balance.</string>
     <string name="chooseImportType">Import data from?</string>
     <string name="app_loyalty_card_keychain">Loyalty Card Keychain</string>
-
     <string name="privacy_policy">Privacy Policy</string>
     <string name="privacy_policy_popup_text">Privacy policy notice (required by some app stores):\n\nNO DATA IS COLLECTED AT ALL, which anyone can confirm since our app is libre software.</string>
     <string name="accept">Accept</string>
     <string name="importCatima">Import from Catima</string>
-    <string name="importCatimaMessage">Select your <i>catima.zip</i> export from Catima to import.\nOr create it from the "Import/Export" menu of another Catima app by pressing "Export" there first.</string>
+    <string name="importCatimaMessage">Select your <i>catima.zip</i> export from Catima to import.
+\nCreate it from the Import/Export menu of another Catima app by pressing Export there first.</string>
     <string name="importFidme">Import from FidMe</string>
-    <string name="importFidmeMessage">Select your <i>fidme-export-request-xxxxxx.zip</i> export from FidMe to import, and select the barcode types manually afterwards.\nOr create it from your FidMe profile by choosing "Data Protection" and then pressing "Extract my data" first.</string>
+    <string name="importFidmeMessage">Select your <i>fidme-export-request-xxxxxx.zip</i> export from FidMe to import, and select the barcode types manually afterwards.
+\nCreate it from your FidMe profile by choosing Data Protection and then pressing Extract my data first.</string>
     <string name="importLoyaltyCardKeychain">Import from Loyalty Card Keychain</string>
-    <string name="importLoyaltyCardKeychainMessage">Select your <i>LoyaltyCardKeychain.csv</i> export from Loyalty Card Keychain to import.\nOr create it from the "Import/Export" menu in Loyalty Card Keychain by pressing "Export" there first.</string>
+    <string name="importLoyaltyCardKeychainMessage">Select your <i>LoyaltyCardKeychain.csv</i> export from Loyalty Card Keychain to import.
+\nCreate it from the Import/Export menu in Loyalty Card Keychain by pressing Export there first.</string>
     <string name="importStocard">Import from Stocard</string>
-    <string name="importStocardMessage">Select your <i>***-sync.zip</i> export from Stocard to import.\nOr get it by e-mailing support@stocardapp.com asking for an export of your data.</string>
+    <string name="importStocardMessage">Select your <i>***-sync.zip</i> export from Stocard to import.
+\nGet it by e-mailing support@stocardapp.com asking for an export of your data.</string>
     <string name="importVoucherVault">Import from Voucher Vault</string>
-    <string name="importVoucherVaultMessage">Select your <i>vouchervault.json</i> export from Voucher Vault to import.\nOr create it by pressing "Export" in Voucher Vault first.</string>
+    <string name="importVoucherVaultMessage">Select your <i>vouchervault.json</i> export from Voucher Vault to import.
+\nCreate it by pressing Export in Voucher Vault first.</string>
     <string name="barcodeId">Barcode value</string>
     <string name="sameAsCardId">Same as card ID</string>
     <string name="setBarcodeId">Set barcode value</string>
@@ -221,7 +202,6 @@
     <string name="settings_locale">Language</string>
     <string name="settings_key_locale" translatable="false">pref_locale</string>
     <string name="settings_system_locale">System</string>
-
     <string name="setting_key_theme_color" translatable="false">pref_theme_color</string>
     <string name="settings_theme_color">Theme color</string>
     <string name="settings_catima_theme">Catima</string>
@@ -244,7 +224,6 @@
     <string name="settings_key_brown_theme" translatable="false">brown_theme</string>
     <string name="app_contributors">Made possible by: <xliff:g id="app_contributors">%s</xliff:g></string>
     <string name="sort">Sort</string>
-
     <string name="toggleMoreInfo">Toggle showing more info</string>
     <string name="swipeToSwitchImages">Swipe or long press to switch images</string>
     <string name="sort_by_name">Name</string>
@@ -253,4 +232,15 @@
     <string name="sort_by_balance">Balance</string>
     <string name="reverse">Reverse</string>
     <string name="sort_by">Sort by</string>
-</resources>
+    <string name="version_history">Version History</string>
+    <string name="arrow" translatable="false"><![CDATA[>]]></string>
+    <string name="credits">Credits</string>
+    <string name="help_translate_this_app">Help translate this app</string>
+    <string name="license">License</string>
+    <string name="source_repository">Source Repository</string>
+    <string name="on_github">on GitHub</string>
+    <string name="and_data_usage">and data usage</string>
+    <string name="rate_this_app">Rate this app</string>
+    <string name="on_google_play">on Google Play</string>
+    <string name="report_error">Report Error</string>
+</resources>

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

@@ -82,8 +82,14 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="SplashTheme" parent="@style/AppTheme">
-        <item name="android:windowBackground">@drawable/background_splash</item>
+    <!--    Splash Screen Theme-->
+    <style name="Theme.App.Starting" parent="Theme.SplashScreen">
+
+        <item name="windowSplashScreenBackground">@color/ic_launcher_background</item>
+
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
+
+        <item name="postSplashScreenTheme">@style/AppTheme</item>
     </style>
 
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar"/>

app/src/test/java/protect/card_locker/DatabaseTest.java

@@ -270,6 +270,7 @@ public class DatabaseTest
         database.execSQL("drop table " + DBHelper.LoyaltyCardDbIds.TABLE);
         database.execSQL("drop table " + DBHelper.LoyaltyCardDbGroups.TABLE);
         database.execSQL("drop table " + DBHelper.LoyaltyCardDbIdsGroups.TABLE);
+        database.execSQL("drop table " + DBHelper.LoyaltyCardDbFTS.TABLE);
 
         // Create the table as it existed in revision 1
         database.execSQL("create table " + DBHelper.LoyaltyCardDbIds.TABLE + "(" +

app/src/test/java/protect/card_locker/MainActivityTest.java

@@ -59,12 +59,11 @@ public class MainActivityTest
         assertNotNull(menu);
 
         // The settings, import/export, groups, search and add button should be present
-        assertEquals(menu.size(), 7);
+        assertEquals(menu.size(), 6);
         assertEquals("Search", menu.findItem(R.id.action_search).getTitle().toString());
         assertEquals("Sort", menu.findItem(R.id.action_sort).getTitle().toString());
         assertEquals("Groups", menu.findItem(R.id.action_manage_groups).getTitle().toString());
         assertEquals("Import/Export", menu.findItem(R.id.action_import_export).getTitle().toString());
-        assertEquals("Privacy Policy", menu.findItem(R.id.action_privacy_policy).getTitle().toString());
         assertEquals("About", menu.findItem(R.id.action_about).getTitle().toString());
         assertEquals("Settings", menu.findItem(R.id.action_settings).getTitle().toString());
     }
@@ -361,7 +360,7 @@ public class MainActivityTest
 
         assertEquals(View.GONE, helpText.getVisibility());
         assertEquals(View.VISIBLE, noMatchingCardsText.getVisibility());
-        assertEquals(View.VISIBLE, list.getVisibility());
+        assertEquals(View.GONE, list.getVisibility());
 
         assertEquals(0, list.getAdapter().getItemCount());
 
@@ -383,7 +382,7 @@ public class MainActivityTest
 
         assertEquals(View.GONE, helpText.getVisibility());
         assertEquals(View.VISIBLE, noMatchingCardsText.getVisibility());
-        assertEquals(View.VISIBLE, list.getVisibility());
+        assertEquals(View.GONE, list.getVisibility());
 
         assertEquals(0, list.getAdapter().getItemCount());
 
@@ -397,7 +396,7 @@ public class MainActivityTest
 
         assertEquals(View.GONE, helpText.getVisibility());
         assertEquals(View.VISIBLE, noMatchingCardsText.getVisibility());
-        assertEquals(View.VISIBLE, list.getVisibility());
+        assertEquals(View.GONE, list.getVisibility());
 
         assertEquals(0, list.getAdapter().getItemCount());
 
@@ -406,7 +405,7 @@ public class MainActivityTest
 
         assertEquals(View.GONE, helpText.getVisibility());
         assertEquals(View.VISIBLE, noMatchingCardsText.getVisibility());
-        assertEquals(View.VISIBLE, list.getVisibility());
+        assertEquals(View.GONE, list.getVisibility());
 
         assertEquals(0, list.getAdapter().getItemCount());
 

fastlane/metadata/android/bs/changelogs/67.txt

@@ -0,0 +1,6 @@
+- Dodaj opciju da se postavi posebna barcode vrijednost od ID kartice
+- Pojednostavi konfiguraciju fonta
+- Nekoliko lakših korisničkih funkcija
+- Koristi ikonu slova za prečice
+- Uvijek Prikaži sve barkode vrste u manuelnom ulazu
+- Ukloni Politiku privatnosti prvog početka

fastlane/metadata/android/bs/changelogs/68.txt

@@ -0,0 +1,4 @@
+- Podržite novi PDF417 export iz Voucher trezora
+- Podržite za kopiranje više barkodova odjednom.
+- Podržite dijeljenje više kartica odanosti odjednom
+- Pitaj da ažuriraš vrijednost za barcode ako se promijeni ID kartica

fastlane/metadata/android/bs/changelogs/69.txt

@@ -0,0 +1,3 @@
+- Dodaj nestali barkod za izvoz
+- Nemoj prikazati dijalog o barcodeu ako je vrijednost kao ID kartice
+- Dodaj Finski prevod

fastlane/metadata/android/bs/changelogs/7.txt

@@ -0,0 +1,2 @@
+- Long-click of a card donosi opciju da kopira ID karticu u clipboard. (vuci broj 49 (https://github.com/brarcher/loyalty-card-locker/issues/49))
+- Back button na ulaz/izvoz pogled sada radi, prebacujem korisnika Na main view

fastlane/metadata/android/bs/changelogs/71.txt

@@ -0,0 +1,2 @@
+- Nekoliko manjih prijevoda i korisničke funkcije
+- Popravi crash u uvoz/dijeljenje lojalnost karticu na Android 6

fastlane/metadata/android/bs/changelogs/72.txt

@@ -0,0 +1 @@
+- Popraviti nesposobnost konfiguriranja slika u novoj kartici lojalnosti

fastlane/metadata/android/bs/changelogs/73.txt

@@ -0,0 +1 @@
+- Popravi učitavanje slika pri uređivanju postojeće kartice

fastlane/metadata/android/bs/changelogs/74.txt

@@ -0,0 +1,3 @@
+- Napravi kraticu
+- Generiši kraticu kartice
+- Popravi boju kartice

fastlane/metadata/android/bs/changelogs/75.txt

@@ -0,0 +1,4 @@
+- Izmijeni izabrani boju u dijalogu za mijenjanje boja
+- Podrška za brisanje više kartica odjednom
+- Popravi moguću Aritmeticexcepciju pri mijenjanju slike
+- Fiksiraj cijeli ekran je zatvoren kada rotirajući uređaj

fastlane/metadata/android/bs/changelogs/76.txt

@@ -0,0 +1,4 @@
+- Napravi linkove u bilješkama koje se mogu kliknuti
+- Pre-odaberite grupu u kojoj je korisnik trenutno pri kreiranju nove kartice
+- Zarez-odvojena grupna imena u lojalnost card view
+- Fiksiraj maksimiziraj dugme koje se pojavljuje na barkodeu

fastlane/metadata/android/bs/changelogs/77.txt

@@ -0,0 +1,4 @@
+- Poboljšaj uvoznika
+- Fix uvoznik Catia export sa više nota
+- Titula skale u prihvatljivom opsegu
+- Poboljšanja u animaciji

fastlane/metadata/android/bs/changelogs/78.txt

@@ -0,0 +1 @@
+- Fix crash na rotaciju u lojalnost kartice editovanje aktivnosti

fastlane/metadata/android/bs/changelogs/79.txt

@@ -0,0 +1,2 @@
+- Popravi Kratica tastature za biranje grafičkog elementa
+- Zamijeni uobičajeni Android crni ekran prskanjem ekrana

fastlane/metadata/android/bs/changelogs/80.txt

@@ -0,0 +1,2 @@
+- Fix slike nisu uvezene iz sigurnosne kopije
+- Opcija za prevazilaženje jezika

fastlane/metadata/android/bs/changelogs/81.txt

@@ -0,0 +1,4 @@
+- Poboljšaj listu karata za pejzaž i tablicu
+- Dodaj mi boju za kosu (hvala, Subhashish Anand!)
+- Ne zatvarajte aktivnost na grešci kamere (tako ručni unos je i dalje moguć)
+- Dodaj sve doprinosioce dijalogu s obavještenjima

fastlane/metadata/android/bs/changelogs/82.txt

@@ -0,0 +1,4 @@
+- Poboljšana podrška čitaocima ekrana
+- Nemoj da se slupaš dok pokušavaš da otvoriš video iz galerije
+- Provuci podršku na zaslonu sa kartica
+- Ne Resetuj grupu na pritiskom dugmeta

fastlane/metadata/android/bs/changelogs/83.txt

@@ -0,0 +1,2 @@
+- Podrška za mijenjanje redoslijeda sortiranja
+- Sprecite da ne gledate velike slike za barkodeom

fastlane/metadata/android/bs/changelogs/84.txt

@@ -0,0 +1 @@
+- Male greške i poboljšanja

fastlane/metadata/android/cs_CZ/changelogs/11.txt

@@ -0,0 +1,5 @@
+- Při úpravě ID karty předvyplňte na začátku existující ID
+- Omezte šířku generovaných čárových kódů, abyste snížili spotřebu paměti a chyby mimo paměť
+- Při editaci karty změňte tlačítko "Zadat kartu" na "Upravit kartu", pokud ID karty již existuje
+- Změňte barevné schéma tak, aby bylo jemnější a kompatibilní s ikonou aplikace, a změňte rozložení při prohlížení karty, aby bylo přehlednější
+- Přidejte úvodního průvodce, který se spustí při prvním spuštění aplikace

fastlane/metadata/android/cs_CZ/changelogs/13.txt

@@ -0,0 +1,2 @@
+- Změna ve verzi v0.11 snížila využití paměti při kreslení čárových kódů, ale ovlivnila rozměry čárových kódů. Nyní je tato změna provedena tak, aby byly rozměry čárového kódu zachovány a zároveň se snížilo využití paměti. (pull #126)
+- Aktualizace překladů do němčiny a francouzštiny. (pull #122, pull #124, pull #125))

fastlane/metadata/android/cs_CZ/changelogs/14.txt

@@ -0,0 +1,3 @@
+- Přidání možnosti nabídky zámku otáčení obrazovky při zobrazení karty. Pokud je uzamčeno, obrazovka přejde do své "přirozené" orientace a další otáčení obrazovky bude zablokováno. (pull #128)
+- Pokud je karta vybrána na hlavní obrazovce, ale nelze ji načíst, aplikace elegantně selže a vypíše zprávu. (pull #132)
+- Oprava případu, kdy nebylo možné najít ID rozvržení pro úvodního průvodce. (pull #128)

fastlane/metadata/android/cs_CZ/changelogs/15.txt

@@ -0,0 +1,2 @@
+- Přidání podpory zástupců aplikací (Android 7.1+), kdy se jako zástupci zobrazí naposledy použité karty. (pull #145 (https://github.com/brarcher/loyalty-card-locker/pull/145))
+- Přidání widgetu, který funguje jako připnutý zástupce aplikace, pro podporu zařízení, která běží pod systémem Android 7.1. (pull #142 (https://github.com/brarcher/loyalty-card-locker/pull/142))

fastlane/metadata/android/cs_CZ/changelogs/16.txt

@@ -0,0 +1,5 @@
+- Přidání podpory pro přidávání zástupců na domovskou obrazovku při přidávání nebo úpravách karty. (pull #155)
+- Odstranit widget, protože byl špatnou náhradou za zástupce. (pull #155)
+- Oprava exportu záloh v systému Android 7+. (pull #153)
+- Přesnější hlášení typu mime při exportu zálohovaných dat. (pull #156)
+- Oprava chyby, kdy nebylo možné upravit kartu. (pull #155)

fastlane/metadata/android/cs_CZ/changelogs/17.txt

@@ -0,0 +1,2 @@
+- Přidání podpory pro přidávání zástupců věrnostních karet ze spouštěče/domácí obrazovky. (pull #161 (https://github.com/brarcher/loyalty-card-locker/pull/161))
+- Odstranění podpory pro přidávání zástupců věrnostních karet ze samotné aplikace. Tím se odstraní potřeba oprávnění k přidávání zkratek. (pull #163 (https://github.com/brarcher/loyalty-card-locker/pull/163))

fastlane/metadata/android/cs_CZ/changelogs/18.txt

@@ -0,0 +1,2 @@
+- Oprava problému na Android SDK 24+, kdy použití možnosti importu výběru souboru způsobovalo pád. (pull #170 (https://github.com/brarcher/loyalty-card-locker/pull/170))
+- Nová ikona a barevné schéma. (pull #171 (https://github.com/brarcher/loyalty-card-locker/pull/171))

fastlane/metadata/android/cs_CZ/changelogs/19.txt

@@ -0,0 +1,3 @@
+- Oprava pádu při importu některých typů poškozených souborů CSV. (pull #177 (https://github.com/brarcher/loyalty-card-locker/pull/177))
+- Oprava importu záloh přímo ze souborového systému. (pull #180 (https://github.com/brarcher/loyalty-card-locker/pull/180))
+- Oprava importu záloh z některých typů poskytovatelů obsahu. (pull #179 (https://github.com/brarcher/loyalty-card-locker/pull/179))

fastlane/metadata/android/cs_CZ/changelogs/2.txt

@@ -0,0 +1,3 @@
+- Překlad do italštiny.
+- Podpora všech typů čárových kódů 1D. (Původně byly podporovány pouze 1D čárové kódy produktů)
+- Přidání požadovaného oprávnění pro fotoaparát, které původně chybělo.

fastlane/metadata/android/cs_CZ/changelogs/20.txt

@@ -0,0 +1 @@
+- Dočasné řešení pádu při instalaci na některých verzích systému Android (pravděpodobně Android 5 a nižší). (pull #184 (https://github.com/brarcher/loyalty-card-locker/pull/184))

fastlane/metadata/android/cs_CZ/changelogs/21.txt

@@ -0,0 +1,2 @@
+- Vylepšené rozvržení seznamu karet. (pull #188 (https://github.com/brarcher/loyalty-card-locker/pull/188))
+- Vylepšeno rozvržení při zobrazení karty. (pull #190 (https://github.com/brarcher/loyalty-card-locker/pull/190))

fastlane/metadata/android/cs_CZ/changelogs/22.txt

@@ -0,0 +1 @@
+- Změny v zobrazení karty, které zobrazují poznámku, umožňují, aby ID karty zabíralo více řádků, a zobrazují název obchodu. (pull #197 (https://github.com/brarcher/loyalty-card-locker/pull/197))

fastlane/metadata/android/cs_CZ/changelogs/23.txt

@@ -0,0 +1,3 @@
+- Přidejte tichou mezeru na začátek/konec čárových kódů. (pull #200 (https://github.com/brarcher/loyalty-card-locker/pull/200))
+- Přidání možností konfigurace barev použitých pro písmo a pozadí názvu obchodu. (pull #203 (https://github.com/brarcher/loyalty-card-locker/pull/203))
+- Přidání možností nastavení velikosti písma na stránce s výpisem karet a na stránce s jednotlivými kartami. (pull #204 (https://github.com/brarcher/loyalty-card-locker/pull/204))

fastlane/metadata/android/cs_CZ/changelogs/24.txt

@@ -0,0 +1,4 @@
+- Aktualizace překladů. (pull #208 (https://github.com/brarcher/loyalty-card-locker/pull/208))
+- Aktualizace vykreslování čárových kódů: (pull #209 (https://github.com/brarcher/loyalty-card-locker/pull/209))
+  - Při otočení obrazovky znovu načtěte aktivitu zobrazení karty, aby měl obrázek čárového kódu správnou velikost.
+  - Vykreslování 1D čárových kódů ve větším prostoru, což umožní lépe vyplnit obrazovku.

fastlane/metadata/android/cs_CZ/changelogs/25.txt

@@ -0,0 +1,2 @@
+- Zmenšení prostoru v záhlaví při zobrazení karty. (pull #213 (https://github.com/brarcher/loyalty-card-locker/pull/213))
+- Zakázat pípání při skenování čárového kódu. (pull #216 (https://github.com/brarcher/loyalty-card-locker/pull/216))

fastlane/metadata/android/cs_CZ/changelogs/26.txt

@@ -0,0 +1 @@
+- Zabránění pádu při vykreslování čárového kódu, který vyčerpá paměť aplikace. (pull #219 (https://github.com/brarcher/loyalty-card-locker/pull/219))

fastlane/metadata/android/cs_CZ/changelogs/27.txt

@@ -0,0 +1,2 @@
+- Snížení min SDK ze 17 na 15. (pull #226 (https://github.com/brarcher/loyalty-card-locker/pull/226))
+- Odstranit použití starší knihovny apache, která se používá pouze v unit testech, ale již není potřeba. (pull #225 (https://github.com/brarcher/loyalty-card-locker/pull/225))

fastlane/metadata/android/cs_CZ/changelogs/28.txt

@@ -0,0 +1,5 @@
+- Přidané překlady
+  - Polština (pull #232 (https://github.com/brarcher/loyalty-card-locker/pull/232))
+  - Španělština (pull #232 (https://github.com/brarcher/loyalty-card-locker/pull/232))
+  - Slovenština (pull #232 (https://github.com/brarcher/loyalty-card-locker/pull/232))
+- Aktualizované překlady (pull #239 (https://github.com/brarcher/loyalty-card-locker/pull/239))

fastlane/metadata/android/cs_CZ/changelogs/29.txt

@@ -0,0 +1,2 @@
+- Oprava španělských překladů (pull #244 (https://github.com/brarcher/loyalty-card-locker/pull/244))
+- Aktualizovat překlady (pull #244 (https://github.com/brarcher/loyalty-card-locker/pull/244))

fastlane/metadata/android/cs_CZ/changelogs/3.txt

@@ -0,0 +1,14 @@
+- Nyní oficiálně podporuje následující 1D a 2D čárové kódy:
+  - AZTEC
+  - CODABAR
+  - CODE_39
+  - CODE_128
+  - DATA_MATRIX
+  - EAN_8
+  - EAN_13
+  - ITF
+  - PDF_417
+  - QR_CODE
+  - UPC_A
+
+- Vygenerované čárové kódy jsou větší, snadněji se skenují ze skenovacího zařízení.

fastlane/metadata/android/cs_CZ/changelogs/30.txt

@@ -0,0 +1,4 @@
+- Přidání nastavení pro ovládání jasu obrazovky při zobrazení čárového kódu (pull #259)
+- Přidání překladů do řečtiny (pull #252)
+- Přidat slovinské překlady (pull #260)
+- Aktualizace překladů (pull #260, pull #254)

fastlane/metadata/android/cs_CZ/changelogs/31.txt

@@ -0,0 +1,2 @@
+- Řazení seznamu karet bez ohledu na velikost písmen (pull #266 (https://github.com/brarcher/loyalty-card-locker/pull/266))
+- Přidáno nastavení pro uzamčení orientace pro všechny karty (pull #269 (https://github.com/brarcher/loyalty-card-locker/pull/269))

fastlane/metadata/android/cs_CZ/changelogs/32.txt

@@ -0,0 +1 @@
+- Oprava vytváření nové karty ručním zadáním čárového kódu (issue #272 (https://github.com/brarcher/loyalty-card-locker/issues/272))

fastlane/metadata/android/cs_CZ/changelogs/33.txt

@@ -0,0 +1 @@
+- Aktualizace a přidání překladů

fastlane/metadata/android/cs_CZ/changelogs/34.txt

@@ -0,0 +1 @@
+- Aktualizace ruského překladu

fastlane/metadata/android/cs_CZ/changelogs/35.txt

@@ -0,0 +1,2 @@
+- Povolení zálohování aplikace
+- Aktualizace překladů do francouzštiny a slovinštiny

fastlane/metadata/android/cs_CZ/changelogs/36.txt

@@ -0,0 +1,14 @@
+- Přidání možnosti vyhledat kartu
+- Přidání možnosti sdílet a přijímat věrnostní karty
+- Podpora tmavého režimu
+- Věrnostní karty mohou být nyní bez čárového kódu (např. bez čárového kódu)
+- Poznámky mohou přesahovat více řádků
+- Vylepšení velikosti poznámek
+- Zlepšení viditelnosti oznámení a ikon aplikací
+- Aktualizace cílového SDK na Android 10
+- Vylepšení následujících překladů:
+  - Němčina
+  - Italština
+  - nizozemština
+  - Polština
+  - ruština

fastlane/metadata/android/cs_CZ/changelogs/37.txt

@@ -0,0 +1 @@
+- Oprava problému se sdílením karet bez barvy pozadí (#343 (https://github.com/brarcher/loyalty-card-locker/pull/343))

fastlane/metadata/android/cs_CZ/changelogs/38.txt

@@ -0,0 +1,3 @@
+- Klepnutím na čárový kód jej nyní přesunete do horní části obrazovky (#348 (https://github.com/brarcher/loyalty-card-locker/pull/348))
+- Přidání bílého prostoru kolem čárových kódů pro lepší skenování v tmavém režimu (#328 (https://github.com/brarcher/loyalty-card-locker/issues/328))
+- Oprava prohozených tlačítek importu. (#346 (https://github.com/brarcher/loyalty-card-locker/pull/346))

fastlane/metadata/android/cs_CZ/changelogs/39.txt

@@ -0,0 +1,3 @@
+- Oprava centrování čárového kódu při návratu z celé obrazovky (#351 (https://github.com/brarcher/loyalty-card-locker/pull/351))
+- Umožnit výběr umístění pro export zálohy (#352 (https://github.com/brarcher/loyalty-card-locker/pull/352))
+- Aktualizace překladů (#357 (https://github.com/brarcher/loyalty-card-locker/pull/357)) & (#362 (https://github.com/brarcher/loyalty-card-locker/pull/362))

fastlane/metadata/android/cs_CZ/changelogs/4.txt

@@ -0,0 +1,4 @@
+- Překlad do nizozemštiny
+- Umožnit editaci pole se jménem po přidání věrnostní karty
+- Přidat nepovinné pole pro poznámku
+- Vyřešit všechny problémy identifikované nástrojem FindBugs a vyžadovat vyřešení všech problémů FindBugs před přijetím požadavku na stažení.

fastlane/metadata/android/cs_CZ/changelogs/40.txt

@@ -0,0 +1,6 @@
+- Změna jména na Catima
+- Odstraněno intro
+- Přidání plovoucích akčních tlačítek
+- Oprava pádu systému Android 5 při otevření obrazovky O systému
+- Přidána podpora oblíbených položek
+- Oprava ignorování zakázaného automatického otáčení

fastlane/metadata/android/cs_CZ/changelogs/41.txt

@@ -0,0 +1,2 @@
+- Přidání zaoblených okrajů na ikony karet v hlavním přehledu
+- Přidána podpora pro seskupování záznamů

fastlane/metadata/android/cs_CZ/changelogs/42.txt

@@ -0,0 +1 @@
+- Oprava pádu při vyhledávání bez skupin

fastlane/metadata/android/cs_CZ/changelogs/43.txt

@@ -0,0 +1,3 @@
+- Vylepšené uživatelské rozhraní pro úpravy
+- Odstraněna možnost barvy textu záhlaví (nyní se automaticky generuje na základě jasu).
+- Aktualizované překlady

fastlane/metadata/android/cs_CZ/changelogs/44.txt

@@ -0,0 +1,2 @@
+- Přidání přejetí mezi skupinami na domovské obrazovce
+- Oprava pádu u karet bez barvy záhlaví

fastlane/metadata/android/cs_CZ/changelogs/45.txt

@@ -0,0 +1 @@
+- Oprava spouštění přejetí domovské obrazovky i při svislém přejetí prstem

fastlane/metadata/android/cs_CZ/changelogs/46.txt

@@ -0,0 +1 @@
+- Zapamatování aktivní karty skupiny mezi obrazovkami a relacemi

fastlane/metadata/android/cs_CZ/changelogs/47.txt

@@ -0,0 +1,2 @@
+- Vždy zobrazit všechny možnosti importu/exportu a zobrazit přípitek na aktuální problémy (zlepšuje kompatibilitu s XPrivacyLua)
+- Požádat o potvrzení při opuštění zobrazení úprav po provedení změn bez uložení

fastlane/metadata/android/cs_CZ/changelogs/48.txt

@@ -0,0 +1,3 @@
+- Přesunutí obrazovky Informace do vlastní aktivity
+- Zeptat se uživatele, zda chce použít svůj fotoaparát, nebo ručně zadat ID na přidání/úpravu karty.
+- Vytvořit ruční řazení skupin namísto nuceného abecedního řazení

fastlane/metadata/android/cs_CZ/changelogs/49.txt

@@ -0,0 +1,2 @@
+- Vylepšené překlady
+- Drobné opravy uživatelského rozhraní

fastlane/metadata/android/cs_CZ/changelogs/5.txt

@@ -0,0 +1,2 @@
+- Z hlavní obrazovky lze otevřít dialogové okno o aplikaci, které poskytuje podrobnosti o aplikaci a projektu na GitHubu (issue #19 (https://github.com/brarcher/loyalty-card-locker/issues/19)).
+- Umožnění importu informací o věrnostních kartách z/do souboru CSV v externím úložišti (issue #36 (https://github.com/brarcher/loyalty-card-locker/issues/36), issue #20 (https://github.com/brarcher/loyalty-card-locker/issues/20))

fastlane/metadata/android/cs_CZ/changelogs/50.txt

@@ -0,0 +1,2 @@
+- Zlepšete kontrast tím, že na červených tlačítkách vždy použijete bílý text.
+- Přetahovací spodní list v zobrazení věrnostní karty

fastlane/metadata/android/cs_CZ/changelogs/51.txt

@@ -0,0 +1 @@
+- Oprava průhledného pozadí spodního listu

fastlane/metadata/android/cs_CZ/changelogs/52.txt

@@ -0,0 +1,3 @@
+- Automatické zaostření textového pole při vytváření nebo úpravě skupiny
+- Oprava rozmazaných ikon (všude používejte SVG)
+- Vždy otevřít fotoaparát, ale přidat tlačítko ručního skenování do zobrazení fotoaparátu

fastlane/metadata/android/cs_CZ/changelogs/54.txt

@@ -0,0 +1 @@
+- Oprava tlačítka pro úpravu nebo více informací na spodním listu nad ID čárového kódu

fastlane/metadata/android/cs_CZ/changelogs/55.txt

@@ -0,0 +1,2 @@
+- Oddělení uživatelského rozhraní pro úpravy na kartách, aby bylo prostornější.
+- Přidání podpory polí s vypršením platnosti

fastlane/metadata/android/cs_CZ/changelogs/56.txt

@@ -0,0 +1 @@
+- Oprava pádu při přepnutí na kartu s čárovým kódem v zobrazení úprav, pokud není k dispozici žádný čárový kód

fastlane/metadata/android/cs_CZ/changelogs/57.txt

@@ -0,0 +1,4 @@
+- Přidání podpory pro škálování čárového kódu při přesunu na horní stranu, aby se vešel i do menších skenerů
+- Oprava přeskakování spodního listu po přepnutí na celou obrazovku
+- Zmenšit záhlaví v zobrazení věrnostních karet v režimu na šířku
+- Oprava karet, které nezůstávají ve skupině, když se skupina přejmenuje

fastlane/metadata/android/cs_CZ/changelogs/58.txt

@@ -0,0 +1 @@
+- Oprava pádu na verzích před Androidem 7