From 8e1e9ec2e324e6128c6297c7fb2f90188f16cbdc Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 7 Jan 2021 18:21:29 +0300
Subject: [PATCH] rebase translations

---
 locale/zh_CN/LC_MESSAGES/messages.mo | Bin 52774 -> 52715 bytes
 locale/zh_CN/LC_MESSAGES/messages.po |   7 ++++---
 messages.pot                         |   2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index f19e63338cb0862f07a256d83b0a3e122de869fa..587a00453655f7556e63746b54d4f51361c47cf5 100644
GIT binary patch
delta 6352
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
F@jtaQFU$Y{

delta 6383
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
QW|oBYB(AjZl{pXoA5r8nlK=n!

diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 86709d25b..19b2d2e78 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-15 16:27+0300\n"
+"POT-Creation-Date: 2021-01-07 18:21+0300\n"
 "PO-Revision-Date: 2020-12-22 13:22+0000\n"
 "Last-Translator: Ptsa Daniel <ptsa1987@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://weblate.tt-rss.org/projects/tt-rss/messages/zh_Hans/>\n"
@@ -1192,7 +1192,8 @@ msgstr "没有匹配的用户。"
 msgid "(inverse)"
 msgstr "(反选)"
 
-#: classes/pref/filters.php:227 classes/pref/filters.php:554
+#: classes/pref/filters.php:227
+#: classes/pref/filters.php:554
 #, fuzzy, php-format
 msgid "%s on %s in %s %s"
 msgstr "%s on %s in %s %s"
@@ -1320,7 +1321,7 @@ msgstr "匹配任意规则"
 msgid "inverse"
 msgstr "反选"
 
-#: classes/pref/filters.php:1149
+#: classes/pref/filters.php:1141
 #, php-format
 msgid "%s (+%d action)"
 msgid_plural "%s (+%d actions)"
diff --git a/messages.pot b/messages.pot
index c85b95b9a..23407077a 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-01-07 18:17+0300\n"
+"POT-Creation-Date: 2021-01-07 18:21+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
GitLab