From 9093c88e23bb31007567a2b7e0c3d45f03e693e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Tue, 10 Nov 2020 09:17:16 +0000 Subject: [PATCH 1/7] Strings reworked --- app/src/main/res/values/strings.xml | 60 ++++++++++++++--------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b12f7e4ea..5ee720711 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,8 +5,8 @@ Search Add - You don\'t have any cards at the moment. Click the "+" (plus) button to get started.\n\nCatima lets you carry your cards on your phone, so they are always within reach. - No cards match the filter. Please try some different terms. + Click the "+" (plus) button to add a card first.\n\nCatima carries your cards on the device, so they are always within reach. + Could not find any such cards. Please try changing your search. Store Note @@ -28,7 +28,7 @@ Block Rotation Unblock Rotation Remove Card - Please confirm that you want to delete this card. + Please confirm you want to delete this card. OK Copy ID to clipboard Share @@ -36,44 +36,44 @@ Added shortcut Edit Card Add Card - Scan Card\'s Barcode + Scan Card Barcode Card Shortcut - There are no cards, add one first + Add a card first - Image of card\'s barcode + Image of card barcode - No Store entered - No Card ID entered - Could not lookup loyalty card + No store entered + No card ID entered + Could not find card Could not parse the import URI %1$s: %2$s Import/Export Export - Backed up data can allow you to move your cards to another device. - Import successful + Backing up your cards allows you to move them to another device. + Imported Import failed - Failed to import - Export successful + Could not import cards + Exported Export failed - Failed to export + Could not export cards Importing… Exporting… - Unable to import or export cards without the external storage permission - Data will be written to a location of your choice. + Grant external storage permission to import or export cards first + The data will be written to a location of your choice. Import from filesystem Choose a specific file from the filesystem. From filesystem - Use external application - Use an external application like Dropbox, Google Drive, or your favorite file manager to open a file. - Use external application + Use external app + Use an external app like Nextcloud, OnionShare, or your favorite file manager to open a file. + Use external app About - Copyright 2019-%d Sylvia van Os. - Based on Loyalty Card Keychain, copyright 2016-2020 Branden Archer. - Licensed under the GPLv3. + Copyright 2019–%d Sylvia van Os. + Based on Loyalty Card Keychain, copyright 2016–2020 Branden Archer. + Copylefted libre software, licensed GPLv3+. About %s Version: %s - Revision Information: %s + Revision Info: %s %s uses the following third-party libraries: %s %s uses the following third-party resources: %s @@ -95,15 +95,15 @@ User interface Theme pref_theme - System theme + System system - Light theme + Light light - Dark theme + Dark dark Card title list font size pref_card_title_list_font_size_sp - Card note list font size + Font size for card note list pref_card_note_list_font_size_sp Card title font size pref_card_title_font_size_sp @@ -121,12 +121,12 @@ /Catima/share brarcher.github.io /loyalty-card-locker/share - Successfully imported loyalty card data - Successfully exported loyalty card data + Card data imported + Card data exported Enter group name Groups - You don\'t have any groups at the moment. Click the "+" (plus) button to get started.\n\nCards can be assigned to groups to make them easier to find. + Click the "+" (plus) button to add groups first.\n\nCards can be assigned in groups to make them easier to find. %d cards All Please confirm you want to delete this group From 50d9205aefa9893d970c73e5b3e014ec07b2fac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Tue, 10 Nov 2020 09:18:25 +0000 Subject: [PATCH 2/7] Spelling: Font size for card titles --- 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 5ee720711..0db6dc8b8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -101,7 +101,7 @@ light Dark dark - Card title list font size + Font size for card titles pref_card_title_list_font_size_sp Font size for card note list pref_card_note_list_font_size_sp From e1a72a948d002a08a8fb1b83e400cad716225f6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Tue, 10 Nov 2020 12:01:58 +0000 Subject: [PATCH 3/7] Requested changes made --- app/src/main/res/values/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0db6dc8b8..fcf874350 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,7 +6,7 @@ Add Click the "+" (plus) button to add a card first.\n\nCatima carries your cards on the device, so they are always within reach. - Could not find any such cards. Please try changing your search. + Maybe if you look elsewhere, or for something else you will find what you are looking for. Store Note @@ -64,7 +64,7 @@ Choose a specific file from the filesystem. From filesystem Use external app - Use an external app like Nextcloud, OnionShare, or your favorite file manager to open a file. + Use any app or your favorite file manager to open a file. Use external app About @@ -126,7 +126,7 @@ Enter group name Groups - Click the "+" (plus) button to add groups first.\n\nCards can be assigned in groups to make them easier to find. + Click the "+" (plus) button to add groups first.\n\nCards can be grrouped to make them easier to find. %d cards All Please confirm you want to delete this group From 0c4fed5c50d12fe530a4ad4b62b0920185219c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Tue, 10 Nov 2020 12:03:28 +0000 Subject: [PATCH 4/7] Spelling: Grouped --- 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 fcf874350..d5602be33 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -126,7 +126,7 @@ Enter group name Groups - Click the "+" (plus) button to add groups first.\n\nCards can be grrouped to make them easier to find. + Click the "+" (plus) button to add groups first.\n\nCards can be grouped to make them easier to find. %d cards All Please confirm you want to delete this group From 67cbb34425ea29f64b752ef28aee9d4c922601b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Tue, 10 Nov 2020 12:09:16 +0000 Subject: [PATCH 5/7] Spelling: Didn't find anything --- 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 d5602be33..2c96be13f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,7 +6,7 @@ Add Click the "+" (plus) button to add a card first.\n\nCatima carries your cards on the device, so they are always within reach. - Maybe if you look elsewhere, or for something else you will find what you are looking for. + Didn't find anything. Please try again, or look elsewhere. Store Note From e84a23c58e753aa78901ac7ccae210c655eaafc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Tue, 10 Nov 2020 12:14:17 +0000 Subject: [PATCH 6/7] Spelling: Try changing your search --- 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 2c96be13f..7dd836ee0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,7 +6,7 @@ Add Click the "+" (plus) button to add a card first.\n\nCatima carries your cards on the device, so they are always within reach. - Didn't find anything. Please try again, or look elsewhere. + Didn't find anything. Try changing your search. Store Note From ad82492f637b01d4e26ca217f39d2f56e059f8c6 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Tue, 10 Nov 2020 17:59:46 +0100 Subject: [PATCH 7/7] 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 7dd836ee0..0cd9e194c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -126,7 +126,7 @@ Enter group name Groups - Click the "+" (plus) button to add groups first.\n\nCards can be grouped to make them easier to find. + Click the "+" (plus) button to add groups first.\n\nGroups make things easier to find. %d cards All Please confirm you want to delete this group