Merge pull request #271 from brarcher/pre-v0.25

Update for v0.25
2025-12-25 08:07:56 -05:00 · 2018-10-07 15:28:12 -07:00 · 2018-10-07 15:18:08 -07:00 · 2018-10-07 15:12:38 -07:00 · 2018-10-07 15:05:38 -07:00 · 2018-10-06 18:33:41 -04:00
28 changed files with 855 additions and 141 deletions
--- a/.tx/config
+++ b/.tx/config
@@ -0,0 +1,10 @@
+[main]
+host = https://www.transifex.com
+
+[loyalty-card-locker.stringsxml]
+file_filter = app/src/main/res/values-<lang>/strings.xml
+minimum_perc = 0
+source_file = app/src/main/res/values/strings.xml
+source_lang = en
+type = ANDROID
+
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,38 @@
+## v0.25 (2018-10-07)
+
+Changes:
+- Sort card list case insensitive (https://github.com/brarcher/loyalty-card-locker/pull/266)
+- Add setting to lock orientation for all cards (https://github.com/brarcher/loyalty-card-locker/pull/269)
+
+## v0.24 (2018-07-31)
+
+Changes:
+- Add a setting to control screen brightness when displaying a barcode (https://github.com/brarcher/loyalty-card-locker/pull/259)
+- Add Greek translations (https://github.com/brarcher/loyalty-card-locker/pull/252)
+- Add Slovenian translations (https://github.com/brarcher/loyalty-card-locker/pull/260)
+- Update translations (https://github.com/brarcher/loyalty-card-locker/pull/260, https://github.com/brarcher/loyalty-card-locker/pull/254)
+
+## v0.23.4 (2018-05-12)
+
+Changes: 
+- Fix Spanish translations (https://github.com/brarcher/loyalty-card-locker/pull/244)
+- Update translations (https://github.com/brarcher/loyalty-card-locker/pull/244)
+
+## v0.23.3 (2018-05-05)
+
+Changes:
+- Added translations
+  * Polish (https://github.com/brarcher/loyalty-card-locker/pull/232)
+  * Spanish (https://github.com/brarcher/loyalty-card-locker/pull/232)
+  * Slovak (https://github.com/brarcher/loyalty-card-locker/pull/232)
+- Updated translations (https://github.com/brarcher/loyalty-card-locker/pull/239)
+
+## v0.23.2 (2018-03-11)
+
+Changes:
+- Reduce min SDK from 17 to 15. (https://github.com/brarcher/loyalty-card-locker/pull/226)
+- Remove usage of legacy apache library, used only in unit tests but no longer needed. (https://github.com/brarcher/loyalty-card-locker/pull/225)
+
 ## v0.23.1 (2018-03-07)

 Changes:
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
        applicationId "protect.card_locker"
        minSdkVersion 15
        targetSdkVersion 27
-        versionCode 27
-        versionName "0.23.2"
+        versionCode 31
+        versionName "0.25"
    }
    buildTypes {
        release {
--- a/app/src/main/java/protect/card_locker/DBHelper.java
+++ b/app/src/main/java/protect/card_locker/DBHelper.java
@@ -148,7 +148,7 @@ public class DBHelper extends SQLiteOpenHelper
    {
        SQLiteDatabase db = getReadableDatabase();
        Cursor res =  db.rawQuery("select * from " + LoyaltyCardDbIds.TABLE +
-                " ORDER BY " + LoyaltyCardDbIds.STORE, null);
+                " ORDER BY " + LoyaltyCardDbIds.STORE + " COLLATE NOCASE ASC", null);
        return res;
    }

--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -449,14 +449,6 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
            format = result.getFormatName();
        }

-        if(requestCode == SELECT_BARCODE_REQUEST && resultCode == Activity.RESULT_OK)
-        {
-            Log.i(TAG, "Received barcode information from capture");
-
-            contents = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_CONTENTS);
-            format = intent.getStringExtra(BarcodeSelectorActivity.BARCODE_FORMAT);
-        }
-
        if(contents != null && contents.isEmpty() == false &&
                format != null && format.isEmpty() == false)
        {
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -76,6 +76,8 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
        storeName = findViewById(R.id.storeName);
        barcodeImage = findViewById(R.id.barcode);
        collapsingToolbarLayout = findViewById(R.id.collapsingToolbarLayout);
+
+        rotationEnabled = true;
    }

    @Override
@@ -96,7 +98,7 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
        // '1' is the brightest. We attempt to maximize the brightness
        // to help barcode readers scan the barcode.
        Window window = getWindow();
-        if(window != null)
+        if(window != null && settings.useMaxBrightnessDisplayingBarcode())
        {
            WindowManager.LayoutParams attributes = window.getAttributes();
            attributes.screenBrightness = 1F;
@@ -198,7 +200,12 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
    {
        getMenuInflater().inflate(R.menu.card_view_menu, menu);

-        rotationEnabled = true;
+        if(settings.getLockBarcodeScreenOrientation())
+        {
+            MenuItem item = menu.findItem(R.id.action_lock_unlock);
+            setOrientatonLock(item, true);
+            item.setVisible(false);
+        }

        return super.onCreateOptionsMenu(menu);
    }
@@ -227,15 +234,11 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
            case R.id.action_lock_unlock:
                if(rotationEnabled)
                {
-                    item.setIcon(R.drawable.ic_lock_outline_white_24dp);
-                    item.setTitle(R.string.unlockScreen);
-                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
+                    setOrientatonLock(item, true);
                }
                else
                {
-                    item.setIcon(R.drawable.ic_lock_open_white_24dp);
-                    item.setTitle(R.string.lockScreen);
-                    setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
+                    setOrientatonLock(item, false);
                }
                rotationEnabled = !rotationEnabled;
                return true;
@@ -243,4 +246,20 @@ public class LoyaltyCardViewActivity extends AppCompatActivity

        return super.onOptionsItemSelected(item);
    }
+
+    private void setOrientatonLock(MenuItem item, boolean lock)
+    {
+        if(lock)
+        {
+            item.setIcon(R.drawable.ic_lock_outline_white_24dp);
+            item.setTitle(R.string.unlockScreen);
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
+        }
+        else
+        {
+            item.setIcon(R.drawable.ic_lock_open_white_24dp);
+            item.setTitle(R.string.lockScreen);
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
+        }
+    }
 }
--- a/app/src/main/java/protect/card_locker/preferences/Settings.java
+++ b/app/src/main/java/protect/card_locker/preferences/Settings.java
@@ -34,6 +34,11 @@ public class Settings
        return settings.getInt(getResString(keyId), getResInt(defaultId));
    }

+    private boolean getBoolean(@StringRes int keyId, boolean defaultValue)
+    {
+        return settings.getBoolean(getResString(keyId), defaultValue);
+    }
+
    public int getCardTitleListFontSize()
    {
        return getInt(R.string.settings_key_card_title_list_font_size, R.integer.settings_card_title_list_font_size_sp);
@@ -58,4 +63,14 @@ public class Settings
    {
        return getInt(R.string.settings_key_card_note_font_size, R.integer.settings_card_note_font_size_sp);
    }
+
+    public boolean useMaxBrightnessDisplayingBarcode()
+    {
+        return getBoolean(R.string.settings_key_display_barcode_max_brightness, true);
+    }
+
+    public boolean getLockBarcodeScreenOrientation()
+    {
+        return getBoolean(R.string.settings_key_lock_barcode_orientation, false);
+    }
 }
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -71,4 +71,4 @@

    <string name="copy_to_clipboard_toast">ID karty zkopírováno do schránky</string>

-</resources>
+    </resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -4,7 +4,7 @@
    <string name="app_name">Loyalty Card Keychain</string>
    <string name="action_add">Neu</string>

-    <string name="noGiftCards">Sie haben noch keine Kundenkarte angelegt. Über den "+" Button oben rechts, können welche angelegt werden.\n\nDiese App ermöglicht es, Kundenkarten immer mit zu führen.</string>
+    <string name="noGiftCards">Sie haben noch keine Kundenkarte angelegt. Über den \"+\"-Button oben rechts können welche angelegt werden.\n\nDiese App ermöglicht es, Kundenkarten immer mit zu führen.</string>

    <string name="storeName">Geschäft</string>
    <string name="note">Notiz</string>
@@ -59,22 +59,22 @@
    <string name="exporting">Exportiere…</string>
    <string name="noExternalStoragePermissionError">Ohne die Berechtigung für den externen Speicher kann kein Import oder Export erfolgen.</string>
    <string name="exportOptionExplanation">Die Datei wird ins Rootverzeichnis des externen Speichers geschrieben.</string>
-    <string name="importOptionFilesystemTitle">Importiere vom Dateisystem</string>
-    <string name="importOptionFilesystemExplanation">Wähle eine Datei im Speicher aus.</string>
-    <string name="importOptionFilesystemButton">Vom Dateisystem</string>
-    <string name="importOptionApplicationTitle">Nutze eine externe App</string>
+    <string name="importOptionFilesystemTitle">Importiere aus Dateisystem</string>
+    <string name="importOptionFilesystemExplanation">Wähle eine Datei aus dem Speicher aus.</string>
+    <string name="importOptionFilesystemButton">Aus Dateisystem</string>
+    <string name="importOptionApplicationTitle">Externe App verwenden</string>
    <string name="importOptionApplicationExplanation">Wählen Sie eine Datei aus einer App wie Dropbox, Google Drive, oder Ihrem bevorzugten Dateisystem aus.</string>
    <string name="importOptionApplicationButton">Nutze eine externe App</string>
-    <string name="importOptionFixedTitle">Importiere vom Export-Pfad</string>
-    <string name="importOptionFixedExplanation">Importiere vom Export-Pfad.</string>
-    <string name="importOptionFixedButton">Verwende den Export-Pfad.</string>
+    <string name="importOptionFixedTitle">Importiere aus Export-Pfad</string>
+    <string name="importOptionFixedExplanation">Nutze den Export-Pfad, um Karten zu importieren (dies stellt zuvor gesicherte Daten wieder her).</string>
+    <string name="importOptionFixedButton">Export-Pfad verwenden</string>

    <string name="about">Über</string>
    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
    <string name="app_license">Lizensiert unter der GPLv3.</string>
    <string name="about_title_fmt">Über <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">Versions Information: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_revision_fmt">Informationen zu dieser Version: <xliff:g id="app_revision_url">%s</xliff:g></string>
    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> benutzt die folgenden Fremdbibliotheken: <xliff:g id="app_libraries_list">%s</xliff:g></string>
    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> verwendet folgenden Dritt-Ressourcen: <xliff:g id="app_resources_list">%s</xliff:g></string>

@@ -83,6 +83,8 @@

    <string name="copy_to_clipboard_toast">Nummer in die Zwischenablage kopiert</string>

+    <string name="thumbnailDescription">Vorschaubild für die Karte</string>
+
    <string name="startIntro">Starte Einführung</string>
    <string name="intro1Title">Willkommen zu Loyalty Card Keychain\n</string>
    <string name="intro1Description">Verwalten Sie Ihre Barcode-Kundenkarten auf Ihrem Smartphone!\n\n</string>
@@ -97,4 +99,18 @@
    <string name="intro6Title">Feedback\n</string>
    <string name="intro6Description">Diese App enthält keine Werbung, und ist freie und quelloffene Software. Für Details berühren Sie Über im Menü auf der Hauptseite.\n\nHinterlassen Sie uns ein Feedback im App-Store (:</string>

-</resources>
+    <string name="change">Anpassen</string>
+    <string name="storeTextColorTitle">Textfarbe</string>
+    <string name="storeTextBackgroundColorTitle">Hintergrundfarbe</string>
+    <string name="storeNameBackgroundColorDescription">Hintergrundfarbe für den Geschäftsnamen</string>
+    <string name="storeNameColorDescription">Farbe für den Geschäftsnamen</string>
+
+    <string name="settings">Einstellungen</string>
+    <string name="settings_category_title_ui">Benutzeroberfläche</string>
+    <string name="settings_card_title_list_font_size">Schriftgröße des Titels in der Listenansicht</string>
+    <string name="settings_card_note_list_font_size">Schriftgröße der Notiz in der Listenansicht</string>
+    <string name="settings_card_title_font_size">Schriftgröße des Titels</string>
+    <string name="settings_card_id_font_size">Schriftgröße der Kartennummer</string>
+    <string name="settings_card_note_font_size">Schriftgröße der Notiz</string>
+    <string name="settings_display_barcode_max_brightness">Helligkeit bei Barcode Ansicht erhöhen</string>
+    </resources>
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -0,0 +1,115 @@
+<resources
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="app_name">Loyalty Card Keychain</string>
+    <string name="action_add">Προσθήκη</string>
+
+    <string name="noGiftCards">Δεν έχετε κάρτες προς το παρόν. Πατήστε το κουμπί \"+\" (συν) στο πάνω μέρος για να ξεκινήσετε.\n\nΤο Loyalty Card Keychain σας δίνει τη δυνατότητα να έχετε τις κάρτες σας στο τηλέφωνο σας, έτσι ώστε να τις έχετε πάντα μαζί σας.</string>
+
+    <string name="storeName">Κατάστημα</string>
+    <string name="note">Σημείωση</string>
+    <string name="cardId">Κωδικός Κάρτας</string>
+    <string name="barcodeType">Τύπος Barcode</string>
+
+    <string name="cancel">Άκυρο</string>
+    <string name="save">Αποθήκευση</string>
+    <string name="capture">Φωτογράφιση Κάρτας</string>
+    <string name="enterCard">Εισάγετε Κάρτα</string>
+    <string name="editCard">Επεξεργασία Κάρτας</string>
+    <string name="edit">Επεξεργασία</string>
+    <string name="delete">Διαγραφή</string>
+    <string name="confirm">Επιβεβαίωση</string>
+    <string name="lockScreen">Αποκλεισμός Περιστροφής</string>
+    <string name="unlockScreen">Περιστροφή</string>
+    <string name="deleteTitle">Αφαίρεση Κάρτας</string>
+    <string name="deleteConfirmation">Παρακαλώ επιβεβαιώστε ότι θέλετε να διαγράψετε αυτή την κάρτα.</string>
+    <string name="ok">OK</string>
+    <string name="copy_to_clipboard">Αντιγραφή κωδικού στο πρόχειρο</string>
+    <string name="sendLabel">Αποστολή&#8230;</string>
+    <string name="addedShortcut">Προστέθηκε στην Αρχική Οθόνη</string>
+
+    <string name="editCardTitle">Επεξεργασία Κάρτας</string>
+    <string name="addCardTitle">Προσθήκη Κάρτας</string>
+    <string name="viewCardTitle">Εμφάνιση Κάρτας</string>
+    <string name="scanCardBarcode">Σαρώστε τον κωδικό της κάρτας</string>
+    <string name="cardShortcut">Συντόμευση Κάρτας</string>
+    <string name="noCardsMessage">Δεν υπάρχουν κάρτες. προσθέστε μία πρώτα</string>
+
+    <string name="barcodeImageDescription">Εικόνα του barcode της κάρτας</string>
+
+    <string name="noStoreError">Δεν δώσατε κατάστημα</string>
+    <string name="noCardIdError">Δεν δώσατε κωδικό κάρτας</string>
+    <string name="noCardExistsError">Δεν ήταν δυνατό να εντοπιστεί κάρτα</string>
+
+    <string name="cardIdFormat">%1$s: %2$s</string>
+    <string name="importExport">Εισαγωγή/Εξαγωγή</string>
+    <string name="importName">Εισαγωγή</string>
+    <string name="exportName">Εξαγωγή</string>
+    <string name="importExportHelp">Τα εφεδρικά δεδομένα σας δίνουν την δυνατότητα να μεταφέρετε τις κάρτες σας σε μία άλλη συσκευή.</string>
+    <string name="importedFrom">Εισαγωγή από: %1$s</string>
+    <string name="exportedTo">Εξαγωγή σε: %1$s</string>
+    <string name="fileMissing">Το αρχείο λείπει: %1$s</string>
+    <string name="importSuccessfulTitle">Εισαγωγή επιτυχής</string>
+    <string name="importFailedTitle">Εισαγωγή ανεπιτυχής</string>
+    <string name="importFailed">Δεν εισήχθει: %1$s</string>
+    <string name="exportSuccessfulTitle">Εξαγωγή επιτυχής</string>
+    <string name="exportFailedTitle">Εξαγωγή ανεπιτυχής</string>
+    <string name="exportFailed">Δεν εξήχθη: %1$s</string>
+    <string name="importing">Γίνεται εισαγωγή του&#8230;</string>
+    <string name="exporting">Γίνεται εξαγωγή του&#8230;</string>
+    <string name="noExternalStoragePermissionError">Δεν είναι δυνατή η εισαγωγή ή εξαγωγή καρτών χωρίς την άδεια πρόσβασης στον εξωτερικό χώρο αποθήκευσης</string>
+    <string name="exportOptionExplanation">Τα δεδομένα αποθηκεύονται στον αρχικό φάκελο του εξωτερικού χώρου αποθήκευσης.</string>
+    <string name="importOptionFilesystemTitle">Εισαγωγή από το σύστημα αρχείων</string>
+    <string name="importOptionFilesystemExplanation">Επιλέξτε ένα συγκεκριμένο αρχείο από το σύστημα αρχείων.</string>
+    <string name="importOptionFilesystemButton">Από το σύστημα αρχείων</string>
+    <string name="importOptionApplicationTitle">Χρήση εξωτερικής εφαρμογής</string>
+    <string name="importOptionApplicationExplanation">Κάντε χρήση μίας εξωτερικής εφαρμογής όπως είναι τα Dropbox, Google Drive ή ο αγαπημένος σας διαχειριστής αρχείων για να ανοίξετε ένα αρχείο.</string>
+    <string name="importOptionApplicationButton">Χρήση εξωτερικής εφαρμογής</string>
+    <string name="importOptionFixedTitle">Εισαγωγή από τοποθεσία εξαγωγής</string>
+    <string name="importOptionFixedExplanation">Εισαγωγή από την ίδια τοποθεσία στο σύστημα αρχείων, στην οποία γίνεται αποθήκευση κατά την εξαγωγή.</string>
+    <string name="importOptionFixedButton">Χρήση τοποθεσίας εξαγωγής</string>
+
+    <string name="about">Σχετικά</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</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>
+    <string name="app_libraries">Το <xliff:g id="app_name">%s</xliff:g> χρησιμοποιεί τις ακόλουθες βιβλιοθήκες τρίτων: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources">Το <xliff:g id="app_name">%s</xliff:g> χρησιμοποιεί τους παρακάτω πόρους τρίτων: <xliff:g id="app_resources_list">%s</xliff:g></string>
+
+    <string name="selectBarcodeTitle">Επιλέξτε Barcode</string>
+    <string name="enterBarcodeInstructions">Δώστε την τιμή του barcode και μετά επιλέξτε την εικόνα που αναπαριστά το barcode που θέλετε να χρησιμοποιείσετε</string>
+
+    <string name="copy_to_clipboard_toast">Ο κωδικός της κάρτας αντιγράφτηκε στο πρόχειρο</string>
+
+    <string name="thumbnailDescription">Μικρογραφία κάρτας</string>
+
+    <string name="startIntro">Έναρξη Επεξήγησης</string>
+    <string name="intro1Title">Καλώς ήλθατε στο Loyalty Card Keychain\n</string>
+    <string name="intro1Description">Διαχειριστείτε τις κάρτες σας που βασίζονται σε barcodes μέσα από το κινητό σας!\n\n</string>
+    <string name="intro2Title">Προσθήκη Καρτών\n</string>
+    <string name="intro2Description">Προσθέστε μία νέα κάρτα πατώντας το συν από την λίστα καρτών.\n\n</string>
+    <string name="intro3Title">Προσθήκη Καρτών\n</string>
+    <string name="intro3Description">Για να προσθέσετε το barcode, είτε φωτογραφίστε με την κάμερα είτε γράψτε το χειροκίνητα.\n\n</string>
+    <string name="intro4Title">Εμφάνιση Κάρτας\n</string>
+    <string name="intro4Description">Για να εμφανίσετε μία κάρτα, πατήστε πάνω στο όνομα του καταστήματος, στην κεντρική οθόνη της εφαρμογής\n\n</string>
+    <string name="intro5Title">Αντίγραφα Ασφαλείας\n</string>
+    <string name="intro5Description">Μπορείτε να δημιουργήσετε αντίγραφα ασφαλείας των καρτών. Για εξαγωγή ή εισαγωγή των δεδομένων των καρτών πατήστε Εισαγωγή/Εξαγωγή στο μενού στην κεντρική οθόνη της εφαρμογής.\n\n</string>
+    <string name="intro6Title">Σχόλια\n</string>
+    <string name="intro6Description">Αυτή η εφαρμογή είναι δωρεάν, χωρίς διαφημίσεις και open source. Δείτε λεπτομέρειες πατώντας το Σχετικά στο μενού στην κεντρική οθόνη της εφαρμογής.\n\nΠαρακαλώ αφήστε σχόλια στο app store! (:</string>
+
+    <string name="change">Αλλαγή</string>
+    <string name="storeTextColorTitle">Χρώμα Κειμένου Καταστήματος</string>
+    <string name="storeTextBackgroundColorTitle">Χρώμα Κεφαλίδας</string>
+    <string name="storeNameBackgroundColorDescription">Χρώμα για το υπόβαθρο του καταστήματος</string>
+    <string name="storeNameColorDescription">Χρώμα για το κείμενο του καταστήματος</string>
+
+    <string name="settings">Ρυθμίσεις</string>
+    <string name="settings_category_title_ui">Διεπαφή χρήστη</string>
+    <string name="settings_card_title_list_font_size">Μέγεθος κειμένου λίστας καρτών</string>
+    <string name="settings_card_note_list_font_size">Μέγεθος κειμένου λίστας σημειώσεων καρτών</string>
+    <string name="settings_card_title_font_size">Μέγεθος κειμένου τίτλου κάρτας</string>
+    <string name="settings_card_id_font_size">Μέγεθος κειμένου κωδικού κάρτας</string>
+    <string name="settings_card_note_font_size">Μέγεθος κειμένου σημείωσης κάρτας</string>
+    </resources>
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -0,0 +1,4 @@
+<resources
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    </resources>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,115 @@
+<resources
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="app_name">Cartera para Tarjetas de Fidelización.</string>
+    <string name="action_add">Añadir</string>
+
+    <string name="noGiftCards">Actualmente no tienes ninguna tarjeta guardada. Presiona el botón \"+\" para comenzar.\n\nEsta cartera te permite llevar tus tarjetas de fidelización en tu teléfono para que estén siempre a tu alcance.</string>
+
+    <string name="storeName">Tienda</string>
+    <string name="note">Nota</string>
+    <string name="cardId">ID de la Tarjeta</string>
+    <string name="barcodeType">Tipo de Código de Barras</string>
+
+    <string name="cancel">Cancelar</string>
+    <string name="save">Guardar</string>
+    <string name="capture">Escanear Tarjeta</string>
+    <string name="enterCard">Introducir Tarjeta</string>
+    <string name="editCard">Editar Tarjeta</string>
+    <string name="edit">Editar</string>
+    <string name="delete">Eliminar</string>
+    <string name="confirm">Confirmar</string>
+    <string name="lockScreen">Bloquear Rotación de Pantalla</string>
+    <string name="unlockScreen">Rotación de Pantalla Automática</string>
+    <string name="deleteTitle">Eliminar Tarjeta de Fidelización</string>
+    <string name="deleteConfirmation">Por favor, confirma si quieres eliminar esta tarjeta.</string>
+    <string name="ok">OK</string>
+    <string name="copy_to_clipboard">Copiar ID al portapapeles</string>
+    <string name="sendLabel">Enviar&#8230;</string>
+    <string name="addedShortcut">Añadido a la Pantalla de Inicio</string>
+
+    <string name="editCardTitle">Editar Tarjeta de Fidelización</string>
+    <string name="addCardTitle">Añadir Tarjeta de Fidelización</string>
+    <string name="viewCardTitle">Ver Tarjeta de Fidelización</string>
+    <string name="scanCardBarcode">Escanear el Código de Barras de la Tarjeta</string>
+    <string name="cardShortcut">Atajo de Tarjeta</string>
+    <string name="noCardsMessage">No hay ninguna tarjeta, añade una primero</string>
+
+    <string name="barcodeImageDescription">Imagen del código de barras de la tarjeta</string>
+
+    <string name="noStoreError">Establecimiento no especificado</string>
+    <string name="noCardIdError">ID de la Tarjeta no especificado</string>
+    <string name="noCardExistsError">No se ha podido encontrar la tarjeta de fidelización</string>
+
+    <string name="cardIdFormat">%1$s: %2$s</string>
+    <string name="importExport">Importar/Exportar</string>
+    <string name="importName">Importar</string>
+    <string name="exportName">Exportar</string>
+    <string name="importExportHelp">La copia de seguridad te permite transferir tus tarjetas a otro dispositivo.</string>
+    <string name="importedFrom">Importar desde: %1$s</string>
+    <string name="exportedTo">Exportar a: %1$s</string>
+    <string name="fileMissing">Archivo perdido: %1$s</string>
+    <string name="importSuccessfulTitle">Datos importados correctamente</string>
+    <string name="importFailedTitle">Ha ocurrido un error al importar los datos</string>
+    <string name="importFailed">Error al importar: %1$s</string>
+    <string name="exportSuccessfulTitle">Datos exportados correctamente</string>
+    <string name="exportFailedTitle">Ha ocurrido un error al exportar los datos</string>
+    <string name="exportFailed">Error al exportar: %1$s</string>
+    <string name="importing">Importando&#8230;</string>
+    <string name="exporting">Exportando&#8230;</string>
+    <string name="noExternalStoragePermissionError">No se pueden importar o exportar tarjetas sin el permiso de almacenamiento</string>
+    <string name="exportOptionExplanation">Los datos son guardados en la carpeta base del almacenamiento externo.</string>
+    <string name="importOptionFilesystemTitle">Importar desde el sistema de archivos</string>
+    <string name="importOptionFilesystemExplanation">Seleccionar un archivo del sistema de archivos</string>
+    <string name="importOptionFilesystemButton">Desde el sistema de archivos</string>
+    <string name="importOptionApplicationTitle">Usar una applicación externa</string>
+    <string name="importOptionApplicationExplanation">Use una aplicación externa como Dropbox, Google Drive o tu gestor de archivos favoritos para abrir un archivo.</string>
+    <string name="importOptionApplicationButton">Usar aplicación externa</string>
+    <string name="importOptionFixedTitle">Importar desde el lugar donde los datos son exportados</string>
+    <string name="importOptionFixedExplanation">Importar desde el mismo lugar en el sistema de archivos donde los datos son exportados.</string>
+    <string name="importOptionFixedButton">Utilizar el lugar donde los datos son exportados</string>
+
+    <string name="about">Acerca de</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
+    <string name="app_license">Licencia GPLv3</string>
+    <string name="about_title_fmt">Acerca de <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">Versión: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Información sobre la Revisión: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> utiliza las siguientes librerías de terceros: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> utiliza los siguientes recursos de terceros: <xliff:g id="app_resources_list">%s</xliff:g></string>
+
+    <string name="selectBarcodeTitle">Selecciona el Código de Barras</string>
+    <string name="enterBarcodeInstructions">Introduce el valor del código de barras y después presiona en una imagen para seleccionar el tipo de código de barras.</string>
+
+    <string name="copy_to_clipboard_toast">ID de la Tarjeta copiado al portapapeles</string>
+
+    <string name="thumbnailDescription">Miniatura para la tarjeta</string>
+
+    <string name="startIntro">Empezar Introducción</string>
+    <string name="intro1Title">Bienvenido a la Cartera para Tarjetas de Fidelización\n</string>
+    <string name="intro1Description">Gestiona las tarjetas de fidelización o tarjetas cliente con codigo de barras desde tu teléfono!\n\n</string>
+    <string name="intro2Title">Añadir Tarjetas\n</string>
+    <string name="intro2Description">Añade una nueva tarjeta presionando el signo + en la lista de tarjetas.\n\n</string>
+    <string name="intro3Title">Añadir Tarjetas\n</string>
+    <string name="intro3Description">Para añadir el código de barras, escanea la tarjeta con tu cámara o introduce el código manualmente.\n\n</string>
+    <string name="intro4Title">Mostrar Tarjeta\n</string>
+    <string name="intro4Description">Para mostrar una tarjeta, presiona en el nombre de la tienda desde la pantalla principal\n\n</string>
+    <string name="intro5Title">Copias de Seguridad\n</string>
+    <string name="intro5Description">Puedes hacer una copia de seguridad de tus tarjetas. Para exportar o importar los datos presiona Importar/Exportar en el menú de la pagina principal.\n\n</string>
+    <string name="intro6Title">Tu Opinión\n</string>
+    <string name="intro6Description">Esta aplicación es gratuita, libre de publicidad y de código libre. Para más detalles presiona en Acerca De en el menu principal.\n\nPor favor deja tu opinión en la tienda de applicaciones! (:</string>
+
+    <string name="change">Cambiar</string>
+    <string name="storeTextColorTitle">Color del Texto de la Tienda</string>
+    <string name="storeTextBackgroundColorTitle">Color Principal</string>
+    <string name="storeNameBackgroundColorDescription">Color de fondo para el texto de la tienda</string>
+    <string name="storeNameColorDescription">Color del texto de la tienda</string>
+
+    <string name="settings">Configuración</string>
+    <string name="settings_category_title_ui">Interfaz de Usuario</string>
+    <string name="settings_card_title_list_font_size">Tamaño de la letra para el título (lista)</string>
+    <string name="settings_card_note_list_font_size">Tamaño de la letra para notas (lista)</string>
+    <string name="settings_card_title_font_size">Tamaño de la letra para el título</string>
+    <string name="settings_card_id_font_size">Tamaño de la letra para el ID de la tarjeta</string>
+    <string name="settings_card_note_font_size">Tamaño de la letra para notas</string>
+    </resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -4,7 +4,7 @@
    <string name="app_name">Loyalty Card Keychain</string>
    <string name="action_add">Ajouter</string>

-    <string name="noGiftCards">Pas de carte de fidélité enregistrée. Cliquez sur le bouton "+" (plus) pour commencer.\n\nLoyalty Card Locker vous permet d\'enregistrer vos cartes de fidélité sur votre téléphone pour toujours les avoir à portée de main.</string>
+    <string name="noGiftCards">Aucune carte de fidélité enregistrée. Appuyez sur le bouton \"+\" (plus) pour commencer.\n\nLoyalty Card Locker vous permet d\'enregistrer vos cartes de fidélité sur votre téléphone pour toujours les avoir à portée de main.</string>

    <string name="storeName">Nom</string>
    <string name="note">Note</string>
@@ -13,7 +13,7 @@

    <string name="cancel">Annuler</string>
    <string name="save">Enregistrer</string>
-    <string name="capture">Flasher</string>
+    <string name="capture">Mode capture</string>
    <string name="enterCard">Mode manuel</string>
    <string name="editCard">Modifier</string>
    <string name="edit">Modifier</string>
@@ -83,20 +83,23 @@

    <string name="copy_to_clipboard_toast">Numéro de carte copié dans le presse-papier</string>

-    <string name="thumbnailDescription">Vignette pour la carte</string>
+    <string name="thumbnailDescription">Miniature pour la carte</string>

    <string name="startIntro">Présentation</string>
    <string name="intro1Title">Bienvenue dans\nLoyalty Card Keychain\n</string>
    <string name="intro1Description">Gérez vos cartes de fidélité\nsur votre téléphone !\n\n</string>
    <string name="intro2Title">Ajouter une carte\n</string>
-    <string name="intro2Description">Touchez le signe \'+\' en haut de l\'écran pour ajouter une carte.\n\n</string>
+    <string name="intro2Description">Ajoutez une nouvelle carte en appuyant sur le bouton \"+\" depuis la liste des cartes.\n\n</string>
    <string name="intro3Title">Ajouter une carte\n</string>
    <string name="intro3Description">Pour enregistrer le code-barres, utilisez l\'appareil-photo ou entrez-le manuellement.\n\n</string>
    <string name="intro4Title">Afficher une carte\n</string>
-    <string name="intro4Description">Pour afficher une carte, touchez le nom du magasin sur l\'écran principal\n\n</string>
+    <string name="intro4Description">Pour afficher une carte, appuyez sur le nom du magasin depuis l\'écran principal\n\n</string>
    <string name="intro5Title">Sauvegarde\n</string>
-    <string name="intro5Description">Les cartes peuvent être sauvegardées. Touchez \'Importer/Exporter\' sur l\'écran principal pour restaurer ou sauvegarder les cartes.\n\n</string>
-    <string name="intro6Title">Votre avis\n</string>
-    <string name="intro6Description">Cette application est gratuite, sans publicité, et son code est ouvert. Découvrez-en plus en touchant \'à propos\' sur l\'écran principal.\n\nLaissez un commentaire sur votre magasin d\'applications (:</string>
+    <string name="intro5Description">Les cartes peuvent être sauvegardées. Appuyez sur \"Importer/Exporter\" depuis l\'écran principal pour restaurer ou sauvegarder les cartes.\n\n</string>
+    <string name="intro6Title">Commentaire\n</string>
+    <string name="intro6Description">Cette application est gratuite, sans pub, et son code est ouvert. Plus de détails en appuyant sur \"À propos\" depuis l\'écran principal.\n\nMerci de laisser un commentaire sur le Play Store (:</string>

-</resources>
+    <string name="change">Modifier</string>
+    <string name="settings">Paramètres</string>
+    <string name="settings_category_title_ui">Interface</string>
+    </resources>
--- a/app/src/main/res/values-he-rIL/strings.xml
+++ b/app/src/main/res/values-he-rIL/strings.xml
@@ -11,4 +11,4 @@
    <string name="capture">צלם כרטיס</string>
    <string name="enterCard">הכנס כרטיס</string>
    <string name="editCard">עריכת כרטיס</string>
-</resources>
+    </resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -95,4 +95,4 @@
    <string name="intro6Title">Feedback\n</string>
    <string name="intro6Description">Questa app è gratuita, priva di pubblicità e open source. Guarda i dettagli premendo su Informazioni nella schermata principale.\n\nPer favore, lascia un feedback nell\'app store! (:</string>

-</resources>
+    </resources>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -54,4 +54,4 @@

    <string name="copy_to_clipboard_toast">Kortelės ID nukopijuota į iškarpinę</string>

-</resources>
+    </resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,100 +1,117 @@
 <resources
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

-    <string name="app_name">Klantenkaartenkluis</string>
-    <string name="action_add">Voeg toe</string>
+    <string name="app_name">Klantenkaartkluis</string>
+    <string name="action_add">Toevoegen</string>

-    <string name="noGiftCards">Er zijn momenteel geen klantenkaarten toegevoegd. Klik de knop met "+" (plus) om te beginnen.\n\nKlantenkaartenkluis beheert klantenkaarten op een smartphone of tablet, zodat ze altijd binnen handbereik zijn.</string>
+    <string name="noGiftCards">Er zijn nog geen klantenkaarten aanwezig. Klik op de knop \"+\" (plus) om te beginnen.\n\nKlantenkaartenkluis beheert klantenkaarten op een smartphone of tablet, zodat ze altijd binnen handbereik zijn.</string>

    <string name="storeName">Winkel</string>
-    <string name="note">Notitie</string>
+    <string name="note">Opmerking</string>
    <string name="cardId">Kaart-ID</string>
    <string name="barcodeType">Barcodetype</string>

-    <string name="cancel">Annuleer</string>
-    <string name="save">Sla op</string>
-    <string name="capture">Scan kaart</string>
-    <string name="enterCard">Voer kaart in</string>
-    <string name="editCard">Bewerk kaart</string>
-    <string name="edit">Bewerk</string>
-    <string name="delete">Verwijder</string>
-    <string name="confirm">Bevestig</string>
-    <string name="lockScreen">Blokkeer rotatie</string>
-    <string name="unlockScreen">Deblokkeer rotatie</string>
-    <string name="deleteTitle">Verwijder kaart</string>
-    <string name="deleteConfirmation">Bevestig deze kaart te verwijderen.</string>
+    <string name="cancel">Annuleren</string>
+    <string name="save">Opslaan</string>
+    <string name="capture">Scan een kaart</string>
+    <string name="enterCard">Voer een kaart in</string>
+    <string name="editCard">Kaart bewerken</string>
+    <string name="edit">Bewerken</string>
+    <string name="delete">Verwijderen</string>
+    <string name="confirm">Bevestigen</string>
+    <string name="lockScreen">Draaien blokkeren</string>
+    <string name="unlockScreen">Draaien deblokkeren</string>
+    <string name="deleteTitle">Kaart verwijderen</string>
+    <string name="deleteConfirmation">Bevestig dat je deze kaart wilt verwijderen.</string>
    <string name="ok">Oké</string>
-    <string name="copy_to_clipboard">Kopieer het ID naar het klembord</string>
-    <string name="sendLabel">Verzend&#8230;</string>
-    <string name="addedShortcut">Toegevoegd aan hoofdscherm</string>
+    <string name="copy_to_clipboard">ID kopiëren naar klembord</string>
+    <string name="sendLabel">Versturen&#8230;</string>
+    <string name="addedShortcut">Toegevoegd aan beginscherm</string>

-    <string name="editCardTitle">Bewerk klantenkaart</string>
-    <string name="addCardTitle">Voeg klantenkaart toe</string>
-    <string name="viewCardTitle">Bekijk klantenkaart</string>
-    <string name="scanCardBarcode">Scan barcode klantenkaart</string>
+    <string name="editCardTitle">Klantenkaart bewerken</string>
+    <string name="addCardTitle">Klantenkaart toevoegen</string>
+    <string name="viewCardTitle">Klantenkaart bekijken</string>
+    <string name="scanCardBarcode">Klantenkaart-barcode scannen</string>
    <string name="cardShortcut">Kaartsnelkoppeling</string>
-    <string name="noCardsMessage">Er zijn geen kaarten, voeg er eerst een toe</string>
+    <string name="noCardsMessage">Er zijn geen kaarten; voeg er één toe.</string>

-    <string name="barcodeImageDescription">Afbeelding barcode klantenkaart</string>
+    <string name="barcodeImageDescription">Afbeelding van klantenkaart-barcode</string>

-    <string name="noStoreError">Geen winkel toegevoegd</string>
-    <string name="noCardIdError">Geen kaart-ID toegevoegd</string>
-    <string name="noCardExistsError">Kon klantenkaart niet vinden</string>
+    <string name="noStoreError">Geen winkel ingevoerd</string>
+    <string name="noCardIdError">Geen kaart-ID ingevoerd</string>
+    <string name="noCardExistsError">De klantenkaart kan niet worden opgevraagd.</string>

    <string name="cardIdFormat">%1$s: %2$s</string>
-    <string name="importExport">Importeer/Exporteer</string>
-    <string name="importName">Importeer</string>
-    <string name="exportName">Exporteer</string>
-    <string name="importExportHelp">Data die is geback-upt maakt het mogelijk om je klantenkaarten naar een ander apparaat te verplaatsen.</string>
-    <string name="importedFrom">Geïmporteerd van: %1$s</string>
+    <string name="importExport">Importeren/Exporteren</string>
+    <string name="importName">Importeren</string>
+    <string name="exportName">Exporteren</string>
+    <string name="importExportHelp">Door de gegevens te back-uppen kun je je kaarten overzetten naar een ander apparaat.</string>
+    <string name="importedFrom">Geïmporteerd uit: %1$s</string>
    <string name="exportedTo">Geëxporteerd naar: %1$s</string>
-    <string name="fileMissing">Bestand niet gevonden: %1$s</string>
-    <string name="importSuccessfulTitle">Importeren succesvol</string>
-    <string name="importFailedTitle">Importeren mislukte</string>
-    <string name="importFailed">Importeren mislukte: %1$s</string>
-    <string name="exportSuccessfulTitle">Exporteren succesvol</string>
+    <string name="fileMissing">Bestand ontbreekt: %1$s</string>
+    <string name="importSuccessfulTitle">Importeren voltooid</string>
+    <string name="importFailedTitle">Importeren mislukt</string>
+    <string name="importFailed">Het importeren is mislukt: %1$s</string>
+    <string name="exportSuccessfulTitle">Exporteren voltooid</string>
    <string name="exportFailedTitle">Exporteren mislukt</string>
-    <string name="exportFailed">Exporteren mislukte: %1$s</string>
-    <string name="importing">Importerende&#8230;</string>
-    <string name="exporting">Exporterende&#8230;</string>
-    <string name="noExternalStoragePermissionError">Niet mogelijk te importeren of exporteren zonder rechten op externe opslag</string>
-    <string name="exportOptionExplanation">Data is weggeschreven naar de hoogste map in externe opslag.</string>
-    <string name="importOptionFilesystemTitle">Importeer van filesysteem</string>
-    <string name="importOptionFilesystemExplanation">Kies een specifiek bestand van het filesysteem.</string>
-    <string name="importOptionFilesystemButton">Van filesysteem</string>
-    <string name="importOptionApplicationTitle">Gebruik externe applicatie</string>
-    <string name="importOptionApplicationExplanation">Gebruik een externe applicatie zoals Dropbox, Google Drive of je favoriete bestandsbeheer om een bestand te openen.</string>
-    <string name="importOptionApplicationButton">Gebruik externe applicatie</string>
-    <string name="importOptionFixedTitle">Importeer van exporteerlocatie</string>
-    <string name="importOptionFixedExplanation">Importeer van zelfde locatie op het filesysteem waar tijdens exporteren naar geschreven is.</string>
-    <string name="importOptionFixedButton">gebruik exporteerlocaite</string>
+    <string name="exportFailed">Het exporteren is mislukt: %1$s</string>
+    <string name="importing">Bezig met importeren&#8230;...</string>
+    <string name="exporting">Bezig met exporteren&#8230;...</string>
+    <string name="noExternalStoragePermissionError">Het importeren of exporteren van kaarten is niet mogelijk zonder de machtiging \'externe opslag\'.</string>
+    <string name="exportOptionExplanation">De gegevens zijn weggeschreven naar de hoogste map op de externe opslag.</string>
+    <string name="importOptionFilesystemTitle">Importeren uit bestandssysteem</string>
+    <string name="importOptionFilesystemExplanation">Kies een specifiek bestand uit het bestandssysteem.</string>
+    <string name="importOptionFilesystemButton">Uit bestandssysteem</string>
+    <string name="importOptionApplicationTitle">Externe app gebruiken</string>
+    <string name="importOptionApplicationExplanation">Open een bestand middels een externe app, zoals Dropbox, Google Drive of je favoriete bestandsbeheerder.</string>
+    <string name="importOptionApplicationButton">Externe app gebruiken</string>
+    <string name="importOptionFixedTitle">Importeren uit exportlocatie</string>
+    <string name="importOptionFixedExplanation">Importeer uit dezelfde locatie op het bestandssysteem waar tijdens het exporteren naar weggeschreven is.</string>
+    <string name="importOptionFixedButton">Exportlocatie gebruiken</string>

    <string name="about">Over</string>
-    <string name="app_copyright_fmt">Auteursrecht 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
-    <string name="app_license">Gelicenseerd met GPLv3.</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
+    <string name="app_license">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">Revisieïnformatie: <xliff:g id="app_revision_url">%s</xliff:g></string>
-    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> gebruikt de volgende bibliotheken van derden: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> gebruikt de volgende bronnen van derden: <xliff:g id="app_resources_list">%s</xliff:g></string>
+    <string name="app_revision_fmt">Versie-informatie: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> gebruikt de volgende bibliotheken van derde partijen: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> gebruikt de volgende bronnen van derde partijen: <xliff:g id="app_resources_list">%s</xliff:g></string>

-<string name="selectBarcodeTitle">Selecteer barcode</string>
-<string name="enterBarcodeInstructions">Voer de waarde van de barcode in en kies daarna de afbeelding die de barcode die je wil gebruiken representeert</string>
+    <string name="selectBarcodeTitle">Barcode selecteren</string>
+    <string name="enterBarcodeInstructions">Voer de waarde van de barcode in en kies daarna de afbeelding van de barcode die je wilt gebruiken.</string>

-<string name="copy_to_clipboard_toast">Het ID is naar het klembord gekopieerd</string>
+    <string name="copy_to_clipboard_toast">Kaart-ID is gekopieerd naar het klembord</string>

-<string name="startIntro">Start inleiding</string>
-<string name="intro1Title">Welkom bij Loyalty Card Keychain\n</string>
-<string name="intro1Description">Beheer je barcodegebaseerde klantenkaarten op je telefoon!\n\n</string>
-<string name="intro2Title">Kaarten toevoegen\n</string>
-<string name="intro2Description">Voeg een nieuwe kaart toe door in de lijst met kaarten de plus aan te raken.\n\n</string>
-<string name="intro3Title">Kaarten toevoegen\n</string>
-<string name="intro3Description">Om een barcode toe te voegen, scan deze met je camera of voer ze handmatig in.\n\n</string>
-<string name="intro4Title">Toon kaart\n</string>
-<string name="intro4Description">Om een kaart te tonen, klik in het hoofdscherm op de naam van de winkel\n\n</string>
-<string name="intro5Title">Backup\n</string>
-<string name="intro5Description">De kaarten kunnen worden geback-upt. Om te kaarten te exporteren of importeren, raak in het menu in het hoofdscherm Importeer/Exporteer aan.\n\n</string>
-<string name="intro6Title">Terugkoppeling\n</string>
-<string name="intro6Description">Deze app is gratis, vrije van advertenties en opensource. Zie details door Over aan te raken in het menu op het hoofdscher,.\n\nBeschrijft je ervaring in de app store! (:</string>
+    <string name="thumbnailDescription">Voorbeeldminiatuur voor kaart</string>

+    <string name="startIntro">Rondleiding starten</string>
+    <string name="intro1Title">Welkom bij Klantenkaartkluis\n</string>
+    <string name="intro1Description">Beheer je op barcodes gebaseerde klantenkaarten op je telefoon!\n\n</string>
+    <string name="intro2Title">Kaarten toevoegen\n</string>
+    <string name="intro2Description">Voeg een nieuwe kaart toe door in de kaartenlijst op de plus-knop te drukken.\n\n</string>
+    <string name="intro3Title">Kaarten toevoegen\n</string>
+    <string name="intro3Description">De barcode kan worden toegevoegd door deze handmatig in te voeren of te scannen met de camera.\n\n</string>
+    <string name="intro4Title">Kaart tonen\n</string>
+    <string name="intro4Description">Als je een kaart wilt tonen, druk dan op het beginscherm op de naam van de winkel.\n\n</string>
+    <string name="intro5Title">Back-uppen\n</string>
+    <string name="intro5Description">De kaarten kunnen worden geback-upt. Als je kaarten wilt exporteren of importeren, druk dan in het menu op het hoofdscherm op Importeren/Exporteren.\n\n</string>
+    <string name="intro6Title">Feedback\n</string>
+    <string name="intro6Description">Deze app is gratis, advertentievrij en open source. Bekijk de details hiervan door op Over te drukken in het menu op het hoofdscherm.\n\nGeef feedback in de app-winkel! (:</string>
+
+    <string name="change">Wijzigen</string>
+    <string name="storeTextColorTitle">Tekstkleur van winkelnaam</string>
+    <string name="storeTextBackgroundColorTitle">Kopkleur</string>
+    <string name="storeNameBackgroundColorDescription">Achtergrondkleur van winkeltekst</string>
+    <string name="storeNameColorDescription">Kleur van winkeltekst</string>
+
+    <string name="settings">Instellingen</string>
+    <string name="settings_category_title_ui">Uiterlijk en bediening</string>
+    <string name="settings_card_title_list_font_size">Kaarttitel lijstlettertypegrootte</string>
+    <string name="settings_card_note_list_font_size">Kaartnotitie lijstlettertypegrootte</string>
+    <string name="settings_card_title_font_size">Kaarttitel-lettertypegrootte</string>
+    <string name="settings_card_id_font_size">Kaart-ID lettertypegrootte</string>
+    <string name="settings_card_note_font_size">Kaartnotitie lettertypegrootte</string>
+    <string name="settings_display_barcode_max_brightness">Barcodeweergave lichter maken</string>
+    <string name="settings_lock_barcode_orientation">Barcode-oriëntatie vergrendelen</string>
    </resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -0,0 +1,116 @@
+<resources
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="app_name">Loyalty Card Keychain</string>
+    <string name="action_add">Dodaj</string>
+
+    <string name="noGiftCards">W tej chwili nie masz żadnych kart lojalnościowych. Kliknij przycisk \"+\" (plus) u góry, aby rozpocząć. \n\nLoyalty Locker Card pozwala nosić karty lojalnościowe w telefonie, dzięki czemu są zawsze w zasięgu ręki.</string>
+
+    <string name="storeName">Sklep</string>
+    <string name="note">Notatka</string>
+    <string name="cardId">Identyfikator karty</string>
+    <string name="barcodeType">Typ kodu kreskowego</string>
+
+    <string name="cancel">Anuluj</string>
+    <string name="save">Zapisz</string>
+    <string name="capture">Zeskanuj kod</string>
+    <string name="enterCard">Wprowadź ręcznie</string>
+    <string name="editCard">Edytuj kartę</string>
+    <string name="edit">Edytuj</string>
+    <string name="delete">Usuń</string>
+    <string name="confirm">Potwierdź</string>
+    <string name="lockScreen">Zablokuj autoobracanie ekranu</string>
+    <string name="unlockScreen">Odblokuj autoobracanie ekranu</string>
+    <string name="deleteTitle">Usuń kartę lojalnościową</string>
+    <string name="deleteConfirmation">Potwierdź, że chcesz usunąć tę kartę.</string>
+    <string name="ok">OK</string>
+    <string name="copy_to_clipboard">Skopiuj identyfikator do schowka</string>
+    <string name="sendLabel">Wyślij&#8230;</string>
+    <string name="addedShortcut">Dodano do ekranu głównego</string>
+
+    <string name="editCardTitle">Edytuj kartę lojalnościową</string>
+    <string name="addCardTitle">Dodaj kartę lojalnościową</string>
+    <string name="viewCardTitle">Pokaż kartę lojalnościową</string>
+    <string name="scanCardBarcode">Zeskanuj kod kreskowy karty lojalnościowej</string>
+    <string name="cardShortcut">Skrót karty</string>
+    <string name="noCardsMessage">Nie ma kart, należy dodać pierwszą</string>
+
+    <string name="barcodeImageDescription">Obraz kodu kreskowego karty</string>
+
+    <string name="noStoreError">Nie wprowadzono nazwy sklepu</string>
+    <string name="noCardIdError">Nie wprowadzono identyfikatora karty</string>
+    <string name="noCardExistsError">Nie można wyszukać karty lojalnościowej</string>
+
+    <string name="cardIdFormat">%1$s: %2$s</string>
+    <string name="importExport">Importuj/Eksportuj</string>
+    <string name="importName">Importuj</string>
+    <string name="exportName">Eksportuj</string>
+    <string name="importExportHelp">Zarchiwizowane dane umożliwiają przeniesienie kart na inne urządzenie.</string>
+    <string name="importedFrom">Zaimportowano z: %1$s</string>
+    <string name="exportedTo">Wyeksportowano do: %1$s</string>
+    <string name="fileMissing">Brak pliku: %1$s</string>
+    <string name="importSuccessfulTitle">Zaimportowano pomyślnie</string>
+    <string name="importFailedTitle">Import nie powiódł się</string>
+    <string name="importFailed">Nie udało się zaimportować: %1$s</string>
+    <string name="exportSuccessfulTitle">Wyeksportowano pomyślnie</string>
+    <string name="exportFailedTitle">Eksport nie powiódł się</string>
+    <string name="exportFailed">Nie udało się wyeksportować: %1$s</string>
+    <string name="importing">Importowanie&#8230;</string>
+    <string name="exporting">Eksportowanie&#8230;</string>
+    <string name="noExternalStoragePermissionError">Nie można importować ani eksportować kart bez uprawnień do pamięci zewnętrznej</string>
+    <string name="exportOptionExplanation">Dane zapisywane są w głównym katalogu pamięci zewnętrznej.</string>
+    <string name="importOptionFilesystemTitle">Importuj z systemu plików</string>
+    <string name="importOptionFilesystemExplanation">Wybierz określony plik z systemu plików.</string>
+    <string name="importOptionFilesystemButton">Z systemu plików</string>
+    <string name="importOptionApplicationTitle">Użyj zewnętrznej aplikacji</string>
+    <string name="importOptionApplicationExplanation">Użyj zewnętrznej aplikacji jak Dropbox, Google Drive, bądź ulubiony menedżer plików, aby otworzyć plik.</string>
+    <string name="importOptionApplicationButton">Użyj zewnętrznej aplikacji</string>
+    <string name="importOptionFixedTitle">Importuj z lokalizacji eksportowania</string>
+    <string name="importOptionFixedExplanation">Importuj z tej samej lokalizacji w systemie plików, do którego zapisano przy eksporcie.</string>
+    <string name="importOptionFixedButton">Użyj lokalizacji eksportu</string>
+
+    <string name="about">O aplikacji</string>
+    <string name="app_copyright_fmt">© 2016 — <xliff:g>%d</xliff:g> Branden Archer.</string>
+    <string name="app_license">Licencjonowane na podstawie GNU General Public License, wersji 3.0.</string>
+    <string name="about_title_fmt">O <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">Wersja: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Informacje o wersji: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> wykorzystuje następujące biblioteki osób trzecich: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> wykorzystuje następujące zasoby osób trzecich: <xliff:g id="app_resources_list">%s</xliff:g></string>
+
+    <string name="selectBarcodeTitle">Wybierz kod kreskowy</string>
+    <string name="enterBarcodeInstructions">Wprowadź wartość kodu kreskowego, a następnie wybierz obraz, który reprezentuje kod kreskowy, który chcesz użyć</string>
+
+    <string name="copy_to_clipboard_toast">Skopiowano identyfikator karty do schowka</string>
+
+    <string name="thumbnailDescription">Miniaturka karty</string>
+
+    <string name="startIntro">Pokaż ekran powitalny</string>
+    <string name="intro1Title">Witamy w Loyalty Card Keychain\n</string>
+    <string name="intro1Description">Zarządzaj kartami sklepowymi/lojalnościowymi opartymi na kodzie kreskowym na swoim telefonie!\n\n</string>
+    <string name="intro2Title">Dodawanie kart\n</string>
+    <string name="intro2Description">Dodaj nową kartę, dotykając znaku plus z listy kart. \n\n</string>
+    <string name="intro3Title">Dodawanie kart \n</string>
+    <string name="intro3Description">Aby dodać kod kreskowy, wykonaj zdjęcie aparatem lub wpisz ręcznie. \n\n</string>
+    <string name="intro4Title">Pokaż kartę \n</string>
+    <string name="intro4Description">Aby wyświetlić kartę, na głównym ekranie kliknij nazwę sklepu \n\n</string>
+    <string name="intro5Title">Kopia zapasowa\n</string>
+    <string name="intro5Description">Karty można zarchiwizować. Aby wyeksportować lub zaimportować dane karty, dotknij opcji Importuj/eksportuj w menu na stronie głównej. \n\n</string>
+    <string name="intro6Title">Informacje zwrotne\n</string>
+    <string name="intro6Description">Ta aplikacja jest darmowa, bez reklam i z otwartym kodem źródłowym. Zobacz szczegóły, klikając Informacje w menu na stronie głównej. \n\n Proszę zostawić opinię o programie w sklepie z aplikacjami! (:</string>
+
+    <string name="change">Zmień</string>
+    <string name="storeTextColorTitle">Kolor tekstu nazwy sklepu</string>
+    <string name="storeTextBackgroundColorTitle">Kolor nagłówka</string>
+    <string name="storeNameBackgroundColorDescription">Kolor tła tekstu nazwy sklepu</string>
+    <string name="storeNameColorDescription">Kolor dla tekstu sklepu</string>
+
+    <string name="settings">Ustawienia</string>
+    <string name="settings_category_title_ui">Interfejs użytkownika</string>
+    <string name="settings_card_title_list_font_size">Rozmiar czcionki listy tytułów kart</string>
+    <string name="settings_card_note_list_font_size">Rozmiar czcionki listy kart</string>
+    <string name="settings_card_title_font_size">Rozmiar czcionki tytułu karty</string>
+    <string name="settings_card_id_font_size">Rozmiar czcionki identyfikatora karty</string>
+    <string name="settings_card_note_font_size">Rozmiar czcionki notatki karty</string>
+    <string name="settings_display_barcode_max_brightness">Rozjaśnij widok kodu kreskowego</string>
+    </resources>
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -0,0 +1,4 @@
+<resources
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,8 +1,8 @@
 <resources
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

-    <string name="app_name">Брелок карт лояльности</string>
-    <string name="action_add">Добавить</string>
+    <string name="app_name">Карты лояльности</string>
+    <string name="action_add">Добавить карту</string>

    <string name="noGiftCards">На данный момент у Вас нет ни одной карты лояльности. Нажмите на кнопку «+» (плюс) вверху, чтобы добавить первую карту.\n\n «Брелок карт лояльности» позволит Вам хранить скидочные карты в Вашем телефоне, чтобы они всегда были под рукой.</string>

@@ -15,10 +15,12 @@
    <string name="save">Сохранить</string>
    <string name="capture">Просканировать карту</string>
    <string name="enterCard">Ввести вручную</string>
-    <string name="editCard">Редактировать карту</string>
-    <string name="edit">Редактировать</string>
-    <string name="delete">Удалить</string>
+    <string name="editCard">Редактор карты</string>
+    <string name="edit">Редактировать карту</string>
+    <string name="delete">Удалить карту</string>
    <string name="confirm">Подтвердить</string>
+    <string name="lockScreen">Зафиксировать поворот экрана</string>
+    <string name="unlockScreen">Автоповорот экрана</string>
    <string name="deleteTitle">Удалить карту лояльности</string>
    <string name="deleteConfirmation">Вы действительно хотите удалить эту карту?</string>
    <string name="ok">OK</string>
@@ -27,7 +29,12 @@
    <string name="addedShortcut">Карта добавлена на главный экран.</string>

    <string name="editCardTitle">Редактировать карточку лояльности</string>
-    <string name="addCardTitle">Добавить карточку лояльности</string>
+    <string name="addCardTitle">Добавить карту</string>
+    <string name="about">О программе</string>
+    <string name="app_license">Программа лицензирована согласно GPLv3.</string>
+    <string name="about_title_fmt">О программе <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="copy_to_clipboard_toast">Идентифицатор карты скопирован в буфер обмена.</string>
+
    <string name="thumbnailDescription">Логорип карты</string>

    <string name="startIntro">Введение</string>
@@ -42,4 +49,5 @@
    <string name="intro6Title">Обратная связь\n</string>
    <string name="intro6Description">Это бесплатное приложение, не обремененное рекламой и с открытым исходным кодом. Подробнее см. в разделе «О программе» в меню на главной странице.\n\nПожалуйста, оставьте отзыв в магазине приложений! (:</string>

-</resources>
+    <string name="settings">Настройки</string>
+    </resources>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -0,0 +1,63 @@
+<resources
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="action_add">Pridať</string>
+
+    <string name="note">Poznámka</string>
+    <string name="barcodeType">Typ čiarového kódu</string>
+
+    <string name="cancel">Zrušiť</string>
+    <string name="save">Uložiť</string>
+    <string name="edit">Upraviť</string>
+    <string name="delete">Vymazať</string>
+    <string name="confirm">Potvrdiť</string>
+    <string name="ok">OK</string>
+    <string name="copy_to_clipboard">Kopírovať ID do schránky</string>
+    <string name="addedShortcut">Pridané na domovskú obrazovku</string>
+
+    <string name="cardIdFormat">%1$s: %2$s</string>
+    <string name="importExport">Import/Export</string>
+    <string name="importName">Import</string>
+    <string name="exportName">Export</string>
+    <string name="importedFrom">Importované z: %1$s</string>
+    <string name="exportedTo">Exportované do: %1$s</string>
+    <string name="fileMissing">Chýbajúci súbor: %1$s</string>
+    <string name="importSuccessfulTitle">Import bol úspešný</string>
+    <string name="importFailedTitle">Import zlyhal</string>
+    <string name="importFailed">Zlyhal import: %1$s</string>
+    <string name="exportSuccessfulTitle">Export bol úspešný</string>
+    <string name="exportFailedTitle">Export zlyhal</string>
+    <string name="exportFailed">Zlyhal export: %1$s</string>
+    <string name="importing">Importujem&#8230;</string>
+    <string name="exporting">Exportujem&#8230;</string>
+    <string name="exportOptionExplanation">Dáta sú zapísané do koreňového adresára na externom úložisku.</string>
+    <string name="importOptionFilesystemTitle">Import zo súborového systému.</string>
+    <string name="importOptionFilesystemExplanation">Vyberte súbor zo súborového systému.</string>
+    <string name="importOptionFilesystemButton">Zo súborového systému</string>
+    <string name="importOptionApplicationTitle">Použite externú aplikáciu</string>
+    <string name="importOptionApplicationExplanation">Na otvorenie súboru použite externú aplikáciu, ako Dropbox, Disk Google, alebo Vášho obľúbeného správcu súborov.</string>
+    <string name="importOptionApplicationButton">Použiť externú aplikáciu</string>
+    <string name="importOptionFixedTitle">Importujte z exportovacieho umiestnenia.</string>
+    <string name="importOptionFixedExplanation">Importujte z rovnakého umiestnenia v súborovom systéme, na ktorý je zapisovaný export.</string>
+    <string name="importOptionFixedButton">Použite exportovacie umiestnenie</string>
+
+    <string name="about">O aplikácii</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
+    <string name="app_license">Licencované GPLv3.</string>
+    <string name="about_title_fmt">O <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">Verzia: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> používa nasledujúce knižnice tretej strany: <xliff:g id="app_libraries_list">%s</xliff:g></string>
+    <string name="selectBarcodeTitle">Vyberte čiarový kód</string>
+    <string name="enterBarcodeInstructions">Zadajte čiarový kód a vyberte obrázok reprezentujúci čiarový kód, ktorý chcete použiť</string>
+
+    <string name="startIntro">Spusti úvod</string>
+    <string name="intro1Title">Vitajte v aplikácii Loyalty Card Keychain\n</string>
+    <string name="intro3Description">Čiarový kód nasnímajte kamerou, alebo ho vypíšte ručne.\n\n</string>
+    <string name="intro5Title">Záloha\n</string>
+    <string name="intro6Title">Spätná väzba\n</string>
+    <string name="intro6Description">Táto aplikácia je slobodná, neobsahuje reklamu a má otvorený zdrojový kód. Ďalšie informácie nájdete v položke menu O aplikácii na hlavnej stránke.\n\n Prosíme, zanechajte spätnú väzbu v obchode s aplikáciami. (:</string>
+
+    <string name="storeTextBackgroundColorTitle">Farba hlavičky</string>
+    <string name="settings">Nastavenia</string>
+    <string name="settings_category_title_ui">Používateľské prostredie</string>
+    </resources>
--- a/app/src/main/res/values-sl-rSI/strings.xml
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@@ -0,0 +1,4 @@
+<resources
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    </resources>
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -0,0 +1,115 @@
+<resources
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="app_name">Kartice zvestobe</string>
+    <string name="action_add">Dodaj</string>
+
+    <string name="noGiftCards">Trenutno nimate shranjene nobene kartice zvestobe. Kliknite  \"+\" (plus) na vrhu, da jih dodate.\n\n Aplikacija Kartice zvestobe Vam omogoča, da imate kartice zvestobe shranjene na Vašem telefonu in vedno v dosegu roke.</string>
+
+    <string name="storeName">Shrani</string>
+    <string name="note">Zabeležka</string>
+    <string name="cardId">Št. kartice</string>
+    <string name="barcodeType">Vrsta črne kode</string>
+
+    <string name="cancel">Prekliči</string>
+    <string name="save">Shrani</string>
+    <string name="capture">Slikaj kartico</string>
+    <string name="enterCard">Vnesi kartico</string>
+    <string name="editCard">Uredi kartico</string>
+    <string name="edit">Uredi</string>
+    <string name="delete">Izbriši</string>
+    <string name="confirm">Potrdi</string>
+    <string name="lockScreen">Onemogoči obračanje zaslona</string>
+    <string name="unlockScreen">Omogoči obračanje zaslona</string>
+    <string name="deleteTitle">Odstrani kartico zvestobe</string>
+    <string name="deleteConfirmation">Prosim potrdite, če želite izbrisati to kartico.</string>
+    <string name="ok">Vredu</string>
+    <string name="copy_to_clipboard">Kopirajte številko kartice</string>
+    <string name="sendLabel">Pošlji#8230;</string>
+    <string name="addedShortcut">Dodajte na domači zaslon</string>
+
+    <string name="editCardTitle">Uredi kartico zvestobe</string>
+    <string name="addCardTitle">Dodaj kartico zvestobe</string>
+    <string name="viewCardTitle">Prikaži kartico zvestobe</string>
+    <string name="scanCardBarcode">Skeniraj črtno kodo</string>
+    <string name="cardShortcut">Bližnjica do kartice</string>
+    <string name="noCardsMessage">Trenutno ni na voljo nobene kartice. Najprej jih je potrebno dodati.</string>
+
+    <string name="barcodeImageDescription">Slika črtne kode na kartici</string>
+
+    <string name="noStoreError">Ime trgovine ni bilo vnešeno</string>
+    <string name="noCardIdError">Številka kartice ni bila vnešena</string>
+    <string name="noCardExistsError">Te kartice zvestobe ni bilo moč najti</string>
+
+    <string name="cardIdFormat">%1$s:%2$s</string>
+    <string name="importExport">Uvozi/izvozi</string>
+    <string name="importName">Uvozi</string>
+    <string name="exportName">Izvozi</string>
+    <string name="importExportHelp">Varnostna kopija omogoča varen prenos kartic na druge telefonske naprave.</string>
+    <string name="importedFrom">Uvoženo iz: %1$s</string>
+    <string name="exportedTo">Izvoženo v:%1$s</string>
+    <string name="fileMissing">Manjkajoča datoteka: %1$s</string>
+    <string name="importSuccessfulTitle">Uvoz je bil uspešen</string>
+    <string name="importFailedTitle">Uvoz ni uspel</string>
+    <string name="importFailed">Napaka pri uvozu: %1$s</string>
+    <string name="exportSuccessfulTitle">Izvoz je uspel</string>
+    <string name="exportFailedTitle">Izvoz ni uspel</string>
+    <string name="exportFailed">Napaka pri izvozu: %1$s</string>
+    <string name="importing">Uvažanje&#8230;</string>
+    <string name="exporting">Izvažanje&#8230;</string>
+    <string name="noExternalStoragePermissionError">Izvažanje in uvažanje je nemogoče brez omogočenega dostopa do zunanje shrambe</string>
+    <string name="exportOptionExplanation">Podati so bili zapisani v prvo mapo v zunanji shrambi</string>
+    <string name="importOptionFilesystemTitle">Uvozi iz datotečnega sistema</string>
+    <string name="importOptionFilesystemExplanation">Izberite specifično datoteko iz datotečnega sistema</string>
+    <string name="importOptionFilesystemButton">Iz datotečnega sistema</string>
+    <string name="importOptionApplicationTitle">Uporabi zunanjo aplikacijo</string>
+    <string name="importOptionApplicationExplanation">Uporabi zunanjo aplikacijo, kot npr. Dropbox, Google Drive ali ostale upravljalnike datotek, za odpiranje datoteko.</string>
+    <string name="importOptionApplicationButton">Uporabi zunanjo aplikacijo</string>
+    <string name="importOptionFixedTitle">Uvozi iz zunanje aplikacije</string>
+    <string name="importOptionFixedExplanation">Uvozi iz iste lokacije, ki je namenjena izvozu</string>
+    <string name="importOptionFixedButton">Uporabi lokacijo izvoza</string>
+
+    <string name="about">Več o aplikaciji</string>
+    <string name="app_copyright_fmt">Copyright 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
+    <string name="app_license">Licencirano s skladu z GPLv3.</string>
+    <string name="about_title_fmt">Več o <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">Verzija: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Informacije o popravkih: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> uporablja sledeče zunanje knjižnice: <xliff:g id="app_libraries_list">%s</xliff:g> </string>
+    <string name="app_resources"><xliff:g id="app_name">%s</xliff:g>uporablja sledeče zunanje vire: <xliff:g id="app_resources_list">%s</xliff:g></string>
+
+    <string name="selectBarcodeTitle">Izberite črtno kodo</string>
+    <string name="enterBarcodeInstructions">Vnesite vrednost črtne kode in izberite črtno kodo, ki jo želite uporabljati</string>
+
+    <string name="copy_to_clipboard_toast">Številka kartice je bila kopirana v odložišče</string>
+
+    <string name="thumbnailDescription">Ikona kartice</string>
+
+    <string name="startIntro">Uvodnik</string>
+    <string name="intro1Title">Dobrodošli v aplikacijo Kartice zvestobe\n</string>
+    <string name="intro1Description">Urejajte vaše črtne kode oziroma kartice na Vašem telefonu!\n\n</string>
+    <string name="intro2Title">Dodajanje kartic\n</string>
+    <string name="intro2Description">Dodajte kartico s klikom na plus na seznamu kartic.\n\n</string>
+    <string name="intro3Title">Dodajanje kartic\n</string>
+    <string name="intro3Description">Če želite dodati črtno kodo jo ali slikajte s fotoaparatom ali jo vnesite ročno.\n\n</string>
+    <string name="intro4Title">Prikaži kartico\n</string>
+    <string name="intro4Description">Za prikaz kartice je potreben klik na ime trgovine na glavnem zaslonu\n\n</string>
+    <string name="intro5Title">Varnostna kopija\n</string>
+    <string name="intro5Description">Kartice lahko shranite s pomočjo varnostne kopije. Za uvoz ali izvoz kartic je potrebno klikniti Uvozi/Izvozi v meniju na glavni strani.\n\n</string>
+    <string name="intro6Title">Povratne informacije razvijalcem\n</string>
+    <string name="intro6Description">Aplikacija je brezplačna, brez oglasov in odprtokodna.  Če želite izvedeti več podrobnosti, kliknite na Več o aplikaciji v meniju na glavni strani.\n\nProsim, napišite Vaše mnenje o aplikaciji v spletni trgovini (:</string>
+
+    <string name="change">Spremeni</string>
+    <string name="storeTextColorTitle">Barva besedila trgovine</string>
+    <string name="storeTextBackgroundColorTitle">Barva naslova</string>
+    <string name="storeNameBackgroundColorDescription">Barva ozadja za imenom trgovine</string>
+    <string name="storeNameColorDescription">Barva trgovine</string>
+
+    <string name="settings">Nastavitve</string>
+    <string name="settings_category_title_ui">Uporabniški vmesnik</string>
+    <string name="settings_card_title_list_font_size">Velikost pisave seznama naslovov kartic</string>
+    <string name="settings_card_note_list_font_size">Velikost pisave seznama zabeležk </string>
+    <string name="settings_card_title_font_size">Velikost pisave imen kartic</string>
+    <string name="settings_card_id_font_size">Velikost pisave številke kartice</string>
+    <string name="settings_card_note_font_size">Velikost pisave zabeležke</string>
+    </resources>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -0,0 +1,4 @@
+<resources
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -119,5 +119,8 @@
    <string name="settings_key_card_id_font_size" translatable="false">pref_card_id_font_size_sp</string>
    <string name="settings_card_note_font_size">Card note font size</string>
    <string name="settings_key_card_note_font_size" translatable="false">pref_card_note_font_size_sp</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>
+    <string name="settings_key_lock_barcode_orientation" translatable="false">pref_lock_barcode_orientation</string>
 </resources>
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -41,6 +41,15 @@
            app:vnt_maxValue="@integer/settings_card_note_max_font_size_sp"
            app:vnt_minValue="@integer/settings_card_note_min_font_size_sp" />

+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="@string/settings_key_display_barcode_max_brightness"
+            android:title="@string/settings_display_barcode_max_brightness"/>
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="@string/settings_key_lock_barcode_orientation"
+            android:title="@string/settings_lock_barcode_orientation"/>
    </PreferenceCategory>

 </PreferenceScreen>
--- a/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
+++ b/app/src/test/java/protect/card_locker/LoyaltyCardViewActivityTest.java
@@ -11,6 +11,7 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.widget.TextViewCompat;
 import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -566,4 +567,41 @@ public class LoyaltyCardViewActivityTest
        shadowOf(activity).clickMenuItem(android.R.id.home);
        assertEquals(true, activity.isFinishing());
    }
+
+    @Test
+    public void checkScreenOrientationLockSetting()
+    {
+        for(boolean locked : new boolean[] {false, true})
+        {
+            ActivityController activityController = createActivityWithLoyaltyCard(false);
+
+            Activity activity = (Activity)activityController.get();
+            DBHelper db = new DBHelper(activity);
+            db.insertLoyaltyCard("store", "note", BARCODE_DATA, BARCODE_TYPE, Color.BLACK, Color.WHITE);
+
+            SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(activity);
+            settings.edit()
+                    .putBoolean(activity.getResources().getString(R.string.settings_key_lock_barcode_orientation), locked)
+                    .apply();
+
+            activityController.start();
+            activityController.resume();
+            activityController.visible();
+
+            assertEquals(false, activity.isFinishing());
+
+            MenuItem item = shadowOf(activity).getOptionsMenu().findItem(R.id.action_lock_unlock);
+
+            if(locked)
+            {
+                assertEquals(item.isVisible(), false);
+            }
+            else
+            {
+                assertEquals(item.isVisible(), true);
+                String title = item.getTitle().toString();
+                assertEquals(title, activity.getString(R.string.lockScreen));
+            }
+        }
+    }
 }
--- a/privacy-policy.md
+++ b/privacy-policy.md
@@ -1,23 +1,28 @@
-# PRIVACY POLICY MODEL FOR MOBILE APPLICATIONS
+# PRIVACY POLICY FOR LOYALTY CARD KEYCHAIN

-This privacy policy governs your use of the software application Loyalty Keychain (“Application”) for mobile devices
-that was created by Protect. The Application is Basic description of the app (features, functionality and
-content).
+This privacy policy governs your use of the software application Loyalty Card Keychain (“Application”) for mobile devices
+that was created by Protect. The Application is designed to store and display barcodes.

 # What information does the Application obtain and how is it used?

-The Application allows information on real estate properties to be added and maintained
-by the user, which may includes images of the properties. This data is only stored on the mobile
-device, and is not transmitted of off the device.
+The Application allows a user to create store entries with a barcode. When a store is later selected the
+corresponding barcode is displayed. This user data remains on the device and is not transmitted off of the 
+device.
+
+If a crash occurs, a dialog may appear with crash details and a suggestion to transmit the details
+to the developer. A user has the option to not send the crash details; a user must 'opt-in' to
+sending such details.

 # User Provided Information 

 The Application does not have a registration option. The only information which is obtained
-is any information provided by the App Store that the application was downloaded from.
+is (1) crash details which a user intentionally send to the developer via the app, and 
+(2) any information provided by the App Store that the application was downloaded from.

 # Automatically Collected Information 

-No information is collected from the Application and transmitted off of the mobile device, either automatically or manually.
+No information is automatically collected from the Application and transmitted off of the mobile device, 
+either automatically or manually.

 # Does the Application collect precise real time location information of the device?

@@ -25,29 +30,33 @@ No.

 # Do third parties see and/or have access to information obtained by the Application?

-No, as no data is transmitted off of the mobile device by the Application.
+Any crash data which is intentionally submitted by a user to the developer is stored on an email server
+which is not owned by the developer. Crash details may be uploaded to a third-party development tool
+such as GitHub. In such a case the email address of the user is not uploaded, unless specifically requested
+by the user. Besides this, no other data is transmitted off of the mobile device by the Application.

 # What are my opt-out rights?

-There is no opt-out rights, as there is nothing to opt-out from. No data is transmitted off of the mobile device
-by the Application, either manually or automatically.
+The only data collection is that of crash details, and submitting these to the developer is only opt-in. To
+opt-out, a user would have to not submit crash details via the app.

 # Data Retention Policy, Managing Your Information

-No data is captured from users by the Application, so there is no information to manage. The only data
-which is known is the data provided by the App Store the Application was downloaded from.
+Crash details submitted by a user are stored on a third-party email service, and the retention policy is to
+not delete such emails.

 # Children

-Ths Application is not used to knowingly solicit data from or market to children under the age of 13. If a parent or
+This Application is not used to knowingly solicit data from or market to children under the age of 13. If a parent or
 guardian becomes aware that his or her child has provided us with information without their consent, he or she should
 contact us at protect.github@gmail.com. We will delete such information from our files within a reasonable time.

 # Security

-We are concerned about safeguarding the confidentiality of your information. Note that no information is captured
-by the Application and transmitted off of the mobile device. The only data breach possible is that with the user's
-own mobile device.
+We are concerned about safeguarding the confidentiality of your information. The only information which could
+be sent to the developer is crash details, and these are opt-in. If a user is presented with the option to
+submit details on a crash, all the information which would be submitted is presented to the user. The only
+personally identifiable information is the email address of the user which is used to send the crash details.

 # Changes
Author	SHA1	Message	Date
Branden Archer	727f3f32fe	Merge pull request #271 from brarcher/pre-v0.25 Update for v0.25	2018-10-07 15:28:12 -07:00
Branden Archer	6fa70afac5	Update for v0.25	2018-10-07 15:18:08 -07:00
Branden Archer	c5ad261392	Merge pull request #270 from brarcher/translations Update translations	2018-10-07 15:12:38 -07:00
Branden Archer	28018eb681	Update translations	2018-10-07 15:05:38 -07:00
Branden Archer	28f7b3db02	Merge pull request #269 from brarcher/orientation-setting Add option to lock orientation state	2018-10-06 18:33:41 -04:00
Branden Archer	10e720de91	Add option to lock orientation state This new option will control if the screen orientation lock option is displayed or not. If set, the orientation lock is forced and the unlock option is hidden.	2018-10-06 15:27:36 -07:00
Branden Archer	4de952ba2d	Set rotation state in onCreate() The menu creation need not change this state	2018-10-06 14:24:50 -07:00
Branden Archer	c5de27abe3	Move orientation locking code to separate method	2018-10-06 14:24:05 -07:00
Branden Archer	cafa09a86a	Remove unneeded code The IntentIntegrator parses out the result, so this code is not necessary.	2018-09-18 10:53:16 -04:00
Branden Archer	1635737658	Merge pull request #267 from brarcher/translations Update translations	2018-09-17 10:20:54 -04:00
Branden Archer	6ee60687b6	Update translations	2018-09-17 10:03:05 -04:00
Branden Archer	0afd9358e6	Merge pull request #266 from brarcher/fix-sorting Sort card list case insensitive	2018-09-15 23:04:35 -04:00
Branden Archer	cad3b492a2	Sort card list case insensitive	2018-09-15 22:50:36 -04:00
Branden Archer	59bde6916c	Merge pull request #261 from brarcher/pre-v0.24 Update for v0.24	2018-07-31 21:55:52 -04:00
Branden Archer	eb6364b932	Update CHANGELOG	2018-07-31 21:48:33 -04:00
Branden Archer	ae7ac21785	Update for v0.24	2018-07-31 21:44:28 -04:00
Branden Archer	2dd02f42f5	Merge pull request #260 from brarcher/transifex Add/update translations	2018-07-27 23:25:37 -04:00
Branden Archer	3b8e38001c	Update translations	2018-07-27 23:18:38 -04:00
Branden Archer	fbb0ab27ec	Add Slovenian translations	2018-07-27 23:18:38 -04:00
Branden Archer	ceea5182d1	Merge pull request #259 from brarcher/setting-barcode-brightness Configure brightening screen when display a barcode	2018-07-25 22:43:21 -04:00
Branden Archer	34c07800dd	Configure brightening screen when display a barcode When a barcode is displayed the screen's brightness is set to the maximum, in an attempt to provide the best chance for a barcode scanner to capture the barcode. However, it may not always be desired to increase the brightness, for example when using the app in low light. This change adds a setting to control the screen brightening behavior when a barcode is viewed.	2018-07-25 22:24:27 -04:00
Branden Archer	8c7a3273e8	Merge pull request #256 from brarcher/privacy Update privacy-policy	2018-07-25 22:07:35 -04:00
Branden Archer	49cd9a28c7	Update privacy-policy	2018-06-26 17:30:38 -04:00
Branden Archer	392024f84f	Merge pull request #254 from brarcher/transifex Transifex config file and translation updates	2018-06-16 18:08:47 -04:00
Branden Archer	165f963f7d	Update translations	2018-06-16 17:54:29 -04:00
Branden Archer	aca44c5830	Add Transifex config file	2018-06-16 17:54:29 -04:00
Branden Archer	e2ed5b515a	Merge pull request #252 from brarcher/greek Add Greek translations	2018-06-13 09:33:08 -04:00
Branden Archer	ba6705b96e	Add Greek translations	2018-06-13 09:19:38 -04:00
Branden Archer	9f407e5eb0	Merge pull request #246 from brarcher/changelog Update CHANGELOG	2018-05-12 21:40:56 -04:00
Branden Archer	c00da00be5	Update CHANGELOG	2018-05-12 11:56:48 -04:00
Branden Archer	c2ea640a71	Merge pull request #245 from brarcher/pre-v0.23.4 Update for v0.23.4	2018-05-12 11:48:08 -04:00
Branden Archer	ba5259f0f6	Update for v0.23.4	2018-05-12 11:41:57 -04:00
Branden Archer	b1abfdff2e	Merge pull request #244 from brarcher/translations Translations	2018-05-12 11:41:09 -04:00
Branden Archer	39219531b4	Update translations	2018-05-12 11:33:16 -04:00
Branden Archer	048edf186e	Fix Spanish translations The wrong language was in this file.	2018-05-12 11:32:40 -04:00
Branden Archer	ee6d415d26	Merge pull request #240 from brarcher/pre-v0.23.3 Update for v0.23.3	2018-05-05 20:38:42 -04:00
Branden Archer	5143e3fe45	Update for v0.23.3	2018-05-05 20:26:28 -04:00
Branden Archer	306ee053c1	Merge pull request #239 from brarcher/translations Update translations	2018-05-05 20:23:40 -04:00
Branden Archer	40871690d5	Update translations	2018-05-05 18:28:33 -04:00
Branden Archer	0bbbabce97	Merge pull request #232 from kRkk/master Add Polish translation	2018-03-22 22:37:31 -04:00
Karol	f59c485472	Add Polish translation	2018-03-22 22:48:20 +01:00
Branden Archer	d8543f456c	Merge pull request #228 from brarcher/changelog Update CHANGELOG for v0.23.2	2018-03-11 23:51:07 -04:00
Branden Archer	fcf88a1ace	Update CHANGELOG for v0.23.2	2018-03-11 23:33:42 -04:00