Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: tdesdk/kompare
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/tdesdk/kompare/
(cherry picked from commit 364e0ab2be9e2a9808bf801fec4ac41896d851cd)

1 files changed, 498 insertions, 458 deletions

diff --git a/tde-i18n-zh_CN/messages/tdesdk/kompare.po b/tde-i18n-zh_CN/messages/tdesdk/kompare.po
index f755e5ca7d0..d195a31fabe 100644
--- a/tde-i18n-zh_CN/messages/tdesdk/kompare.po
+++ b/tde-i18n-zh_CN/messages/tdesdk/kompare.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kompare\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2005-12-10 11:24+0800\n"
 "Last-Translator: Levin Du <zsdjw@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -17,314 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr "应用差异(&A)"
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr "不应用差异(&A)"
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr "全部应用(&L)"
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr "全部不应用(&U)"
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr "上一个文件(&R)"
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr "下一个文件(&E)"
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr "上一处差异(&P)"
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr "下一处差异(&N)"
-
-#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
-msgid ""
-"<qt>No models or no differences, this file: <b>%1</b>"
-", is not a valid diff file.</qt>"
-msgstr "<qt>没有模型(model)或比较结果，此文件：<b>%1</b>不是合法的 diff 文件。</qt>"
-
-#: libdiff2/komparemodellist.cpp:246
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
-msgstr "<qt>应用 diff 结果<b>%1</b>到文件<b>%2</b>时出现问题。</qt>"
-
-#: libdiff2/komparemodellist.cpp:271
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
-".</qt>"
-msgstr "<qt>应用 diff 结果<b>%1</b>到文件夹<b>%2</b>时出现问题。</qt>"
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr "无法打开临时文件。"
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr "<qt>无法写入临时文件<b>%1</b>，将删除该文件。</qt>"
-
-#: libdiff2/komparemodellist.cpp:368
-msgid ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
-msgstr ""
-"<qt>无法创建目标目录 <b>%1</b>。\n"
-"文件未保存。</qt>"
-
-#: libdiff2/komparemodellist.cpp:383
-msgid ""
-"<qt>Could not upload the temporary file to the destination location <b>%1</b>"
-". The temporary file is still available under: <b>%2</b>"
-". You can manually copy it to the right place.</qt>"
-msgstr "<qt>无法上传临时文件到目标位置<b>%1</b>。在<b>%2</b>下的临时文件仍然可用，可以手工复制到正确的地方。</qt>"
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr "无法分析 diff 输出。"
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr "文件是相同的。"
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr "无法写入临时文件。"
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "差异(&D)"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr "运行 diff 在"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "命令行"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 108
-#: rc.cpp:27
-#, no-c-format
-msgid "cd dir && diff -udHprNa -- source destination"
-msgstr "cd 目录 && diff -udHprNa -- 源 目标"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr "查找较小的改动"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr "优化大文件"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr "忽略大小写的变化"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "将制表符扩展成空格"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr "忽略新增或删除的空行"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "忽略空白的变化"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr "显示函数名称"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr "递归比较文件夹"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr "新文件作为空文件处理"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "格式"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 244
-#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63
-#, no-c-format
-msgid "Context"
-msgstr "上下文"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 252
-#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66
-#, no-c-format
-msgid "Ed"
-msgstr "Ed"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 260
-#: komparepart/kompare_part.cpp:647 libdialogpages/diffpage.cpp:241 rc.cpp:69
-#, no-c-format
-msgid "Normal"
-msgstr "正常"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 268
-#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72
-#, no-c-format
-msgid "RCS"
-msgstr "RCS"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 276
-#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75
-#, no-c-format
-msgid "Unified"
-msgstr "统一"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr "并排"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr "上下文行数："
-
-#: main.cpp:33
-msgid ""
-"A program to view the differences between files and optionally generate a diff"
-msgstr "本程序查看文件间的差异，并可以生成 diff 结果"
-
-#: main.cpp:39
-msgid "This will compare URL1 with URL2"
-msgstr "这将比较 URL1 和 URL2"
-
-#: main.cpp:40
-msgid ""
-"This will open URL1 and expect it to be diff output. URL1 can also be a '-' and "
-"then it will read from standard input. Can be used for instance for cvs diff | "
-"kompare -o -. Kompare will do a check to see if it can find the original "
-"file(s) and then blend the original file(s) into the diffoutput and show that "
-"in the viewer. -n disables the check."
-msgstr ""
-"这将打开 URL1，并假定其为 diff 结果。URL1 亦可以是“-”，表示从标准输入读取，应用例子为“cvs diff | kompare -o "
-"-”。Kompare 会检查能否找到原始文件，然后合并原始文件并将结果显示在查看器中，“-n”选项关闭此检查。"
-
-#: main.cpp:41
-msgid ""
-"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the "
-"file or folder that the diffoutput needs to be blended into. "
-msgstr "这将合并 URL2 到 URL1，URL2 应为 diff 结果而 URL1 则是要被合并的文件或文件夹。"
-
-#: main.cpp:42
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
-msgstr "当使用“-o”选项且 URL 为“-”时，不自动检查原始文件的存在。"
-
-#: main.cpp:43
-msgid ""
-"Use this to specify the encoding when calling it from the command line. It will "
-"default to the local encoding if not specified."
-msgstr "使用此处指定从命令行调用时所用的编码。如果未指定，则默认为系统的本地编码。"
-
-#: main.cpp:52
-msgid "Kompare"
-msgstr "Kompare"
-
-#: main.cpp:54
-msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
-msgstr "(c) 2001-2004, John Firebaugh 和 Otto Bruggeman"
-
-#: main.cpp:55 main.cpp:56
-msgid "Author"
-msgstr "作者"
-
-#: main.cpp:57
-msgid "Kompare icon artist"
-msgstr "Kompare 图标制作者"
-
-#: main.cpp:58
-msgid "A lot of good advice"
-msgstr "许多好建议"
-
-#: main.cpp:59
-msgid "Cervisia diff viewer"
-msgstr "Cervisia diff 查看器"
-
-#: kompare_shell.cpp:398 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr "比较文件或文件夹"
-
-#: kompare_shell.cpp:399 main.cpp:186
-msgid "Source"
-msgstr "源文件"
-
-#: kompare_shell.cpp:400 main.cpp:187
-msgid "Destination"
-msgstr "目标文件"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid "Compare"
-msgstr "比较"
-
-#: main.cpp:189
-msgid "Compare these files or folder"
-msgstr "比较这些文件或文件夹"
-
-#: kompare_shell.cpp:402 main.cpp:189
-msgid ""
-"If you have entered 2 filenames or 2 folders in the fields in this dialog then "
-"this button will be enabled and pressing it will start a comparison of the "
-"entered files or folders. "
-msgstr ""
-"在对话框的字段中输入了两个文件名或文件夹名，此按钮才可用，\n"
-"按下它，将开始比较所输入的文件或文件夹。"
-
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "开源软件国际化简体中文组(http://i18n.linux.net.cn)"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -422,19 +121,45 @@ msgstr "合并 diff 输出到此文件或文件夹"
 
 #: kompare_shell.cpp:373
 msgid ""
-"If you have entered a file or folder name and a file that contains diff output "
-"in the fields in this dialog then this button will be enabled and pressing it "
-"will open kompare's main view where the output of the entered file or files "
-"from the folder are mixed with the diff output so you can then apply the "
-"difference(s) to a file or to the files. "
+"If you have entered a file or folder name and a file that contains diff "
+"output in the fields in this dialog then this button will be enabled and "
+"pressing it will open kompare's main view where the output of the entered "
+"file or files from the folder are mixed with the diff output so you can then "
+"apply the difference(s) to a file or to the files. "
 msgstr ""
-"如果您在此对话框中输入了文件或文件夹名称，以及包含 diff 输出的文件，则此按钮可以使用。单击此按钮后，将打开 kompare "
-"的主视图，输入的文件或文件夹中的文件将会与 diff 输出混合，这样您就可以将差异应用到文件了。"
+"如果您在此对话框中输入了文件或文件夹名称，以及包含 diff 输出的文件，则此按钮"
+"可以使用。单击此按钮后，将打开 kompare 的主视图，输入的文件或文件夹中的文件将"
+"会与 diff 输出混合，这样您就可以将差异应用到文件了。"
+
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr "比较文件或文件夹"
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "源文件"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "目标文件"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "比较"
 
 #: kompare_shell.cpp:402
 msgid "Compare these files or folders"
 msgstr "比较这些文件或文件夹"
 
+#: kompare_shell.cpp:402 main.cpp:189
+msgid ""
+"If you have entered 2 filenames or 2 folders in the fields in this dialog "
+"then this button will be enabled and pressing it will start a comparison of "
+"the entered files or folders. "
+msgstr ""
+"在对话框的字段中输入了两个文件名或文件夹名，此按钮才可用，\n"
+"按下它，将开始比较所输入的文件或文件夹。"
+
 #: kompare_shell.cpp:439
 msgid "Text View"
 msgstr "文本视图"
@@ -518,19 +243,228 @@ msgstr "未知"
 msgid "KompareNavTreePart"
 msgstr "KompareNavTreePart"
 
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
-msgstr "您可以在此输入您想要比较的文件。"
+#: komparepart/kompare_part.cpp:165
+msgid "Save &All"
+msgstr "全部保存(&A)"
+
+#: komparepart/kompare_part.cpp:168
+msgid "Save .&diff..."
+msgstr "保存.diff 文件(&D)..."
+
+#: komparepart/kompare_part.cpp:171
+msgid "Swap Source with Destination"
+msgstr "交换源文件和目标文件"
+
+#: komparepart/kompare_part.cpp:174
+msgid "Show Statistics"
+msgstr "显示统计信息"
+
+#: komparepart/kompare_part.cpp:269
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+msgstr "<qt>URL <b>%1</b> 无法下载。</qt>"
+
+#: komparepart/kompare_part.cpp:281
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+msgstr "<qt>URL <b>%1</b> 在您的系统上不存在。</qt>"
+
+#: komparepart/kompare_part.cpp:425
+msgid "Diff Options"
+msgstr "Diff 选项"
+
+#: komparepart/kompare_part.cpp:443
+msgid "*.diff *.dif *.patch|Patch Files"
+msgstr "*.diff *.dif *.patch|补丁文件"
+
+#: komparepart/kompare_part.cpp:443
+msgid "Save .diff"
+msgstr "保存 .diff 文件"
+
+#: komparepart/kompare_part.cpp:446
+msgid "The file exists or is write-protected; do you want to overwrite it?"
+msgstr "文件已经存在或有写保护，要覆盖吗？"
+
+#: komparepart/kompare_part.cpp:446
+msgid "File Exists"
+msgstr "文件已存在"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Overwrite"
+msgstr "覆盖"
+
+#: komparepart/kompare_part.cpp:446
+msgid "Do Not Overwrite"
+msgstr "不覆盖"
+
+#: komparepart/kompare_part.cpp:481
+msgid "KomparePart"
+msgstr "KomparePart"
+
+#: komparepart/kompare_part.cpp:493
+msgid "Running diff..."
+msgstr "运行 diff..."
+
+#: komparepart/kompare_part.cpp:496
+msgid "Parsing diff output..."
+msgstr "分析 diff 输出..."
+
+#: komparepart/kompare_part.cpp:545
+msgid "Comparing file %1 with file %2"
+msgstr "正在比较文件 %1 和 %2"
+
+#: komparepart/kompare_part.cpp:550
+msgid "Comparing files in %1 with files in %2"
+msgstr "正在比较 %1 和 %2 中的文件"
+
+#: komparepart/kompare_part.cpp:555
+#, c-format
+msgid "Viewing diff output from %1"
+msgstr "查看 %1 的 diff 结果"
+
+#: komparepart/kompare_part.cpp:558
+msgid "Blending diff output from %1 into file %2"
+msgstr "合并 %1 的 diff 结果到文件 %2"
+
+#: komparepart/kompare_part.cpp:563
+msgid "Blending diff output from %1 into folder %2"
+msgstr "合并 %1 的 diff 结果到文件夹 %2"
+
+#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
+msgid ""
+"You have made changes to the destination file(s).\n"
+"Would you like to save them?"
+msgstr ""
+"目标文件已经修改,\n"
+"要保存吗？"
+
+#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
+msgid "Save Changes?"
+msgstr "保存修改？"
+
+#: komparepart/kompare_part.cpp:635 komparepart/komparesaveoptionsbase.ui:276
+#: libdialogpages/diffpage.cpp:244
+#, no-c-format
+msgid "Unified"
+msgstr "统一"
+
+#: komparepart/kompare_part.cpp:638 komparepart/komparesaveoptionsbase.ui:244
+#: libdialogpages/diffpage.cpp:238
+#, no-c-format
+msgid "Context"
+msgstr "上下文"
+
+#: komparepart/kompare_part.cpp:641 komparepart/komparesaveoptionsbase.ui:268
+#: libdialogpages/diffpage.cpp:242
+#, no-c-format
+msgid "RCS"
+msgstr "RCS"
+
+#: komparepart/kompare_part.cpp:644 komparepart/komparesaveoptionsbase.ui:252
+#: libdialogpages/diffpage.cpp:239
+#, no-c-format
+msgid "Ed"
+msgstr "Ed"
+
+#: komparepart/kompare_part.cpp:647 komparepart/komparesaveoptionsbase.ui:260
+#: libdialogpages/diffpage.cpp:241
+#, no-c-format
+msgid "Normal"
+msgstr "正常"
+
+#: komparepart/kompare_part.cpp:667
+msgid ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are "
+"available."
+msgstr "没有 diff 文件，或没有比较两个文件，因为统计信息不可用。"
+
+#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
+#: komparepart/kompare_part.cpp:698
+msgid "Diff Statistics"
+msgstr "Diff 统计"
+
+#: komparepart/kompare_part.cpp:673
+msgid ""
+"Statistics:\n"
+"\n"
+"Old file: %1\n"
+"New file: %2\n"
+"\n"
+"Format: %3\n"
+"Number of hunks: %4\n"
+"Number of differences: %5"
+msgstr ""
+"统计：\n"
+"\n"
+"旧文件：%1\n"
+"新文件：%2\n"
+"\n"
+"格式：%3\n"
+"相同个数：%4\n"
+"差异个数：%5"
+
+#: komparepart/kompare_part.cpp:686
+msgid ""
+"Statistics:\n"
+"\n"
+"Number of files in diff file: %1\n"
+"Format: %2\n"
+"\n"
+"Current old file: %3\n"
+"Current new file: %4\n"
+"\n"
+"Number of hunks: %5\n"
+"Number of differences: %6"
+msgstr ""
+"统计：\n"
+"\n"
+"diff结果中的文件个数：%1\n"
+"格式：%2\n"
+"\n"
+"当前旧文件：%3\n"
+"当前新文件：%4\n"
+"\n"
+"相同个数：%5\n"
+"差异个数：%6"
+
+#: komparepart/kompareprefdlg.cpp:33
+msgid "Preferences"
+msgstr "首选项"
+
+#: komparepart/kompareprefdlg.cpp:39
+#, fuzzy
+msgid "View"
+msgstr "文本视图"
+
+#: komparepart/kompareprefdlg.cpp:39
+msgid "View Settings"
+msgstr "查看设置"
 
 #: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
 msgid "Diff"
 msgstr "Diff"
 
+#: komparepart/kompareprefdlg.cpp:43
+msgid "Diff Settings"
+msgstr "Diff 设置"
+
+#: kompareurldialog.cpp:41
+#, fuzzy
+msgid "Files"
+msgstr "文件(&F)"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr "您可以在此输入您想要比较的文件。"
+
 #: kompareurldialog.cpp:47
 msgid "Here you can change the options for comparing the files."
 msgstr "您可以在此更改要比较文件的选项。"
 
 #: kompareurldialog.cpp:53
+#, fuzzy
+msgid "Appearance"
+msgstr "外观(&P)"
+
+#: kompareurldialog.cpp:53
 msgid "Here you can change the options for the view."
 msgstr "您可以在此更改视图选项。"
 
@@ -544,7 +478,8 @@ msgid ""
 "program does not support all the options that the GNU version does. This way "
 "you can select that version."
 msgstr ""
-"在此可以选择另外一个 diff 程序。在 Solaris 上，标准 diff 程序不支持 GNU 版本的所有选项，因此可以选择 GNU 版本。"
+"在此可以选择另外一个 diff 程序。在 Solaris 上，标准 diff 程序不支持 GNU 版本"
+"的所有选项，因此可以选择 GNU 版本。"
 
 #: libdialogpages/diffpage.cpp:221
 msgid "&Diff"
@@ -556,21 +491,30 @@ msgstr "输出格式"
 
 #: libdialogpages/diffpage.cpp:233
 msgid ""
-"Select the format of the output generated by diff. Unified is the one that is "
-"used most frequently because it is very readable. The TDE developers like this "
-"format the best so use it for sending patches."
-msgstr "选择 diff 产生结果的格式。统一(unified)是种经常使用的格式，它非常容易阅读，因此 TDE 开发者发送补丁时最喜欢这种格式。"
+"Select the format of the output generated by diff. Unified is the one that "
+"is used most frequently because it is very readable. The TDE developers like "
+"this format the best so use it for sending patches."
+msgstr ""
+"选择 diff 产生结果的格式。统一(unified)是种经常使用的格式，它非常容易阅读，因"
+"此 TDE 开发者发送补丁时最喜欢这种格式。"
 
 #: libdialogpages/diffpage.cpp:247
 msgid "Lines of Context"
 msgstr "上下文行数"
 
+#: komparepart/komparesaveoptionsbase.ui:312 libdialogpages/diffpage.cpp:251
+#, no-c-format
+msgid "Number of context lines:"
+msgstr "上下文行数："
+
 #: libdialogpages/diffpage.cpp:253
 msgid ""
 "The number of context lines is normally 2 or 3. This makes the diff readable "
 "and applicable in most cases. More than 3 lines will only bloat the diff "
 "unnecessarily."
-msgstr "上下文的行数通常是 2 或 3，这样使得 diff 容易阅读，且能应用于大多数场合。多于 3 行一般是不需要的。"
+msgstr ""
+"上下文的行数通常是 2 或 3，这样使得 diff 容易阅读，且能应用于大多数场合。多"
+"于 3 行一般是不需要的。"
 
 #: libdialogpages/diffpage.cpp:259
 msgid "&Format"
@@ -684,14 +628,14 @@ msgstr "要排除的文件模式"
 
 #: libdialogpages/diffpage.cpp:330
 msgid ""
-"If this is checked you can enter a shell pattern in the text box on the right "
-"or select entries from the list."
+"If this is checked you can enter a shell pattern in the text box on the "
+"right or select entries from the list."
 msgstr "如果选上，可以在右边文本框输入 shell 模式或从列表中选择。"
 
 #: libdialogpages/diffpage.cpp:332
 msgid ""
-"Here you can enter or remove a shell pattern or select one or more entries from "
-"the list."
+"Here you can enter or remove a shell pattern or select one or more entries "
+"from the list."
 msgstr "这里可以输入或删除 shell 模式或从列表中选择一个或多个模式。"
 
 #: libdialogpages/diffpage.cpp:338
@@ -705,14 +649,14 @@ msgstr "如果选上，可以在右边的组合框输入文件名。"
 
 #: libdialogpages/diffpage.cpp:342
 msgid ""
-"Here you can enter the URL of a file with shell patterns to ignore during the "
-"comparison of the folders."
+"Here you can enter the URL of a file with shell patterns to ignore during "
+"the comparison of the folders."
 msgstr "这里可以输入在文件夹比较时要忽略的文件的 URL，该 URL 含有 shell 模式。"
 
 #: libdialogpages/diffpage.cpp:344
 msgid ""
-"Any file you select in the dialog that pops up when you click it will be put in "
-"the dialog to the left of this button."
+"Any file you select in the dialog that pops up when you click it will be put "
+"in the dialog to the left of this button."
 msgstr "任何在弹出的对话框中点击选择的文件将会放入此按钮左边的对话框中。"
 
 #: libdialogpages/diffpage.cpp:352
@@ -779,165 +723,261 @@ msgstr "字体："
 msgid "Size:"
 msgstr "大小："
 
-#: komparepart/kompareprefdlg.cpp:33
-msgid "Preferences"
-msgstr "首选项"
+#: libdialogpages/viewpage.cpp:119
+#, fuzzy
+msgid "&Fonts"
+msgstr "字体："
 
-#: komparepart/kompareprefdlg.cpp:39
-msgid "View Settings"
-msgstr "查看设置"
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr "应用差异(&A)"
 
-#: komparepart/kompareprefdlg.cpp:43
-msgid "Diff Settings"
-msgstr "Diff 设置"
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
+msgstr "不应用差异(&A)"
 
-#: komparepart/kompare_part.cpp:165
-msgid "Save &All"
-msgstr "全部保存(&A)"
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr "全部应用(&L)"
 
-#: komparepart/kompare_part.cpp:168
-msgid "Save .&diff..."
-msgstr "保存.diff 文件(&D)..."
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
+msgstr "全部不应用(&U)"
 
-#: komparepart/kompare_part.cpp:171
-msgid "Swap Source with Destination"
-msgstr "交换源文件和目标文件"
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr "上一个文件(&R)"
 
-#: komparepart/kompare_part.cpp:174
-msgid "Show Statistics"
-msgstr "显示统计信息"
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr "下一个文件(&E)"
 
-#: komparepart/kompare_part.cpp:269
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
-msgstr "<qt>URL <b>%1</b> 无法下载。</qt>"
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
+msgstr "上一处差异(&P)"
 
-#: komparepart/kompare_part.cpp:281
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
-msgstr "<qt>URL <b>%1</b> 在您的系统上不存在。</qt>"
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr "下一处差异(&N)"
 
-#: komparepart/kompare_part.cpp:425
-msgid "Diff Options"
-msgstr "Diff 选项"
+#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
+msgid ""
+"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff "
+"file.</qt>"
+msgstr ""
+"<qt>没有模型(model)或比较结果，此文件：<b>%1</b>不是合法的 diff 文件。</qt>"
 
-#: komparepart/kompare_part.cpp:443
-msgid "*.diff *.dif *.patch|Patch Files"
-msgstr "*.diff *.dif *.patch|补丁文件"
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
+"qt>"
+msgstr "<qt>应用 diff 结果<b>%1</b>到文件<b>%2</b>时出现问题。</qt>"
 
-#: komparepart/kompare_part.cpp:443
-msgid "Save .diff"
-msgstr "保存 .diff 文件"
+#: libdiff2/komparemodellist.cpp:271
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
+"</qt>"
+msgstr "<qt>应用 diff 结果<b>%1</b>到文件夹<b>%2</b>时出现问题。</qt>"
 
-#: komparepart/kompare_part.cpp:446
-msgid "The file exists or is write-protected; do you want to overwrite it?"
-msgstr "文件已经存在或有写保护，要覆盖吗？"
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
+msgstr "无法打开临时文件。"
 
-#: komparepart/kompare_part.cpp:446
-msgid "File Exists"
-msgstr "文件已存在"
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr "<qt>无法写入临时文件<b>%1</b>，将删除该文件。</qt>"
 
-#: komparepart/kompare_part.cpp:446
-msgid "Overwrite"
-msgstr "覆盖"
+#: libdiff2/komparemodellist.cpp:368
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
+msgstr ""
+"<qt>无法创建目标目录 <b>%1</b>。\n"
+"文件未保存。</qt>"
 
-#: komparepart/kompare_part.cpp:446
-msgid "Do Not Overwrite"
-msgstr "不覆盖"
+#: libdiff2/komparemodellist.cpp:383
+msgid ""
+"<qt>Could not upload the temporary file to the destination location <b>%1</"
+"b>. The temporary file is still available under: <b>%2</b>. You can manually "
+"copy it to the right place.</qt>"
+msgstr ""
+"<qt>无法上传临时文件到目标位置<b>%1</b>。在<b>%2</b>下的临时文件仍然可用，可"
+"以手工复制到正确的地方。</qt>"
 
-#: komparepart/kompare_part.cpp:481
-msgid "KomparePart"
-msgstr "KomparePart"
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr "无法分析 diff 输出。"
 
-#: komparepart/kompare_part.cpp:493
-msgid "Running diff..."
-msgstr "运行 diff..."
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr "文件是相同的。"
 
-#: komparepart/kompare_part.cpp:496
-msgid "Parsing diff output..."
-msgstr "分析 diff 输出..."
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
+msgstr "无法写入临时文件。"
 
-#: komparepart/kompare_part.cpp:545
-msgid "Comparing file %1 with file %2"
-msgstr "正在比较文件 %1 和 %2"
+#: main.cpp:33
+msgid ""
+"A program to view the differences between files and optionally generate a "
+"diff"
+msgstr "本程序查看文件间的差异，并可以生成 diff 结果"
 
-#: komparepart/kompare_part.cpp:550
-msgid "Comparing files in %1 with files in %2"
-msgstr "正在比较 %1 和 %2 中的文件"
+#: main.cpp:39
+msgid "This will compare URL1 with URL2"
+msgstr "这将比较 URL1 和 URL2"
 
-#: komparepart/kompare_part.cpp:555
-#, c-format
-msgid "Viewing diff output from %1"
-msgstr "查看 %1 的 diff 结果"
+#: main.cpp:40
+msgid ""
+"This will open URL1 and expect it to be diff output. URL1 can also be a '-' "
+"and then it will read from standard input. Can be used for instance for cvs "
+"diff | kompare -o -. Kompare will do a check to see if it can find the "
+"original file(s) and then blend the original file(s) into the diffoutput and "
+"show that in the viewer. -n disables the check."
+msgstr ""
+"这将打开 URL1，并假定其为 diff 结果。URL1 亦可以是“-”，表示从标准输入读取，应"
+"用例子为“cvs diff | kompare -o -”。Kompare 会检查能否找到原始文件，然后合并原"
+"始文件并将结果显示在查看器中，“-n”选项关闭此检查。"
 
-#: komparepart/kompare_part.cpp:558
-msgid "Blending diff output from %1 into file %2"
-msgstr "合并 %1 的 diff 结果到文件 %2"
+#: main.cpp:41
+msgid ""
+"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 "
+"the file or folder that the diffoutput needs to be blended into. "
+msgstr ""
+"这将合并 URL2 到 URL1，URL2 应为 diff 结果而 URL1 则是要被合并的文件或文件"
+"夹。"
 
-#: komparepart/kompare_part.cpp:563
-msgid "Blending diff output from %1 into folder %2"
-msgstr "合并 %1 的 diff 结果到文件夹 %2"
+#: main.cpp:42
+msgid ""
+"Disables the check for automatically finding the original file(s) when using "
+"'-' as URL with the -o option."
+msgstr "当使用“-o”选项且 URL 为“-”时，不自动检查原始文件的存在。"
 
-#: komparepart/kompare_part.cpp:586 komparepart/kompare_part.cpp:709
+#: main.cpp:43
 msgid ""
-"You have made changes to the destination file(s).\n"
-"Would you like to save them?"
+"Use this to specify the encoding when calling it from the command line. It "
+"will default to the local encoding if not specified."
 msgstr ""
-"目标文件已经修改,\n"
-"要保存吗？"
+"使用此处指定从命令行调用时所用的编码。如果未指定，则默认为系统的本地编码。"
 
-#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711
-msgid "Save Changes?"
-msgstr "保存修改？"
+#: main.cpp:52
+msgid "Kompare"
+msgstr "Kompare"
 
-#: komparepart/kompare_part.cpp:667
-msgid ""
-"No diff file, or no 2 files have been diffed. Therefore no stats are available."
-msgstr "没有 diff 文件，或没有比较两个文件，因为统计信息不可用。"
+#: main.cpp:54
+msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman"
+msgstr "(c) 2001-2004, John Firebaugh 和 Otto Bruggeman"
 
-#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683
-#: komparepart/kompare_part.cpp:698
-msgid "Diff Statistics"
-msgstr "Diff 统计"
+#: main.cpp:55 main.cpp:56
+msgid "Author"
+msgstr "作者"
 
-#: komparepart/kompare_part.cpp:673
-msgid ""
-"Statistics:\n"
-"\n"
-"Old file: %1\n"
-"New file: %2\n"
-"\n"
-"Format: %3\n"
-"Number of hunks: %4\n"
-"Number of differences: %5"
-msgstr ""
-"统计：\n"
-"\n"
-"旧文件：%1\n"
-"新文件：%2\n"
-"\n"
-"格式：%3\n"
-"相同个数：%4\n"
-"差异个数：%5"
+#: main.cpp:57
+msgid "Kompare icon artist"
+msgstr "Kompare 图标制作者"
 
-#: komparepart/kompare_part.cpp:686
-msgid ""
-"Statistics:\n"
-"\n"
-"Number of files in diff file: %1\n"
-"Format: %2\n"
-"\n"
-"Current old file: %3\n"
-"Current new file: %4\n"
-"\n"
-"Number of hunks: %5\n"
-"Number of differences: %6"
+#: main.cpp:58
+msgid "A lot of good advice"
+msgstr "许多好建议"
+
+#: main.cpp:59
+msgid "Cervisia diff viewer"
+msgstr "Cervisia diff 查看器"
+
+#: main.cpp:189
+msgid "Compare these files or folder"
+msgstr "比较这些文件或文件夹"
+
+#: komparepart/komparepartui.rc:4 kompareui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "文件(&F)"
+
+#: komparepart/komparepartui.rc:13
+#, no-c-format
+msgid "&Difference"
+msgstr "差异(&D)"
+
+#: komparepart/komparepartui.rc:25 kompareui.rc:14
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "查看设置"
+
+#: komparepart/komparesaveoptionsbase.ui:41
+#, no-c-format
+msgid "Run Diff In"
+msgstr "运行 diff 在"
+
+#: komparepart/komparesaveoptionsbase.ui:84
+#, no-c-format
+msgid "Command Line"
+msgstr "命令行"
+
+#: komparepart/komparesaveoptionsbase.ui:108
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr "cd 目录 && diff -udHprNa -- 源 目标"
+
+#: komparepart/komparesaveoptionsbase.ui:118
+#, fuzzy, no-c-format
+msgid "Options"
+msgstr "选项(&P)"
+
+#: komparepart/komparesaveoptionsbase.ui:135
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr "查找较小的改动"
+
+#: komparepart/komparesaveoptionsbase.ui:146
+#, no-c-format
+msgid "Optimize for large files"
+msgstr "优化大文件"
+
+#: komparepart/komparesaveoptionsbase.ui:157
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr "忽略大小写的变化"
+
+#: komparepart/komparesaveoptionsbase.ui:165
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr "将制表符扩展成空格"
+
+#: komparepart/komparesaveoptionsbase.ui:173
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr "忽略新增或删除的空行"
+
+#: komparepart/komparesaveoptionsbase.ui:181
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr "忽略空白的变化"
+
+#: komparepart/komparesaveoptionsbase.ui:189
+#, no-c-format
+msgid "Show function names"
+msgstr "显示函数名称"
+
+#: komparepart/komparesaveoptionsbase.ui:200
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr "递归比较文件夹"
+
+#: komparepart/komparesaveoptionsbase.ui:211
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr "新文件作为空文件处理"
+
+#: komparepart/komparesaveoptionsbase.ui:227
+#, no-c-format
+msgid "Format"
+msgstr "格式"
+
+#: komparepart/komparesaveoptionsbase.ui:287
+#, no-c-format
+msgid "Side-by-side"
+msgstr "并排"
+
+#: kompareui.rc:27
+#, no-c-format
+msgid "Main Toolbar"
 msgstr ""
-"统计：\n"
-"\n"
-"diff结果中的文件个数：%1\n"
-"格式：%2\n"
-"\n"
-"当前旧文件：%3\n"
-"当前新文件：%4\n"
-"\n"
-"相同个数：%5\n"
-"差异个数：%6"