Merge branch 'weblate-integration'

2 files changed, 20 insertions, 21 deletions

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 6715bb293..f19e63338 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.mo
+++ b/locale/zh_CN/LC_MESSAGES/messages.mo
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 64eefa00d..86709d25b 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:17+0300\n"
-"PO-Revision-Date: 2020-10-15 17:22+0000\n"
+"POT-Creation-Date: 2020-10-15 16:27+0300\n"
+"PO-Revision-Date: 2020-12-22 13:22+0000\n"
 "Last-Translator: Ptsa Daniel <[email protected]>\n"
 "Language-Team: Chinese (Simplified) <https://weblate.tt-rss.org/projects/tt-rss/messages/zh_Hans/>\n"
 "Language: zh_CN\n"
@@ -323,7 +323,7 @@ msgstr "全部信息源："
 
 #: index.php:254
 msgid "(Un)hide read feeds"
-msgstr "隐藏（显示）已读信息"
+msgstr "隐藏/显示 已读"
 
 #: index.php:255
 msgid "Other actions:"
@@ -793,7 +793,7 @@ msgstr "切换标题分组"
 
 #: classes/rpc.php:798
 msgid "Debug feed update"
-msgstr "调试信息源更新"
+msgstr "信息源更新调试"
 
 #: classes/rpc.php:799
 msgid "Debug viewfeed()"
@@ -1192,11 +1192,10 @@ msgstr "没有匹配的用户。"
 msgid "(inverse)"
 msgstr "(反选)"
 
-#: classes/pref/filters.php:227
-#: classes/pref/filters.php:554
-#, php-format
+#: classes/pref/filters.php:227 classes/pref/filters.php:554
+#, fuzzy, php-format
 msgid "%s on %s in %s %s"
-msgstr ""
+msgstr "%s on %s in %s %s"
 
 #: classes/pref/filters.php:347
 #: classes/pref/filters.php:832
@@ -1321,11 +1320,11 @@ msgstr "匹配任意规则"
 msgid "inverse"
 msgstr "反选"
 
-#: classes/pref/filters.php:1141
-#, fuzzy, php-format
+#: classes/pref/filters.php:1149
+#, php-format
 msgid "%s (+%d action)"
 msgid_plural "%s (+%d actions)"
-msgstr[0] "信息源动作"
+msgstr[0] "%s (+%d 个操作)"
 
 #: classes/pref/labels.php:38
 msgid "Colors"
@@ -1734,7 +1733,7 @@ msgstr "系统插件"
 #: classes/pref/prefs.php:986
 #, php-format
 msgid "v%.2f, by %s"
-msgstr ""
+msgstr "v%.2f, 由 %s 提供"
 
 #: classes/pref/prefs.php:948
 msgid "User plugins"
@@ -2036,7 +2035,7 @@ msgstr "点击以编辑信息源"
 #: classes/pref/feeds.php:1522
 #: classes/pref/feeds.php:1581
 msgid "Unsubscribe from selected feeds"
-msgstr "取消订阅选中的信息源"
+msgstr "退订选中的信息源"
 
 #: classes/pref/feeds.php:1676
 msgid "One valid feed per line (no detection is done)"
@@ -2372,7 +2371,7 @@ msgstr "完成。"
 #: classes/handler/public.php:1187
 #, php-format
 msgid "Tiny Tiny RSS database needs update to the latest version (%d to %d)."
-msgstr "您的 Tiny Tiny RSS 数据库需要升级到最新版（ %d 到  %d ）。"
+msgstr "您的Tiny Tiny RSS数据库需要升级到最新版(%d 到 %d )."
 
 #: classes/handler/public.php:1199
 msgid "Perform updates"
@@ -3091,7 +3090,7 @@ msgstr "调试信息源"
 
 #: js/FeedTree.js:125
 msgid "(Un)collapse"
-msgstr "收起和展开"
+msgstr "收起/展开"
 
 #: js/Feeds.js:387
 msgid "Mark all articles as read?"
@@ -3115,7 +3114,7 @@ msgstr "将 %s 中 %w 2周前的文章标记为已读?"
 
 #: js/Feeds.js:418
 msgid "Mark %w in %s as read?"
-msgstr "将 %s 中 %w 的文章标记为已读?"
+msgstr "将 %s 中的 %w 标记为已读?"
 
 #: js/Feeds.js:421
 msgid "search results"
@@ -3127,7 +3126,7 @@ msgstr "全部文章"
 
 #: js/Feeds.js:464
 msgid "Mark all articles in %s as read?"
-msgstr "将 %s 中的全部文章标记为已读？"
+msgstr "将选中的 %s 篇文章标记为已读?"
 
 #: js/Headlines.js:629
 #: js/Headlines.js:679
@@ -3146,12 +3145,12 @@ msgstr "找到新文章，点击重新加载。"
 #: js/Headlines.js:886
 msgid "%d article selected"
 msgid_plural "%d articles selected"
-msgstr[0] "%d 文章被选中"
+msgstr[0] "%d 篇文章被选定"
 
 #: js/Headlines.js:959
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
-msgstr[0] "删除 %s 中选择的 %d 篇文章？"
+msgstr[0] "删除%d,在%s选中的文章?"
 
 #: js/Headlines.js:961
 msgid "Delete %d selected article?"
@@ -3161,7 +3160,7 @@ msgstr[0] "删除选中的 %d 篇文章？"
 #: js/Headlines.js:1101
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
-msgstr[0] "将 %s 中的 %d 篇选中的文章存档？"
+msgstr[0] "存档%d,在%s中选择的文章?"
 
 #: js/Headlines.js:1104
 msgid "Move %d archived article back?"
@@ -3175,7 +3174,7 @@ msgstr "请注意,未加星的文章可能在下一次文章更新中被清除."
 #: js/Headlines.js:1134
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
-msgstr[0] "将 %s 中选中的 %d 篇文章标记为已读？"
+msgstr[0] "标记%d为已读,在%s中选择的文章？"
 
 #: js/Headlines.js:1150
 msgid "No article is selected."