Skip to content

App strings reworked #136

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

Open
comradekingu wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

App strings reworked #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9182027
App strings reworked
comradekingu Oct 27, 2021
1915cf5
Project names
comradekingu Oct 27, 2021
5f9c91b
Further improvements
comradekingu Oct 27, 2021
2635bfc
Further improvements 2
comradekingu Oct 27, 2021
80cc047
Merge branch 'develop' into patch-1
comradekingu Aug 19, 2024
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
120 changes: 60 additions & 60 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Readrops</string>
<string name="app_licence">App released under the GPLv3 licence</string>
<string name="to_read">To read</string>
<string name="non_read_articles">Non read articles</string>
<string name="app_licence">Licenced GPLv3+</string>
<string name="to_read">Reading</string>
<string name="non_read_articles">Unread</string>
<string name="open_nav_drawer">Open menu</string>
<string name="close_nav_drawer">Close menu</string>
<string name="add_feed_item">Add feed</string>
<string name="add_folder_item">Add folder</string>
<string name="settings">Settings</string>
<string name="about">About</string>
<string name="add_feed_title">Add feed</string>
<string name="feed_url">Feed url</string>
<string name="validate">Validate</string>
<string name="empty_field">Field can\'t be empty</string>
<string name="wrong_url">Input is not a valid URL</string>
<string name="add_feed_no_result">No feed url found</string>
<string name="feed_url">Feed URL</string>
<string name="validate">Check</string>
<string name="empty_field">Populate this field first</string>
<string name="wrong_url">Input a valid URL first</string>
<string name="add_feed_no_result">Could not find a feed URL</string>
<string name="add_feed_connexion_error">Connection error</string>
<string name="add_feed_unknownhost_error">Unknown host</string>
<string name="by_author">by %1$s</string>
Expand All @@ -24,99 +24,99 @@
<string name="read_time_one_minute">1 min</string>
<string name="interpoint" translatable="false">·</string>
<string name="share_article">Share Article</string>
<string name="open_url">Open url</string>
<string name="open_url">Open URL</string>
<string name="add_folder">Add folder</string>
<string name="feed_folder">Feed folder</string>
<string name="feed_name">Feed name</string>
<string name="edit_feed">Edit feed</string>
<string name="folder">Folder</string>
<string name="no_folder">No folder</string>
<string name="cancel">Cancel</string>
<string name="delete_feed">Delete feed ?</string>
<string name="delete_feed">Delete feed?</string>
<string name="load">Load</string>
<string name="updating_feed">Updating feed : %1$s</string>
<string name="updating_feed">Updating feed, %1$s…</string>
Copy link
Contributor Author

@comradekingu comradekingu Oct 27, 2021

Choose a reason for hiding this comment

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

Suggested change
<string name="updating_feed">Updating feed, %1$s…</string>
<string name="updating_feed">Updating the %1$s feed…</string>

On the assumption it is the name of the feed

<string name="results">Results</string>
<string name="feed_insertion_successfull">Feed %1$s added successfully</string>
<string name="feed_insertion_network_failed">Network failure when accessing feed %1$s</string>
<string name="feed_insertion_parse_failed">Failure when parsing feed %1$s</string>
<string name="feed_insertion_wrong_format">Wrong format for feed %1$s</string>
<string name="feed_insertion_unknown_error">Unknown error for feed %1$s</string>
<string name="feed_insertion_successfull">Added the %1$s feed</string>
<string name="feed_insertion_network_failed">Could not access the %1$s feed due to a network failure</string>
Copy link
Contributor Author

@comradekingu comradekingu Oct 27, 2021

Choose a reason for hiding this comment

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

Is network failure anything outside of not connected to the Internet?

<string name="feed_insertion_parse_failed">Could not parse the %1$s feed</string>
<string name="feed_insertion_wrong_format">Wrong format for the %1$s feed</string>
<string name="feed_insertion_unknown_error">Unknown error for the %1$s feed</string>
<string name="articles">Articles</string>
<string name="read_later">To read later</string>
<string name="show_read_articles">Show read articles</string>
<string name="read_later">Reading later</string>
<string name="show_read_articles">Show read</string>
<string name="filter">Filter</string>
<string name="mark_unread">Mark as non read</string>
<string name="mark_unread">Mark as unread</string>
<string name="mark_read">Mark as read</string>
<string name="select_all">Select all</string>
<string name="account_url">Account url</string>
<string name="account_url">Account URL</string>
<string name="account_name">Account name</string>
<string name="login">Login</string>
<string name="login">Username</string>
Copy link
Contributor Author

@comradekingu comradekingu Oct 27, 2021

Choose a reason for hiding this comment

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

Not 100% sure here, but this would avoid errors in translation

<string name="password">Password</string>
<string name="password_helper">This is your FreshRSS API password (Configuration &gt; Profile)</string>
<string name="password_helper">Your FreshRSS API password from Configuration → Profile</string>
<string name="account_settings">Account settings</string>
<string name="add_account">Add account</string>
<string name="no_feed">No feed</string>
<string name="choose_account">Choose an account</string>
<string name="choose_account">Choose setup</string>
Copy link
Contributor Author

@comradekingu comradekingu Oct 27, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

This is the setup screen, where IMO "account" again doesn't really do anything

<string name="feeds_and_folders">Feeds and folders</string>
<string name="account">Account</string>
<string name="manage_feeds_folders">Manage feeds and folders</string>
<string name="folders">Folders</string>
<string name="feeds">Feeds</string>
<string name="edit_folder">Edit folder</string>
<string name="delete_folder">Delete folder ?</string>
<string name="delete_folder">Delete folder?</string>
<string name="delete_account">Delete account</string>
<string name="delete_account_question">Delete account ?</string>
<string name="feed_deleted">The feed %1$s has been deleted</string>
<string name="feed_doesnt_exist">The feed %1$s doesn\'t exist on the server</string>
<string name="error_occured">An error occured</string>
<string name="delete_account_question">Delete account?</string>
<string name="feed_deleted">Deleted the %1$s feed</string>
<string name="feed_doesnt_exist">The %1$s feed doesn\'t exist on the server</string>
<string name="error_occured">Something went wrong</string>
<string name="folder_already_exists">The folder already exists</string>
<string name="folder_bad_format">Bad format for the new folder</string>
<string name="folder_bad_format">The new folder has an incorrect format</string>
<string name="folder_doesnt_exist">The folder doesn\'t exist on the server</string>
<string name="credentials">Credentials</string>
<string name="filter_newest">Newest to oldest</string>
<string name="filter_oldest">Oldest to newest</string>
<string name="login_failed">Login failed. Please check your credentials</string>
<string name="credentials">Username and password</string>
<string name="filter_newest">Newest first</string>
<string name="filter_oldest">Oldest first</string>
<string name="login_failed">Could not log in. Did you supply the correct username and password?</string>
<string name="new_account">New account</string>
<string name="app_url" translatable="false">https://github.com/readrops/Readrops</string>
<string name="number_items_to_parse">Maximum number of items per feed</string>
<string name="number_items_to_parse">Max items per feed</string>
<string name="unlimited">Unlimited</string>
<string name="local">Local</string>
<string name="feeds_number">%1$s feeds</string>
<string name="feed_number">%1$s feed</string>
<string name="feeds_number">%1$s feeds</string>
<string name="delete">Delete</string>
<string name="app_description">App released under the GPLv3 licence</string>
<string name="no_item">No item</string>
<string name="no_feed_found">No feed found</string>
<string name="feed_insertion_error">Error for feed %1$s</string>
<string name="get_feeds_colors">Get feeds colors</string>
<string name="feeds_colors">Feeds Colors</string>
<string name="global">Global</string>
<string name="reload_feeds_colors">Reload feeds colors</string>
<string name="open_items_in">Open items in</string>
<string name="webview">Webview</string>
<string name="app_description">Copylefted libre software, licensed GPLv3+\n\nUse, study, change, and share with all.</string>
<string name="no_item">Add something to show it here</string>
<string name="no_feed_found">Could not find any feeds</string>
<string name="feed_insertion_error">The %1$s feed has a problem</string>
<string name="get_feeds_colors">Fetch feed colors</string>
<string name="feeds_colors">Feed Colors</string>
<string name="global">For the whole app</string>
<string name="reload_feeds_colors">Reload feed colors</string>
<string name="open_items_in">Open items in…</string>
<string name="webview">The app</string>
<string name="external_navigator">External web browser</string>
<string name="actualize">Actualize</string>
<string name="actualize">Start</string>
<string name="share_url">Share URL</string>
<string name="opml_import_export">OPML Import/Export</string>
<string name="opml_processing">Processing OPML file</string>
<string name="operation_takes_time">This operation can take a significant time as each feed needs to be queried.</string>
<string name="processing_file_failed">An error occurred during the file processing</string>
<string name="operation_takes_time">This can take a while.</string>
<string name="processing_file_failed">Could not process the file</string>
<string name="opml_import">OPML import</string>
<string name="opml_export">OPML export</string>
<string name="external_storage_opml_export">Subscriptions export needs external storage permission</string>
<string name="external_storage_opml_export">Grant storage access to export subscriptions</string>
<string name="try_again">Try again</string>
<string name="permissions">Permissions</string>
<string name="or">Or</string>
<string name="image_options">Image Options</string>
<string name="download_image">Download image</string>
<string name="share_image">Share image</string>
<string name="download_image">Download</string>
<string name="share_image">Share</string>
<string name="theme">Theme</string>
<string name="light">Light</string>
<string name="dark">Dark</string>
<string name="opml_export_description">Export feeds and folders</string>
<string name="new_feed">New feed</string>
<string name="download_image_permission">To download the image, storage permission is needed</string>
<string name="auto_synchro">Automatic synchronisation</string>
<string name="download_image_permission">Grant storage access to download the image</string>
<string name="auto_synchro">Syncing</string>
Copy link
Contributor Author

@comradekingu comradekingu Oct 27, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Suggested change
<string name="auto_synchro">Syncing</string>
<string name="auto_synchro">Auto-syncing</string>

Somehow it isn't auto if set to "manual", but consistent with "turn on ___" below.
Maybe go with "Syncing" for both?

<string name="manual">Manual</string>
Copy link
Contributor Author

@comradekingu comradekingu Oct 27, 2021

Choose a reason for hiding this comment

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

Suggested change
<string name="manual">Manual</string>
<string name="manual">Only manual</string>

Better than "No", works with "Auto"?

<string name="min_30">30 mins</string>
<string name="hour_1">1 hour</string>
Expand All @@ -125,17 +125,17 @@
<string name="hour_6">6 hours</string>
<string name="hour_12">12 hours</string>
<string name="every_day">Every day</string>
<string name="account_synchro">Accounts synchronisation</string>
<string name="account_synchro">Account-syncing</string>
<string name="new_items">%1$s new articles</string>
<string name="enable_notifications">Enable notifications</string>
<string name="enable_notifications">Turn on</string>
<string name="notifications">Notifications</string>
<string name="enable_all_feeds">Enable all feeds notifications</string>
<string name="auto_synchro_disabled">Automatic synchronization is disabled</string>
<string name="enable_auto_synchro_text">To be displayed, notifications need auto synchronization to be activated.\nDo you want to open settings ?</string>
<string name="enable_all_feeds">Turn on all feeds notifications</string>
<string name="auto_synchro_disabled">Auto-syncing off</string>
<string name="enable_auto_synchro_text">Open the settings to turn on auto-syncing to show notifications?</string>
<string name="open">Open</string>
<string name="back">Back</string>
<string name="show_caption">Show caption</string>
<string name="synchronize">Synchronize</string>
<string name="synchronize">Sync</string>
<string name="navigator_view">Navigator view</string>
<string name="favorites">Favorites</string>
<string name="source_code">Source code</string>
Expand Down Expand Up @@ -233,4 +233,4 @@
<string name="downloaded_file">Downloaded file!</string>
<string name="provide_full_url">Please provide the full API URL</string>
<string name="provide_root_url">Please provide the service root URL</string>
</resources>
</resources>
4 changes: 2 additions & 2 deletions db/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>
<string name="app_name" translatable="false">readropsdb</string>
<string name="app_name" translatable="false">ReadropsDB</string>
Copy link
Contributor Author

@comradekingu comradekingu Oct 27, 2021

Choose a reason for hiding this comment

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

Assumption on my part


<string name="freshrss" translatable="false">Freshrss</string>
<string name="freshrss" translatable="false">FreshRSS</string>
<string name="feedly" translatable="false">Feedly</string>
<string name="nextcloud_news" translatable="false">Nextcloud News</string>

Expand Down