From 6dd5ed2c3cccce1ab4866b8ba8fd5aca5202dc25 Mon Sep 17 00:00:00 2001 From: Automated System Date: Mon, 27 Jan 2025 20:59:50 +0000 Subject: [PATCH] Merge translation files from master branch. --- translations/messages/kdiff3/zh_CN.po | 23 +++++++++++-------- .../messages/kdiff3_plugin/zh_Hans.po | 18 +++++++++------ 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/translations/messages/kdiff3/zh_CN.po b/translations/messages/kdiff3/zh_CN.po index 7a032a0..c93f2e5 100644 --- a/translations/messages/kdiff3/zh_CN.po +++ b/translations/messages/kdiff3/zh_CN.po @@ -2,18 +2,21 @@ # Copyright (C) 2004 Free Software Foundation, Inc. # zhu-zhy , 2004. # Mai Haohui , 2004. -# +# Toad114514 , 2025. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" "POT-Creation-Date: 2023-11-26 18:16+0000\n" -"PO-Revision-Date: 2005-02-07 10:03+0800\n" -"Last-Translator: Mai Hao Hui \n" -"Language-Team: zh_CN \n" -"Language: \n" +"PO-Revision-Date: 2025-01-27 17:12+0000\n" +"Last-Translator: Toad114514 \n" +"Language-Team: Chinese (Simplified) \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.17\n" #. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" @@ -655,15 +658,15 @@ msgstr "不同文件数：" #: directorymergewindow.cpp:2940 msgid "Show Files only in A" -msgstr "" +msgstr "仅在 A 显示文件" #: directorymergewindow.cpp:2941 msgid "Show Files only in B" -msgstr "" +msgstr "仅在 B 显示文件" #: directorymergewindow.cpp:2942 msgid "Show Files only in C" -msgstr "" +msgstr "仅在 C 显示文件" #: directorymergewindow.cpp:2946 #, fuzzy @@ -838,7 +841,7 @@ msgstr "保存当前文档为..." #: kdiff3.cpp:443 msgid "Print the differences" -msgstr "" +msgstr "打印差异" #: kdiff3.cpp:445 msgid "Quits the application" @@ -1268,7 +1271,7 @@ msgstr "文件 B 和 C 二进制数据相同。\n" #: mergeresultwindow.cpp:817 #, fuzzy msgid "Files %1 and %2 have equal text.\n" -msgstr "文件 A 和 B 文本相同。\n" +msgstr "文件 %1 和 %2 文本相同。\n" #: mergeresultwindow.cpp:823 msgid "Total number of conflicts: " diff --git a/translations/messages/kdiff3_plugin/zh_Hans.po b/translations/messages/kdiff3_plugin/zh_Hans.po index ef47e99..af7e2fd 100644 --- a/translations/messages/kdiff3_plugin/zh_Hans.po +++ b/translations/messages/kdiff3_plugin/zh_Hans.po @@ -1,11 +1,12 @@ # SOME DESCRIPTIVE TITLE. # Xiao Wenming , 2022. +# Toad114514 , 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2020-05-11 04:19+0200\n" -"PO-Revision-Date: 2022-09-10 04:56+0000\n" -"Last-Translator: Xiao Wenming \n" +"PO-Revision-Date: 2025-01-27 17:12+0000\n" +"Last-Translator: Toad114514 \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -13,7 +14,7 @@ msgstr "" "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" +"X-Generator: Weblate 4.17\n" #. Instead of a literal translation, add your name to the end of the list (separated by a comma). msgid "" @@ -43,7 +44,7 @@ msgstr "与%1合并" #: kdiff3plugin.cpp:114 msgid "Save '%1' for later" -msgstr "" +msgstr "一会再保存 '%1'" #: kdiff3plugin.cpp:119 msgid "3-way merge with base" @@ -51,11 +52,11 @@ msgstr "" #: kdiff3plugin.cpp:125 msgid "Compare with ..." -msgstr "" +msgstr "与 ... 比较 ..." #: kdiff3plugin.cpp:134 msgid "Clear list" -msgstr "" +msgstr "清除列表" #: kdiff3plugin.cpp:141 msgid "Compare" @@ -67,7 +68,7 @@ msgstr "" #: kdiff3plugin.cpp:149 msgid "About KDiff3 menu plugin ..." -msgstr "" +msgstr "关于 KDiff3 菜单插件 …" #: kdiff3plugin.cpp:250 msgid "" @@ -75,6 +76,9 @@ msgid "" "KDiff3 homepage: http://kdiff3.sourceforge.net\n" "\n" msgstr "" +"KDiff3 菜单插件: 版权所有 (C) 2006 Joachim Eibl\n" +"KDiff3 主页: http://kdiff3.sourceforge.net\n" +"\n" #: kdiff3plugin.cpp:252 msgid ""