1 files changed, 16 insertions, 65 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 68e135c..ab39ef4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdiff3\n"
-"POT-Creation-Date: 2018-12-27 20:04+0100\n"
+"POT-Creation-Date: 2019-01-13 19:08+0100\n"
 "PO-Revision-Date: 2005-02-07 10:03+0800\n"
 "Last-Translator: Mai Hao Hui <[email protected]>\n"
 "Language-Team: zh_CN <[email protected]>\n"
@@ -151,11 +151,6 @@ msgid ""
 "the merge and rescan the directory?"
 msgstr "您当前正在合并目录。您确定要放弃合并，重新扫描目录吗？"
 
-#: directorymergewindow.cpp:335 kdiff3.cpp:602 kdiff3.cpp:610 kdiff3.cpp:622
-#: mergeresultwindow.cpp:287 pdiff.cpp:981 pdiff.cpp:1724 pdiff.cpp:1732
-msgid "Warning"
-msgstr ""
-
 #: directorymergewindow.cpp:335 directorymergewindow.cpp:2930
 msgid "Rescan"
 msgstr "重新扫描"
@@ -259,11 +254,6 @@ msgstr "更改全部合并操作"
 msgid "C&ontinue"
 msgstr "继续(&o)"
 
-#: directorymergewindow.cpp:868 fileaccess.cpp:1476 mergeresultwindow.cpp:287
-#: smalldialogs.cpp:169 smalldialogs.cpp:381
-msgid "&Cancel"
-msgstr ""
-
 #: directorymergewindow.cpp:1236
 msgid "Processing "
 msgstr "处理 "
@@ -357,13 +347,6 @@ msgstr "程序错误"
 msgid "An error occurred while copying.\n"
 msgstr "复制时发生错误。\n"
 
-#: directorymergewindow.cpp:1965 directorymergewindow.cpp:2034
-#: directorymergewindow.cpp:2066 directorymergewindow.cpp:2112
-#: directorymergewindow.cpp:2121 directorymergewindow.cpp:2371
-#, fuzzy
-msgid "Error"
-msgstr "错误。"
-
 #: directorymergewindow.cpp:1966 directorymergewindow.cpp:2372
 msgid "Merge Error"
 msgstr "合并错误"
@@ -588,11 +571,6 @@ msgstr "上次修改"
 msgid "Link-Destination"
 msgstr "链接目标"
 
-#: directorymergewindow.cpp:2712
-#, fuzzy
-msgid "File"
-msgstr "文件..."
-
 #: directorymergewindow.cpp:2729
 msgid "not available"
 msgstr "不可用"
@@ -850,10 +828,6 @@ msgstr "文件打开出错"
 msgid "Opens documents for comparison..."
 msgstr "打开文档比较..."
 
-#: kdiff3.cpp:436
-msgid "Reload"
-msgstr ""
-
 #: kdiff3.cpp:439
 msgid "Saves the merge result. All conflicts must be solved!"
 msgstr "保存合并结果。必须解决全部冲突！"
@@ -1123,10 +1097,6 @@ msgid ""
 "You are currently doing a directory merge. Are you sure, you want to abort?"
 msgstr "您当前正在合并目录。您确认要放弃吗？"
 
-#: kdiff3.cpp:622
-msgid "Quit"
-msgstr ""
-
 #: kdiff3.cpp:644
 msgid "Saving file..."
 msgstr "正在保存文件..."
@@ -1135,10 +1105,6 @@ msgstr "正在保存文件..."
 msgid "Saving file with a new filename..."
 msgstr "正在用新文件名保存文件..."
 
-#: kdiff3.cpp:663
-msgid "Save As..."
-msgstr ""
-
 #: kdiff3.cpp:751
 #, fuzzy
 msgid "Printing..."
@@ -1404,15 +1370,6 @@ msgstr "Latin1"
 msgid "Change this if non-ASCII characters are not displayed correctly."
 msgstr "如果非 ASCII 字符不能正确显示，请更改此选项。"
 
-#: optiondialog.cpp:455
-#, fuzzy
-msgid "Configure"
-msgstr "配置..."
-
-#: optiondialog.cpp:510
-msgid "Font"
-msgstr ""
-
 #: optiondialog.cpp:510
 msgid "Editor & Diff Output Font"
 msgstr "编辑器和 Diff 输出字体"
@@ -2373,10 +2330,6 @@ msgstr "输出(可选)："
 msgid "Configure..."
 msgstr "配置..."
 
-#: smalldialogs.cpp:164
-msgid "&OK"
-msgstr ""
-
 #: smalldialogs.cpp:347
 msgid "Search text:"
 msgstr "搜索文本："
@@ -2449,14 +2402,6 @@ msgstr ""
 msgid "Sort key result:"
 msgstr ""
 
-#: smalldialogs.cpp:493
-msgid "OK"
-msgstr ""
-
-#: smalldialogs.cpp:497
-msgid "Cancel"
-msgstr ""
-
 #: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568
 msgid "Match success."
 msgstr ""
@@ -2480,11 +2425,6 @@ msgstr "&KDiff3"
 msgid "Configure KDiff3"
 msgstr "配置 KDiff3"
 
-#: kdiff3_shell.rc:4
-#, fuzzy, no-c-format
-msgid "&File"
-msgstr "文件..."
-
 #: kdiff3_shell.rc:7
 #, no-c-format
 msgid "&Directory"
@@ -2520,10 +2460,21 @@ msgstr "合并(&M)"
 msgid "&Window"
 msgstr "窗口(&W)"
 
-#: kdiff3_shell.rc:106
-#, no-c-format
-msgid "Main Toolbar"
-msgstr ""
+#, fuzzy
+#~ msgid "Error"
+#~ msgstr "错误。"
+
+#, fuzzy
+#~ msgid "File"
+#~ msgstr "文件..."
+
+#, fuzzy
+#~ msgid "Configure"
+#~ msgstr "配置..."
+
+#, fuzzy
+#~ msgid "&File"
+#~ msgstr "文件..."
 
 #~ msgid "Files A and B are binary equal.\n"
 #~ msgstr "文件 A 和 B 二进制数据相同。\n"