From d30491238b081f6d5d5175a9c71eb0383d4fdbb1 Mon Sep 17 00:00:00 2001
From: Automated System <gitea@mirror.git.trinitydesktop.org>
Date: Sat, 10 Sep 2022 22:52:31 +0000
Subject: [PATCH] Merge translation files from master branch.

---
 translations/desktop_files/zh_CN.po           | 20 +++++++++---------
 .../messages/kdiff3_plugin/zh_Hans.po         | 21 +++++++++++--------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/translations/desktop_files/zh_CN.po b/translations/desktop_files/zh_CN.po
index 361488b..447b5d0 100644
--- a/translations/desktop_files/zh_CN.po
+++ b/translations/desktop_files/zh_CN.po
@@ -1,36 +1,36 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Xiao Wenming <xwmde@163.com>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-06-28 10:45+0200\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"
+"PO-Revision-Date: 2022-09-10 04:56+0000\n"
+"Last-Translator: Xiao Wenming <xwmde@163.com>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/applications/kdiff3-desktop-files/zh_Hans/>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Name
 #: kdiff3plugin/kdiff3_plugin.desktop:4
 msgid "Compare/Merge Files/Directories"
-msgstr ""
+msgstr "比较/合并 文件/目录"
 
 #. Name
 #: kdiff3plugin/kdiff3plugin.desktop:4
 msgid "Compare/Merge Files/Directories with KDiff3"
-msgstr ""
+msgstr "使用KDiff3比较/合并文件/目录"
 
 #. Name
 #: src/kdiff3.desktop:3
-#, fuzzy
 msgid "KDiff3"
-msgstr "KDiff3 组件"
+msgstr "KDiff3"
 
 #. GenericName
 #: src/kdiff3.desktop:5
diff --git a/translations/messages/kdiff3_plugin/zh_Hans.po b/translations/messages/kdiff3_plugin/zh_Hans.po
index 2a5cf7e..ef47e99 100644
--- a/translations/messages/kdiff3_plugin/zh_Hans.po
+++ b/translations/messages/kdiff3_plugin/zh_Hans.po
@@ -4,39 +4,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2020-05-11 04:19+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2022-09-10 04:56+0000\n"
+"Last-Translator: Xiao Wenming <xwmde@163.com>\n"
+"Language-Team: Chinese (Simplified) <https://mirror.git.trinitydesktop.org/"
+"weblate/projects/applications/kdiff3-plugin/zh_Hans/>\n"
 "Language: zh_Hans\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.13.1\n"
 
 #. Instead of a literal translation, add your name to the end of the list (separated by a comma).
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
-msgstr ""
+msgstr "您的名字"
 
 #. Instead of a literal translation, add your email to the end of the list (separated by a comma).
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
-msgstr ""
+msgstr "您的电子邮件"
 
 #: kdiff3plugin.cpp:97
 msgid "KDiff3"
-msgstr ""
+msgstr "KDiff3"
 
 #: kdiff3plugin.cpp:104
 #, c-format
 msgid "Compare with %1"
-msgstr ""
+msgstr "与%1比较"
 
 #: kdiff3plugin.cpp:109
 #, c-format
 msgid "Merge with %1"
-msgstr ""
+msgstr "与%1合并"
 
 #: kdiff3plugin.cpp:114
 msgid "Save '%1' for later"
@@ -56,7 +59,7 @@ msgstr ""
 
 #: kdiff3plugin.cpp:141
 msgid "Compare"
-msgstr ""
+msgstr "比较"
 
 #: kdiff3plugin.cpp:146
 msgid "3 way comparison"