From 91820272bb0560715c6c4c5f76610b02218071a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Wed, 27 Oct 2021 07:36:46 +0000
Subject: [PATCH 1/4] App strings reworked

---
 app/src/main/res/values/strings.xml | 116 ++++++++++++++--------------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fdb7c5327..5d749e3ce 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name" translatable="false">Readrops</string>
-    <string name="to_read">To read</string>
-    <string name="non_read_articles">Non read articles</string>
+    <string name="to_read">Reading</string>
+    <string name="non_read_articles">Non-read</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>
@@ -10,11 +10,11 @@
     <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>
@@ -23,7 +23,7 @@
     <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>
@@ -33,89 +33,89 @@
     <string name="cancel">Cancel</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>
     <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>
+    <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="unread">Mark as non read</string>
+    <string name="unread">Mark as non-read</string>
     <string name="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>
     <string name="password">Password</string>
-    <string name="password_helper">This is your FreshRSS API password (Configuration &gt; Profile)</string>
+    <string name="password_helper">This is your FreshRSS API password (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>
     <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">Login details</string>
+    <string name="filter_newest">Newest first</string>
+    <string name="filter_oldest">Oldest first</string>
+    <string name="login_failed">Could not log in. Ensure your username and password is correct.</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 access to storage 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 access to storage to download the image</string>
+    <string name="auto_synchro">Syncing</string>
     <string name="manual">Manual</string>
     <string name="min_30">30 mins</string>
     <string name="hour_1">1 hour</string>
@@ -124,20 +124,20 @@
     <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">Turn on antomatic syncing to show notifications.\nOpen the settings?</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>
     <string name="changelog">Changelog</string>
     <string name="changelog_url" translatable="false">https://github.com/readrops/Readrops/blob/develop/CHANGELOG.md</string>
-</resources>
\ No newline at end of file
+</resources>

From 1915cf572407f6facbf29dbb22dbb80eecead724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Wed, 27 Oct 2021 07:41:27 +0000
Subject: [PATCH 2/4] Project names

---
 db/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/src/main/res/values/strings.xml b/db/src/main/res/values/strings.xml
index a9e4b5d40..de28d3c66 100644
--- a/db/src/main/res/values/strings.xml
+++ b/db/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
-    <string name="app_name" translatable="false">readropsdb</string>
+    <string name="app_name" translatable="false">ReadropsDB</string>
 
-    <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>
 

From 5f9c91b5b2cf5fdf66dc89b208a4e4def804039d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Wed, 27 Oct 2021 10:08:02 +0200
Subject: [PATCH 3/4] Further improvements

---
 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 5d749e3ce..544463d89 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="app_name" translatable="false">Readrops</string>
     <string name="to_read">Reading</string>
-    <string name="non_read_articles">Non-read</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>
@@ -44,14 +44,14 @@
     <string name="read_later">Reading later</string>
     <string name="show_read_articles">Show read</string>
     <string name="filter">Filter</string>
-    <string name="unread">Mark as non-read</string>
+    <string name="unread">Mark as unread</string>
     <string name="read">Mark as read</string>
     <string name="select_all">Select all</string>
     <string name="account_url">Account URL</string>
     <string name="account_name">Account name</string>
     <string name="login">Username</string>
     <string name="password">Password</string>
-    <string name="password_helper">This is your FreshRSS API password (Configuration → 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>
@@ -71,10 +71,10 @@
     <string name="folder_already_exists">The folder already exists</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">Login details</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. Ensure your username and password is correct.</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">Max items per feed</string>

From 2635bfcb6b5f2a7d35a9036933e657ede51819b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= <epost@anotheragency.no>
Date: Wed, 27 Oct 2021 10:12:52 +0200
Subject: [PATCH 4/4] Further improvements 2

---
 app/src/main/res/values/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 544463d89..7223b0163 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,7 +31,7 @@
     <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="results">Results</string>
@@ -102,7 +102,7 @@
     <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">Grant access to storage to export subscriptions</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>
@@ -114,7 +114,7 @@
     <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">Grant access to storage to download the image</string>
+    <string name="download_image_permission">Grant storage access to download the image</string>
     <string name="auto_synchro">Syncing</string>
     <string name="manual">Manual</string>
     <string name="min_30">30 mins</string>
@@ -130,7 +130,7 @@
     <string name="notifications">Notifications</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">Turn on antomatic syncing to show notifications.\nOpen the settings?</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>