From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 9 Oct 2018 11:16:38 +0000 (+0300)
Subject: Merge branch 'master' of git.tt-rss.org:fox/tt-rss
X-Git-Tag: 18.12~66
X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=e60e4ac08627d467c25eba6e1b62069bc5cfc168;hp=717a638972334e8b4790bbf84c99a56e99e9307d

Merge branch 'master' of git.tt-rss.org:fox/tt-rss
---

diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 963b32de..3736d1f6 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -561,17 +561,17 @@ msgstr "全部文章"
 #: include/functions.php:1188
 #: js/viewfeed.js:1695
 msgid "Toggle starred"
-msgstr "锁定加星标的项"
+msgstr "加星此文章"
 
 #: include/functions.php:1189
 #: js/viewfeed.js:1707
 msgid "Toggle published"
-msgstr "锁定发布的项"
+msgstr "发布此文章"
 
 #: include/functions.php:1190
 #: js/viewfeed.js:1682
 msgid "Toggle unread"
-msgstr "锁定未读项"
+msgstr "标记为未读"
 
 #: include/functions.php:1191
 msgid "Edit tags"
diff --git a/locale/zh_TW/LC_MESSAGES/messages.po b/locale/zh_TW/LC_MESSAGES/messages.po
index f294983c..fd47716e 100644
--- a/locale/zh_TW/LC_MESSAGES/messages.po
+++ b/locale/zh_TW/LC_MESSAGES/messages.po
@@ -552,17 +552,17 @@ msgstr "文章"
 #: include/functions.php:1188
 #: js/viewfeed.js:1695
 msgid "Toggle starred"
-msgstr "鎖定加星標的項"
+msgstr "加星此文章"
 
 #: include/functions.php:1189
 #: js/viewfeed.js:1707
 msgid "Toggle published"
-msgstr "鎖定發布的項"
+msgstr "發布此文章"
 
 #: include/functions.php:1190
 #: js/viewfeed.js:1682
 msgid "Toggle unread"
-msgstr "鎖定未讀項"
+msgstr "標記為未讀"
 
 #: include/functions.php:1191
 msgid "Edit tags"
@@ -593,7 +593,7 @@ msgstr "向上捲動"
 #: include/functions.php:1197
 #, fuzzy
 msgid "Select article under cursor"
-msgstr "選擇鼠標指向的文章"
+msgstr "選擇滑鼠指向的文章"
 
 #: include/functions.php:1198
 #, fuzzy
@@ -3211,7 +3211,7 @@ msgstr "移除預定義標籤"
 #: js/viewfeed.js:1817
 #, fuzzy
 msgid "Select articles in group"
-msgstr "選擇鼠標指向的文章"
+msgstr "選擇滑鼠指向的文章"
 
 #: js/viewfeed.js:1827
 #, fuzzy