Skip to content

Commit 3d2dc61

Browse files
committed
Merge branch 'master' of github.com:martinrotter/rssguard
2 parents 6ea02e3 + 84db0e6 commit 3d2dc61

3 files changed

Lines changed: 40 additions & 39 deletions

File tree

localization/rssguard_es.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ Number of disabled feeds: %3</translation>
420420
<message>
421421
<location filename="../src/librssguard/gui/reusable/colortoolbutton.cpp" line="125"/>
422422
<source>Select icon file</source>
423-
<translation type="unfinished">Select icon file</translation>
423+
<translation>Seleccionar icono</translation>
424424
</message>
425425
<message>
426426
<location filename="../src/librssguard/gui/reusable/colortoolbutton.cpp" line="128"/>

localization/rssguard_zh_CN.ts

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ Maybe change used database name in settings and try again. Falling back to SQLit
724724
<message>
725725
<location filename="../src/librssguard/services/abstract/feed.cpp" line="409"/>
726726
<source>contains no articles</source>
727-
<translation type="unfinished">contains no articles</translation>
727+
<translation>不包含文章</translation>
728728
</message>
729729
<message>
730730
<location filename="../src/librssguard/services/abstract/feed.cpp" line="412"/>
@@ -1674,24 +1674,24 @@ Icon themes base folder -&gt; &quot;%6&quot;</source>
16741674
<message>
16751675
<location filename="../src/librssguard/gui/dialogs/formaskauth.cpp" line="40"/>
16761676
<source>operation was cancelled</source>
1677-
<translation type="unfinished">operation was cancelled</translation>
1677+
<translation>操作被取消</translation>
16781678
</message>
16791679
<message>
16801680
<location filename="../src/librssguard/gui/dialogs/formaskauth.cpp" line="46"/>
16811681
<source>Username should not be empty.</source>
1682-
<translation type="unfinished">Username should not be empty.</translation>
1682+
<translation>用户名不应为空。</translation>
16831683
</message>
16841684
<message>
16851685
<location filename="../src/librssguard/gui/dialogs/formaskauth.cpp" line="49"/>
16861686
<location filename="../src/librssguard/gui/dialogs/formaskauth.cpp" line="58"/>
16871687
<location filename="../src/librssguard/gui/dialogs/formaskauth.cpp" line="58"/>
16881688
<source>OK.</source>
1689-
<translation type="unfinished">OK.</translation>
1689+
<translation>好</translation>
16901690
</message>
16911691
<message>
16921692
<location filename="../src/librssguard/gui/dialogs/formaskauth.cpp" line="55"/>
16931693
<source>Password should not be empty.</source>
1694-
<translation type="unfinished">Password should not be empty.</translation>
1694+
<translation>密码不应为空。</translation>
16951695
</message>
16961696
</context>
16971697
<context>
@@ -2261,7 +2261,7 @@ Icon themes base folder -&gt; &quot;%6&quot;</source>
22612261
<location filename="../src/librssguard/services/abstract/gui/formfeeddetails.ui" line="87"/>
22622262
<location filename="../build/Desktop_Qt_6_11_0_MSVC2022_64bit-Debug/src/librssguard/ui_formfeeddetails.h" line="228"/>
22632263
<source>Open articles via their URL automatically</source>
2264-
<translation type="unfinished">Open articles via their URL automatically</translation>
2264+
<translation>通过文章URL自动打开文章</translation>
22652265
</message>
22662266
<message>
22672267
<location filename="../src/librssguard/services/abstract/gui/formfeeddetails.ui" line="131"/>
@@ -2921,7 +2921,7 @@ Icon themes base folder -&gt; &quot;%6&quot;</source>
29212921
<location filename="../src/librssguard/gui/dialogs/formmain.ui" line="1039"/>
29222922
<location filename="../build/Desktop_Qt_6_11_0_MSVC2022_64bit-Debug/src/librssguard/ui_formmain.h" line="880"/>
29232923
<source>Delete stored &amp;cookies</source>
2924-
<translation type="unfinished">Delete stored &amp;cookies</translation>
2924+
<translation>删除已存储的 &amp;cookie</translation>
29252925
</message>
29262926
<message>
29272927
<location filename="../src/librssguard/gui/dialogs/formmain.ui" line="1044"/>
@@ -3222,12 +3222,12 @@ Icon themes base folder -&gt; &quot;%6&quot;</source>
32223222
<message>
32233223
<location filename="../src/librssguard/gui/dialogs/formmain.cpp" line="823"/>
32243224
<source>Cookies deleted</source>
3225-
<translation type="unfinished">Cookies deleted</translation>
3225+
<translation>Cookies 已删除</translation>
32263226
</message>
32273227
<message>
32283228
<location filename="../src/librssguard/gui/dialogs/formmain.cpp" line="823"/>
32293229
<source>Stored cookies were deleted.</source>
3230-
<translation type="unfinished">Stored cookies were deleted.</translation>
3230+
<translation>存储的 cookie 已被删除。</translation>
32313231
</message>
32323232
<message>
32333233
<location filename="../src/librssguard/gui/dialogs/formmain.cpp" line="829"/>
@@ -3713,7 +3713,7 @@ You have to restart manually.</source>
37133713
<location filename="../src/librssguard/gui/dialogs/formsettings.ui" line="20"/>
37143714
<location filename="../build/Desktop_Qt_6_11_0_MSVC2022_64bit-Debug/src/librssguard/ui_formsettings.h" line="86"/>
37153715
<source>Search settings...</source>
3716-
<translation type="unfinished">Search settings...</translation>
3716+
<translation>搜索设置……</translation>
37173717
</message>
37183718
</context>
37193719
<context>
@@ -6684,17 +6684,17 @@ List of supported readers:</source>
66846684
<message>
66856685
<location filename="../src/librssguard/miscellaneous/skinfactory.cpp" line="654"/>
66866686
<source>folders background (highlighted)</source>
6687-
<translation type="unfinished">folders background (highlighted)</translation>
6687+
<translation>文件夹背景(高亮)</translation>
66886688
</message>
66896689
<message>
66906690
<location filename="../src/librssguard/miscellaneous/skinfactory.cpp" line="657"/>
66916691
<source>article counts</source>
6692-
<translation type="unfinished">article counts</translation>
6692+
<translation>文章数</translation>
66936693
</message>
66946694
<message>
66956695
<location filename="../src/librssguard/miscellaneous/skinfactory.cpp" line="660"/>
66966696
<source>article counts (highlighted)</source>
6697-
<translation type="unfinished">article counts (highlighted)</translation>
6697+
<translation>文章数 (高亮)</translation>
66986698
</message>
66996699
<message>
67006700
<location filename="../src/librssguard-ttrss/src/ttrssnetworkfactory.cpp" line="1011"/>
@@ -6829,26 +6829,26 @@ List of supported readers:</source>
68296829
<message>
68306830
<location filename="../src/librssguard/gui/webviewers/webviewer.cpp" line="235"/>
68316831
<source>Image not decoded</source>
6832-
<translation type="unfinished">Image not decoded</translation>
6832+
<translation>图像未解码</translation>
68336833
</message>
68346834
<message>
68356835
<location filename="../src/librssguard/gui/webviewers/webviewer.cpp" line="236"/>
68366836
<source>Failed to decode image &apos;%1&apos;.</source>
6837-
<translation type="unfinished">Failed to decode image &apos;%1&apos;.</translation>
6837+
<translation>解码图像 &apos;%1&apos; 失败。</translation>
68386838
</message>
68396839
<message>
68406840
<location filename="../src/librssguard/gui/webviewers/webviewer.cpp" line="243"/>
68416841
<location filename="../src/librssguard/gui/webviewers/webviewer.cpp" line="290"/>
68426842
<location filename="../src/librssguard/gui/webviewers/webviewer.cpp" line="290"/>
68436843
<source>Image not downloaded</source>
6844-
<translation type="unfinished">Image not downloaded</translation>
6844+
<translation>图像未下载</translation>
68456845
</message>
68466846
<message>
68476847
<location filename="../src/librssguard/gui/webviewers/webviewer.cpp" line="244"/>
68486848
<location filename="../src/librssguard/gui/webviewers/webviewer.cpp" line="291"/>
68496849
<location filename="../src/librssguard/gui/webviewers/webviewer.cpp" line="291"/>
68506850
<source>Failed to download image &apos;%1&apos; with error &apos;%2&apos;.</source>
6851-
<translation type="unfinished">Failed to download image &apos;%1&apos; with error &apos;%2&apos;.</translation>
6851+
<translation>下载图像 &apos;%1&apos; 失败,错误 &apos;%2&apos;</translation>
68526852
</message>
68536853
<message>
68546854
<location filename="../src/librssguard/gui/webviewers/webviewer.cpp" line="272"/>
@@ -7919,13 +7919,13 @@ This can tremendously speed up the application if you have hundreds of thousands
79197919
<location filename="../src/librssguard/gui/settings/settingsfeedsmessages.ui" line="131"/>
79207920
<location filename="../build/Desktop_Qt_6_11_0_MSVC2022_64bit-Debug/src/librssguard/ui_settingsfeedsmessages.h" line="697"/>
79217921
<source>Only auto-fetch articles if network is connected</source>
7922-
<translation type="unfinished">Only auto-fetch articles if network is connected</translation>
7922+
<translation>仅当网络连接时自动获取文章</translation>
79237923
</message>
79247924
<message>
79257925
<location filename="../src/librssguard/gui/settings/settingsfeedsmessages.ui" line="138"/>
79267926
<location filename="../build/Desktop_Qt_6_11_0_MSVC2022_64bit-Debug/src/librssguard/ui_settingsfeedsmessages.h" line="698"/>
79277927
<source>Only auto-fetch articles if Game Mode is not active</source>
7928-
<translation type="unfinished">Only auto-fetch articles if Game Mode is not active</translation>
7928+
<translation>只在游戏模式未激活时自动获取文章</translation>
79297929
</message>
79307930
<message>
79317931
<location filename="../src/librssguard/gui/settings/settingsfeedsmessages.ui" line="146"/>
@@ -8260,7 +8260,7 @@ This can tremendously speed up the application if you have hundreds of thousands
82608260
<message>
82618261
<location filename="../src/librssguard/gui/settings/settingsgui.cpp" line="311"/>
82628262
<source>Clear color</source>
8263-
<translation type="unfinished">Clear color</translation>
8263+
<translation>清除颜色</translation>
82648264
</message>
82658265
<message>
82668266
<location filename="../src/librssguard/gui/settings/settingsgui.cpp" line="181"/>
@@ -8602,7 +8602,7 @@ Description: %3</source>
86028602
<location filename="../src/librssguard/gui/settings/settingsnetwork.ui" line="34"/>
86038603
<location filename="../build/Desktop_Qt_6_11_0_MSVC2022_64bit-Debug/src/librssguard/ui_settingsnetwork.h" line="127"/>
86048604
<source>Ignore all cookies</source>
8605-
<translation type="unfinished">Ignore all cookies</translation>
8605+
<translation>忽略所有 cookie</translation>
86068606
</message>
86078607
<message>
86088608
<location filename="../src/librssguard/gui/settings/settingsnetwork.ui" line="41"/>
@@ -9094,15 +9094,15 @@ HTTP/2: %6
90949094
Ignore cookies: %7
90959095
Report empty feed as broken: %8
90969096
Fetch full articles: %9 (plain text only: %10)</source>
9097-
<translation type="unfinished">Encoding: %1
9098-
Type: %2
9099-
Post-processing script: %3
9100-
Use raw XML saving: %4
9101-
Fetch article comments: %5
9097+
<translation>编码: %1
9098+
类型: %2
9099+
后期处理脚本: %3
9100+
使用原始 XML 保存: %4
9101+
获取文章评论: %5
91029102
HTTP/2: %6
9103-
Ignore cookies: %7
9104-
Report empty feed as broken: %8
9105-
Fetch full articles: %9 (plain text only: %10)</translation>
9103+
忽略cookies: %7
9104+
将空源报告为已损坏: %8
9105+
获取完整文章: %9 (仅纯文本: %10)</translation>
91069106
</message>
91079107
<message>
91089108
<location filename="../src/librssguard-standard/src/standardfeed.cpp" line="493"/>
@@ -9372,7 +9372,7 @@ Also, you can post-process generated feed data with yet another script if you wi
93729372
<message>
93739373
<location filename="../src/librssguard-standard/src/gui/standardfeedexpdetails.ui" line="108"/>
93749374
<source>Report feed as broken when it contains no articles</source>
9375-
<translation type="unfinished">Report feed as broken when it contains no articles</translation>
9375+
<translation>不含文章时报告源已损坏</translation>
93769376
</message>
93779377
<message>
93789378
<location filename="../src/librssguard-standard/src/gui/standardfeedexpdetails.ui" line="125"/>
@@ -9401,7 +9401,7 @@ This setting is useful when raw XML parsing of the feed is very slow, this happe
94019401
<message>
94029402
<location filename="../src/librssguard-standard/src/gui/standardfeedexpdetails.cpp" line="40"/>
94039403
<source>When enabled, a successfully downloaded and parsed feed which contains no articles will be reported as broken. Empty feeds are valid, so keep this disabled for feeds where having no articles is expected.</source>
9404-
<translation type="unfinished">When enabled, a successfully downloaded and parsed feed which contains no articles will be reported as broken. Empty feeds are valid, so keep this disabled for feeds where having no articles is expected.</translation>
9404+
<translation>如果启用,成功下载和解析的不含文章的源将被报告为已损坏。 空源是有效的,所以预期对没有文章的源保持禁用此选项。</translation>
94059405
</message>
94069406
<message>
94079407
<location filename="../src/librssguard-standard/src/gui/standardfeedexpdetails.cpp" line="46"/>
@@ -9434,7 +9434,7 @@ This setting is useful when raw XML parsing of the feed is very slow, this happe
94349434
<message>
94359435
<location filename="../src/librssguard-standard/src/gui/standardfeednetworkdetails.ui" line="56"/>
94369436
<source>Ignore cookies when downloading this feed</source>
9437-
<translation type="unfinished">Ignore cookies when downloading this feed</translation>
9437+
<translation>下载此源时忽略 cookie</translation>
94389438
</message>
94399439
<message>
94409440
<location filename="../src/librssguard-standard/src/gui/standardfeednetworkdetails.ui" line="65"/>
@@ -9444,7 +9444,7 @@ This setting is useful when raw XML parsing of the feed is very slow, this happe
94449444
<message>
94459445
<location filename="../src/librssguard-standard/src/gui/standardfeednetworkdetails.ui" line="89"/>
94469446
<source>Extra domains</source>
9447-
<translation type="unfinished">Extra domains</translation>
9447+
<translation>附加域名</translation>
94489448
</message>
94499449
<message>
94509450
<location filename="../src/librssguard-standard/src/gui/standardfeednetworkdetails.ui" line="113"/>
@@ -9466,9 +9466,9 @@ This setting is useful when raw XML parsing of the feed is very slow, this happe
94669466
<source>Resources (images, CSS, etc.) server from these domains will also be downloaded via proxy, if the proxy is set. Enter each domain on separate line.
94679467

94689468
This feature only works on &quot;web&quot; version of the app, because on &quot;text&quot; version is not needed, as the proxy resolution there is fully automatic.</source>
9469-
<translation type="unfinished">Resources (images, CSS, etc.) server from these domains will also be downloaded via proxy, if the proxy is set. Enter each domain on separate line.
9469+
<translation>如果设置了代理,这些域名提供的资源(图片、CSS等)也会通过代理下载。每行输入一个域名。
94709470

9471-
This feature only works on &quot;web&quot; version of the app, because on &quot;text&quot; version is not needed, as the proxy resolution there is fully automatic.</translation>
9471+
此功能仅适用于本应用的 &quot;web&quot;版本,&quot;文本&quot;版不需要,因为此版本的代理解析是全自动的。</translation>
94729472
</message>
94739473
<message>
94749474
<location filename="../src/librssguard-standard/src/gui/standardfeednetworkdetails.cpp" line="43"/>
@@ -10230,7 +10230,7 @@ Last login on: %4</source>
1023010230
<message>
1023110231
<location filename="../src/librssguard/gui/webviewers/qtwebengine/webenginepage.cpp" line="77"/>
1023210232
<source>Proxy &apos;%1&apos; authentication</source>
10233-
<translation type="unfinished">Proxy &apos;%1&apos; authentication</translation>
10233+
<translation>代理服务器 &apos;%1&apos; 身份认证</translation>
1023410234
</message>
1023510235
<message>
1023610236
<location filename="../src/librssguard/gui/webviewers/qtwebengine/webenginepage.cpp" line="91"/>
@@ -10531,12 +10531,12 @@ Last login on: %4</source>
1053110531
<message>
1053210532
<location filename="../src/librssguard/network-web/webfactory.cpp" line="735"/>
1053310533
<source>Navigate to website(s) manually</source>
10534-
<translation type="unfinished">Navigate to website(s) manually</translation>
10534+
<translation>手动转到网站</translation>
1053510535
</message>
1053610536
<message>
1053710537
<location filename="../src/librssguard/network-web/webfactory.cpp" line="736"/>
1053810538
<source>%1 was unable to launch your web browser with the given URL, you need to open the below website URLs in your web browser manually.</source>
10539-
<translation type="unfinished">%1 was unable to launch your web browser with the given URL, you need to open the below website URLs in your web browser manually.</translation>
10539+
<translation>%1无法用给定的URL启动你的网络浏览器,你需要在你的网络浏览器中手动打开以下网站URL。</translation>
1054010540
</message>
1054110541
</context>
1054210542
<context>

resources/scripts/github-actions/prepare-linux.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ pacman -Syu --noconfirm \
4848
mariadb-clients \
4949
mpv \
5050
ninja \
51+
patchelf \
5152
pipewire-audio \
5253
pulseaudio \
5354
pulseaudio-alsa \

0 commit comments

Comments
 (0)