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

This commit is contained in:
Martin Rotter 2023-10-03 13:38:27 +02:00
commit 66a70ded98

View file

@ -2561,40 +2561,40 @@ QtWebEngineキャッシュフォルダ -&gt; &quot;%7&quot;</translation>
<message>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="317"/>
<source>ACCEPTED</source>
<translation type="unfinished">ACCEPTED</translation>
<translation></translation>
</message>
<message>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="317"/>
<source>REJECTED</source>
<translation type="unfinished">REJECTED</translation>
<translation></translation>
</message>
<message>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="330"/>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="331"/>
<source>yes</source>
<translation type="unfinished">yes</translation>
<translation></translation>
</message>
<message>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="330"/>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="331"/>
<source>no</source>
<translation type="unfinished">no</translation>
<translation></translation>
</message>
<message>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="602"/>
<source>Cannot find &apos;clang-format&apos;</source>
<translation type="unfinished">Cannot find &apos;clang-format&apos;</translation>
<translation>&apos;clang-format&apos; </translation>
</message>
<message>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="603"/>
<source>Script was not beautified, because &apos;clang-format&apos; tool was not found.</source>
<translation type="unfinished">Script was not beautified, because &apos;clang-format&apos; tool was not found.</translation>
<translation>&apos;clang-format&apos; </translation>
</message>
<message>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="246"/>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="621"/>
<source>Error</source>
<translation type="unfinished">Error</translation>
<translation></translation>
</message>
<message>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="622"/>
@ -2604,27 +2604,27 @@ QtWebEngineキャッシュフォルダ -&gt; &quot;%7&quot;</translation>
<message>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="631"/>
<source>Beautifier was running for too long time</source>
<translation type="unfinished">Beautifier was running for too long time</translation>
<translation></translation>
</message>
<message>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="632"/>
<source>Script was not beautified, is &apos;clang-format&apos; installed?</source>
<translation type="unfinished">Script was not beautified, is &apos;clang-format&apos; installed?</translation>
<translation> &apos;clang-format&apos; </translation>
</message>
<message>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="247"/>
<source>Cannot save new filter, error: &apos;%1&apos;.</source>
<translation type="unfinished">Cannot save new filter, error: &apos;%1&apos;.</translation>
<translation> : &apos;%1&apos;.</translation>
</message>
<message>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="192"/>
<source>Context menu</source>
<translation type="unfinished">Context menu</translation>
<translation></translation>
</message>
<message>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="194"/>
<source>Filter articles like this</source>
<translation type="unfinished">Filter articles like this</translation>
<translation></translation>
</message>
<message>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="233"/>
@ -2635,7 +2635,7 @@ QtWebEngineキャッシュフォルダ -&gt; &quot;%7&quot;</translation>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="299"/>
<source>EXISTING articles filtering error: &apos;%1&apos;.
</source>
<translation type="unfinished">EXISTING articles filtering error: &apos;%1&apos;.
<translation>: &apos;%1&apos;.
</translation>
</message>
<message>
@ -2643,7 +2643,7 @@ QtWebEngineキャッシュフォルダ -&gt; &quot;%7&quot;</translation>
<source>Article will be %1.
</source>
<translation type="unfinished">Article will be %1.
<translation> %1
</translation>
</message>
@ -2657,20 +2657,20 @@ QtWebEngineキャッシュフォルダ -&gt; &quot;%7&quot;</translation>
Created on = &apos;%6&apos;
Contents = &apos;%7&apos;
RAW contents = &apos;%8&apos;</source>
<translation type="unfinished">Output (modified) article is:
Title = &apos;%1&apos;
<translation>:
= &apos;%1&apos;
URL = &apos;%2&apos;
Author = &apos;%3&apos;
Is read/important = &apos;%4/%5&apos;
Created on = &apos;%6&apos;
Contents = &apos;%7&apos;
RAW contents = &apos;%8&apos;</translation>
稿 = &apos;%3&apos;
/ = &apos;%4/%5&apos;
= &apos;%6&apos;
= &apos;%7&apos;
RAW = &apos;%8&apos;</translation>
</message>
<message>
<location filename="../src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp" line="340"/>
<source>SAMPLE article filtering error: &apos;%1&apos;.
</source>
<translation type="unfinished">SAMPLE article filtering error: &apos;%1&apos;.
<translation>: &apos;%1&apos;.
</translation>
</message>
<message>