Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Less verbose strings #645

Merged
merged 8 commits into from
Dec 6, 2021
Merged

Less verbose strings #645

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ca296e0
"Card" removed from strings
comradekingu Dec 3, 2021
a282542
Needed card strings recovered. "Reverse side"
comradekingu Dec 3, 2021
56989e0
Suggested changes made
comradekingu Dec 4, 2021
5c2b614
Less first, data, image, reversed order
comradekingu Dec 4, 2021
d0f114a
Update app/src/main/res/values/strings.xml
TheLastProject Dec 5, 2021
4fe6184
Reverse-side image
comradekingu Dec 5, 2021
d7b11af
Back to back edits :)
comradekingu Dec 5, 2021
a170093
Front and back
comradekingu Dec 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 31 additions & 30 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<string name="action_search">Search</string>
<string name="action_add">Add</string>
<plurals name="selectedCardCount">
<item quantity="one"><xliff:g>%d</xliff:g> card selected</item>
<item quantity="other"><xliff:g>%d</xliff:g> cards selected</item>
<item quantity="one"><xliff:g>%d</xliff:g> selected</item>
<item quantity="other"><xliff:g>%d</xliff:g> selected</item>
</plurals>
<string name="noGiftCards">Click the + plus button to add a card, or import some from the ⋮ menu first.</string>
<string name="noGiftCardsGroup">You don\'t have any loyalty cards yet. Once you\'ve added some you can assign them to the group here.</string>
<string name="noMatchingGiftCards">Didn\'t find anything. Try changing your search.</string>
<string name="noGiftCardsGroup">If you add some cards you can assign them to this group afterwards.</string>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a fan of changing this from "here" to "afterwards", because this appears exactly at the UI location where you can choose which cards belong to a group. The old string is very explicitly: "once you have created cards, come back to this screen to add them to this group". The new one is vague "if you do X you can do Y after that".

<string name="noMatchingGiftCards">No results. Try changing your search.</string>
<string name="storeName">Name</string>
<string name="note">Note</string>
<string name="cardId">Card ID</string>
<string name="barcodeType">Barcode type</string>
<string name="barcodeNoBarcode">This card has no barcode</string>
<string name="barcodeNoBarcode">There is no barcode</string>
<string name="noBarcode">No barcode</string>
<string name="star">Add to favorites</string>
<string name="unstar">Remove from favorites</string>
Expand All @@ -29,12 +29,12 @@
For example, in Russian, Android's plural quantity "one" actually refers to "any number ending on 1 but not ending in 11".
So while in English the extra non-plural form seems unnecessary duplication, it is necessary to give translators enough flexibility.
In Catima, we use the plain string when meaning exactly 1, and otherwise use the plural forms -->
<string name="deleteTitle">Delete card</string>
<string name="deleteTitle">Deletion</string>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please read the i18n oddness note as to why it makes no sense to make deleteTitle so different to deleteCardsTitle.

<plurals name="deleteCardsTitle">
<item quantity="one">Delete <xliff:g>%d</xliff:g> card</item>
<item quantity="other">Delete <xliff:g>%d</xliff:g> cards</item>
</plurals>
<string name="deleteConfirmation">Delete this card permanently?</string>
<string name="deleteConfirmation">Delete this permanently?</string>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please read the i18n oddness note as to why it makes no sense to make deleteConfirmation so different to deleteCardsConfirmation.

<plurals name="deleteCardsConfirmation">
<item quantity="one">Delete this <xliff:g>%d</xliff:g> card permanently?</item>
<item quantity="other">Delete these <xliff:g>%d</xliff:g> cards permanently?</item>
Expand All @@ -46,27 +46,28 @@
<string name="sendLabel">Send…</string>
<string name="editCardTitle">Edit Card</string>
<string name="addCardTitle">Add Card</string>
<string name="scanCardBarcode">Scan Card Barcode</string>
<string name="scanCardBarcode">Scan Barcode</string>
<string name="cardShortcut">Card Shortcut</string>
<string name="noCardsMessage">Add a card first</string>
<string name="card_ids_copied">Copied Card ID(s)</string>
<string name="barcodeImageDescriptionWithType">Image of card barcode of type <xliff:g>%s</xliff:g></string>
<string name="card_ids_copied">Copied ID(s)</string>
<!-- %s is a type of barcode here -->
<string name="barcodeImageDescriptionWithType">Image <xliff:g>%s</xliff:g> barcode</string>
<string name="noStoreError">No name entered</string>
<string name="noCardIdError">No card ID entered</string>
<string name="noCardExistsError">Could not find card</string>
<string name="noCardIdError">No ID entered</string>
<string name="noCardExistsError">Could not find that card</string>
<string name="failedParsingImportUriError">Could not parse the import URI</string>
<string name="importExport">Import/Export</string>
<string name="exportName">Export</string>
<string name="importExportHelp">Backing up your cards allows you to move them to another device.</string>
<string name="importExportHelp">Backing up your data allows moving it to another device.</string>
<string name="importSuccessfulTitle">Imported</string>
<string name="importFailedTitle">Import failed</string>
<string name="importFailed">Could not import cards</string>
<string name="importFailed">Could not perform import</string>
<string name="exportSuccessfulTitle">Exported</string>
<string name="exportFailedTitle">Export failed</string>
<string name="exportFailed">Could not export cards</string>
<string name="exportFailed">Could not perform export</string>
<string name="importing">Importing…</string>
<string name="exporting">Exporting…</string>
<string name="noExternalStoragePermissionError">Grant external storage permission to import or export cards first</string>
<string name="noExternalStoragePermissionError">Grant external storage permission to import or export first</string>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While we're changing these anyway, "to import or export data" makes more sense.

<string name="exportOptionExplanation">The data will be written to a location of your choice.</string>
<string name="importOptionFilesystemTitle">Import from filesystem</string>
<string name="importOptionFilesystemExplanation">Choose a specific file from the filesystem.</string>
Expand All @@ -84,9 +85,9 @@
<string name="app_libraries">Libre third-party libraries: <xliff:g id="app_libraries_list">%s</xliff:g></string>
<string name="app_resources">Libre third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
<string name="selectBarcodeTitle">Select Barcode</string>
<string name="enterBarcodeInstructions">Enter the card ID, and either pick its barcode type below, or “This card has no barcode”.</string>
<string name="copy_to_clipboard_toast">Card ID copied to clipboard</string>
<string name="thumbnailDescription">Thumbnail for card</string>
<string name="enterBarcodeInstructions">Enter the ID, and either pick a barcode type below, or “There is no barcode”.</string>
<string name="copy_to_clipboard_toast">ID copied to clipboard</string>
<string name="thumbnailDescription">Thumbnail</string>
<string name="starImage">Favorite star</string>
<string name="settings">Settings</string>
<string name="settings_category_title_ui">User interface</string>
Expand Down Expand Up @@ -120,13 +121,13 @@
<string name="intent_import_card_from_url_path_prefix_thelastproject" translatable="false">/Catima/share</string>
<string name="intent_import_card_from_url_host_brarcher" translatable="false">brarcher.github.io</string>
<string name="intent_import_card_from_url_path_prefix_brarcher" translatable="false">/loyalty-card-locker/share</string>
<string name="importSuccessful">Card data imported</string>
<string name="exportSuccessful">Card data exported</string>
<string name="importSuccessful">Data imported</string>
<string name="exportSuccessful">Data exported</string>
<string name="enter_group_name">Enter group name</string>
<string name="groups">Groups</string>
<string name="group_edit">Edit Group</string>
<string name="noGroups">Click the + plus button to add groups for categorization first.</string>
<string name="noGroupCards">This group does not contain any cards</string>
<string name="noGroupCards">This group is empty</string>
<plurals name="groupCardCount">
<item quantity="one"><xliff:g>%d</xliff:g> card</item>
<item quantity="other"><xliff:g>%d</xliff:g> cards</item>
Expand All @@ -141,7 +142,7 @@
<string name="moveDown">Move downwards</string>
<string name="leaveWithoutSaveTitle">Exit</string>
<string name="leaveWithoutSaveConfirmation">Leave without saving?</string>
<string name="addManually">Manually enter card ID</string>
<string name="addManually">Manually enter ID</string>
<string name="addFromImage">Select image from gallery</string>
<string name="groupsList">Groups: <xliff:g>%s</xliff:g></string>
<string name="editGroup">Editing Group: <xliff:g>%s</xliff:g></string>
Expand Down Expand Up @@ -184,21 +185,21 @@
<string name="importVoucherVaultMessage">Select your <i>vouchervault.json</i> export from Voucher Vault to import.
\nCreate it by pressing Export in Voucher Vault first.</string>
<string name="barcodeId">Barcode value</string>
<string name="sameAsCardId">Same as card ID</string>
<string name="sameAsCardId">Same as ID</string>
<string name="setBarcodeId">Set barcode value</string>
<string name="unsupportedBarcodeType">This barcode type can\'t yet be displayed. It may be supported in a later version of the app.</string>
<string name="wrongValueForBarcodeType">The value is not valid for the selected barcode type</string>
<string name="copy_to_clipboard_multiple_toast">Card IDs copied to clipboard</string>
<string name="copy_to_clipboard_multiple_toast">IDs copied to clipboard</string>
<string name="intent_import_card_from_url_share_multiple_text">I want to share some cards with you</string>
<string name="frontImageDescription">Card\'s front image</string>
<string name="backImageDescription">Card\'s back image</string>
<string name="frontImageDescription">Frontside picture</string>
<string name="backImageDescription">Backside picture</string>
<string name="photos">Photos</string>
<string name="setFrontImage">Set front image</string>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now there is still some inconsistency...

     <string name="frontImageDescription">Front-side image</string>

     <string name="setFrontImage">Set front image</string>

What is wrong with just "Front image" and "Back image" as I've mentioned several times? You keep changing it differently anyway, without telling me why my suggestion (which is what we've been using for years now) is apparently wrong.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, didn't think that was an option. Nor did I notice the inconsistency. Bit out of it on the whole,

<string name="setBackImage">Set back image</string>
<string name="setBackImage">Set reverse side image</string>
TheLastProject marked this conversation as resolved.
Show resolved Hide resolved
<string name="removeImage">Remove image</string>
<string name="takePhoto">Take a photo</string>
<string name="updateBarcodeQuestionTitle">Update barcode value?</string>
<string name="updateBarcodeQuestionText">You changed the card ID. Do you want to also update the barcode to use the same value?</string>
<string name="updateBarcodeQuestionText">You changed the ID. Do you want to also update the barcode to use the same value?</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="passwordRequired">Please enter the password</string>
Expand Down Expand Up @@ -255,4 +256,4 @@
<string name="report_error">Report Error</string>
<string name="action_show_details">Show details</string>
<string name="action_hide_details">Hide details</string>
</resources>
</resources>