Commits

Anonymous committed c1e56a3

New translation

Comments (0)

Files changed (1)

po/zh_CN/kdiff3.po

 msgstr ""
 "Project-Id-Version: kdiff3\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2009-01-18 10:49+0100\n"
+"POT-Creation-Date: 2010-03-15 04:35+0100\n"
 "PO-Revision-Date: 2005-02-07 10:03+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-
-#: kdiff3.cpp:169
-#, fuzzy
-msgid "Current Configuration:"
+"X-Language: zh_CN\n"
+
+#: kreplacements/kreplacements.h:103
+#| msgid "C&ontinue"
+msgid "Continue"
+msgstr "继续"
+
+#: kreplacements/kreplacements.h:104 kreplacements/kreplacements.cpp:164
+#: kreplacements/kreplacements.cpp:195 smalldialogs.cpp:514
+msgid "Cancel"
+msgstr "取消"
+
+#: kreplacements/kreplacements.h:105 kreplacements/kreplacements.cpp:637
+msgid "Quit"
+msgstr "退出"
+
+#: kreplacements/kreplacements.cpp:183 kreplacements/kreplacements.cpp:345
+msgid "Ok"
+msgstr "确定"
+
+#: kreplacements/kreplacements.cpp:187 kreplacements/kreplacements.cpp:721
+msgid "Help"
+msgstr "帮助"
+
+#: kreplacements/kreplacements.cpp:191
+msgid "Defaults"
+msgstr "默认"
+
+#. i18n: file: kdiff3_shell.rc:4
+#. i18n: ectx: Menu (file)
+#: kreplacements/kreplacements.cpp:302 rc.cpp:12
+#| msgid "File..."
+msgid "&File"
+msgstr "文件(&F)"
+
+#: kreplacements/kreplacements.cpp:303
+#| msgid "Editor"
+msgid "&Edit"
+msgstr "编辑(&E)"
+
+#. i18n: file: kdiff3_shell.rc:7
+#. i18n: ectx: Menu (directory)
+#: kreplacements/kreplacements.cpp:304 rc.cpp:15
+msgid "&Directory"
+msgstr "目录(&D)"
+
+#. i18n: file: kdiff3_shell.rc:50
+#. i18n: ectx: Menu (movement)
+#: kreplacements/kreplacements.cpp:307 rc.cpp:24
+msgid "&Movement"
+msgstr "移动(&M)"
+
+#. i18n: file: kdiff3_shell.rc:61
+#. i18n: ectx: Menu (diff)
+#: kreplacements/kreplacements.cpp:308 rc.cpp:27
+msgid "D&iffview"
+msgstr "查看 Diff(&I)"
+
+#. i18n: file: kdiff3_shell.rc:73
+#. i18n: ectx: Menu (merge)
+#: kreplacements/kreplacements.cpp:309 rc.cpp:30
+msgid "&Merge"
+msgstr "合并(&M)"
+
+#. i18n: file: kdiff3_shell.rc:95
+#. i18n: ectx: Menu (window)
+#: kreplacements/kreplacements.cpp:310 rc.cpp:33
+msgid "&Window"
+msgstr "窗口(&W)"
+
+#: kreplacements/kreplacements.cpp:311
+msgid "&Settings"
+msgstr "设置(&S)"
+
+#: kreplacements/kreplacements.cpp:312
+msgid "&Help"
+msgstr "帮助(&H)"
+
+#: kreplacements/kreplacements.cpp:359
+#| msgid "Abort"
+msgid "&About"
+msgstr "关于(&A)"
+
+#: kreplacements/kreplacements.cpp:375
+msgid "A&uthor"
+msgstr "作者(&u)"
+
+#: kreplacements/kreplacements.cpp:389
+msgid "&Thanks To"
+msgstr "感谢(&T)"
+
+#. i18n: file: kdiff3_shell.rc:30
+#. i18n: ectx: Menu (dir_current_merge_menu)
+#: kreplacements/kreplacements.cpp:494 kreplacements/kreplacements.cpp:503
+#: rc.cpp:18
+msgid "Current Item Merge Operation"
+msgstr "当前项目合并操作"
+
+#. i18n: file: kdiff3_shell.rc:38
+#. i18n: ectx: Menu (dir_current_sync_menu)
+#: kreplacements/kreplacements.cpp:495 kreplacements/kreplacements.cpp:504
+#: rc.cpp:21
+msgid "Current Item Sync Operation"
 msgstr "当前项目同步操作"
 
-#: kdiff3.cpp:174
-#, fuzzy
-msgid "Config Option Error:"
-msgstr "文件打开出错"
-
-#: kdiff3.cpp:219
-msgid "Option --auto used, but no output file specified."
-msgstr "选项 -- 自动使用,但没有指定输出文件。"
-
-#: kdiff3.cpp:369
-msgid "Option --auto ignored for directory comparison."
-msgstr "选项 -- 自动忽略目录比较。"
-
-#: kdiff3.cpp:405
-msgid "Saving failed."
-msgstr "保存失败。"
-
-#: kdiff3.cpp:440 pdiff.cpp:1123 pdiff.cpp:1194
-msgid "Opening of these files failed:"
-msgstr "打开以下文件失败:"
-
-#: kdiff3.cpp:449
-msgid "File Open Error"
-msgstr "文件打开出错"
-
-#: kdiff3.cpp:477
-msgid "Opens documents for comparison..."
-msgstr "打开文档比较..."
-
-#: kdiff3.cpp:479
-#, fuzzy
-#| msgid "Ready."
-msgid "Reload"
-msgstr "就绪。"
-
-#: kdiff3.cpp:482
-msgid "Saves the merge result. All conflicts must be solved!"
-msgstr "保存合并结果。必须解决全部冲突!"
-
-#: kdiff3.cpp:484
-msgid "Saves the current document as..."
-msgstr "保存当前文档为..."
-
-#: kdiff3.cpp:486
-msgid "Print the differences"
+#: kreplacements/kreplacements.cpp:603
+#| msgid "Operation"
+msgid "Open"
+msgstr "打开"
+
+#: kreplacements/kreplacements.cpp:612
+#| msgid "Solved"
+msgid "Save"
+msgstr "保存"
+
+#: kreplacements/kreplacements.cpp:620 kdiff3.cpp:718
+msgid "Save As..."
+msgstr "另存为..."
+
+#: kreplacements/kreplacements.cpp:629
+msgid "Print..."
+msgstr "打印..."
+
+#: kreplacements/kreplacements.cpp:645
+msgid "Cut"
+msgstr "剪切"
+
+#: kreplacements/kreplacements.cpp:653
+msgid "Copy"
+msgstr "复制"
+
+#: kreplacements/kreplacements.cpp:661
+msgid "Paste"
+msgstr "粘贴"
+
+#: kreplacements/kreplacements.cpp:669
+#| msgid "Delete A"
+msgid "Select All"
+msgstr "全选"
+
+#: kreplacements/kreplacements.cpp:677
+msgid "Show Toolbar"
+msgstr "显示工具栏"
+
+#: kreplacements/kreplacements.cpp:685
+msgid "Show &Status Bar"
+msgstr "显示状态栏(&S)"
+
+#: kreplacements/kreplacements.cpp:693
+#, kde-format
+#| msgid "Configure..."
+msgid "&Configure %1..."
+msgstr "配置 %1(&C)..."
+
+#: kreplacements/kreplacements.cpp:705 kreplacements/kreplacements.cpp:713
+#| msgid "Abort"
+msgid "About"
+msgstr "关于"
+
+#: kreplacements/kreplacements.cpp:728
+msgid "Find"
+msgstr "查找"
+
+#: kreplacements/kreplacements.cpp:736
+msgid "Find Next"
+msgstr "查找下一个"
+
+#: kreplacements/kreplacements.cpp:756
+#| msgid "Select Another Font"
+msgid "Select Font"
+msgstr "选择字体"
+
+#: kreplacements/kreplacements.cpp:794 optiondialog.cpp:1699
+msgid ""
+"You selected a variable width font.\n"
+"\n"
+"Because this program doesn't handle variable width fonts\n"
+"correctly, you might experience problems while editing.\n"
+"\n"
+"Do you want to continue or do you want to select another font."
 msgstr ""
-
-#: kdiff3.cpp:488
-msgid "Quits the application"
-msgstr "退出程序"
-
-#: kdiff3.cpp:490
-msgid "Cuts the selected section and puts it to the clipboard"
-msgstr "剪切所选节,将其放入剪贴板"
-
-#: kdiff3.cpp:492
-msgid "Copies the selected section to the clipboard"
-msgstr "复制所选节至剪贴板"
-
-#: kdiff3.cpp:494
-msgid "Pastes the clipboard contents to actual position"
-msgstr "粘贴剪贴板内容到实际位置"
-
-#: kdiff3.cpp:496
-msgid "Select everything in current window"
+"您选择了一个可变宽度字体。\n"
+"\n"
+"因为此程序不能正确处理可变宽度字体\n"
+"您可能在编辑时遇到问题。\n"
+"\n"
+"您要继续,还是另选一种字体。"
+
+#: kreplacements/kreplacements.cpp:798
+#| msgid "Incompatible Font"
+msgid "Incompatible font."
+msgstr "不兼容字体"
+
+#: kreplacements/kreplacements.cpp:799
+#| msgid "Continue at Own Risk"
+msgid "Continue at my own risk"
+msgstr "自愿冒险继续"
+
+#: kreplacements/kreplacements.cpp:799
+#| msgid "Select Another Font"
+msgid "Select another font"
+msgstr "选择另一种字体"
+
+#: kreplacements/kreplacements.cpp:1138
+msgid "For more documentation, see the help-menu or the subdirectory doc."
+msgstr "需更多文档,请见帮助菜单或doc目录。"
+
+#: kreplacements/kreplacements.cpp:1141
+#| msgid "KDiff3"
+msgid "KDiff3-Usage"
 msgstr ""
 
-#: kdiff3.cpp:498
-msgid "Search for a string"
-msgstr "搜索字符串"
-
-#: kdiff3.cpp:500
-msgid "Search again for the string"
-msgstr "再次搜索该字符串"
-
-#: kdiff3.cpp:505
-msgid "Enables/disables the statusbar"
-msgstr "启用/禁止状态栏"
-
-#: kdiff3.cpp:509
-msgid "Configure KDiff3..."
-msgstr "配置 KDiff3..."
-
-#: kdiff3.cpp:530
-msgid "Go to Current Delta"
-msgstr "到当前 Delta"
-
-#: kdiff3.cpp:530
-#, fuzzy
-#| msgid "Go to Current Delta"
-msgid ""
-"Current\n"
-"Delta"
-msgstr "到当前 Delta"
-
-#: kdiff3.cpp:532
-msgid "Go to First Delta"
-msgstr "到第一个 Delta"
-
-#: kdiff3.cpp:532
-#, fuzzy
-#| msgid "Go to First Delta"
-msgid ""
-"First\n"
-"Delta"
-msgstr "到第一个 Delta"
-
-#: kdiff3.cpp:534
-msgid "Go to Last Delta"
-msgstr "到最后一个 Delta"
-
-#: kdiff3.cpp:534
-#, fuzzy
-#| msgid "Go to Last Delta"
-msgid ""
-"Last\n"
-"Delta"
-msgstr "到最后一个 Delta"
-
-#: kdiff3.cpp:536
-msgid "(Skips white space differences when \"Show White Space\" is disabled.)"
-msgstr "(禁用“显示空白字符”时跳过空白差异。)"
-
-#: kdiff3.cpp:537
-msgid ""
-"(Does not skip white space differences even when \"Show White Space\" is "
-"disabled.)"
-msgstr "(禁用“显示空白字符”时也不跳过空白差异。)"
-
-#: kdiff3.cpp:538
-msgid "Go to Previous Delta"
-msgstr "到上一个 Delta"
-
-#: kdiff3.cpp:538
-#, fuzzy
-#| msgid "Go to Previous Delta"
-msgid ""
-"Prev\n"
-"Delta"
-msgstr "到上一个 Delta"
-
-#: kdiff3.cpp:540
-msgid "Go to Next Delta"
-msgstr "到下一个 Delta"
-
-#: kdiff3.cpp:540
-#, fuzzy
-#| msgid "Go to Next Delta"
-msgid ""
-"Next\n"
-"Delta"
-msgstr "到下一个 Delta"
-
-#: kdiff3.cpp:542
-msgid "Go to Previous Conflict"
-msgstr "到上一个冲突"
-
-#: kdiff3.cpp:542
-#, fuzzy
-#| msgid "Conflicts"
-msgid ""
-"Prev\n"
-"Conflict"
-msgstr "冲突"
-
-#: kdiff3.cpp:544
-msgid "Go to Next Conflict"
-msgstr "到下一个冲突"
-
-#: kdiff3.cpp:544
-#, fuzzy
-#| msgid "Go to Next Conflict"
-msgid ""
-"Next\n"
-"Conflict"
-msgstr "到下一个冲突"
-
-#: kdiff3.cpp:546
-msgid "Go to Previous Unsolved Conflict"
-msgstr "到上一个未解决冲突"
-
-#: kdiff3.cpp:546
-#, fuzzy
-#| msgid "Unsolved"
-msgid ""
-"Prev\n"
-"Unsolved"
-msgstr "未解决的"
-
-#: kdiff3.cpp:548
-msgid "Go to Next Unsolved Conflict"
-msgstr "到下一个未解决冲突"
-
-#: kdiff3.cpp:548
-#, fuzzy
-#| msgid "Unsolved"
-msgid ""
-"Next\n"
-"Unsolved"
-msgstr "未解决的"
-
-#: kdiff3.cpp:550
-msgid "Select Line(s) From A"
-msgstr "从 A 选择 行"
-
-#: kdiff3.cpp:550
-msgid ""
-"Choose\n"
-"A"
-msgstr ""
-
-#: kdiff3.cpp:551
-msgid "Select Line(s) From B"
-msgstr "从 B 选择行"
-
-#: kdiff3.cpp:551
-msgid ""
-"Choose\n"
-"B"
-msgstr ""
-
-#: kdiff3.cpp:552
-msgid "Select Line(s) From C"
-msgstr "从 C 选择行"
-
-#: kdiff3.cpp:552
-msgid ""
-"Choose\n"
-"C"
-msgstr ""
-
-#: kdiff3.cpp:553
-msgid "Automatically Go to Next Unsolved Conflict After Source Selection"
-msgstr "源码选择后自动到下一个未解决冲突"
-
-#: kdiff3.cpp:553
-#, fuzzy
-msgid ""
-"Auto\n"
-"Next"
-msgstr "自动复制选择"
-
-#: kdiff3.cpp:555
-msgid "Show Space && Tabulator Characters for Differences"
-msgstr "显示间距和制表符的不同"
-
-#: kdiff3.cpp:555
-msgid ""
-"White\n"
-"Characters"
-msgstr ""
-
-#: kdiff3.cpp:556
-msgid "Show White Space"
-msgstr "显示空白字符"
-
-#: kdiff3.cpp:556
-msgid ""
-"White\n"
-"Deltas"
-msgstr ""
-
-#: kdiff3.cpp:558
-msgid "Show Line Numbers"
-msgstr "显示行数"
-
-#: kdiff3.cpp:558
-#, fuzzy
-#| msgid "Show Line Numbers"
-msgid ""
-"Line\n"
-"Numbers"
-msgstr "显示行数"
-
-#: kdiff3.cpp:559
-msgid "Choose A Everywhere"
-msgstr "选择 A 全部"
-
-#: kdiff3.cpp:560
-msgid "Choose B Everywhere"
-msgstr "选择 B 全部"
-
-#: kdiff3.cpp:561
-msgid "Choose C Everywhere"
-msgstr "选择 C 全部"
-
-#: kdiff3.cpp:562
-msgid "Choose A for All Unsolved Conflicts"
-msgstr "选择 A 全部未解决冲突"
-
-#: kdiff3.cpp:563
-msgid "Choose B for All Unsolved Conflicts"
-msgstr "选择 B 全部未解决冲突"
-
-#: kdiff3.cpp:564
-msgid "Choose C for All Unsolved Conflicts"
-msgstr "选择 C 全部未解决冲突"
-
-#: kdiff3.cpp:565
-msgid "Choose A for All Unsolved Whitespace Conflicts"
-msgstr "选择 A 全部未解决空白字符冲突"
-
-#: kdiff3.cpp:566
-msgid "Choose B for All Unsolved Whitespace Conflicts"
-msgstr "选择 B 全部未解决空白字符冲突"
-
-#: kdiff3.cpp:567
-msgid "Choose C for All Unsolved Whitespace Conflicts"
-msgstr "选择 C 全部未解决空白字符冲突"
-
-#: kdiff3.cpp:568
-msgid "Automatically Solve Simple Conflicts"
-msgstr "自动解决简单冲突"
-
-#: kdiff3.cpp:569
-msgid "Set Deltas to Conflicts"
-msgstr "设置 Delta 为冲突"
-
-#: kdiff3.cpp:570
-msgid "Run Regular Expression Auto Merge"
-msgstr ""
-
-#: kdiff3.cpp:571
-#, fuzzy
-msgid "Automatically Solve History Conflicts"
-msgstr "自动解决简单冲突"
-
-#: kdiff3.cpp:572
-msgid "Split Diff At Selection"
-msgstr ""
-
-#: kdiff3.cpp:573
-#, fuzzy
-msgid "Join Selected Diffs"
-msgstr "比较所选文件"
-
-#: kdiff3.cpp:575
-msgid "Show Window A"
-msgstr "显示窗口 A"
-
-#: kdiff3.cpp:576
-msgid "Show Window B"
-msgstr "显示窗口 B"
-
-#: kdiff3.cpp:577
-msgid "Show Window C"
-msgstr "显示窗口 C"
-
-#: kdiff3.cpp:578 kdiff3.cpp:589
-msgid "Focus Next Window"
-msgstr "聚焦于下一个窗口"
-
-#: kdiff3.cpp:580
-msgid "Normal Overview"
-msgstr "普通概览"
-
-#: kdiff3.cpp:581
-msgid "A vs. B Overview"
-msgstr "A 和 B 概览"
-
-#: kdiff3.cpp:582
-msgid "A vs. C Overview"
-msgstr "A 和 C 概览"
-
-#: kdiff3.cpp:583
-msgid "B vs. C Overview"
-msgstr "B 和 C 概览"
-
-#: kdiff3.cpp:584
-msgid "Word Wrap Diff Windows"
-msgstr "在 Diff 窗口自动换行"
-
-#: kdiff3.cpp:585
-msgid "Add Manual Diff Alignment"
-msgstr ""
-
-#: kdiff3.cpp:586
-msgid "Clear All Manual Diff Alignments"
-msgstr ""
-
-#: kdiff3.cpp:591
-msgid "Focus Prev Window"
-msgstr "聚焦于上一个窗口"
-
-#: kdiff3.cpp:592
-msgid "Toggle Split Orientation"
-msgstr "切换分隔方向"
-
-#: kdiff3.cpp:594
-msgid "Dir && Text Split Screen View"
-msgstr "目录和文本分屏视图"
-
-#: kdiff3.cpp:596
-msgid "Toggle Between Dir && Text View"
-msgstr "切换目录和文本视图"
-
-#: kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735 kdiff3.cpp:1016
-#: kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251 pdiff.cpp:1267
-#: pdiff.cpp:1297 pdiff.cpp:1308 directorymergewindow.cpp:721
-msgid "Ready."
-msgstr "就绪。"
-
-#: kdiff3.cpp:652 pdiff.cpp:1792
-msgid "The merge result hasn't been saved."
-msgstr "合并结果未保存。"
-
-#: kdiff3.cpp:653 kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793
-#: pdiff.cpp:1803 directorymergewindow.cpp:389 mergeresultwindow.cpp:303
-msgid "Warning"
-msgstr ""
-
-#: kdiff3.cpp:654
-msgid "Save && Quit"
-msgstr "保存并退出"
-
-#: kdiff3.cpp:655
-msgid "Quit Without Saving"
-msgstr "退出不保存"
-
-#: kdiff3.cpp:663 pdiff.cpp:1803
-msgid "Saving the merge result failed."
-msgstr "保存合并结果失败。"
-
-#: kdiff3.cpp:674 pdiff.cpp:1058
-msgid ""
-"You are currently doing a directory merge. Are you sure, you want to abort?"
-msgstr "您当前正在合并目录。您确认要放弃吗?"
-
-#: kdiff3.cpp:699
-msgid "Saving file..."
-msgstr "正在保存文件..."
-
-#: kdiff3.cpp:716
-msgid "Saving file with a new filename..."
-msgstr "正在用新文件名保存文件..."
-
-#: kdiff3.cpp:718 kreplacements/kreplacements.cpp:620
-msgid "Save As..."
-msgstr ""
-
-#: kdiff3.cpp:810
-#, fuzzy
-msgid "Printing..."
-msgstr "正在退出..."
-
-#: kdiff3.cpp:826 difftextwindow.cpp:1721
-#, fuzzy
-msgid "Top line"
-msgstr "顶端行数 %1"
-
-#: kdiff3.cpp:951
-#, fuzzy
-#| msgid "Select Another Font"
-msgid "Selection"
-msgstr "选择另一种字体"
-
-#: kdiff3.cpp:977
-#, fuzzy
-msgid "Printing completed."
-msgstr "合并操作完成。"
-
-#: kdiff3.cpp:981
-#, fuzzy
-msgid "Printing aborted."
-msgstr "合并操作完成。"
-
-#: kdiff3.cpp:987
-msgid "Exiting..."
-msgstr "正在退出..."
-
-#: kdiff3.cpp:1000
-msgid "Toggling toolbar..."
-msgstr "切换工具栏..."
-
-#: kdiff3.cpp:1021
-msgid "Toggle the statusbar..."
-msgstr "切换状态栏..."
-
-#: fileaccess.cpp:612
-msgid ""
-"While trying to make a backup, deleting an older backup failed. \n"
-"Filename: "
-msgstr ""
-"试图做备份时,删除旧备份失败。\n"
-"文件名:"
-
-#: fileaccess.cpp:619
-msgid ""
-"While trying to make a backup, renaming failed. \n"
-"Filenames: "
-msgstr ""
-"试图备份时,重命名失败。\n"
-"文件名:"
-
-#: fileaccess.cpp:643
-#, kde-format
-msgid "Getting file status: %1"
-msgstr "获取文件状态:%1"
-
-#: fileaccess.cpp:686
-#, kde-format
-msgid "Reading file: %1"
-msgstr "读取文件:%1"
-
-#: fileaccess.cpp:723
-#, kde-format
-msgid "Writing file: %1"
-msgstr "写入文件:%1"
-
-#: fileaccess.cpp:751
-msgid "Out of memory"
-msgstr "内存溢出"
-
-#: fileaccess.cpp:786
-#, kde-format
-msgid "Making directory: %1"
-msgstr "建立目录:%1"
-
-#: fileaccess.cpp:806
-#, kde-format
-msgid "Removing directory: %1"
-msgstr "删除目录:%1"
-
-#: fileaccess.cpp:821
-#, kde-format
-msgid "Removing file: %1"
-msgstr "删除文件:%1"
-
-#: fileaccess.cpp:837
-#, kde-format
-msgid "Creating symbolic link: %1 -> %2"
-msgstr "创建符号链接:%1 -> %2"
-
-#: fileaccess.cpp:864
-#, kde-format
-msgid "Renaming file: %1 -> %2"
-msgstr "重命名文件:%1 -> %2"
-
-#: fileaccess.cpp:897
-#, kde-format
-msgid "Copying file: %1 -> %2"
-msgstr "复制文件:%1 -> %2"
-
-#: fileaccess.cpp:911
-#, kde-format
-msgid ""
-"Error during file copy operation: Opening file for reading failed. Filename: "
-"%1"
-msgstr "文件复制操作出错:打开文件读取失败。文件名:%1"
-
-#: fileaccess.cpp:917
-#, kde-format
-msgid ""
-"Error during file copy operation: Opening file for writing failed. Filename: "
-"%1"
-msgstr "文件复制操作出错:打开文件写入失败。文件名:%1"
-
-#: fileaccess.cpp:932
-#, kde-format
-msgid "Error during file copy operation: Reading failed. Filename: %1"
-msgstr "文件复制操作出错:读取失败。文件名:%1"
-
-#: fileaccess.cpp:941
-#, kde-format
-msgid "Error during file copy operation: Writing failed. Filename: %1"
-msgstr "文件复制操作出错:写入失败。文件名:%1"
-
-#: fileaccess.cpp:1231
-msgid "Reading directory: "
-msgstr "读取目录:"
-
-#: fileaccess.cpp:1355
-#, kde-format
-msgid "Listing directory: %1"
-msgstr "目录列表:%1"
-
-#: fileaccess.cpp:1489 smalldialogs.cpp:179 smalldialogs.cpp:396
-msgid "&Cancel"
-msgstr ""
+#: kreplacements/kreplacements.cpp:1141
+#| msgid "Ignore case"
+msgid "Ignore"
+msgstr "忽略"
+
+#: kreplacements/kreplacements.cpp:1141
+#| msgid "Editor"
+msgid "Exit"
+msgstr "退出"
 
 #: diff.cpp:251
 msgid "Writing clipboard data to temp file failed."
 "现在行匹配处理命令会被禁用。"
 
 #: diff.cpp:1662 diff.cpp:1676
+#| msgid ""
+#| "Data loss error:\n"
+#| "If it is reproducable please contact the author.\n"
 msgid ""
 "Data loss error:\n"
-"If it is reproducable please contact the author.\n"
+"If it is reproducible please contact the author.\n"
 msgstr ""
 "数据丢失错误:\n"
-"如果它是可复的,请联系作者。\n"
+"如果它是可复的,请联系作者。\n"
 
 #: diff.cpp:1664 diff.cpp:1678
 msgid "Severe Internal Error"
 msgstr "严重内部错误"
 
-#: smalldialogs.cpp:58
-msgid "A (Base):"
-msgstr "A (基准文件):"
-
-#: smalldialogs.cpp:65 smalldialogs.cpp:82 smalldialogs.cpp:99
-#: smalldialogs.cpp:142
-msgid "File..."
-msgstr "文件..."
-
-#: smalldialogs.cpp:67 smalldialogs.cpp:84 smalldialogs.cpp:101
-#: smalldialogs.cpp:144
-msgid "Dir..."
-msgstr "目录..."
-
-#: smalldialogs.cpp:93
-msgid "C (Optional):"
-msgstr "C (可选):"
-
-#: smalldialogs.cpp:110 optiondialog.cpp:873 directorymergewindow.cpp:1818
-#: directorymergewindow.cpp:1819 directorymergewindow.cpp:2972
-msgid "Merge"
-msgstr "合并"
-
-#: smalldialogs.cpp:116
-msgid "Swap/Copy Names ..."
-msgstr ""
-
-#: smalldialogs.cpp:121 smalldialogs.cpp:122 smalldialogs.cpp:123
-#, kde-format
-msgid "Swap %1<->%2"
-msgstr ""
-
-#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126
-#, kde-format
-msgid "Copy %1->Output"
-msgstr ""
-
-#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129
-#, kde-format
-msgid "Swap %1<->Output"
-msgstr ""
-
-#: smalldialogs.cpp:136
-msgid "Output (optional):"
-msgstr "输出(可选):"
-
-#: smalldialogs.cpp:168
-msgid "Configure..."
-msgstr "配置..."
-
-#: smalldialogs.cpp:174
-msgid "&OK"
-msgstr ""
-
-#: smalldialogs.cpp:362
-msgid "Search text:"
-msgstr "搜索文本:"
-
-#: smalldialogs.cpp:369
-msgid "Case sensitive"
-msgstr "区分大小写"
-
-#: smalldialogs.cpp:372
-msgid "Search A"
-msgstr "搜索 A"
-
-#: smalldialogs.cpp:377
-msgid "Search B"
-msgstr "搜索 B"
-
-#: smalldialogs.cpp:382
-msgid "Search C"
-msgstr "搜索 C"
-
-#: smalldialogs.cpp:387
-msgid "Search output"
-msgstr "搜索输出"
-
-#: smalldialogs.cpp:392
-msgid "&Search"
-msgstr "搜索(&S)"
-
-#: smalldialogs.cpp:409
-msgid "Regular Expression Tester"
-msgstr ""
-
-#: smalldialogs.cpp:414 optiondialog.cpp:940
-msgid "Auto merge regular expression:"
-msgstr ""
-
-#: smalldialogs.cpp:422
-msgid "Example auto merge line:"
-msgstr ""
-
-#: smalldialogs.cpp:424
-msgid "For auto merge test copy a line as used in your files."
-msgstr ""
-
-#: smalldialogs.cpp:430 smalldialogs.cpp:459 smalldialogs.cpp:496
-msgid "Match result:"
-msgstr ""
-
-#: smalldialogs.cpp:441 optiondialog.cpp:966
-msgid "History start regular expression:"
-msgstr ""
-
-#: smalldialogs.cpp:449
-msgid "Example history start line (with leading comment):"
-msgstr ""
-
-#: smalldialogs.cpp:452
-msgid ""
-"Copy a history start line as used in your files,\n"
-"including the leading comment."
-msgstr ""
-
-#: smalldialogs.cpp:470 optiondialog.cpp:976
-msgid "History entry start regular expression:"
-msgstr ""
-
-#: smalldialogs.cpp:478
-msgid "History sort key order:"
-msgstr ""
-
-#: smalldialogs.cpp:486
-msgid "Example history entry start line (without leading comment):"
-msgstr ""
-
-#: smalldialogs.cpp:488
-msgid ""
-"Copy a history entry start line as used in your files,\n"
-"but omit the leading comment."
-msgstr ""
-
-#: smalldialogs.cpp:503
-msgid "Sort key result:"
-msgstr ""
-
-#: smalldialogs.cpp:510
-msgid "OK"
-msgstr ""
-
-#: smalldialogs.cpp:514 kreplacements/kreplacements.h:104
-#: kreplacements/kreplacements.cpp:164 kreplacements/kreplacements.cpp:195
-msgid "Cancel"
-msgstr ""
-
-#: smalldialogs.cpp:554 smalldialogs.cpp:564 smalldialogs.cpp:585
-msgid "Match success."
-msgstr ""
-
-#: smalldialogs.cpp:558 smalldialogs.cpp:568 smalldialogs.cpp:591
-#, fuzzy
-msgid "Match failed."
-msgstr "保存失败。"
-
-#: smalldialogs.cpp:576
-msgid "Opening and closing parentheses don't match in regular expression."
-msgstr ""
-
-#: optiondialog.cpp:367
-msgid "Unicode, 8 bit"
-msgstr "8 位 Unicode"
-
-#: optiondialog.cpp:368
-msgid "Unicode"
-msgstr "Unicode"
-
-#: optiondialog.cpp:369
-msgid "Latin1"
-msgstr "Latin1"
-
-#: optiondialog.cpp:388
-msgid "Change this if non-ASCII characters are not displayed correctly."
-msgstr "如果非 ASCII 字符不能正确显示,请更改此选项。"
-
-#: optiondialog.cpp:465
-#, fuzzy
-#| msgid "Configure..."
-msgid "Configure"
-msgstr "配置..."
-
-#: optiondialog.cpp:531
-msgid "Font"
-msgstr ""
-
-#: optiondialog.cpp:532
-msgid "Editor & Diff Output Font"
-msgstr "编辑器和 Diff 输出字体"
-
-#: optiondialog.cpp:556
-msgid "Italic font for deltas"
-msgstr "delta 使用斜体字"
-
-#: optiondialog.cpp:559
-msgid ""
-"Selects the italic version of the font for differences.\n"
-"If the font doesn't support italic characters, then this does nothing."
-msgstr ""
-"选择斜体字表示差别。\n"
-"如果字体不支持斜体,那么这个选项无效。"
-
-#: optiondialog.cpp:568
-msgid "Color"
-msgstr "颜色"
-
-#: optiondialog.cpp:569
-#, fuzzy
-msgid "Colors Settings"
-msgstr "区域设置"
-
-#: optiondialog.cpp:588
-msgid "Editor and Diff Views:"
-msgstr ""
-
-#: optiondialog.cpp:596
-msgid "Foreground color:"
-msgstr "前景颜色:"
-
-#: optiondialog.cpp:603
-msgid "Background color:"
-msgstr "背景颜色:"
-
-#: optiondialog.cpp:612
-msgid "Diff background color:"
-msgstr "Diff 背景颜色:"
-
-#: optiondialog.cpp:620
-msgid "Color A:"
-msgstr "颜色 A:"
-
-#: optiondialog.cpp:628
-msgid "Color B:"
-msgstr "颜色 B:"
-
-#: optiondialog.cpp:636
-msgid "Color C:"
-msgstr "颜色 C:"
-
-#: optiondialog.cpp:643
-msgid "Conflict color:"
-msgstr "冲突颜色:"
-
-#: optiondialog.cpp:651
-msgid "Current range background color:"
-msgstr "当前范围背景颜色:"
-
-#: optiondialog.cpp:659
-msgid "Current range diff background color:"
-msgstr "当前范围差别背景颜色:"
-
-#: optiondialog.cpp:666
-msgid "Color for manually aligned difference ranges:"
-msgstr ""
-
-#: optiondialog.cpp:672
-#, fuzzy
-msgid "Directory Comparison View:"
-msgstr "目录比较状态"
-
-#: optiondialog.cpp:678
-msgid "Newest file color:"
-msgstr ""
-
-#: optiondialog.cpp:682
-msgid ""
-"Changing this color will only be effective when starting the next directory "
-"comparison."
-msgstr ""
-
-#: optiondialog.cpp:687
-msgid "Oldest file color:"
-msgstr ""
-
-#: optiondialog.cpp:695
-msgid "Middle age file color:"
-msgstr ""
-
-#: optiondialog.cpp:703
-msgid "Color for missing files:"
-msgstr ""
-
-#: optiondialog.cpp:717
-msgid "Editor"
-msgstr "编辑器"
-
-#: optiondialog.cpp:718
-msgid "Editor Behavior"
-msgstr "编辑器行为"
-
-#: optiondialog.cpp:732
-msgid "Tab inserts spaces"
-msgstr "跳格插入空格"
-
-#: optiondialog.cpp:735
-msgid ""
-"On: Pressing tab generates the appropriate number of spaces.\n"
-"Off: A Tab-character will be inserted."
-msgstr ""
-"打开:按下 Tab 则生成相应数量的空格。\n"
-"关闭:将插入一个制表符。"
-
-#: optiondialog.cpp:741
-msgid "Tab size:"
-msgstr "制表符大小:"
-
-#: optiondialog.cpp:747
-msgid "Auto indentation"
-msgstr "自动缩进"
-
-#: optiondialog.cpp:750
-msgid "On: The indentation of the previous line is used for a new line.\n"
-msgstr "打开:使用前一行的缩进于新一行。\n"
-
-#: optiondialog.cpp:754
-msgid "Auto copy selection"
-msgstr "自动复制选择"
-
-#: optiondialog.cpp:757
-msgid ""
-"On: Any selection is immediately written to the clipboard.\n"
-"Off: You must explicitely copy e.g. via Ctrl-C."
-msgstr ""
-"打开:任何选择将被自动写入剪贴板。\n"
-"关闭:您必须明确复制内容,如通过 Ctrl-C。"
-
-#: optiondialog.cpp:762 mergeresultwindow.cpp:3135
-msgid "Line end style:"
-msgstr "行尾风格:"
-
-#: optiondialog.cpp:776
-msgid ""
-"Sets the line endings for when an edited file is saved.\n"
-"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A"
-msgstr ""
-"设置保存文件的行尾。\n"
-"DOS/Windows:CR+LF;Unix:LF;而 CR=0D,LF=0A"
-
-#: optiondialog.cpp:788
-#, fuzzy
-msgid "Diff"
-msgstr "KDiff3"
-
-#: optiondialog.cpp:789
-#, fuzzy
-msgid "Diff Settings"
-msgstr "Diff 和 Merge 设置"
-
-#: optiondialog.cpp:813
-#, fuzzy
-msgid "Treat as white space."
-msgstr "按空白字符处理 C/C++ 注解"
-
-#: optiondialog.cpp:815
-msgid "Ignore numbers"
-msgstr "忽略数字"
-
-#: optiondialog.cpp:818
-msgid ""
-"Ignore number characters during line matching phase. (Similar to Ignore "
-"white space.)\n"
-"Might help to compare files with numeric data."
-msgstr ""
-"在行匹配阶段,忽略数字字符。(与忽略空白字符相似。)\n"
-"可能帮助比较带数值数据的文件。"
-
-#: optiondialog.cpp:823
-msgid "Ignore C/C++ comments"
-msgstr "忽略 C/C++ 注解"
-
-#: optiondialog.cpp:825
-msgid "Treat C/C++ comments like white space."
-msgstr "按空白字符处理 C/C++ 注解"
-
-#: optiondialog.cpp:829
-msgid "Ignore case"
-msgstr "忽略大小写"
-
-#: optiondialog.cpp:832
-msgid "Treat case differences like white space changes. ('a'<=>'A')"
-msgstr "按处理空格更改的方法处理大小写更改。(“a”<=>“A”)"
-
-#: optiondialog.cpp:836
-msgid "Preprocessor command:"
-msgstr "预处理程序命令:"
-
-#: optiondialog.cpp:840
-msgid "User defined pre-processing. (See the docs for details.)"
-msgstr "用户定义预处理。(详细内容见文档。)"
-
-#: optiondialog.cpp:843
-msgid "Line-matching preprocessor command:"
-msgstr "行匹配预处理命令:"
-
-#: optiondialog.cpp:847
-msgid ""
-"This pre-processor is only used during line matching.\n"
-"(See the docs for details.)"
-msgstr ""
-"此预处理仅在行匹配时使用。\n"
-"(详细内容见文档。)"
-
-#: optiondialog.cpp:850
-msgid "Try hard (slower)"
-msgstr "尽量仔细(较慢)"
-
-#: optiondialog.cpp:853
-msgid ""
-"Enables the --minimal option for the external diff.\n"
-"The analysis of big files will be much slower."
-msgstr ""
-"为外部 diff 程序启用 --minimal 选项。\n"
-"大文件的分析会慢得多。"
-
-#: optiondialog.cpp:858
-msgid "Align B and C for 3 input files"
-msgstr ""
-
-#: optiondialog.cpp:861
-msgid ""
-"Try to align B and C when comparing or merging three input files.\n"
-"Not recommended for merging because merge might get more complicated.\n"
-"(Default is off.)"
-msgstr ""
-
-#: optiondialog.cpp:874
-#, fuzzy
-msgid "Merge Settings"
-msgstr "Diff 和 Merge 设置"
-
-#: optiondialog.cpp:889
-msgid "Auto advance delay (ms):"
-msgstr "自动前进延迟(毫秒):"
-
-#: optiondialog.cpp:894
-msgid ""
-"When in Auto-Advance mode the result of the current selection is shown \n"
-"for the specified time, before jumping to the next conflict. Range: 0-2000 ms"
-msgstr ""
-"在自动前进模式,当前选择结果显示一定时间,才会跳到下一个冲突。范围:0-2000 毫"
-"秒"
-
-#: optiondialog.cpp:899
-#, fuzzy
-#| msgid "Show Window A"
-msgid "Show info dialogs"
-msgstr "显示窗口 A"
-
-#: optiondialog.cpp:901
-msgid "Show a dialog with information about the number of conflicts."
-msgstr ""
-
-#: optiondialog.cpp:904
-msgid "White space 2-file merge default:"
-msgstr "2 文件合并默认空白字符:"
-
-#: optiondialog.cpp:908 optiondialog.cpp:921
-msgid "Manual Choice"
-msgstr "手动选择"
-
-#: optiondialog.cpp:912 optiondialog.cpp:926
-msgid ""
-"Allow the merge algorithm to automatically select an input for white-space-"
-"only changes."
-msgstr "允许合并算法为仅有空白字符变化自动选择输入。"
-
-#: optiondialog.cpp:917
-msgid "White space 3-file merge default:"
-msgstr "默认 3 文件合并空白字符:"
-
-#: optiondialog.cpp:931
-msgid "Automatic Merge Regular Expression"
-msgstr ""
-
-#: optiondialog.cpp:944
-msgid ""
-"Regular expression for lines where KDiff3 should automatically choose one "
-"source.\n"
-"When a line with a conflict matches the regular expression then\n"
-"- if available - C, otherwise B will be chosen."
-msgstr ""
-
-#: optiondialog.cpp:950
-msgid "Run regular expression auto merge on merge start"
-msgstr ""
-
-#: optiondialog.cpp:952
-msgid ""
-"Run the merge for auto merge regular expressions\n"
-"immediately when a merge starts.\n"
-msgstr ""
-
-#: optiondialog.cpp:957
-msgid "Version Control History Merging"
-msgstr ""
-
-#: optiondialog.cpp:970
-msgid ""
-"Regular expression for the start of the version control history entry.\n"
-"Usually this line contains the \"$Log$\"-keyword.\n"
-"Default value: \".*\\$Log.*\\$.*\""
-msgstr ""
-
-#: optiondialog.cpp:988
-msgid ""
-"A version control history entry consists of several lines.\n"
-"Specify the regular expression to detect the first line (without the leading "
-"comment).\n"
-"Use parentheses to group the keys you want to use for sorting.\n"
-"If left empty, then KDiff3 assumes that empty lines separate history "
-"entries.\n"
-"See the documentation for details."
-msgstr ""
-
-#: optiondialog.cpp:996
-msgid "History merge sorting"
-msgstr ""
-
-#: optiondialog.cpp:998
-msgid "Sort version control history by a key."
-msgstr ""
-
-#: optiondialog.cpp:1008
-msgid "History entry start sort key order:"
-msgstr ""
-
-#: optiondialog.cpp:1012
-msgid ""
-"Each parentheses used in the regular expression for the history start entry\n"
-"groups a key that can be used for sorting.\n"
-"Specify the list of keys (that are numbered in order of occurrence\n"
-"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n"
-"If left empty, then no sorting will be done.\n"
-"See the documentation for details."
-msgstr ""
-
-#: optiondialog.cpp:1023
-msgid "Merge version control history on merge start"
-msgstr ""
-
-#: optiondialog.cpp:1025
-msgid "Run version control history automerge on merge start."
-msgstr ""
-
-#: optiondialog.cpp:1029
-#, fuzzy
-msgid "Max number of history entries:"
-msgstr "子目录数:"
-
-#: optiondialog.cpp:1032
-msgid "Cut off after specified number. Use -1 for infinite number of entries."
-msgstr ""
-
-#: optiondialog.cpp:1036
-msgid "Test your regular expressions"
-msgstr ""
-
-#: optiondialog.cpp:1041
-msgid "Irrelevant merge command:"
-msgstr ""
-
-#: optiondialog.cpp:1045
-msgid ""
-"If specified this script is run after automerge\n"
-"when no other relevant changes were detected.\n"
-"Called with the parameters: filename1 filename2 filename3"
-msgstr ""
-
-#: optiondialog.cpp:1051
-msgid "Auto save and quit on merge without conflicts"
-msgstr ""
-
-#: optiondialog.cpp:1054
-msgid ""
-"When KDiff3 was started for a file-merge from the commandline and all\n"
-"conflicts are solvable without user interaction then automatically save and "
-"quit.\n"
-"(Similar to command line option \"--auto\"."
-msgstr ""
-
-#: optiondialog.cpp:1065 optiondialog.cpp:1066
-#, fuzzy
-#| msgid "&Directory"
-msgid "Directory"
-msgstr "目录(&D)"
-
-#: optiondialog.cpp:1079
-msgid "Recursive directories"
-msgstr "包含子目录"
-
-#: optiondialog.cpp:1081
-msgid "Whether to analyze subdirectories or not."
-msgstr "是否分析子目录。"
-
-#: optiondialog.cpp:1083
-msgid "File pattern(s):"
-msgstr "文件模式:"
-
-#: optiondialog.cpp:1088
-msgid ""
-"Pattern(s) of files to be analyzed. \n"
-"Wildcards: '*' and '?'\n"
-"Several Patterns can be specified by using the separator: ';'"
-msgstr ""
-"要分析的文件模式。\n"
-"通配符:“*”和“?”\n"
-"几个模式可以使用分隔符:“;”指定"
-
-#: optiondialog.cpp:1094
-msgid "File-anti-pattern(s):"
-msgstr "排除文件模式:"
-
-#: optiondialog.cpp:1099
-msgid ""
-"Pattern(s) of files to be excluded from analysis. \n"
-"Wildcards: '*' and '?'\n"
-"Several Patterns can be specified by using the separator: ';'"
-msgstr ""
-"排除分析的文件模式。\n"
-"通配符:“*”和“?”\n"
-"几个模式可以使用分隔符:“;”指定"
-
-#: optiondialog.cpp:1105
-msgid "Dir-anti-pattern(s):"
-msgstr "排除目录模式:"
-
-#: optiondialog.cpp:1110
-msgid ""
-"Pattern(s) of directories to be excluded from analysis. \n"
-"Wildcards: '*' and '?'\n"
-"Several Patterns can be specified by using the separator: ';'"
-msgstr ""
-"排除分析的目录模式。\n"
-"通配符:“*”和“?”\n"
-"几个模式可以使用分隔符:“;”指定"
-
-#: optiondialog.cpp:1116
-msgid "Use .cvsignore"
-msgstr "使用 .cvsignore"
-
-#: optiondialog.cpp:1119
-msgid ""
-"Extends the antipattern to anything that would be ignored by CVS.\n"
-"Via local \".cvsignore\"-files this can be directory specific."
-msgstr ""
-"扩展排除模式至任何被 CVS 忽略的类型。\n"
-"通过本地“.cvsignore”文件,可以指定目录。"
-
-#: optiondialog.cpp:1124
-msgid "Find hidden files and directories"
-msgstr "查找隐藏目录和文件"
-
-#: optiondialog.cpp:1127
-msgid "Finds files and directories with the hidden attribute."
-msgstr "查找具有隐藏属性的文件和目录。"
-
-#: optiondialog.cpp:1129
-msgid "Finds files and directories starting with '.'."
-msgstr "查找以“.”开头的文件和目录。"
-
-#: optiondialog.cpp:1133
-msgid "Follow file links"
-msgstr "追踪文件链接"
-
-#: optiondialog.cpp:1136
-msgid ""
-"On: Compare the file the link points to.\n"
-"Off: Compare the links."
-msgstr ""
-"打开:比较链接指向的文件。\n"
-"关闭:比较链接。"
-
-#: optiondialog.cpp:1141
-msgid "Follow directory links"
-msgstr "追踪目录链接"
-
-#: optiondialog.cpp:1144
-msgid ""
-"On: Compare the directory the link points to.\n"
-"Off: Compare the links."
-msgstr ""
-"打开:比较链接指向的目录。\n"
-"关闭:比较链接。"
-
-#: optiondialog.cpp:1160
-msgid "Case sensitive filename comparison"
-msgstr ""
-
-#: optiondialog.cpp:1163
-msgid ""
-"The directory comparison will compare files or directories when their names "
-"match.\n"
-"Set this option if the case of the names must match. (Default for Windows is "
-"off, otherwise on.)"
-msgstr ""
-
-#: optiondialog.cpp:1167
-msgid "File Comparison Mode"
-msgstr "文件比较模式"
-
-#: optiondialog.cpp:1173
-msgid "Binary comparison"
-msgstr "二进制比较"
-
-#: optiondialog.cpp:1174
-msgid "Binary comparison of each file. (Default)"
-msgstr "用二进制比较模式比较每个文件。"
-
-#: optiondialog.cpp:1177
-msgid "Full analysis"
-msgstr "完全分析"
-
-#: optiondialog.cpp:1178
-msgid ""
-"Do a full analysis and show statistics information in extra columns.\n"
-"(Slower than a binary comparison, much slower for binary files.)"
-msgstr ""
-"进行完全分析并且在额外的列里显示统计信息。\n"
-"(比较二进制比较模式慢,比较二进制文件更慢。)"
-
-#: optiondialog.cpp:1182
-#, fuzzy
-msgid "Trust the size and modification date (unsafe)"
-msgstr "信任修改日期(不安全)"
-
-#: optiondialog.cpp:1183
-#, fuzzy
-msgid ""
-"Assume that files are equal if the modification date and file length are "
-"equal.\n"
-"Files with equal contents but different modification dates will appear as "
-"different.\n"
-"Useful for big directories or slow networks."
-msgstr ""
-"假定如果修改日期和文件长度相同,则文件相同。\n"
-"对于大目录或较慢的网络有用。"
-
-#: optiondialog.cpp:1188
-msgid ""
-"Trust the size and date, but use binary comparison if date doesn't match "
-"(unsafe)"
-msgstr ""
-
-#: optiondialog.cpp:1189
-#, fuzzy
-msgid ""
-"Assume that files are equal if the modification date and file length are "
-"equal.\n"
-"If the date isn't equal but the sizes are, use binary comparison.\n"
-"Useful for big directories or slow networks."
-msgstr ""
-"假定如果修改日期和文件长度相同,则文件相同。\n"
-"对于大目录或较慢的网络有用。"
-
-#: optiondialog.cpp:1194
-msgid "Trust the size (unsafe)"
-msgstr "信任大小(不安全)"
-
-#: optiondialog.cpp:1195
-msgid ""
-"Assume that files are equal if their file lengths are equal.\n"
-"Useful for big directories or slow networks when the date is modified during "
-"download."
-msgstr ""
-"假定文件长度相同文件相同。\n"
-"当下载过程中日期被修改时,对于大目录或较慢网络有用。"
-
-#: optiondialog.cpp:1203
-msgid "Synchronize directories"
-msgstr "同步目录"
-
-#: optiondialog.cpp:1206
-msgid ""
-"Offers to store files in both directories so that\n"
-"both directories are the same afterwards.\n"
-"Works only when comparing two directories without specifying a destination."
-msgstr ""
-"为了以后目录相同,提供在两个目录里存储文件。\n"
-"仅在比较两个目录并未指定目标目录时有效。"
-
-#: optiondialog.cpp:1212
-msgid "White space differences considered equal"
-msgstr "认为相同的空白字符数"
-
-#: optiondialog.cpp:1215
-msgid ""
-"If files differ only by white space consider them equal.\n"
-"This is only active when full analysis is chosen."
-msgstr ""
-"如果文件只在空白字符上有差异,则认为它们相同。\n"
-"仅当选择完全比较时此选项才激活。"
-
-#: optiondialog.cpp:1221
-msgid "Copy newer instead of merging (unsafe)"
-msgstr "复制较新而不合并(不安全)"
-
-#: optiondialog.cpp:1224
-msgid ""
-"Don't look inside, just take the newer file.\n"
-"(Use this only if you know what you are doing!)\n"
-"Only effective when comparing two directories."
-msgstr ""
-"不进入查看,仅取较新的文件。\n"
-"(如果您知道自己在做什么再选此项!)\n"
-"仅在比较两个目录时有效。"
-
-#: optiondialog.cpp:1229
-msgid "Backup files (.orig)"
-msgstr "备份文件(.orig)"
-
-#: optiondialog.cpp:1232
-msgid ""
-"When a file would be saved over an old file, then the old file\n"
-"will be renamed with a '.orig'-extension instead of being deleted."
-msgstr ""
-"在已有旧文件的文件保存时,旧文件将被重命名为“.orig”扩展名,而不是被删除。"
-
-#: optiondialog.cpp:1328 optiondialog.cpp:1329
-msgid "Regional Settings"
-msgstr "区域设置"
-
-#: optiondialog.cpp:1429
-msgid "Language (restart required)"
-msgstr "语言(需要重启)"
-
-#: optiondialog.cpp:1461
-msgid ""
-"Choose the language of the GUI-strings or \"Auto\".\n"
-"For a change of language to take place, quit and restart KDiff3."
-msgstr ""
-"选择 GUI 的语言或者选择“自动”。\n"
-"要让更改生效,请退出并重启 KDiff3。"
-
-#: optiondialog.cpp:1479
-msgid "Use the same encoding for everything:"
-msgstr "所有文件使用同一编码:"
-
-#: optiondialog.cpp:1482
-msgid ""
-"Enable this allows to change all encodings by changing the first only.\n"
-"Disable this if different individual settings are needed."
-msgstr ""
-"启用此选项将使得只更改第一个编码设置即可更改全部文件的编码。\n"
-"如果需要为每个文件设置不同的编码,请禁用此选项。"
-
-#: optiondialog.cpp:1487
-msgid "Note: Local Encoding is "
-msgstr "注意:本地编码为"
-
-#: optiondialog.cpp:1491
-msgid "File Encoding for A:"
-msgstr "A 的文件编码:"
-
-#: optiondialog.cpp:1497
-msgid ""
-"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n"
-"If the file is not Unicode then the selected encoding will be used as "
-"fallback.\n"
-"(Unicode detection depends on the first bytes of a file.)"
-msgstr ""
-
-#: optiondialog.cpp:1501 optiondialog.cpp:1510 optiondialog.cpp:1519
-msgid "Auto Detect Unicode"
-msgstr ""
-
-#: optiondialog.cpp:1506
-msgid "File Encoding for B:"
-msgstr "B 的文件编码:"
-
-#: optiondialog.cpp:1515
-msgid "File Encoding for C:"
-msgstr "C 的文件编码:"
-
-#: optiondialog.cpp:1524
-msgid "File Encoding for Merge Output and Saving:"
-msgstr "合并输出和保存的文件编码:"
-
-#: optiondialog.cpp:1528
-#, fuzzy
-msgid "Auto Select"
-msgstr "自动复制选择"
-
-#: optiondialog.cpp:1531
-msgid ""
-"If enabled then the encoding from the input files is used.\n"
-"In ambiguous cases a dialog will ask the user to choose the encoding for "
-"saving."
-msgstr ""
-
-#: optiondialog.cpp:1535
-msgid "File Encoding for Preprocessor Files:"
-msgstr "预处理文件的文件编码:"
-
-#: optiondialog.cpp:1546
-msgid "Right To Left Language"
-msgstr "从右至左语言"
-
-#: optiondialog.cpp:1549
-msgid ""
-"Some languages are read from right to left.\n"
-"This setting will change the viewer and editor accordingly."
-msgstr ""
-"某些语言是从右到左书写的。\n"
-"此设置将更改查看器和编辑器的设置。"
-
-#: optiondialog.cpp:1564
-#, fuzzy
-msgid "Integration"
-msgstr "操作"
-
-#: optiondialog.cpp:1565
-#, fuzzy
-msgid "Integration Settings"
-msgstr "区域设置"
-
-#: optiondialog.cpp:1579
-msgid "Command line options to ignore:"
-msgstr ""
-
-#: optiondialog.cpp:1584
-msgid ""
-"List of command line options that should be ignored when KDiff3 is used by "
-"other tools.\n"
-"Several values can be specified if separated via ';'\n"
-"This will suppress the \"Unknown option\"-error."
-msgstr ""
-
-#: optiondialog.cpp:1591
-msgid "Quit also via Escape key"
-msgstr ""
-
-#: optiondialog.cpp:1594
-msgid ""
-"Fast method to exit.\n"
-"For those who are used to using the Escape-key."
-msgstr ""
-
-#: optiondialog.cpp:1599
-msgid "Integrate with ClearCase"
-msgstr ""
-
-#: optiondialog.cpp:1602
-msgid ""
-"Integrate with Rational ClearCase from IBM.\n"
-"Modifies the \"map\" file in ClearCase-subdir \"lib/mgrs\"\n"
-"(Only enabled when ClearCase \"bin\" directory is in the path.)"
-msgstr ""
-
-#: optiondialog.cpp:1608
-msgid "Remove ClearCase Integration"
-msgstr ""
-
-#: optiondialog.cpp:1611
-msgid ""
-"Restore the old \"map\" file from before doing the Clearcase integration."
-msgstr ""
-
-#: optiondialog.cpp:1692 kreplacements/kreplacements.cpp:794
-msgid ""
-"You selected a variable width font.\n"
-"\n"
-"Because this program doesn't handle variable width fonts\n"
-"correctly, you might experience problems while editing.\n"
-"\n"
-"Do you want to continue or do you want to select another font."
-msgstr ""
-"您选择了一个可变宽度字体。\n"
-"\n"
-"因为此程序不能正确处理可变宽度字体\n"
-"您可能在编辑时遇到问题。\n"
-"\n"
-"您要继续,还是另选一种字体。"
-
-#: optiondialog.cpp:1696
-msgid "Incompatible Font"
-msgstr "不兼容字体"
-
-#: optiondialog.cpp:1697
-msgid "Continue at Own Risk"
-msgstr "自愿冒险继续"
-
-#: optiondialog.cpp:1698
-msgid "Select Another Font"
-msgstr "选择另一种字体"
-
-#: optiondialog.cpp:1733
-msgid "This resets all options. Not only those of the current topic."
-msgstr "这将重置全部选项,而不仅是当前主题的选项。"
-
-#: main.cpp:187
-#, fuzzy
-#| msgid "KDiff3"
-msgid "kdiff3"
-msgstr "KDiff3"
-
-#: main.cpp:189
-msgid "Tool for Comparison and Merge of Files and Directories"
-msgstr "比较及合并文件和目录的工具"
-
-#: main.cpp:190
-msgid "(c) 2002-2008 Joachim Eibl"
-msgstr ""
-
-#: main.cpp:197 kdiff3_part.cpp:303
-msgid "Joachim Eibl"
-msgstr ""
-
-#: main.cpp:198
-msgid "Eike Sauer"
-msgstr ""
-
-#: main.cpp:198
-msgid "Bugfixes, Debian package maintainer"
-msgstr ""
-
-#: main.cpp:199
-msgid "Sebastien Fricker"
-msgstr ""
-
-#: main.cpp:199
-msgid "Windows installer"
-msgstr ""
-
-#: main.cpp:200
-msgid "Stephan Binner"
-msgstr ""
-
-#: main.cpp:200
-msgid "i18n-help"
-msgstr ""
-
-#: main.cpp:201
-msgid "Stefan Partheymueller"
-msgstr ""
-
-#: main.cpp:201
-#, fuzzy
-#| msgid "From Clipboard"
-msgid "Clipboard-patch"
-msgstr "从剪贴板"
-
-#: main.cpp:202
-msgid "David Faure"
-msgstr ""
-
-#: main.cpp:202
-msgid "KIO-Help"
-msgstr ""
-
-#: main.cpp:203
-msgid "Bernd Gehrmann"
-msgstr ""
-
-#: main.cpp:203
-msgid "Class CvsIgnoreList from Cervisia"
-msgstr ""
-
-#: main.cpp:204
-msgid "Andre Woebbeking"
-msgstr ""
-
-#: main.cpp:204
-msgid "Class StringMatcher"
-msgstr ""
-
-#: main.cpp:205
-msgid "Michael Denio"
-msgstr ""
-
-#: main.cpp:205
-#, fuzzy
-#| msgid "Directory Comparison Status"
-msgid "Directory Equality-Coloring patch"
-msgstr "目录比较状态"
-
-#: main.cpp:206
-msgid "Manfred Koehler"
-msgstr ""
-
-#: main.cpp:206
-msgid "Fix for slow startup on Windows"
-msgstr ""
-
-#: main.cpp:207
-#, fuzzy
-#| msgid "Merge Error"
-msgid "Sergey Zorin"
-msgstr "合并错误"
-
-#: main.cpp:207
-msgid "Diff Ext for Windows"
-msgstr ""
-
-#: main.cpp:208
-msgid "Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, Len Tower"
-msgstr ""
-
-#: main.cpp:208
-msgid "GNU-Diffutils"
-msgstr ""
-
-#: main.cpp:209
-msgid "Tino Boellsterling, Timothy Mee"
-msgstr ""
-
-#: main.cpp:209
-msgid "Intensive test, use and feedback"
-msgstr ""
-
-#: main.cpp:210
-msgid "Michael Schmidt"
-msgstr ""
-
-#: main.cpp:210
-msgid "Mac support"
-msgstr ""
-
-#: main.cpp:211
-msgid "Valentin Rusu"
-msgstr ""
-
-#: main.cpp:211 main.cpp:212
-#, fuzzy
-#| msgid "Do Nothing"
-msgid "KDE4 porting"
-msgstr "什么也不做"
-
-#: main.cpp:212
-msgid "Albert Astals Cid"
-msgstr ""
-
-#: main.cpp:214
-msgid "+ Many thanks to those who reported bugs and contributed ideas!"
-msgstr "+ 十分感谢报告错误和贡献想法的人们!"
-
-#: main.cpp:220
-msgid "Merge the input."
-msgstr "合并输入。"
-
-#: main.cpp:221
-msgid "Explicit base file. For compatibility with certain tools."
-msgstr "明确基准文件,以便与某些工具兼容。"
-
-#: main.cpp:222
-msgid "Output file. Implies -m. E.g.: -o newfile.txt"
-msgstr "输出文件。Implies -m。例如:-o newfile.txt"
-
-#: main.cpp:223
-msgid "Output file, again. (For compatibility with certain tools.)"
-msgstr "再次输出文件。(为与某些工具兼容。)"
-
-#: main.cpp:224
-msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)"
-msgstr "如果全部冲突自动解决无图形用户界面。(需要 -o file)"
-
-#: main.cpp:225
-msgid "Don't solve conflicts automatically. (For compatibility...)"
-msgstr "不自动解决冲突。(为了兼容性...)"
-
-#: main.cpp:226
-msgid "Visible name replacement for input file 1 (base)."
-msgstr "为输入文件1(基准文件)做的可见名替换。"
-
-#: main.cpp:227
-msgid "Visible name replacement for input file 2."
-msgstr "为输入文件2做的可见名替换。"
-
-#: main.cpp:228
-msgid "Visible name replacement for input file 3."
-msgstr "为输入文件3做的可见名替换。"
-
-#: main.cpp:229
-msgid "Alternative visible name replacement. Supply this once for every input."
-msgstr "候选可见名替换。每次输入提供。"
-
-#: main.cpp:230
-msgid ""
-"Override a config setting. Use once for every setting. E.g.: --cs "
-"\"AutoAdvance=1\""
-msgstr ""
-
-#: main.cpp:231
-msgid "Show list of config settings and current values."
-msgstr ""
-
-#: main.cpp:232
-#, fuzzy
-msgid "Use a different config file."
-msgstr "不同文件数:"
-
-#: main.cpp:235
-msgid "file1 to open (base, if not specified via --base)"
-msgstr "要打开的文件(基准文件,如果未通过 --base 指定)"
-
-#: main.cpp:236
-msgid "file2 to open"
-msgstr "要打开的文件 2"
-
-#: main.cpp:237
-msgid "file3 to open"
-msgstr "要打开的文件 3"
-
-#: difftextwindow.cpp:388 directorymergewindow.cpp:2689
-#, fuzzy
-#| msgid "File..."
-msgid "File"
-msgstr "文件..."
-
-#: difftextwindow.cpp:390
-#, fuzzy
-#| msgid "Link: "
-msgid "Line"
-msgstr "链接:"
-
-#: difftextwindow.cpp:392
-#, fuzzy
-#| msgid "not available"
-msgid "Line not available"
-msgstr "不可用"
-
-#: difftextwindow.cpp:1731
-msgid "End"
-msgstr "末尾"
-
-#: pdiff.cpp:260
-msgid "PreprocessorCmd: "
-msgstr "预处理程序命令:"
-
-#: pdiff.cpp:265
-msgid "The following option(s) you selected might change data:\n"
-msgstr "你所选的以下选项可能会更改数据:\n"
-
-#: pdiff.cpp:266
-msgid ""
-"\n"
-"Most likely this is not wanted during a merge.\n"
-"Do you want to disable these settings or continue with these settings active?"
-msgstr ""
-"\n"
-"大多数情况下合并应该不会用到这些选项。\n"
-"您想禁用这些设置还是继续激活这些设置?"
-
-#: pdiff.cpp:268
-msgid "Option Unsafe for Merging"
-msgstr "合并时会造成不安全的选项"
-
-#: pdiff.cpp:269
-msgid "Use These Options During Merge"
-msgstr "在合并时使用这些选项"
-
-#: pdiff.cpp:270
-msgid "Disable Unsafe Options"
-msgstr "禁用不安全的选项"
-
-#: pdiff.cpp:300
-msgid "Loading A"
-msgstr "加载 A"
-
-#: pdiff.cpp:304
-msgid "Loading B"
-msgstr "加载 B"
-
-#: pdiff.cpp:321 pdiff.cpp:347
-msgid "Diff: A <-> B"
-msgstr "Diff:A <-> B"
-
-#: pdiff.cpp:327 pdiff.cpp:372
-msgid "Linediff: A <-> B"
-msgstr "Linediff:A <-> B"
-
-#: pdiff.cpp:338
-msgid "Loading C"
-msgstr "加载 C"
-
-#: pdiff.cpp:350
-msgid "Diff: B <-> C"
-msgstr "Diff:B <-> C"
-
-#: pdiff.cpp:353
-msgid "Diff: A <-> C"
-msgstr "Diff:A <-> C"
-
-#: pdiff.cpp:375
-msgid "Linediff: B <-> C"
-msgstr "Linediff:B <-> C"
-
-#: pdiff.cpp:378
-msgid "Linediff: A <-> C"
-msgstr "Linediff:A <-> C"
-
-#: pdiff.cpp:532 mergeresultwindow.cpp:828
-msgid "All input files are binary equal."
-msgstr "全部输入文件二进制数据相同。"
-
-#: pdiff.cpp:534
-#, fuzzy
-msgid "All input files contain the same text, but are not binary equal."
-msgstr "全部输入文件包含相同文本。"
-
-#: pdiff.cpp:536 pdiff.cpp:538 pdiff.cpp:540 mergeresultwindow.cpp:832
-#: mergeresultwindow.cpp:834 mergeresultwindow.cpp:836
-#, fuzzy, kde-format
-msgid "Files %1 and %2 are binary equal.\n"
-msgstr "文件 B 和 C 二进制数据相同。\n"
-
-#: pdiff.cpp:537 pdiff.cpp:539 pdiff.cpp:541
-#, fuzzy, kde-format
-msgid "Files %1 and %2 have equal text, but are not binary equal. \n"
-msgstr "文件 A 和 B 二进制数据相同。\n"
-
-#: pdiff.cpp:551
-msgid ""
-"Some inputfiles don't seem to be pure textfiles.\n"
-"Note that the KDiff3-merge was not meant for binary data.\n"
-"Continue at your own risk."
-msgstr ""
-"一些输入文件不是纯文本文件。\n"
-"注意 KDiff3-merge 用于二进制数据。\n"
-"继续则您自己承担风险。"
-
-#: pdiff.cpp:1060
-msgid "Abort"
-msgstr "放弃"
-
-#: pdiff.cpp:1061 directorymergewindow.cpp:391
-msgid "Continue Merging"
-msgstr "继续合并"
-
-#: pdiff.cpp:1067 pdiff.cpp:1155
-msgid "Opening files..."
-msgstr "正在打开文件..."
-
-#: pdiff.cpp:1132 pdiff.cpp:1203
-msgid "File open error"
-msgstr "打开文件错误"
-
-#: pdiff.cpp:1235
-msgid "Cutting selection..."
-msgstr "剪切所选内容..."
-
-#: pdiff.cpp:1256
-msgid "Copying selection to clipboard..."
-msgstr "复制所选内容到剪贴板..."
-
-#: pdiff.cpp:1272
-msgid "Inserting clipboard contents..."
-msgstr "插入剪贴板内容..."
-
-#: pdiff.cpp:1794
-msgid "Save && Continue"
-msgstr "保存并继续"
-
-#: pdiff.cpp:1795
-msgid "Continue Without Saving"
-msgstr "不保存继续"
-
-#: pdiff.cpp:1997
-msgid "Search complete."
-msgstr "搜索完成。"
-
-#: pdiff.cpp:1997
-msgid "Search Complete"
-msgstr "搜索完成"
-
-#: pdiff.cpp:2231
-msgid "Nothing is selected in either diff input window."
-msgstr ""
-
-#: pdiff.cpp:2231
-#, fuzzy
-msgid "Error while adding manual diff range"
-msgstr "创建目录时出错。"
-
-#: kdiff3_shell.cpp:76
-#, fuzzy
-#| msgid ""
-#| "Could not find our part!\n"
-#| "This usually happens due to an installation problem. Please read the "
-#| "README-file in the source package for details."
-msgid ""
-"Could not initialize our part!\n"
-"This usually happens due to an installation problem. Please read the README-"
-"file in the source package for details."
-msgstr ""
-"无法找到我们的组件!\n"
-"发生此错误通常因为安装错误。详细内容请阅读源码包内的 README 文件。"
-
 #: directorymergewindow.cpp:136
 msgid "Mix of links and normal files."
 msgstr "链接和普通文件混合"
 "the merge and rescan the directory?"
 msgstr "您当前正在合并目录。您确定要放弃合并,重新扫描目录吗?"
 
-#: directorymergewindow.cpp:390 directorymergewindow.cpp:2945
+#: directorymergewindow.cpp:389 mergeresultwindow.cpp:303 kdiff3.cpp:653
+#: kdiff3.cpp:663 kdiff3.cpp:675 pdiff.cpp:1059 pdiff.cpp:1793 pdiff.cpp:1803
+#, fuzzy
+msgid "Warning"
+msgstr "警告"
+
+#: directorymergewindow.cpp:390 directorymergewindow.cpp:2956
 msgid "Rescan"
 msgstr "重新扫描"
 
+#: directorymergewindow.cpp:391 pdiff.cpp:1061
+msgid "Continue Merging"
+msgstr "继续合并"
+
 #: directorymergewindow.cpp:548
+#, fuzzy
 msgid "Opening of directories failed:"
-msgstr "打开目录失败"
+msgstr "打开目录失败"
 
 #: directorymergewindow.cpp:551
 #, kde-format
 msgid "Check the permissions of the subdirectories."
 msgstr "检查子目录权限。"
 
+#: directorymergewindow.cpp:721 kdiff3.cpp:618 kdiff3.cpp:710 kdiff3.cpp:735
+#: kdiff3.cpp:1016 kdiff3.cpp:1037 pdiff.cpp:1141 pdiff.cpp:1213 pdiff.cpp:1251
+#: pdiff.cpp:1267 pdiff.cpp:1297 pdiff.cpp:1308
+msgid "Ready."
+msgstr "就绪。"
+
 #: directorymergewindow.cpp:735
 msgid "Directory Comparison Status"
 msgstr "目录比较状态"
 msgid "Processing "
 msgstr "处理 "
 
-#: directorymergewindow.cpp:1732 directorymergewindow.cpp:1738
+#: directorymergewindow.cpp:1733 directorymergewindow.cpp:1739
 msgid "To do."
 msgstr "执行。"
 
-#: directorymergewindow.cpp:1806 directorymergewindow.cpp:2976
+#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2987
 msgid "Copy A to B"
 msgstr "复制 A 到 B"
 
-#: directorymergewindow.cpp:1807 directorymergewindow.cpp:2977
+#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2988
 msgid "Copy B to A"
 msgstr "复制 B 到 A"
 
-#: directorymergewindow.cpp:1808 directorymergewindow.cpp:2978
+#: directorymergewindow.cpp:1809 directorymergewindow.cpp:2989
 msgid "Delete A"
 msgstr "删除 A"