Merge pull request #240 from brarcher/pre-v0.23.3

Update for v0.23.3
2025-12-25 16:17:53 -05:00 · 2018-05-05 20:38:42 -04:00 · 2018-05-05 20:26:28 -04:00 · 2018-05-05 20:23:40 -04:00 · 2018-05-05 18:28:33 -04:00 · 2018-03-22 22:37:31 -04:00
11 changed files with 325 additions and 43 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+## 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:
+- Prevent crash when rendering a barcode exhausts the application's memory. (https://github.com/brarcher/loyalty-card-locker/pull/219)
+
+## v0.23 (2018-02-28)
+
+Changes:
+- Reduce space in header when viewing a card. (https://github.com/brarcher/loyalty-card-locker/pull/213)
+- Disable beep when scanning a barcode. (https://github.com/brarcher/loyalty-card-locker/pull/216)
+
 ## v0.22 (2018-02-19)

 Changes:
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,10 +11,10 @@ android {

    defaultConfig {
        applicationId "protect.card_locker"
-        minSdkVersion 17
+        minSdkVersion 15
        targetSdkVersion 27
-        versionCode 25
-        versionName "0.23"
+        versionCode 28
+        versionName "0.23.3"
    }
    buildTypes {
        release {
@@ -37,9 +37,6 @@ android {
            includeAndroidResources = true
        }
    }
-
-    // This is for Robolectric support for SDK 23
-    useLibrary 'org.apache.http.legacy'
 }

 dependencies {
--- a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
+++ b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
@@ -149,6 +149,12 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
        {
            Log.e(TAG, "Failed to generate barcode of type " + format + ": " + cardId, e);
        }
+        catch(OutOfMemoryError e)
+        {
+            Log.w(TAG, "Insufficient memory to render barcode, "
+                + imageWidth + "x" + imageHeight + ", " + format.name()
+                + ", length=" + cardId.length(), e);
+        }

        return null;
    }
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -61,7 +61,8 @@
                            android:layout_width="wrap_content"
                            android:textSize="@dimen/inputSize"
                            android:padding="@dimen/inputPadding"
-                            android:layout_alignParentStart="true"/>
+                            android:layout_alignParentStart="true"
+                            android:layout_alignParentLeft="true"/>

                        <EditText
                            android:id="@+id/storeNameEdit"
@@ -70,7 +71,9 @@
                            android:layout_width="match_parent"
                            android:padding="@dimen/inputPadding"
                            android:textSize="@dimen/inputSize"
-                            android:layout_toEndOf="@id/storeNameField"/>
+                            android:layout_toEndOf="@id/storeNameField"
+                            android:layout_toRightOf="@id/storeNameField"
+                            />

                    </RelativeLayout>

@@ -110,7 +113,9 @@
                            android:layout_width="wrap_content"
                            android:textSize="@dimen/inputSize"
                            android:padding="@dimen/inputPadding"
-                            android:layout_alignParentStart="true"/>
+                            android:layout_alignParentStart="true"
+                            android:layout_alignParentLeft="true"
+                            />

                        <EditText
                            android:id="@+id/noteEdit"
@@ -119,7 +124,9 @@
                            android:layout_width="match_parent"
                            android:padding="@dimen/inputPadding"
                            android:textSize="@dimen/inputSize"
-                            android:layout_toEndOf="@id/noteField"/>
+                            android:layout_toEndOf="@id/noteField"
+                            android:layout_toRightOf="@id/noteField"
+                            />
                    </RelativeLayout>

                    <View
@@ -190,6 +197,7 @@
                           android:layout_width="wrap_content"
                           android:layout_height="match_parent"
                           android:layout_toEndOf="@id/headingColorSampleBorder"
+                           android:layout_toRightOf="@id/headingColorSampleBorder"
                           app:layout_constraintEnd_toEndOf="parent"/>
                    </android.support.constraint.ConstraintLayout>

@@ -261,6 +269,7 @@
                            android:layout_width="wrap_content"
                            android:layout_height="match_parent"
                            android:layout_toEndOf="@id/headingStoreTextColorSampleBorder"
+                            android:layout_toRightOf="@id/headingStoreTextColorSampleBorder"
                            app:layout_constraintEnd_toEndOf="parent"/>
                    </android.support.constraint.ConstraintLayout>

@@ -303,7 +312,9 @@
                            android:layout_width="wrap_content"
                            android:textSize="@dimen/inputSize"
                            android:padding="@dimen/inputPadding"
-                            android:layout_alignParentStart="true"/>
+                            android:layout_alignParentStart="true"
+                            android:layout_alignParentLeft="true"
+                            />

                        <TextView
                            android:id="@+id/cardIdView"
@@ -312,7 +323,9 @@
                            android:padding="@dimen/inputPadding"
                            android:textSize="@dimen/inputSize"
                            android:textIsSelectable="true"
-                            android:layout_toEndOf="@id/cardIdField"/>
+                            android:layout_toEndOf="@id/cardIdField"
+                            android:layout_toRightOf="@id/cardIdField"
+                            />
                    </RelativeLayout>

                    <View
--- a/app/src/main/res/layout/loyalty_card_layout.xml
+++ b/app/src/main/res/layout/loyalty_card_layout.xml
@@ -13,6 +13,7 @@
        android:layout_width="@dimen/cardThumbnailSize"
        android:layout_height="@dimen/cardThumbnailSize"
        android:layout_marginEnd="@dimen/activity_margin"
+        android:layout_marginRight="@dimen/activity_margin"
        android:src="@mipmap/ic_launcher"
        android:contentDescription="@string/thumbnailDescription"/>

--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/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-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 \"+\" 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>

+    <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-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -78,23 +78,38 @@
    <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="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">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="copy_to_clipboard_toast">Het ID is naar het klembord gekopieerd</string>
+    <string name="copy_to_clipboard_toast">Het ID is naar het klembord gekopieerd</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">Thumbnail voor kaart</string>

-    </resources>
+    <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="change">Wijzig</string>
+    <string name="storeTextColorTitle">Tekstkleur winkel</string>
+    <string name="storeTextBackgroundColorTitle">Kopkleur</string>
+    <string name="storeNameBackgroundColorDescription">Achtergrondkleur voor winkeltekst</string>
+    <string name="storeNameColorDescription">Kleur voor winkeltekst</string>
+
+    <string name="settings">Instellingen</string>
+    <string name="settings_category_title_ui">Gebruikersinterface</string>
+    <string name="settings_card_title_list_font_size">Kaarttitel lijstlettertypegrootte</string>
+    <string name="settings_card_note_list_font_size">Kaartopmerking 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">Kaartopmerking lettertypegrootte</string>
+</resources>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -0,0 +1,96 @@
+<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="storeName">Sklep</string>
+    <string name="note">Notatka</string>
+    <string name="cardId">ID Karty</string>
+    <string name="barcodeType">Typ Kodu Kreskowego</string>
+
+    <string name="cancel">Anuluj</string>
+    <string name="save">Zapisz</string>
+    <string name="capture">Przechwyć Kartę</string>
+    <string name="enterCard">Wprowadź Kartę</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 Obrót</string>
+    <string name="unlockScreen">Odblokuj Obrót</string>
+    <string name="deleteTitle">Usuń Kartę Lojalnościową</string>
+    <string name="ok">OK</string>
+    <string name="copy_to_clipboard">Skopiuj ID 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">Zobacz Kartę Lojalnościową</string>
+    <string name="scanCardBarcode">Skanuj Kod Kreskowy Karty</string>
+    <string name="cardShortcut">Skrót karty</string>
+    <string name="noCardsMessage">Nie ma kart, dodaj jedną najpierw</string>
+
+    <string name="barcodeImageDescription">Image of card\'s barcode</string>
+
+    <string name="noStoreError">Nie wprowadzono sklepu</string>
+    <string name="noCardIdError">Nie wprowadzono ID 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 pozwalają na przeniesienie twoich kart na inne urządzenie.</string>
+    <string name="importedFrom">Zaimportowano z: %1$s</string>
+    <string name="exportedTo">Eksportowano do: %1$s</string>
+    <string name="fileMissing">Plik brakuje: %1$s</string>
+    <string name="importSuccessfulTitle">Zimportowanio pomyślnie</string>
+    <string name="importFailedTitle">Import nieudany</string>
+    <string name="importFailed">Nie udało się zimportować: %1$s</string>
+    <string name="exportSuccessfulTitle">Zeksportowano pomyślnie</string>
+    <string name="exportFailedTitle">Eksport nieudany</string>
+    <string name="exportFailed">Nie udało się zeksportować: %1$s</string>
+    <string name="importing">Importowanie&#8230;</string>
+    <string name="exporting">Eksportowanie&#8230;</string>
+    <string name="importOptionApplicationTitle">Użuj zewnętrznej aplikacji</string>
+    <string name="importOptionApplicationExplanation">Użyj zewnętrznej aplikacji jak Dropbox, Google Drive, lub twój ulubiony menadżer plików, aby otworzyć plik.</string>
+    <string name="importOptionApplicationButton">Użyj zewnętrznej aplikacji</string>
+
+    <string name="about">O aplikacji</string>
+    <string name="app_copyright_fmt">Prawo autorskie 2016-<xliff:g>%d</xliff:g> Branden Archer</string>
+    <string name="app_license">Licencionowany na licencji GPLv3.</string>
+    <string name="about_title_fmt">O <xliff:g id="app_name">%s</xliff:g></string>
+    <string name="debug_version_fmt">Wersja: <xliff:g id="version">%s</xliff:g></string>
+    <string name="app_revision_fmt">Revision Information: <xliff:g id="app_revision_url">%s</xliff:g></string>
+    <string name="app_libraries"><xliff:g id="app_name">%s</xliff:g> używa następujących bibliotek 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> używa następujących źródeł osób trzecich: <xliff:g id="app_resources_list">%s</xliff:g></string>
+
+    <string name="selectBarcodeTitle">Wybierz Kod Kreskowy</string>
+
+    <string name="copy_to_clipboard_toast">ID Karty została skopiowana do schowka</string>
+
+    <string name="thumbnailDescription">Miniaturka Karty</string>
+
+    <string name="startIntro">Rozpocznij Intro</string>
+    <string name="intro1Title">Witamy w Loyalty Card Keychain\n</string>
+    <string name="intro2Title">Dodawanie Kart\n</string>
+    <string name="intro3Title">Dodawanie Kart\n</string>
+    <string name="intro4Title">Pokazywanie Kart\n</string>
+    <string name="intro5Title">Kopia Zapasowa\n</string>
+    <string name="intro6Title">Feedback\n</string>
+    <string name="intro6Description">Ta aplikacja jest darmowa, bez reklam, i otwarta źródłowo. Zobacz informacje przez dotknięcie O Aplikacji w menu na głównej stronie.\n\nProszę zostaw opinie w sklepie! (:</string>
+
+    <string name="change">Zmień</string>
+    <string name="storeTextBackgroundColorTitle">Kolor Nagłówka</string>
+
+    <string name="settings">Ustawienia</string>
+    <string name="settings_category_title_ui">Interfejs Użytkownika</string>
+    <string name="settings_card_title_list_font_size">Card title list font size</string>
+    <string name="settings_card_note_list_font_size">Wielkość czcionki notatki karty</string>
+    <string name="settings_card_title_font_size">Wielkość czcionki tytułu karty</string>
+    <string name="settings_card_id_font_size">Wielkość czcionki ID karty</string>
+    <string name="settings_card_note_font_size">Wielkość czcionki notatki karty</string>
+</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>

+    <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>
Author	SHA1	Message	Date
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
Branden Archer	a2e99c2b9d	Merge pull request #227 from brarcher/pre-v0.23.2 Update for v0.23.2	2018-03-11 23:27:29 -04:00
Branden Archer	607dff03d4	Update for v0.23.2	2018-03-11 23:20:01 -04:00
Branden Archer	73b6c99d9e	Merge pull request #226 from brarcher/sdk-15 Add additional layout options to support SDK 15	2018-03-11 23:19:18 -04:00
Branden Archer	036748ee56	Add additional layout options to support SDK<17 Google Play statistics show that the earliest Android version in use which has installs for this app is 4.0.3, which is SDK 15. This changes cleans up some layouts so that it will work on SDK 15.	2018-03-11 23:11:51 -04:00
Branden Archer	5cae97482f	Merge pull request #225 from brarcher/test-cleanup Remove unnecessary apache legacy usage	2018-03-11 22:44:13 -04:00
Branden Archer	f67d27167e	Remove unnecessary apache legacy usage The version of robolectric used no longer requires this.	2018-03-11 22:33:31 -04:00
Branden Archer	0832c7fc97	Merge pull request #222 from brarcher/changelog Update CHANGELOG	2018-03-08 11:33:32 -05:00
Branden Archer	f5e1a2d732	Update CHANGELOG	2018-03-07 23:29:17 -05:00
Branden Archer	7b799df98a	Merge pull request #221 from brarcher/pre-v0.23.1 Update for pre-v0.23.1	2018-03-07 23:25:10 -05:00
Branden Archer	968c3e71a1	Update for pre-v0.23.1	2018-03-07 23:14:53 -05:00
Branden Archer	29d8da99cd	Merge pull request #219 from brarcher/barcode-oom Catch case where barcode rendering runs into an OOM	2018-03-04 14:17:53 -05:00
Branden Archer	79213aa3ec	Catch case where barcode rendering runs into an OOM There are still cases where the barcode could not be rendered because the process runs out of its memory limit. To avoid a crash, catch the failure and log it. The barcode will not be displayed, but at least the app will not crash.	2018-03-04 13:10:12 -05:00
Branden Archer	50fdfe92fa	Merge pull request #217 from brarcher/changelog Update CHANGELOG	2018-02-28 23:13:10 -05:00
Branden Archer	4eab1121b0	Update CHANGELOG	2018-02-28 23:07:15 -05:00