FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make some translation strings easier to understand.

Browse Source
This commit is contained in:
Martin Rotter 2020-12-21 09:56:42 +01:00
parent 2acad9ea44
commit 7804d13bea
11 changed files with 93 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
localization/rssguard_en.ts
View File

@ -522,27 +522,6 @@ Click here to open parent directory.</translation>
</context>
<context>
<name>Feed</name>
<message>
<source>does not use auto-update</source>
<extracomment>Describes feed auto-update status.</extracomment>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<source>uses global settings (%n minute(s) to next auto-update)</source>
<extracomment>Describes feed auto-update status.</extracomment>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
<source>uses specific settings (%n minute(s) to next auto-update)</source>
<extracomment>Describes feed auto-update status.</extracomment>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
<source>no errors</source>
<translation type="unfinished">no errors</translation>
@ -563,16 +542,37 @@ Click here to open parent directory.</translation>
<source>unspecified error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>uses global settings (global feed auto-updating is disabled)</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto-update status: %1
Active message filters: %2
Status: %3</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>does not use auto-downloading of messages</source>
<extracomment>Describes feed auto-update status.</extracomment>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<source>uses global settings (%n minute(s) to next auto-download of messages)</source>
<extracomment>Describes feed auto-update status.</extracomment>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
<source>uses global settings (global auto-downloading of messages is disabled)</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<source>uses specific settings (%n minute(s) to next auto-downloading of new messages)</source>
<extracomment>Describes feed auto-update status.</extracomment>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
</context>
<context>
<name>FeedMessageViewer</name>
@ -592,20 +592,20 @@ Status: %3</source>
<translation type="unfinished">Cannot update all items</translation>
</message>
<message>
<source>Starting auto-update of some feeds</source>
<translation type="unfinished">Starting auto-update of some feeds</translation>
<source>You cannot download new messages for your items because another critical operation is ongoing.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Starting auto-download of some feeds&apos; messages</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
<source>I will auto-update %n feed(s).</source>
<source>I will auto-download new messages for %n feed(s).</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
<source>You cannot update items because another critical operation is ongoing.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FeedsImportExportModel</name>
@ -876,10 +876,6 @@ or this functionality is not implemented yet.</translation>
</context>
<context>
<name>FormAddEditLabel</name>
<message>
<source>Dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>...</source>
<translation type="unfinished"></translation>
@ -1064,10 +1060,6 @@ or this functionality is not implemented yet.</translation>
</context>
<context>
<name>FormDownloadAttachment</name>
<message>
<source>Dialog</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Downloading attachment...</source>
<translation type="unfinished"></translation>
@ -1601,30 +1593,6 @@ It is highly recommended to create your own &quot;Application ID&quot;.</source>
</context>
<context>
<name>FormFeedDetails</name>
<message>
<source>Auto-update</source>
<translation>Auto-update</translation>
</message>
<message>
<source>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.</source>
<translation>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.</translation>
</message>
<message>
<source>Auto-update using global interval</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto-update every</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Do not auto-update at all</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto-updating</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Cannot edit feed</source>
<translation type="unfinished">Cannot edit feed</translation>
@ -1637,6 +1605,26 @@ It is highly recommended to create your own &quot;Application ID&quot;.</source>
<source>Edit &apos;%1&apos;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto-downloading of messages</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>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.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download messages using global interval</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download messages every</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Do not download messages at all</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FormMain</name>
@ -2054,7 +2042,7 @@ It is highly recommended to create your own &quot;Application ID&quot;.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Download messages for items with &amp;custom auto-update policy</source>
<source>Download messages for items with &amp;custom auto-download policy</source>
<translation type="unfinished"></translation>
</message>
</context>
@ -3941,14 +3929,6 @@ Authors of this application are NOT responsible for lost data.</translation>
<source>Feeds &amp;&amp; categories</source>
<translation type="unfinished">Feeds &amp;&amp; categories</translation>
</message>
<message>
<source>Auto-update all feeds every</source>
<translation type="unfinished">Auto-update all feeds every</translation>
</message>
<message>
<source>Only auto-update when application is unfocused</source>
<translation>Only auto-update when application is unfocused</translation>
</message>
<message>
<source>Feed connection timeout</source>
<translation type="unfinished">Feed connection timeout</translation>
@ -4001,10 +3981,6 @@ Authors of this application are NOT responsible for lost data.</translation>
<source>Height of image attachments</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable &quot;auto-update started&quot; notification</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Height or rows in feed list (-1 = default height)</source>
<translation type="unfinished"></translation>
@ -4034,7 +4010,19 @@ Authors of this application are NOT responsible for lost data.</translation>
<translation type="unfinished"></translation>
</message>
<message>
<source>Update all feeds on application startup with initial delay of</source>
<source>Download messages for all feeds on application startup with initial delay of</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Enable &quot;auto-download started&quot; notification</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Only auto-download messages when application is unfocused</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Auto-download messages for all feeds every</source>
<translation type="unfinished"></translation>
</message>
</context>

3
src/librssguard/gui/dialogs/formaddeditlabel.ui
View File

@ -10,9 +10,6 @@
<height>97</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">

2
src/librssguard/gui/dialogs/formmain.ui
View File

@ -774,7 +774,7 @@
</action>
<action name="m_actionUpdateSelectedItemsWithCustomTimers">
<property name="text">
<string>Download messages for items with &amp;custom auto-update policy</string>
<string>Download messages for items with &amp;custom auto-download policy</string>
</property>
</action>
<action name="m_actionAlternateColorsInLists">

8
src/librssguard/gui/settings/settingsfeedsmessages.ui
View File

@ -38,7 +38,7 @@
<item>
<widget class="QCheckBox" name="m_checkUpdateAllFeedsOnStartup">
<property name="text">
<string>Update all feeds on application startup with initial delay of</string>
<string>Download messages for all feeds on application startup with initial delay of</string>
</property>
</widget>
</item>
@ -66,14 +66,14 @@
<item row="1" column="0">
<widget class="QCheckBox" name="m_checkAutoUpdateNotification">
<property name="text">
<string>Enable &quot;auto-update started&quot; notification</string>
<string>Enable &quot;auto-download started&quot; notification</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="m_checkAutoUpdateOnlyUnfocused">
<property name="text">
<string>Only auto-update when application is unfocused</string>
<string>Only auto-download messages when application is unfocused</string>
</property>
</widget>
</item>
@ -189,7 +189,7 @@
<item>
<widget class="QCheckBox" name="m_checkAutoUpdate">
<property name="text">
<string>Auto-update all feeds every</string>
<string>Auto-download messages for all feeds every</string>
</property>
</widget>
</item>

16
src/librssguard/miscellaneous/feedreader.cpp
View File

@ -67,7 +67,7 @@ QList<ServiceEntryPoint*> FeedReader::feedServices() {
void FeedReader::updateFeeds(const QList<Feed*>& 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);
}
}

2
src/librssguard/miscellaneous/feedreader.h
View File

@ -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();

8
src/librssguard/services/abstract/feed.cpp
View File

@ -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;
}

2
src/librssguard/services/abstract/feed.h
View File

@ -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,

6
src/librssguard/services/abstract/gui/formfeeddetails.cpp
View File

@ -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)));
}

10
src/librssguard/services/abstract/gui/formfeeddetails.ui
View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>519</width>
<width>471</width>
<height>352</height>
</rect>
</property>
@ -21,13 +21,13 @@
</property>
<widget class="QWidget" name="tabUpdating">
<attribute name="title">
<string>Auto-updating</string>
<string>Auto-downloading of messages</string>
</attribute>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Auto-update</string>
<string>Auto-downloading of messages</string>
</property>
<property name="buddy">
<cstring>m_cmbAutoUpdateType</cstring>
@ -35,11 +35,11 @@
</widget>
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QComboBox" name="m_cmbAutoUpdateType">
<property name="toolTip">
<string>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.</string>
<string>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.</string>
</property>
</widget>
</item>

3
src/librssguard/services/gmail/gui/formdownloadattachment.ui
View File

@ -10,9 +10,6 @@
<height>106</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0" colspan="2">
<widget class="QProgressBar" name="m_progressBar">