From 09fba7171077f0d53c5a973b91773c21ec20c7ae Mon Sep 17 00:00:00 2001 From: Branden Archer Date: Sun, 25 Jun 2017 14:15:09 -0400 Subject: [PATCH 1/2] Fix string format for copyright year The year is an integer, but the format was for a string. --- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-lt/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 32ada1a28..8f253e809 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -49,7 +49,7 @@ Nelze importovat nebo exportovat karty bez přístupu k externímu uložišti O aplikaci - Copyright 2016-%s Branden Archer + Copyright 2016-%d Branden Archer Licensed under the GPLv3. O aplikaci %s Verze: %s diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index cfb290fb0..cf925b381 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -5,7 +5,7 @@ Über %s Neu Neue Kundenkarte - Copyright 2016-%s Branden Archer + Copyright 2016-%d Branden Archer Lizensiert unter der GPLv3. %s benutzt die folgenden Fremdbibliotheken: %s Kundenkarte anzeigen diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index fe6f12b8c..55c2d4396 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -49,7 +49,7 @@ Impossible d\'importer ou d\'exporter les données sans l\'autorisation d\'accès au stockage externe À propos - Copyright 2016-%s Branden Archer + Copyright 2016-%d Branden Archer Licence GPLv3. À propos de %s Version : %s diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 02c57c49f..d7f61cd9f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -41,7 +41,7 @@ Esportazione in corso… Impossibile importare o esportare i dati senza il permesso per l\'uso della memoria esterna. Informazioni - Copyright 2016-%s Branden Archer + Copyright 2016-%d Branden Archer Pubblicato sotto licenza GPLv3. Informazioni su %s Versione: %s diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index ec1ba1c72..811449f03 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -49,7 +49,7 @@ Negalima importuoti/eksportuoti kortelių be išorinės atminties leidimo Apie - Visos teisės saugomos 2016-%s Branden Archer + Visos teisės saugomos 2016-%d Branden Archer Licenzijuota pagal GPLv3. Apie %s Versija: %s diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 416080fb3..b4a53b92e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -41,7 +41,7 @@ Exporterende… Niet mogelijk te importeren of exporteren zonder rechten op externe opslag Over - Auteursrecht 2016-%s Branden Archer + Auteursrecht 2016-%d Branden Archer Gelicenseerd met GPLv3. Over %s Versie: %s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 05f5b51b4..e92355f0f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -66,7 +66,7 @@ Use export location About - Copyright 2016-%s Branden Archer + Copyright 2016-%d Branden Archer Licensed under the GPLv3. About %s Version: %s From de4ab954373deb2972c9d908be81a747f6389dcd Mon Sep 17 00:00:00 2001 From: Branden Archer Date: Sun, 25 Jun 2017 14:15:37 -0400 Subject: [PATCH 2/2] Add credit for save icon in about dialog --- .../java/protect/card_locker/MainActivity.java | 16 +++++++++++++++- app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-lt/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 8 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java index aeafa5d1c..0d7bdf1d7 100644 --- a/app/src/main/java/protect/card_locker/MainActivity.java +++ b/app/src/main/java/protect/card_locker/MainActivity.java @@ -185,6 +185,11 @@ public class MainActivity extends AppCompatActivity "AppIntro", "https://github.com/apl-devs/AppIntro" ); + final Map USED_ASSETS = ImmutableMap.of + ( + "Save by Bernar Novalyi", "https://thenounproject.com/term/save/716011" + ); + StringBuilder libs = new StringBuilder().append("
    "); for (Map.Entry entry : USED_LIBRARIES.entrySet()) { @@ -192,6 +197,13 @@ public class MainActivity extends AppCompatActivity } libs.append("
"); + StringBuilder resources = new StringBuilder().append(""); + String appName = getString(R.string.app_name); int year = Calendar.getInstance().get(Calendar.YEAR); @@ -229,7 +241,9 @@ public class MainActivity extends AppCompatActivity "

" + getString(R.string.app_license) + "

" + - String.format(getString(R.string.app_libraries), appName, libs.toString()); + String.format(getString(R.string.app_libraries), appName, libs.toString()) + + "

" + + String.format(getString(R.string.app_resources), appName, resources.toString()); wv.loadDataWithBaseURL("file:///android_res/drawable/", html, "text/html", "utf-8", null); new AlertDialog.Builder(this) diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 8f253e809..dd2425112 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -55,6 +55,7 @@ Verze: %s Revizní informace: %s %s používá tyto knihovny třetích stran: %s + %s uses the following third-party resources: %s Vyberte čárový kód Zadejte hodnotu čárového kódu a potm vyberte kód, který představuje čárový kód, který je na kartě. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index cf925b381..8cdede4c0 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -8,6 +8,7 @@ Copyright 2016-%d Branden Archer Lizensiert unter der GPLv3. %s benutzt die folgenden Fremdbibliotheken: %s + %s uses the following third-party resources: %s Kundenkarte anzeigen Ok Notiz diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 55c2d4396..73448ff6c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -55,6 +55,7 @@ Version : %s Notes sur les versions : %s %s utilise les bibliothèques-tierces suivantes : %s + %s uses the following third-party resources: %s Choisissez le code-barre Saisissez les chiffres du code-barres et sélectionnez l\'image qui le représente diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d7f61cd9f..9e4897c3c 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -47,6 +47,7 @@ Versione: %s Informazione sulla revisione: %s %s usa le seguenti librerie di terze parti: %s + %s uses the following third-party resources: %s Ok Inserisci carta Modifica carta diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 811449f03..953c51718 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -55,6 +55,7 @@ Versija: %s Revizijos informacija: %s %s naudoja šias trečiosios šalies bibliotekas: %s + %s uses the following third-party resources: %s Pasirinkite brūkšninį kodą Enter the barcode value then select the image which represents the barcode you want to use diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index b4a53b92e..d0908a155 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -47,6 +47,7 @@ Versie: %s Revisieïnformatie: %s %s gebruikt de volgende bibliotheken van derden: %s + %s uses the following third-party resources: %s Oké Voer kaart in Edit Card diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e92355f0f..613d83108 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -72,6 +72,7 @@ Version: %s Revision Information: %s %s uses the following third-party libraries: %s + %s uses the following third-party resources: %s Select Barcode Enter the barcode value then select the image which represents the barcode you want to use