From 0b54d87f4f54d4d7e8019f3b4cf77e1d71bb3773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 8 Jul 2021 20:47:35 +0000 Subject: [PATCH 1/6] App strings reworked 4 --- app/src/main/res/values/strings.xml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2822560ab..a9fa4f3e7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -72,8 +72,8 @@ About %s Version: %s Revision Info: %s - Third-party libre libraries: %s - Third-party libre resources: %s + Libre third-party libraries: %s + Libre third-party resources: %s Select Barcode Enter the card ID, and either pick its barcode type below, or “This card has no barcode”. @@ -163,21 +163,20 @@ Privacy policy notice (required by some app stores):\n\nNO DATA IS COLLECTED AT ALL, which anyone can confirm since our app is libre software. Accept Import from Catima - Find a file likely named Catima.csv to import.\nOr create it from the Import/Export menu of another Catima app by pressing "Export" there first. + Find a file likely named Catima.csv to import.\nOr create it from the "Import/Export" menu of another Catima app by pressing "Export" there first. Import from FidMe - Find a file likely named fidme-export-request-xxxxxx.zip to import, and then select the barcode types manually afterwards.\nOr create it from your FidMe profile by choosing "Data Protection" and then pressing "Extract my data" first. + Find a file likely named fidme-export-request-xxxxxx.zip to import, and select the barcode types manually afterwards.\nOr create it from your FidMe profile by choosing "Data Protection" and then pressing "Extract my data" first. Import from Loyalty Card Keychain - Find a file most likely named LoyaltyCardKeychain.csv to import.\nOr create it from the Import/Export menu in Loyalty Card Keychain by pressing "Export" first. + Find a file most likely named LoyaltyCardKeychain.csv to import.\nOr create it from the "Import/Export" menu in Loyalty Card Keychain by pressing "Export" there first. Import from Stocard - Find your Stocard .zip file to import, and then select the barcode types manually afterwards.\nOr get it by emailing support@stocardapp.com and asking for an export of your data first. + Find your Stocard.zip file to import, and select the barcode types manually afterwards.\nOr get it by e-mailing support@stocardapp.com asking for an export of your data. Import from Voucher Vault Find a file likely named vouchervault.json to import.\nOr create it by pressing "Export" in Voucher Vault first. Barcode value - Same as card ID Set barcode value - This barcode type can\'t yet be displayed. It may be supported in a newer version of the app. + This barcode type can\'t yet be displayed. It may be supported in a later version of the app. The value is not valid for the selected barcode type - Copied card IDs to clipboard + Card IDs copied to clipboard I want to share some cards with you Card\'s front image Card\'s back image From b10d50d5a08acf43e841c00a3b45ca32f082589b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 8 Jul 2021 22:05:38 +0000 Subject: [PATCH 2/6] Revert accidental deletion --- app/src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a9fa4f3e7..246b526dd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -173,6 +173,7 @@ Import from Voucher Vault Find a file likely named vouchervault.json to import.\nOr create it by pressing "Export" in Voucher Vault first. Barcode value + Same as card ID Set barcode value This barcode type can\'t yet be displayed. It may be supported in a later version of the app. The value is not valid for the selected barcode type From 8dff8d392e40c5436ee664ede1e10eb77d218f51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 8 Jul 2021 22:07:47 +0000 Subject: [PATCH 3/6] Fixes to import dialogs --- app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 246b526dd..a8c2a737a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -163,13 +163,13 @@ Privacy policy notice (required by some app stores):\n\nNO DATA IS COLLECTED AT ALL, which anyone can confirm since our app is libre software. Accept Import from Catima - Find a file likely named Catima.csv to import.\nOr create it from the "Import/Export" menu of another Catima app by pressing "Export" there first. + Find a file likely named Catima.csv or .zip to import.\nOr create it from the "Import/Export" menu of another Catima app by pressing "Export" there first. Import from FidMe Find a file likely named fidme-export-request-xxxxxx.zip to import, and select the barcode types manually afterwards.\nOr create it from your FidMe profile by choosing "Data Protection" and then pressing "Extract my data" first. Import from Loyalty Card Keychain Find a file most likely named LoyaltyCardKeychain.csv to import.\nOr create it from the "Import/Export" menu in Loyalty Card Keychain by pressing "Export" there first. Import from Stocard - Find your Stocard.zip file to import, and select the barcode types manually afterwards.\nOr get it by e-mailing support@stocardapp.com asking for an export of your data. + Find your ***-sync.zip file from Stocard to import, and select the barcode types manually afterwards.\nOr get it by e-mailing support@stocardapp.com asking for an export of your data. Import from Voucher Vault Find a file likely named vouchervault.json to import.\nOr create it by pressing "Export" in Voucher Vault first. Barcode value From f64eea64704555a0c7cc49721953693cb62e2c56 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Sun, 11 Jul 2021 12:31:22 +0200 Subject: [PATCH 4/6] Update app/src/main/res/values/strings.xml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Allan Nordhøy --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a8c2a737a..474ce9221 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -163,7 +163,7 @@ Privacy policy notice (required by some app stores):\n\nNO DATA IS COLLECTED AT ALL, which anyone can confirm since our app is libre software. Accept Import from Catima - Find a file likely named Catima.csv or .zip to import.\nOr create it from the "Import/Export" menu of another Catima app by pressing "Export" there first. + Find a file named Catima.csv or .zip to import.\nOr create it from the "Import/Export" menu of another Catima app by pressing "Export" there first. Import from FidMe Find a file likely named fidme-export-request-xxxxxx.zip to import, and select the barcode types manually afterwards.\nOr create it from your FidMe profile by choosing "Data Protection" and then pressing "Extract my data" first. Import from Loyalty Card Keychain From 964c6034055c502d5760b3a758ba338ebe80fc0c Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Sun, 11 Jul 2021 12:31:51 +0200 Subject: [PATCH 5/6] Only list new format --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 474ce9221..a25cdcc5e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -163,7 +163,7 @@ Privacy policy notice (required by some app stores):\n\nNO DATA IS COLLECTED AT ALL, which anyone can confirm since our app is libre software. Accept Import from Catima - Find a file named Catima.csv or .zip to import.\nOr create it from the "Import/Export" menu of another Catima app by pressing "Export" there first. + Find a file named catima.zip to import.\nOr create it from the "Import/Export" menu of another Catima app by pressing "Export" there first. Import from FidMe Find a file likely named fidme-export-request-xxxxxx.zip to import, and select the barcode types manually afterwards.\nOr create it from your FidMe profile by choosing "Data Protection" and then pressing "Extract my data" first. Import from Loyalty Card Keychain From e69d6a453be5267a44ecb22dc5328a5b5a6d83df Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Sun, 11 Jul 2021 13:35:53 +0200 Subject: [PATCH 6/6] Consistent phrasing --- app/src/main/res/values/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a25cdcc5e..0a938a575 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -163,15 +163,15 @@ Privacy policy notice (required by some app stores):\n\nNO DATA IS COLLECTED AT ALL, which anyone can confirm since our app is libre software. Accept Import from Catima - Find a file named catima.zip to import.\nOr create it from the "Import/Export" menu of another Catima app by pressing "Export" there first. + Select your catima.zip export from Catima to import.\nOr create it from the "Import/Export" menu of another Catima app by pressing "Export" there first. Import from FidMe - Find a file likely named fidme-export-request-xxxxxx.zip to import, and select the barcode types manually afterwards.\nOr create it from your FidMe profile by choosing "Data Protection" and then pressing "Extract my data" first. + Select your fidme-export-request-xxxxxx.zip export from FidMe to import, and select the barcode types manually afterwards.\nOr create it from your FidMe profile by choosing "Data Protection" and then pressing "Extract my data" first. Import from Loyalty Card Keychain - Find a file most likely named LoyaltyCardKeychain.csv to import.\nOr create it from the "Import/Export" menu in Loyalty Card Keychain by pressing "Export" there first. + Select your LoyaltyCardKeychain.csv export from Loyalty Card Keychain to import.\nOr create it from the "Import/Export" menu in Loyalty Card Keychain by pressing "Export" there first. Import from Stocard - Find your ***-sync.zip file from Stocard to import, and select the barcode types manually afterwards.\nOr get it by e-mailing support@stocardapp.com asking for an export of your data. + Select your ***-sync.zip export from Stocard to import, and select the barcode types manually afterwards.\nOr get it by e-mailing support@stocardapp.com asking for an export of your data. Import from Voucher Vault - Find a file likely named vouchervault.json to import.\nOr create it by pressing "Export" in Voucher Vault first. + Select your vouchervault.json export from Voucher Vault to import.\nOr create it by pressing "Export" in Voucher Vault first. Barcode value Same as card ID Set barcode value