Merge branch 'master' of github.com:martinrotter/rssguard

This commit is contained in:
Martin Rotter 2023-11-02 13:18:02 +01:00
commit c0f33e6289

View File

@ -6,7 +6,7 @@
<message>
<location filename="../src/librssguard/services/abstract/accountcheckmodel.cpp" line="187"/>
<source>(category)</source>
<translation></translation>
<translation>()</translation>
</message>
<message>
<location filename="../src/librssguard/services/abstract/accountcheckmodel.cpp" line="190"/>
@ -29,7 +29,7 @@
<message>
<location filename="../src/librssguard/network-web/adblock/adblockdialog.cpp" line="65"/>
<source>There is some error in AdBlock component and it cannot be enabled. Check error message below (or application debug log) for more information.</source>
<translation>AdBlock () </translation>
<translation>AdBlock </translation>
</message>
<message>
<location filename="../src/librssguard/network-web/adblock/adblockdialog.cpp" line="99"/>
@ -39,14 +39,14 @@
<message>
<location filename="../src/librssguard/network-web/adblock/adblockdialog.cpp" line="114"/>
<source>There is error, check application log for more details and head to online documentation.</source>
<translation>线</translation>
<translation>线</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/adblock/adblockdialog.cpp" line="85"/>
<source>There is error, check application log for more details and head to online documentation. Also make sure that Node.js is installed.
Error: %1</source>
<translation>线 Node.js
<translation>线 Node.js
%1</translation>
</message>
@ -67,7 +67,7 @@ Error: %1</source>
<message>
<location filename="../src/librssguard/network-web/adblock/adblockdialog.cpp" line="98"/>
<source>It seems your AdBlock runs fine, but wait few seconds to be sure.</source>
<translation> AdBlock </translation>
<translation> AdBlock </translation>
</message>
<message>
<location filename="../src/librssguard/network-web/adblock/adblockdialog.ui" line="20"/>
@ -77,27 +77,27 @@ Error: %1</source>
<message>
<location filename="../src/librssguard/network-web/adblock/adblockdialog.ui" line="32"/>
<source>&amp;Help</source>
<translation></translation>
<translation>&amp;</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/adblock/adblockdialog.ui" line="58"/>
<source>Filter lists</source>
<translation></translation>
<translation></translation>
</message>
<message>
<location filename="../src/librssguard/network-web/adblock/adblockdialog.ui" line="64"/>
<source>Add your direct links to filter lists here (one URL per line)</source>
<translation>()</translation>
<translation>URL</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/adblock/adblockdialog.ui" line="78"/>
<source>Custom filters</source>
<translation></translation>
<translation></translation>
</message>
<message>
<location filename="../src/librssguard/network-web/adblock/adblockdialog.ui" line="84"/>
<source>Add your custom filters here (one filter per line)</source>
<translation>()</translation>
<translation></translation>
</message>
</context>
<context>
@ -105,7 +105,7 @@ Error: %1</source>
<message>
<location filename="../src/librssguard/network-web/adblock/adblockicon.cpp" line="12"/>
<source>AdBlock lets you block unwanted content on web pages</source>
<translation>AdBlock </translation>
<translation>AdBlock </translation>
</message>
<message>
<location filename="../src/librssguard/network-web/adblock/adblockicon.cpp" line="45"/>
@ -118,12 +118,12 @@ Error: %1</source>
<message>
<location filename="../src/librssguard/network-web/adblock/adblockmanager.cpp" line="198"/>
<source>Failed to setup filters and start server: %1.</source>
<translation>%1</translation>
<translation>%1</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/adblock/adblockmanager.cpp" line="375"/>
<source>failed to download filter list &apos;%1&apos;</source>
<translation> &apos;%1&apos;</translation>
<translation> &apos;%1&apos;</translation>
</message>
</context>
<context>
@ -131,7 +131,7 @@ Error: %1</source>
<message>
<location filename="../src/librssguard/miscellaneous/application.cpp" line="1151"/>
<source>Application is already running.</source>
<translation></translation>
<translation></translation>
</message>
<message>
<location filename="../src/librssguard/miscellaneous/application.cpp" line="592"/>