diff --git a/localization/rssguard_en.ts b/localization/rssguard_en.ts index cb03ce802..ea74c44ec 100644 --- a/localization/rssguard_en.ts +++ b/localization/rssguard_en.ts @@ -522,27 +522,6 @@ Click here to open parent directory. Feed - - does not use auto-update - Describes feed auto-update status. - - - - uses global settings (%n minute(s) to next auto-update) - Describes feed auto-update status. - - - - - - - uses specific settings (%n minute(s) to next auto-update) - Describes feed auto-update status. - - - - - no errors no errors @@ -563,16 +542,37 @@ Click here to open parent directory. unspecified error - - uses global settings (global feed auto-updating is disabled) - - Auto-update status: %1 Active message filters: %2 Status: %3 + + does not use auto-downloading of messages + Describes feed auto-update status. + + + + uses global settings (%n minute(s) to next auto-download of messages) + Describes feed auto-update status. + + + + + + + uses global settings (global auto-downloading of messages is disabled) + + + + uses specific settings (%n minute(s) to next auto-downloading of new messages) + Describes feed auto-update status. + + + + + FeedMessageViewer @@ -592,20 +592,20 @@ Status: %3 Cannot update all items - Starting auto-update of some feeds - Starting auto-update of some feeds + You cannot download new messages for your items because another critical operation is ongoing. + + + + Starting auto-download of some feeds' messages + - I will auto-update %n feed(s). + I will auto-download new messages for %n feed(s). - - You cannot update items because another critical operation is ongoing. - - FeedsImportExportModel @@ -876,10 +876,6 @@ or this functionality is not implemented yet. FormAddEditLabel - - Dialog - - ... @@ -1064,10 +1060,6 @@ or this functionality is not implemented yet. FormDownloadAttachment - - Dialog - - Downloading attachment... @@ -1601,30 +1593,6 @@ It is highly recommended to create your own "Application ID". FormFeedDetails - - Auto-update - Auto-update - - - Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings. - Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings. - - - Auto-update using global interval - - - - Auto-update every - - - - Do not auto-update at all - - - - Auto-updating - - Cannot edit feed Cannot edit feed @@ -1637,6 +1605,26 @@ It is highly recommended to create your own "Application ID". Edit '%1' + + Auto-downloading of messages + + + + Select the auto-download strategy for messages of this feed. Default auto-download strategy means that new messges of this feed will be downloaded in time intervals set in application settings. + + + + Download messages using global interval + + + + Download messages every + + + + Do not download messages at all + + FormMain @@ -2054,7 +2042,7 @@ It is highly recommended to create your own "Application ID". - Download messages for items with &custom auto-update policy + Download messages for items with &custom auto-download policy @@ -3941,14 +3929,6 @@ Authors of this application are NOT responsible for lost data. Feeds && categories Feeds && categories - - Auto-update all feeds every - Auto-update all feeds every - - - Only auto-update when application is unfocused - Only auto-update when application is unfocused - Feed connection timeout Feed connection timeout @@ -4001,10 +3981,6 @@ Authors of this application are NOT responsible for lost data. Height of image attachments - - Enable "auto-update started" notification - - Height or rows in feed list (-1 = default height) @@ -4034,7 +4010,19 @@ Authors of this application are NOT responsible for lost data. - Update all feeds on application startup with initial delay of + Download messages for all feeds on application startup with initial delay of + + + + Enable "auto-download started" notification + + + + Only auto-download messages when application is unfocused + + + + Auto-download messages for all feeds every diff --git a/src/librssguard/gui/dialogs/formaddeditlabel.ui b/src/librssguard/gui/dialogs/formaddeditlabel.ui index 5ab5a9218..be3f287e0 100644 --- a/src/librssguard/gui/dialogs/formaddeditlabel.ui +++ b/src/librssguard/gui/dialogs/formaddeditlabel.ui @@ -10,9 +10,6 @@ 97 - - Dialog - diff --git a/src/librssguard/gui/dialogs/formmain.ui b/src/librssguard/gui/dialogs/formmain.ui index 67c76efa0..4d521b5aa 100755 --- a/src/librssguard/gui/dialogs/formmain.ui +++ b/src/librssguard/gui/dialogs/formmain.ui @@ -774,7 +774,7 @@ - Download messages for items with &custom auto-update policy + Download messages for items with &custom auto-download policy diff --git a/src/librssguard/gui/settings/settingsfeedsmessages.ui b/src/librssguard/gui/settings/settingsfeedsmessages.ui index b2ead831a..22d0c7f29 100644 --- a/src/librssguard/gui/settings/settingsfeedsmessages.ui +++ b/src/librssguard/gui/settings/settingsfeedsmessages.ui @@ -38,7 +38,7 @@ - Update all feeds on application startup with initial delay of + Download messages for all feeds on application startup with initial delay of @@ -66,14 +66,14 @@ - Enable "auto-update started" notification + Enable "auto-download started" notification - Only auto-update when application is unfocused + Only auto-download messages when application is unfocused @@ -189,7 +189,7 @@ - Auto-update all feeds every + Auto-download messages for all feeds every diff --git a/src/librssguard/miscellaneous/feedreader.cpp b/src/librssguard/miscellaneous/feedreader.cpp index 796224a2e..2424da4e3 100644 --- a/src/librssguard/miscellaneous/feedreader.cpp +++ b/src/librssguard/miscellaneous/feedreader.cpp @@ -67,7 +67,7 @@ QList FeedReader::feedServices() { void FeedReader::updateFeeds(const QList& feeds) { if (!qApp->feedUpdateLock()->tryLock()) { qApp->showGuiMessage(tr("Cannot update all items"), - tr("You cannot update items " + tr("You cannot download new messages for your items " "because another critical operation is ongoing."), QSystemTrayIcon::MessageIcon::Warning, qApp->mainFormWidget(), true); return; @@ -133,12 +133,12 @@ void FeedReader::updateAutoUpdateStatus() { if (!m_autoUpdateTimer->isActive()) { m_autoUpdateTimer->setInterval(AUTO_UPDATE_INTERVAL); m_autoUpdateTimer->start(); - qDebugNN << LOGSEC_CORE << "Auto-update timer started with interval " + qDebugNN << LOGSEC_CORE << "Auto-download timer started with interval " << m_autoUpdateTimer->interval() << " ms."; } else { - qDebugNN << LOGSEC_CORE << "Auto-update timer is already running."; + qDebugNN << LOGSEC_CORE << "Auto-download timer is already running."; } } @@ -262,7 +262,7 @@ void FeedReader::executeNextAutoUpdate() { // and there are no caches to synchronize. if (disable_update_with_window && full_caches.empty()) { qDebugNN << LOGSEC_CORE - << "Delaying scheduled feed auto-update for one minute since window " + << "Delaying scheduled feed auto-download for one minute since window " << "is focused and updates while focused are disabled by the " << "user and all account caches are empty."; @@ -272,7 +272,7 @@ void FeedReader::executeNextAutoUpdate() { if (!qApp->feedUpdateLock()->tryLock()) { qDebugNN << LOGSEC_CORE - << "Delaying scheduled feed auto-updates and message state synchronization for " + << "Delaying scheduled feed auto-downloads and message state synchronization for " << "one minute due to another running update."; // Cannot update, quit. @@ -287,7 +287,7 @@ void FeedReader::executeNextAutoUpdate() { } qDebugNN << LOGSEC_CORE - << "Starting auto-update event, remaining " + << "Starting auto-download event, remaining " << m_globalAutoUpdateRemainingInterval << " minutes out of " << m_globalAutoUpdateInitialInterval << " total minutes to next global feed update."; @@ -311,8 +311,8 @@ void FeedReader::executeNextAutoUpdate() { // NOTE: OSD/bubble informing about performing of scheduled update can be shown now. if (qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::EnableAutoUpdateNotification)).toBool()) { - qApp->showGuiMessage(tr("Starting auto-update of some feeds"), - tr("I will auto-update %n feed(s).", nullptr, feeds_for_update.size()), + qApp->showGuiMessage(tr("Starting auto-download of some feeds' messages"), + tr("I will auto-download new messages for %n feed(s).", nullptr, feeds_for_update.size()), QSystemTrayIcon::MessageIcon::Information); } } diff --git a/src/librssguard/miscellaneous/feedreader.h b/src/librssguard/miscellaneous/feedreader.h index 0962e568e..ec42f63ac 100644 --- a/src/librssguard/miscellaneous/feedreader.h +++ b/src/librssguard/miscellaneous/feedreader.h @@ -48,7 +48,7 @@ class RSSGUARD_DLLSPEC FeedReader : public QObject { // True if feed update is running right now. bool isFeedUpdateRunning() const; - // Resets global auto-update intervals according to settings + // Resets global auto-download intervals according to settings // and starts/stop the timer as needed. void updateAutoUpdateStatus(); diff --git a/src/librssguard/services/abstract/feed.cpp b/src/librssguard/services/abstract/feed.cpp index ad623eb9d..e253ca614 100755 --- a/src/librssguard/services/abstract/feed.cpp +++ b/src/librssguard/services/abstract/feed.cpp @@ -336,24 +336,24 @@ QString Feed::getAutoUpdateStatusDescription() const { case AutoUpdateType::DontAutoUpdate: //: Describes feed auto-update status. - auto_update_string = tr("does not use auto-update"); + auto_update_string = tr("does not use auto-downloading of messages"); break; case AutoUpdateType::DefaultAutoUpdate: //: Describes feed auto-update status. auto_update_string = qApp->feedReader()->autoUpdateEnabled() - ? tr("uses global settings (%n minute(s) to next auto-update)", + ? tr("uses global settings (%n minute(s) to next auto-download of messages)", nullptr, qApp->feedReader()->autoUpdateRemainingInterval()) - : tr("uses global settings (global feed auto-updating is disabled)"); + : tr("uses global settings (global auto-downloading of messages is disabled)"); break; case AutoUpdateType::SpecificAutoUpdate: default: //: Describes feed auto-update status. - auto_update_string = tr("uses specific settings (%n minute(s) to next auto-update)", nullptr, autoUpdateRemainingInterval()); + auto_update_string = tr("uses specific settings (%n minute(s) to next auto-downloading of new messages)", nullptr, autoUpdateRemainingInterval()); break; } diff --git a/src/librssguard/services/abstract/feed.h b/src/librssguard/services/abstract/feed.h index 083fa25b7..97dd677c8 100644 --- a/src/librssguard/services/abstract/feed.h +++ b/src/librssguard/services/abstract/feed.h @@ -17,7 +17,7 @@ class Feed : public RootItem { public: - // Specifies the auto-update strategy for the feed. + // Specifies the auto-download strategy for the feed. enum class AutoUpdateType { DontAutoUpdate = 0, DefaultAutoUpdate = 1, diff --git a/src/librssguard/services/abstract/gui/formfeeddetails.cpp b/src/librssguard/services/abstract/gui/formfeeddetails.cpp index b9312ce3e..231da2cc7 100644 --- a/src/librssguard/services/abstract/gui/formfeeddetails.cpp +++ b/src/librssguard/services/abstract/gui/formfeeddetails.cpp @@ -107,10 +107,10 @@ void FormFeedDetails::initialize() { // Setup auto-update options. m_ui->m_spinAutoUpdateInterval->setValue(DEFAULT_AUTO_UPDATE_INTERVAL); - m_ui->m_cmbAutoUpdateType->addItem(tr("Auto-update using global interval"), + m_ui->m_cmbAutoUpdateType->addItem(tr("Download messages using global interval"), QVariant::fromValue(int(Feed::AutoUpdateType::DefaultAutoUpdate))); - m_ui->m_cmbAutoUpdateType->addItem(tr("Auto-update every"), + m_ui->m_cmbAutoUpdateType->addItem(tr("Download messages every"), QVariant::fromValue(int(Feed::AutoUpdateType::SpecificAutoUpdate))); - m_ui->m_cmbAutoUpdateType->addItem(tr("Do not auto-update at all"), + m_ui->m_cmbAutoUpdateType->addItem(tr("Do not download messages at all"), QVariant::fromValue(int(Feed::AutoUpdateType::DontAutoUpdate))); } diff --git a/src/librssguard/services/abstract/gui/formfeeddetails.ui b/src/librssguard/services/abstract/gui/formfeeddetails.ui index c04c0a4a6..bdd44ddcf 100644 --- a/src/librssguard/services/abstract/gui/formfeeddetails.ui +++ b/src/librssguard/services/abstract/gui/formfeeddetails.ui @@ -6,7 +6,7 @@ 0 0 - 519 + 471 352 @@ -21,13 +21,13 @@ - Auto-updating + Auto-downloading of messages - Auto-update + Auto-downloading of messages m_cmbAutoUpdateType @@ -35,11 +35,11 @@ - + - Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings. + Select the auto-download strategy for messages of this feed. Default auto-download strategy means that new messges of this feed will be downloaded in time intervals set in application settings. diff --git a/src/librssguard/services/gmail/gui/formdownloadattachment.ui b/src/librssguard/services/gmail/gui/formdownloadattachment.ui index ce09cdd20..4663d36f3 100644 --- a/src/librssguard/services/gmail/gui/formdownloadattachment.ui +++ b/src/librssguard/services/gmail/gui/formdownloadattachment.ui @@ -10,9 +10,6 @@ 106 - - Dialog -