diff options
Diffstat (limited to 'tde-i18n-zh_CN/messages/tdesdk/kompare.po')
| -rw-r--r-- | tde-i18n-zh_CN/messages/tdesdk/kompare.po | 938 |
1 files changed, 469 insertions, 469 deletions
diff --git a/tde-i18n-zh_CN/messages/tdesdk/kompare.po b/tde-i18n-zh_CN/messages/tdesdk/kompare.po index 88f0a682c06..f755e5ca7d0 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 00:48-0500\n" +"POT-Creation-Date: 2014-09-29 12:05-0500\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,97 +17,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3.1\n" -#: _translatorinfo.cpp:1 -msgid "" -"_: NAME OF TRANSLATORS\n" -"Your names" -msgstr "开源软件国际化简体中文组(http://i18n.linux.net.cn)" - -#: _translatorinfo.cpp:3 -msgid "" -"_: EMAIL OF TRANSLATORS\n" -"Your emails" -msgstr "i18n-translation@lists.linux.net.cn" - -#: komparenavtreepart/komparenavtreepart.cpp:61 -msgid "Source Folder" -msgstr "源文件夹" - -#: komparenavtreepart/komparenavtreepart.cpp:66 -msgid "Destination Folder" -msgstr "目标文件夹" - -#: komparenavtreepart/komparenavtreepart.cpp:71 -msgid "Source File" -msgstr "源文件" - -#: komparenavtreepart/komparenavtreepart.cpp:72 -msgid "Destination File" -msgstr "目标文件" - -#: komparenavtreepart/komparenavtreepart.cpp:78 -msgid "Source Line" -msgstr "源文件行" - -#: komparenavtreepart/komparenavtreepart.cpp:79 -msgid "Destination Line" -msgstr "目标文件行" - -#: komparenavtreepart/komparenavtreepart.cpp:80 -msgid "Difference" -msgstr "差异" - -#: komparenavtreepart/komparenavtreepart.cpp:426 -#, c-format -msgid "" -"_n: Applied: Changes made to %n line undone\n" -"Applied: Changes made to %n lines undone" -msgstr "应用结果：未完成 %n 行的修改" - -#: komparenavtreepart/komparenavtreepart.cpp:429 -#, c-format -msgid "" -"_n: Changed %n line\n" -"Changed %n lines" -msgstr "修改了 %n 行" - -#: komparenavtreepart/komparenavtreepart.cpp:434 -#, c-format -msgid "" -"_n: Applied: Insertion of %n line undone\n" -"Applied: Insertion of %n lines undone" -msgstr "应用结果：未完成 %n 行的插入" - -#: komparenavtreepart/komparenavtreepart.cpp:437 -#, c-format -msgid "" -"_n: Inserted %n line\n" -"Inserted %n lines" -msgstr "插入了 %n 行" - -#: komparenavtreepart/komparenavtreepart.cpp:442 -#, c-format -msgid "" -"_n: Applied: Deletion of %n line undone\n" -"Applied: Deletion of %n lines undone" -msgstr "应用结果：未完成 %n 行的删除" - -#: komparenavtreepart/komparenavtreepart.cpp:445 -#, c-format -msgid "" -"_n: Deleted %n line\n" -"Deleted %n lines" -msgstr "删除了 %n 行" - -#: komparenavtreepart/komparenavtreepart.cpp:531 -#: komparepart/kompare_part.cpp:651 -msgid "Unknown" -msgstr "未知" - -#: komparenavtreepart/komparenavtreepart.cpp:694 -msgid "KompareNavTreePart" -msgstr "KompareNavTreePart" - #: libdiff2/komparemodellist.cpp:61 msgid "&Apply Difference" msgstr "应用差异(&A)" @@ -192,156 +101,6 @@ msgstr "文件是相同的。" msgid "Could not write to the temporary file." msgstr "无法写入临时文件。" -#: kompare_shell.cpp:77 -msgid "Could not find our KompareViewPart." -msgstr "找不到部件 KompareViewPart。" - -#: kompare_shell.cpp:106 -msgid "Could not load our KompareViewPart." -msgstr "无法加载部件 KompareViewPart。" - -#: kompare_shell.cpp:114 -msgid "Could not find our KompareNavigationPart." -msgstr "找不到部件 KompareNavigationPart。" - -#: kompare_shell.cpp:138 -msgid "Could not load our KompareNavigationPart." -msgstr "无法加载部件 KompareNavigationPart。" - -#: kompare_shell.cpp:233 -msgid "&Open Diff..." -msgstr "打开 diff 文件(&O)..." - -#: kompare_shell.cpp:234 -msgid "&Compare Files..." -msgstr "比较文件(&C)..." - -#: kompare_shell.cpp:237 -msgid "&Blend URL with Diff..." -msgstr "合并 diff 到 URL(&B)..." - -#: kompare_shell.cpp:246 -msgid "Show T&ext View" -msgstr "显示文本视图(&E)" - -#: kompare_shell.cpp:248 -msgid "Hide T&ext View" -msgstr "隐藏文本视图(&E)" - -#: kompare_shell.cpp:257 -msgid " 0 of 0 differences " -msgstr "无差异" - -#: kompare_shell.cpp:258 -msgid " 0 of 0 files " -msgstr "无文件" - -#: kompare_shell.cpp:273 -msgid "" -"_n: %1 of %n file \n" -" %1 of %n files " -msgstr " 第 %1 / %n 个文件" - -#: kompare_shell.cpp:275 -#, c-format -msgid "" -"_n: %n file \n" -" %n files " -msgstr " %n 个文件 " - -#: kompare_shell.cpp:278 -msgid "" -"_n: %1 of %n difference, %2 applied \n" -" %1 of %n differences, %2 applied " -msgstr " 第 %1 / %n 个差异，己应用 %2 个" - -#: kompare_shell.cpp:281 -#, c-format -msgid "" -"_n: %n difference \n" -" %n differences " -msgstr " %n 个差异 " - -#: kompare_shell.cpp:369 -msgid "Blend File/Folder with diff Output" -msgstr "合并 diff 输出到文件/文件夹" - -#: kompare_shell.cpp:370 -msgid "File/Folder" -msgstr "文件/文件夹" - -#: kompare_shell.cpp:371 -msgid "Diff Output" -msgstr "Diff 输出" - -#: kompare_shell.cpp:373 -msgid "Blend" -msgstr "合并" - -#: kompare_shell.cpp:373 -msgid "Blend this file or folder with the diff output" -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. " -msgstr "" -"如果您在此对话框中输入了文件或文件夹名称，以及包含 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 "文本视图" - -#: kompareurldialog.cpp:41 -msgid "Here you can enter the files you want to compare." -msgstr "您可以在此输入您想要比较的文件。" - -#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 -msgid "Diff" -msgstr "Diff" - -#: kompareurldialog.cpp:47 -msgid "Here you can change the options for comparing the files." -msgstr "您可以在此更改要比较文件的选项。" - -#: kompareurldialog.cpp:53 -msgid "Here you can change the options for the view." -msgstr "您可以在此更改视图选项。" - #. i18n: file komparepart/komparepartui.rc line 13 #: rc.cpp:15 #, no-c-format @@ -468,228 +227,312 @@ msgstr "并排" msgid "Number of context lines:" msgstr "上下文行数：" -#: komparepart/kompareprefdlg.cpp:33 -msgid "Preferences" -msgstr "首选项" +#: main.cpp:33 +msgid "" +"A program to view the differences between files and optionally generate a diff" +msgstr "本程序查看文件间的差异，并可以生成 diff 结果" -#: komparepart/kompareprefdlg.cpp:39 -msgid "View Settings" -msgstr "查看设置" +#: main.cpp:39 +msgid "This will compare URL1 with URL2" +msgstr "这将比较 URL1 和 URL2" -#: komparepart/kompareprefdlg.cpp:43 -msgid "Diff Settings" -msgstr "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:165 -msgid "Save &All" -msgstr "全部保存(&A)" +#: 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:168 -msgid "Save .&diff..." -msgstr "保存.diff 文件(&D)..." +#: 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:171 -msgid "Swap Source with Destination" -msgstr "交换源文件和目标文件" +#: 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 "使用此处指定从命令行调用时所用的编码。如果未指定，则默认为系统的本地编码。" -#: komparepart/kompare_part.cpp:174 -msgid "Show Statistics" -msgstr "显示统计信息" +#: main.cpp:52 +msgid "Kompare" +msgstr "Kompare" -#: komparepart/kompare_part.cpp:269 -msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" -msgstr "<qt>URL <b>%1</b> 无法下载。</qt>" +#: main.cpp:54 +msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" +msgstr "(c) 2001-2004, John Firebaugh 和 Otto Bruggeman" -#: 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>" +#: main.cpp:55 main.cpp:56 +msgid "Author" +msgstr "作者" -#: komparepart/kompare_part.cpp:425 -msgid "Diff Options" -msgstr "Diff 选项" +#: main.cpp:57 +msgid "Kompare icon artist" +msgstr "Kompare 图标制作者" -#: komparepart/kompare_part.cpp:443 -msgid "*.diff *.dif *.patch|Patch Files" -msgstr "*.diff *.dif *.patch|补丁文件" +#: main.cpp:58 +msgid "A lot of good advice" +msgstr "许多好建议" -#: komparepart/kompare_part.cpp:443 -msgid "Save .diff" -msgstr "保存 .diff 文件" +#: main.cpp:59 +msgid "Cervisia diff viewer" +msgstr "Cervisia diff 查看器" -#: komparepart/kompare_part.cpp:446 -msgid "The file exists or is write-protected; do you want to overwrite it?" -msgstr "文件已经存在或有写保护，要覆盖吗？" +#: kompare_shell.cpp:398 main.cpp:185 +msgid "Compare Files or Folders" +msgstr "比较文件或文件夹" -#: komparepart/kompare_part.cpp:446 -msgid "File Exists" -msgstr "文件已存在" +#: kompare_shell.cpp:399 main.cpp:186 +msgid "Source" +msgstr "源文件" -#: komparepart/kompare_part.cpp:446 -msgid "Overwrite" -msgstr "覆盖" +#: kompare_shell.cpp:400 main.cpp:187 +msgid "Destination" +msgstr "目标文件" -#: komparepart/kompare_part.cpp:446 -msgid "Do Not Overwrite" -msgstr "不覆盖" +#: kompare_shell.cpp:402 main.cpp:189 +msgid "Compare" +msgstr "比较" -#: komparepart/kompare_part.cpp:481 -msgid "KomparePart" -msgstr "KomparePart" +#: main.cpp:189 +msgid "Compare these files or folder" +msgstr "比较这些文件或文件夹" -#: komparepart/kompare_part.cpp:493 -msgid "Running diff..." -msgstr "运行 diff..." +#: 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" +"按下它，将开始比较所输入的文件或文件夹。" -#: komparepart/kompare_part.cpp:496 -msgid "Parsing diff output..." -msgstr "分析 diff 输出..." +#: _translatorinfo.cpp:1 +msgid "" +"_: NAME OF TRANSLATORS\n" +"Your names" +msgstr "开源软件国际化简体中文组(http://i18n.linux.net.cn)" -#: komparepart/kompare_part.cpp:545 -msgid "Comparing file %1 with file %2" -msgstr "正在比较文件 %1 和 %2" +#: _translatorinfo.cpp:3 +msgid "" +"_: EMAIL OF TRANSLATORS\n" +"Your emails" +msgstr "i18n-translation@lists.linux.net.cn" -#: komparepart/kompare_part.cpp:550 -msgid "Comparing files in %1 with files in %2" -msgstr "正在比较 %1 和 %2 中的文件" +#: kompare_shell.cpp:77 +msgid "Could not find our KompareViewPart." +msgstr "找不到部件 KompareViewPart。" -#: komparepart/kompare_part.cpp:555 -#, c-format -msgid "Viewing diff output from %1" -msgstr "查看 %1 的 diff 结果" +#: kompare_shell.cpp:106 +msgid "Could not load our KompareViewPart." +msgstr "无法加载部件 KompareViewPart。" -#: komparepart/kompare_part.cpp:558 -msgid "Blending diff output from %1 into file %2" -msgstr "合并 %1 的 diff 结果到文件 %2" +#: kompare_shell.cpp:114 +msgid "Could not find our KompareNavigationPart." +msgstr "找不到部件 KompareNavigationPart。" -#: komparepart/kompare_part.cpp:563 -msgid "Blending diff output from %1 into folder %2" -msgstr "合并 %1 的 diff 结果到文件夹 %2" +#: kompare_shell.cpp:138 +msgid "Could not load our KompareNavigationPart." +msgstr "无法加载部件 KompareNavigationPart。" -#: 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" -"要保存吗？" +#: kompare_shell.cpp:233 +msgid "&Open Diff..." +msgstr "打开 diff 文件(&O)..." -#: komparepart/kompare_part.cpp:588 komparepart/kompare_part.cpp:711 -msgid "Save Changes?" -msgstr "保存修改？" +#: kompare_shell.cpp:234 +msgid "&Compare Files..." +msgstr "比较文件(&C)..." -#: komparepart/kompare_part.cpp:667 +#: kompare_shell.cpp:237 +msgid "&Blend URL with Diff..." +msgstr "合并 diff 到 URL(&B)..." + +#: kompare_shell.cpp:246 +msgid "Show T&ext View" +msgstr "显示文本视图(&E)" + +#: kompare_shell.cpp:248 +msgid "Hide T&ext View" +msgstr "隐藏文本视图(&E)" + +#: kompare_shell.cpp:257 +msgid " 0 of 0 differences " +msgstr "无差异" + +#: kompare_shell.cpp:258 +msgid " 0 of 0 files " +msgstr "无文件" + +#: kompare_shell.cpp:273 msgid "" -"No diff file, or no 2 files have been diffed. Therefore no stats are available." -msgstr "没有 diff 文件，或没有比较两个文件，因为统计信息不可用。" +"_n: %1 of %n file \n" +" %1 of %n files " +msgstr " 第 %1 / %n 个文件" -#: komparepart/kompare_part.cpp:669 komparepart/kompare_part.cpp:683 -#: komparepart/kompare_part.cpp:698 -msgid "Diff Statistics" -msgstr "Diff 统计" +#: kompare_shell.cpp:275 +#, c-format +msgid "" +"_n: %n file \n" +" %n files " +msgstr " %n 个文件 " -#: komparepart/kompare_part.cpp:673 +#: kompare_shell.cpp:278 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" +"_n: %1 of %n difference, %2 applied \n" +" %1 of %n differences, %2 applied " +msgstr " 第 %1 / %n 个差异，己应用 %2 个" -#: komparepart/kompare_part.cpp:686 +#: kompare_shell.cpp:281 +#, c-format 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" +"_n: %n difference \n" +" %n differences " +msgstr " %n 个差异 " + +#: kompare_shell.cpp:369 +msgid "Blend File/Folder with diff Output" +msgstr "合并 diff 输出到文件/文件夹" + +#: kompare_shell.cpp:370 +msgid "File/Folder" +msgstr "文件/文件夹" + +#: kompare_shell.cpp:371 +msgid "Diff Output" +msgstr "Diff 输出" + +#: kompare_shell.cpp:373 +msgid "Blend" +msgstr "合并" + +#: kompare_shell.cpp:373 +msgid "Blend this file or folder with the diff output" +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. " msgstr "" -"统计：\n" -"\n" -"diff结果中的文件个数：%1\n" -"格式：%2\n" -"\n" -"当前旧文件：%3\n" -"当前新文件：%4\n" -"\n" -"相同个数：%5\n" -"差异个数：%6" +"如果您在此对话框中输入了文件或文件夹名称，以及包含 diff 输出的文件，则此按钮可以使用。单击此按钮后，将打开 kompare " +"的主视图，输入的文件或文件夹中的文件将会与 diff 输出混合，这样您就可以将差异应用到文件了。" -#: libdialogpages/filespage.cpp:53 -msgid "Encoding" -msgstr "编码" +#: kompare_shell.cpp:402 +msgid "Compare these files or folders" +msgstr "比较这些文件或文件夹" -#: libdialogpages/filespage.cpp:64 -msgid "&Files" -msgstr "文件(&F)" +#: kompare_shell.cpp:439 +msgid "Text View" +msgstr "文本视图" -#: libdialogpages/viewpage.cpp:51 -msgid "Colors" -msgstr "颜色" +#: komparenavtreepart/komparenavtreepart.cpp:61 +msgid "Source Folder" +msgstr "源文件夹" -#: libdialogpages/viewpage.cpp:56 -msgid "Removed color:" -msgstr "删除文本的颜色：" +#: komparenavtreepart/komparenavtreepart.cpp:66 +msgid "Destination Folder" +msgstr "目标文件夹" -#: libdialogpages/viewpage.cpp:61 -msgid "Changed color:" -msgstr "改变文本的颜色：" +#: komparenavtreepart/komparenavtreepart.cpp:71 +msgid "Source File" +msgstr "源文件" -#: libdialogpages/viewpage.cpp:66 -msgid "Added color:" -msgstr "新增文本的颜色：" +#: komparenavtreepart/komparenavtreepart.cpp:72 +msgid "Destination File" +msgstr "目标文件" -#: libdialogpages/viewpage.cpp:71 -msgid "Applied color:" -msgstr "应用文本的颜色：" +#: komparenavtreepart/komparenavtreepart.cpp:78 +msgid "Source Line" +msgstr "源文件行" -#: libdialogpages/viewpage.cpp:76 -msgid "Mouse Wheel" -msgstr "鼠标滚轮" +#: komparenavtreepart/komparenavtreepart.cpp:79 +msgid "Destination Line" +msgstr "目标文件行" -#: libdialogpages/viewpage.cpp:80 -msgid "Number of lines:" -msgstr "行数：" +#: komparenavtreepart/komparenavtreepart.cpp:80 +msgid "Difference" +msgstr "差异" -#: libdialogpages/viewpage.cpp:86 -msgid "Tabs to Spaces" -msgstr "将制表符扩展成空格" +#: komparenavtreepart/komparenavtreepart.cpp:426 +#, c-format +msgid "" +"_n: Applied: Changes made to %n line undone\n" +"Applied: Changes made to %n lines undone" +msgstr "应用结果：未完成 %n 行的修改" -#: libdialogpages/viewpage.cpp:90 -msgid "Number of spaces to convert a tab character to:" -msgstr "制表符转换成空格的个数：" +#: komparenavtreepart/komparenavtreepart.cpp:429 +#, c-format +msgid "" +"_n: Changed %n line\n" +"Changed %n lines" +msgstr "修改了 %n 行" -#: libdialogpages/viewpage.cpp:97 -msgid "A&ppearance" -msgstr "外观(&P)" +#: komparenavtreepart/komparenavtreepart.cpp:434 +#, c-format +msgid "" +"_n: Applied: Insertion of %n line undone\n" +"Applied: Insertion of %n lines undone" +msgstr "应用结果：未完成 %n 行的插入" -#: libdialogpages/viewpage.cpp:104 -msgid "Text Font" -msgstr "文本字体" +#: komparenavtreepart/komparenavtreepart.cpp:437 +#, c-format +msgid "" +"_n: Inserted %n line\n" +"Inserted %n lines" +msgstr "插入了 %n 行" -#: libdialogpages/viewpage.cpp:108 -msgid "Font:" -msgstr "字体：" +#: komparenavtreepart/komparenavtreepart.cpp:442 +#, c-format +msgid "" +"_n: Applied: Deletion of %n line undone\n" +"Applied: Deletion of %n lines undone" +msgstr "应用结果：未完成 %n 行的删除" -#: libdialogpages/viewpage.cpp:112 -msgid "Size:" -msgstr "大小：" +#: komparenavtreepart/komparenavtreepart.cpp:445 +#, c-format +msgid "" +"_n: Deleted %n line\n" +"Deleted %n lines" +msgstr "删除了 %n 行" + +#: komparenavtreepart/komparenavtreepart.cpp:531 +#: komparepart/kompare_part.cpp:651 +msgid "Unknown" +msgstr "未知" + +#: komparenavtreepart/komparenavtreepart.cpp:694 +msgid "KompareNavTreePart" +msgstr "KompareNavTreePart" + +#: kompareurldialog.cpp:41 +msgid "Here you can enter the files you want to compare." +msgstr "您可以在此输入您想要比较的文件。" + +#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47 +msgid "Diff" +msgstr "Diff" + +#: kompareurldialog.cpp:47 +msgid "Here you can change the options for comparing the files." +msgstr "您可以在此更改要比较文件的选项。" + +#: kompareurldialog.cpp:53 +msgid "Here you can change the options for the view." +msgstr "您可以在此更改视图选项。" #: libdialogpages/diffpage.cpp:211 msgid "Diff Program" @@ -876,68 +719,225 @@ msgstr "任何在弹出的对话框中点击选择的文件将会放入此按钮 msgid "&Exclude" msgstr "排除(&E)" -#: main.cpp:33 -msgid "" -"A program to view the differences between files and optionally generate a diff" -msgstr "本程序查看文件间的差异，并可以生成 diff 结果" +#: libdialogpages/filespage.cpp:53 +msgid "Encoding" +msgstr "编码" -#: main.cpp:39 -msgid "This will compare URL1 with URL2" -msgstr "这将比较 URL1 和 URL2" +#: libdialogpages/filespage.cpp:64 +msgid "&Files" +msgstr "文件(&F)" -#: 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”选项关闭此检查。" +#: libdialogpages/viewpage.cpp:51 +msgid "Colors" +msgstr "颜色" -#: 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 则是要被合并的文件或文件夹。" +#: libdialogpages/viewpage.cpp:56 +msgid "Removed color:" +msgstr "删除文本的颜色：" -#: 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 为“-”时，不自动检查原始文件的存在。" +#: libdialogpages/viewpage.cpp:61 +msgid "Changed color:" +msgstr "改变文本的颜色：" -#: 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 "使用此处指定从命令行调用时所用的编码。如果未指定，则默认为系统的本地编码。" +#: libdialogpages/viewpage.cpp:66 +msgid "Added color:" +msgstr "新增文本的颜色：" -#: main.cpp:52 -msgid "Kompare" -msgstr "Kompare" +#: libdialogpages/viewpage.cpp:71 +msgid "Applied color:" +msgstr "应用文本的颜色：" -#: main.cpp:54 -msgid "(c) 2001-2004, John Firebaugh and Otto Bruggeman" -msgstr "(c) 2001-2004, John Firebaugh 和 Otto Bruggeman" +#: libdialogpages/viewpage.cpp:76 +msgid "Mouse Wheel" +msgstr "鼠标滚轮" -#: main.cpp:55 main.cpp:56 -msgid "Author" -msgstr "作者" +#: libdialogpages/viewpage.cpp:80 +msgid "Number of lines:" +msgstr "行数：" -#: main.cpp:57 -msgid "Kompare icon artist" -msgstr "Kompare 图标制作者" +#: libdialogpages/viewpage.cpp:86 +msgid "Tabs to Spaces" +msgstr "将制表符扩展成空格" -#: main.cpp:58 -msgid "A lot of good advice" -msgstr "许多好建议" +#: libdialogpages/viewpage.cpp:90 +msgid "Number of spaces to convert a tab character to:" +msgstr "制表符转换成空格的个数：" -#: main.cpp:59 -msgid "Cervisia diff viewer" -msgstr "Cervisia diff 查看器" +#: libdialogpages/viewpage.cpp:97 +msgid "A&ppearance" +msgstr "外观(&P)" -#: main.cpp:189 -msgid "Compare these files or folder" -msgstr "比较这些文件或文件夹" +#: libdialogpages/viewpage.cpp:104 +msgid "Text Font" +msgstr "文本字体" + +#: libdialogpages/viewpage.cpp:108 +msgid "Font:" +msgstr "字体：" + +#: libdialogpages/viewpage.cpp:112 +msgid "Size:" +msgstr "大小：" + +#: komparepart/kompareprefdlg.cpp:33 +msgid "Preferences" +msgstr "首选项" + +#: komparepart/kompareprefdlg.cpp:39 +msgid "View Settings" +msgstr "查看设置" + +#: komparepart/kompareprefdlg.cpp:43 +msgid "Diff Settings" +msgstr "Diff 设置" + +#: 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: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" |