Commit b03d48f3 authored by Christophe Henry's avatar Christophe Henry
Browse files

Merge branch 'develop' into 'develop'

Update strings to feature more natural English

See merge request !109
parents 92355e53 8d64bcd0
Pipeline #4268 failed with stage
in 0 seconds
......@@ -3,7 +3,7 @@
## Bug fixes
* Fix [#103](https://git.feneas.org/christophehenry/freshrss-android/-/issues/103): retrieving articles restults in 404 ([!110](https://git.feneas.org/christophehenry/freshrss-android/-/merge_requests/110))
* Make english sentence more natural to native speakers ([!109](https://git.feneas.org/christophehenry/freshrss-android/-/merge_requests/109))
# 1.3.2
......
......@@ -108,7 +108,8 @@ Read [Android's documentation on translations](https://developer.android.com/stu
* [Fipaddict](https://git.feneas.org/Fipaddict) (French)
* [ButterflyOfFire](https://git.feneas.org/BoFFire) (Arab)
* Brett Cornwall (English)
## UI Graphism
There are no graphists yet. If you think you can improve the look of the application
......@@ -129,4 +130,4 @@ on the project. You, too, matter and deserve a thank you.
## Devs
* [Christophe](https://git.feneas.org/christophehenry)
\ No newline at end of file
* [Christophe](https://git.feneas.org/christophehenry)
......@@ -3,7 +3,7 @@
<string name="app_name" translatable="false">FreshRSS</string>
<!-- Debug-->
<string name="debug_infos" translatable="false">Debug infos</string>
<string name="debug_infos" translatable="false">Debug info</string>
<string name="debug_worker_planned_refreshes" translatable="false">Planned refreshes (%d)</string>
<string name="debug_worker_finished_refreshes" translatable="false">Finished refreshes (%d)</string>
<string name="debug_worker_id" translatable="false">ID: </string>
......@@ -62,10 +62,10 @@
<string name="notification_channel_refresh_description">FreshRSS is fetching content from your FreshRSS server</string>
<string name="notification_channel_errors_title">Errors</string>
<string name="notification_channel_errors_reports_title">Errors reports</string>
<string name="notification_channel_errors_description">FreshRSS has met an error you should be notified about</string>
<string name="notification_channel_errors_description">FreshRSS has encountered an error</string>
<string name="notification_crash_title">FreshRSS has crashed</string>
<string name="notification_crash_description">FreshRSS has encountered an error. You may have a chance to help us improve FreshRSS. Would you
like to send a report?</string>
<string name="notification_crash_description">FreshRSS has encountered an error. Would you like to help improve FreshRSS by
sending a report?</string>
<!-- Strings related to subscriptions -->
<string name="subscription_title_label">Title</string>
<string name="rss_icon">RSS icon</string>
......@@ -78,19 +78,19 @@
<string name="mark_read_status_authorization">mark this article as %s</string>
<string name="read">read</string>
<string name="unread">unread</string>
<string name="add_favorite_status">add the article %s to the favorites</string>
<string name="remove_favorit_status">remove the article %s from the favorites</string>
<string name="add_favorite_status">add the article %s to your favorites</string>
<string name="remove_favorit_status">remove the article %s from your favorites</string>
<string name="request_already_ongoing">A request is already ongoing. Please retry later.</string>
<string name="unable_to">Sorry, the application failed to %s</string>
<string name="empty_subscriptions_section_favorites">You have no favorite yet.\nWhy don\'t you add one?</string>
<string name="empty_subscriptions_section_favorites_category">You have no favorite in %s category.\nWhy don\'t you add one?</string>
<string name="empty_subscriptions_section_all">It\'s quite empty here.\nWhy don\'t find a subscription to get something to read?</string>
<string name="empty_subscriptions_section_all_category">You have no subscription in %s category.\nWhy don\'t you add one?</string>
<string name="empty_subscriptions_section_unread">Yaye! You have read everything here.\nWhy don\'t go in a library to read a book?</string>
<string name="empty_subscriptions_section_unread_category">Yaye! You have read everything in %s category.\nWhy don\'t go in a library to read a book?</string>
<string name="empty_subscription_list">There is no articles on %s feed yet.\nNew articles will probably be published soon.</string>
<string name="empty_subscription_unread_list">You have read every article on %s feed!</string>
<string name="empty_subscription_favorite_list">There is no favorite on %s feed!\n</string>
<string name="empty_subscriptions_section_favorites">You have no favorites yet.\n Why not add one?</string>
<string name="empty_subscriptions_section_favorites_category">You have no favorites in the %s category.\nWhy not add one?</string>
<string name="empty_subscriptions_section_all">It\'s quite empty here.\nWhy not add a new subscription to get something to read?</string>
<string name="empty_subscriptions_section_all_category">You have no subscriptions in the %s category.\nWhy not add one?</string>
<string name="empty_subscriptions_section_unread">Nothing new to read!\nWhy not visit your local library?</string>
<string name="empty_subscriptions_section_unread_category">Nothing new to read for the %s category.\nWhy not visit your local library?</string>
<string name="empty_subscription_list">There are no articles from %s yet.\nNew articles will probably be published soon.</string>
<string name="empty_subscription_unread_list">You\'ve read every article from %s!</string>
<string name="empty_subscription_favorite_list">You have no favorites from %s!</string>
<string name="human_time_grouping_today">Today</string>
<string name="human_time_grouping_yesterday">Yesterday</string>
<string name="human_time_grouping_this_week">This week</string>
......@@ -99,13 +99,13 @@
<string name="human_time_grouping_last_month">Last month</string>
<string name="human_time_grouping_this_year">This year</string>empty_subscription_list
<string name="human_time_grouping_old_articles">Old articles</string>
<string name="hello_user">Hello%s</string>
<string name="good_morning_user">Good morning%s</string>
<string name="good_evening_user">Good evening%s</string>
<string name="hello_user">Hello,%s</string>
<string name="good_morning_user">Good morning,%s</string>
<string name="good_evening_user">Good evening,%s</string>
<string name="subscription_categories">Categories</string>
<string name="share_article">Share article of %s</string>
<string name="instance_url_malformed">This URL is malformed</string>
<string name="no_internet_connection_avaible">There is no internet connection avaible for now, please retry later</string>
<string name="share_article">Share article - %s</string>
<string name="instance_url_malformed">This URL doesn\'t look right</string>
<string name="no_internet_connection_avaible">You\'re not connected to the internet.</string>
<!-- Other messages -->
<string name="nav_header_subtitle">Navigation</string>
<string name="title_settings">Settings</string>
......@@ -129,14 +129,14 @@
<string name="feed_description">Feed description</string>
<string name="website_url">Website URL</string>
<string name="feed_url">Feed URL</string>
<string name="feed_already_subscribed">The feed %s is already in your feed.\n\nYou didn\'t sleep well last night?\nYou need a hug, maybe? \(^o^)/</string>
<string name="add_feed_failed_unknown_error">It\'s embarrassing…\n\nNo feed could be added from %s because of an unexpected error (⚆_⚆)</string>
<string name="no_feed_found">Oh no!\n\nNot feed could be found at URL %s!\n\n(╯°□°)╯︵ ┻━┻</string>
<string name="feed_already_subscribed">%s is already in your feed.\n\nDid you sleep well last night?\nDo you need a hug? \(^o^)/</string>
<string name="add_feed_failed_unknown_error">This is embarrassing…\n\nNo feed could be added from %s because of an unexpected error (⚆_⚆)</string>
<string name="no_feed_found">Oh no!\n\nI couldn\'t find a feed at %s!\n\n(╯°□°)╯︵ ┻━┻</string>
<string name="feed_wait">Please wait…\nU´ᴥ`U</string>
<string name="appearance_setting_title">Appearance</string>
<string name="last_sync_a_few_seconds_ago">Last sync a few seconds ago</string>
<string name="last_sync_relative_date_text">Last sync about %s ago</string>
<string name="last_sync_absolute_date_text">Last sync on %s</string>
<string name="retain_scroll_position_preference_title">Retain articles scroll position</string>
<string name="retain_scroll_position_preference_summary">If checked, the scroll position of articles will be remebered throuought restart</string>
<string name="retain_scroll_position_preference_title">Retain article scroll positions</string>
<string name="retain_scroll_position_preference_summary">If checked, scroll positions will be remembered even after a restart.</string>
</resources>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment