From 001f0b4ee5bbaedcae04994d63a9e090a98916e3 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Wed, 24 Jan 2024 07:15:38 +0100 Subject: [PATCH] lang sync --- localization/rssguard_en.ts | 294 ++++++++++++++---------- src/librssguard/core/feeddownloader.cpp | 8 +- 2 files changed, 177 insertions(+), 125 deletions(-) diff --git a/localization/rssguard_en.ts b/localization/rssguard_en.ts index 8c62a81c9..abf1f0411 100644 --- a/localization/rssguard_en.ts +++ b/localization/rssguard_en.ts @@ -251,6 +251,92 @@ version by clicking this popup notification. + + ArticleAmountControl + + + Form + + + + + Ignoring old articles + + + + + Add articles with any date into the database + + + + + Avoid adding articles before this date/time into the database + + + + + Absolute date/time + + + + + Relative time + + + + + Limiting amount of articles in feeds + + + + + Customize article limits + + + + + In database, keep + + + + + Do not remove important articles + + + + + Do not remove unread articles + + + + + Just move articles to recycle bin, do not purge them + + + + + Setting any limitations here will instruct %1 to ignore some incoming articles. The logic runs AFTER any article filters so even if your article filter accepts particular article, it can still subsequently ignored and not added to database. + + + + + All excessive articles are removed automatically by the application, usually after particular feed is fetched. Articles are either completely purged (including articles from recycle bin) from internal database or are just moved to recycle bin. + + + + + all articles + + + + + newest article(s) + + + + + + ArticleListNotification @@ -732,33 +818,33 @@ Click here to open parent directory. Feed - + uses global settings, but global auto-fetching of articles is disabled - + no errors no errors - + authentication error - + network error - + does not use auto-fetching of articles Describes feed auto-update status. - + uses global settings (%n minute(s) to next auto-fetch of articles) @@ -766,7 +852,7 @@ Click here to open parent directory. - + uses specific settings (%n minute(s) to next auto-fetching of new articles) Describes feed auto-update status. @@ -775,22 +861,22 @@ Click here to open parent directory. - + has new articles - + parsing error - + error - + Auto-update status: %1 Active message filters: %2 Status: %3 @@ -812,23 +898,23 @@ Item ID: %5 - + Filtered feed list - + Cannot select article in article list as your feed is filtered out from feed list. - + Filtered article list - - Cannot select article as it seems your article list is filtered. + + Cannot select article as it seems your article list is filtered or the article was deleted. @@ -1983,22 +2069,22 @@ QtWebEngine cache folder -> "%7" FormFeedDetails - + Add new feed Add new feed - + Cannot save changes: %1 - + Edit "%1" - + Edit %n feeds @@ -2006,22 +2092,22 @@ QtWebEngine cache folder -> "%7" - + Fetch articles using global interval - + Fetch articles every - + Disable auto-fetching of articles - + Cannot save feed properties @@ -2046,42 +2132,22 @@ QtWebEngine cache folder -> "%7" - - Add articles with any date into the database - - - - - Avoid adding articles before this date/time into the database - - - - - Absolute date/time - - - - - Relative time - - - - + Miscellaneous - + Disable this feed - + Right-to-left layout - + Ignore notifications for this feed @@ -3117,41 +3183,41 @@ QtWebEngine cache folder -> "%7" FormSettings - + Critical settings were changed Critical settings were changed - - + + Changed categories of settings: %1. - + Some settings are changed and will be lost - + Some settings were changed and by cancelling this dialog, you would lose these changes. - + Do you really want to close this dialog without saving any settings? - + Some critical settings were changed and will be applied after the application gets restarted. You have to restart manually. - + Do you want to restart now? @@ -5759,7 +5825,7 @@ Feedly is a secure space where you can privately organize and research the topic - + Cannot insert article filter, because current database cannot return last inserted row ID. @@ -5939,7 +6005,8 @@ List of supported readers: - + + not a JSON feed @@ -6471,12 +6538,12 @@ Number of categories: %2 - + Error when fetching list of feeds - + Feeds & categories for account '%1' were not fetched, error: %2 @@ -6883,27 +6950,27 @@ Authors of this application are NOT responsible for lost data. SettingsFeedsMessages - + Select new font - + Enter format for count of articles displayed next to each feed/category in feed list. Use "%all" and "%unread" strings which are placeholders for the actual count of all (or unread) articles. - + Note that enabling this might have drastic consequences on performance of article list with big number of articles. - + days (turned off) - + day(s) @@ -6911,17 +6978,17 @@ Authors of this application are NOT responsible for lost data. - + = unchanged size - + PC restart needed - + Your PC needs to be restarted to make some of enabled features fully working. @@ -6966,172 +7033,157 @@ Authors of this application are NOT responsible for lost data. - - Avoid adding articles before this date into the database - - - - - Absolute date/time - - - - - Relative time - - - - + Feeds list - - + + Row height - + Feed list font - - - + + + Font preview - - - + + + &Change font - + Article count format - + Hide article counts if there are no unread articles - + Allow only basic keyboard shortcuts for feed/article list - + Display tooltips for feeds and articles - + Update feed list during feed fetching - + Articles - + Remove all read articles from all feeds on application exit - + Ignore changes in article body when new articles are being fetched - + Internal article viewer - + Limit height of all pictures - + Use legacy article formatting - + Unread article icon type - + Bring application window to front once article is opened in external web browser - + Article browser font - + Fixup date/time of articles which are in the future - + Display attachments directly in article - + Keep article viewer always visible - + Articles list - + Keep article selection in the middle of the article list viewport - + Enable multiline items - + Top/bottom row padding - + Use custom date/time format - + Custom date/time format for today's articles - + Article list font - + Show relative time for articles not older than @@ -8372,17 +8424,17 @@ Unread news: %2 TextBrowserViewer - + Enable external resources - + Download - + image diff --git a/src/librssguard/core/feeddownloader.cpp b/src/librssguard/core/feeddownloader.cpp index cfa1637cf..4f5392950 100644 --- a/src/librssguard/core/feeddownloader.cpp +++ b/src/librssguard/core/feeddownloader.cpp @@ -410,9 +410,7 @@ void FeedDownloader::updateOneFeed(ServiceRoot* acc, << NONQUOTE_W_SPACE(updated_messages.m_all.size()) "total messages for feed" << QUOTE_W_SPACE(feed->customId()) << "stored in DB."; - if (!updated_messages.m_unread.isEmpty()) { - m_results.appendUpdatedFeed(feed, updated_messages.m_unread); - } + m_results.appendUpdatedFeed(feed, updated_messages.m_unread); } catch (const FeedFetchException& feed_ex) { qCriticalNN << LOGSEC_NETWORK << "Error when fetching feed:" << QUOTE_W_SPACE(feed_ex.feedStatus()) @@ -580,7 +578,9 @@ QString FeedDownloadResults::overview(int how_many_feeds) const { } void FeedDownloadResults::appendUpdatedFeed(Feed* feed, const QList& updated_unread_msgs) { - m_updatedFeeds.insert(feed, updated_unread_msgs); + if (!updated_unread_msgs.isEmpty()) { + m_updatedFeeds.insert(feed, updated_unread_msgs); + } } void FeedDownloadResults::clear() {