X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Translations%2FWinMerge%2FChineseSimplified.po;h=5a2d788b9e4859f30e154d21c5bf08d057c80d97;hb=482891e1891e906373d2ad95902b34101e13e30c;hp=390948cf29d3fa1cd4e1c52d8586a918ec56bbbd;hpb=c3f876c416c3ffd8c718d340b2e83497e9d0a7a6;p=winmerge-jp%2Fwinmerge-jp.git

diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index 390948cf2..5a2d788b9 100644
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -53,8 +53,8 @@ msgstr ""
 msgid "Copy Selected Line(s) from Right"
 msgstr ""
 
-msgid "&Select Line Difference\tF4"
-msgstr "选中行内差异(&S)\tF4"
+msgid "Select Line &Difference\tF4"
+msgstr "选中行内差异(&D)\tF4"
 
 msgid "Add this change to Substitution &Filters"
 msgstr ""
@@ -74,6 +74,12 @@ msgstr "复制(&C)"
 msgid "&Paste"
 msgstr "粘贴(&P)"
 
+msgid "&Scripts"
+msgstr "脚本(&S)"
+
+msgid "< Empty >"
+msgstr "< 空 >"
+
 msgid "&Go to...\tCtrl+G"
 msgstr "转到(&G)...\tCtrl+G"
 
@@ -95,6 +101,9 @@ msgstr "使用外部编辑器(&E)\tCtrl+Alt+E"
 msgid "&With..."
 msgstr "选择程序(&W)..."
 
+msgid "Open &Parent Folder..."
+msgstr "打开上层文件夹(&P)..."
+
 msgid "S&hell Menu"
 msgstr "外壳菜单(&S)"
 
@@ -128,6 +137,18 @@ msgstr "下一页(&N)"
 msgid "&Active Pane"
 msgstr "活动窗格(&A)"
 
+msgid "Rotate &Right 90deg"
+msgstr ""
+
+msgid "Rotate &Left 90deg"
+msgstr ""
+
+msgid "Flip V&ertically"
+msgstr ""
+
+msgid "Flip H&orizontally"
+msgstr ""
+
 msgid "&Zoom"
 msgstr "缩放(&Z)"
 
@@ -169,7 +190,7 @@ msgstr "垂直擦拭(&V)"
 msgid "&Horizontal Wipe"
 msgstr "水平擦拭(&H)"
 
-msgid "&Rectangle Select"
+msgid "Rectangle &Select"
 msgstr ""
 
 msgid "&Set Background Color"
@@ -220,9 +241,6 @@ msgstr "最近打开的工程"
 msgid "Recent F&iles Or Folders"
 msgstr "最近打开的文件或文件夹(&I)"
 
-msgid "< Empty >"
-msgstr "< 空 >"
-
 msgid "E&xit\tCtrl+Q"
 msgstr "退出(&X)\tCtrl+Q"
 
@@ -418,8 +436,8 @@ msgstr "交换组1与组&3"
 msgid "Com&pare Statistics..."
 msgstr "比较结果统计(&P)..."
 
-msgid "Refre&sh\tF5"
-msgstr "刷新(&S)\tF5"
+msgid "Refresh\tF5"
+msgstr "刷新\tF5"
 
 msgid "&Refresh Selected\tCtrl+F5"
 msgstr "刷新选中项(&R)\tCtrl+F5"
@@ -511,9 +529,6 @@ msgstr "重新加载(&L)\tCtrl+F5"
 msgid "Reco&mpare As"
 msgstr "重新比较(&M)"
 
-msgid "&XML"
-msgstr "&XML"
-
 msgid "&Undo\tCtrl+Z"
 msgstr "撤销(&U)\tCtrl+Z"
 
@@ -529,9 +544,6 @@ msgstr "复制(&C)\tCtrl+C"
 msgid "&Paste\tCtrl+V"
 msgstr "粘贴(&P)\tCtrl+V"
 
-msgid "Select Line &Difference\tF4"
-msgstr "选中行内差异(&D)\tF4"
-
 msgid "F&ind...\tCtrl+F"
 msgstr "查找(&I)...\tCtrl+F"
 
@@ -697,11 +709,17 @@ msgstr "添加同步点(&S)\tAlt+S"
 msgid "Clear Sync&hronization Points"
 msgstr "清除同步点(&H)"
 
+msgid "Unpac&ker"
+msgstr ""
+
 msgid "&Prediffer"
 msgstr "预处理(&P)"
 
-msgid "&Scripts"
-msgstr "脚本(&S)"
+msgid "Apply Pre&differ..."
+msgstr ""
+
+msgid "&Transform with editor script..."
+msgstr ""
 
 msgid "Sp&lit"
 msgstr "分隔(&L)"
@@ -709,6 +727,9 @@ msgstr "分隔(&L)"
 msgid "Comp&are"
 msgstr "比较(&A)"
 
+msgid "Compare in new &window"
+msgstr ""
+
 msgid "Compare Non-hor&izontally..."
 msgstr "非横向比较(&I)..."
 
@@ -793,12 +814,9 @@ msgstr "隐藏(&H)"
 msgid "&Open Left"
 msgstr "打开左侧(&O)"
 
-msgid "with &External Editor"
+msgid "With &External Editor"
 msgstr "用外部编辑器(&E)"
 
-msgid "Open &Parent Folder..."
-msgstr "打开上层文件夹(&P)..."
-
 msgid "Open Midd&le"
 msgstr "打开中间(&L)"
 
@@ -867,14 +885,20 @@ msgstr "复制完整路径(&C)"
 msgid "Copy &Filename"
 msgstr "复制文件名(&F)"
 
-msgid "Prediffer Settings"
-msgstr "设置预处理器"
+msgid "Unpacker Settings"
+msgstr ""
 
-msgid "&No prediffer"
-msgstr "无预处理器(&N)"
+msgid "<None>"
+msgstr "<无>"
 
-msgid "Auto prediffer"
-msgstr "自动预处理"
+msgid "<Automatic>"
+msgstr "<自动>"
+
+msgid "&Select..."
+msgstr "选择(&S)..."
+
+msgid "Prediffer Settings"
+msgstr "设置预处理器"
 
 msgid "G&o to Diff"
 msgstr "转到差异(&O)"
@@ -897,6 +921,9 @@ msgstr "忽略空白字符的变化(G)"
 msgid "Ig&nore all"
 msgstr "忽略所有空白字符(&N)"
 
+msgid "Ignore blan&k lines"
+msgstr "忽略空行(&K)"
+
 msgid "Ignore &case"
 msgstr "忽略大小写(&C)"
 
@@ -906,6 +933,9 @@ msgstr "忽略换行符差异 (Windows/Unix/Mac)(&R)"
 msgid "Ignore codepage &differences"
 msgstr "忽略代码页差异(&D)"
 
+msgid "Ignore c&omment differences"
+msgstr ""
+
 msgid "&Include Subfolders"
 msgstr "包含子目录(&I)"
 
@@ -987,9 +1017,6 @@ msgstr "浏览..."
 msgid " Folder: Filter"
 msgstr " 文件夹: 过滤器"
 
-msgid "&Select..."
-msgstr "选择(&S)..."
-
 msgid " File: Unpacker Plugin"
 msgstr " 文件: 解包插件"
 
@@ -1038,21 +1065,12 @@ msgstr "启动时显示“选择文件或文件夹”对话框"
 msgid "Close \"Select Files or Folders\" Dialog on clicking OK button"
 msgstr "点击“确定”按钮时关闭“选择文件或文件夹”对话框"
 
-msgid "O&pen-dialog Auto-Completion:"
-msgstr "“打开”对话框的自动完成(&P):"
+msgid "Op&en-dialog Auto-Completion:"
+msgstr "“打开”对话框的自动完成(&E):"
 
 msgid "Language:"
 msgstr "语言:"
 
-msgid ""
-"WinMerge allows hiding some common message boxes. Press the Reset button to "
-"make all message boxes visible again."
-msgstr ""
-"WinMerge 允许隐藏一些常见的提示框。点“重置”按钮可以恢复显示隐藏的消息框。"
-
-msgid "Reset"
-msgstr "重置"
-
 msgid "Find"
 msgstr "查找"
 
@@ -1290,14 +1308,11 @@ msgstr "上移(&U)"
 msgid "Move &Down"
 msgstr "下移(&D)"
 
-msgid "Select Unpacker"
-msgstr "选择解包程序"
-
-msgid "File unpacker:"
-msgstr "文件解包程序:"
+msgid "Select Plugin"
+msgstr ""
 
-msgid "Display all unpackers, don't check the extension."
-msgstr "不检查扩展名，显示所有解包器。"
+msgid "Plugin &Name:"
+msgstr ""
 
 msgid "Extensions list:"
 msgstr "扩展名:"
@@ -1305,6 +1320,21 @@ msgstr "扩展名:"
 msgid "Description:"
 msgstr "描述:"
 
+msgid "Default arguments:"
+msgstr ""
+
+msgid "Display all plugins, don't check the extension."
+msgstr ""
+
+msgid "&Open files in the same window type after unpacking."
+msgstr ""
+
+msgid "&Plugin Pipeline:"
+msgstr ""
+
+msgid "&Add pipe"
+msgstr ""
+
 msgid "Stop"
 msgstr "停止"
 
@@ -1359,12 +1389,6 @@ msgstr "忽略空白字符的变化(&I)"
 msgid "I&gnore all"
 msgstr "忽略所有空白字符(&G)"
 
-msgid "Ignore blan&k lines"
-msgstr "忽略空行(&K)"
-
-msgid "Ignore c&omment differences"
-msgstr ""
-
 msgid "E&nable moved block detection"
 msgstr "启用块移动检测(&N)"
 
@@ -1422,6 +1446,15 @@ msgstr "单词分隔字符:"
 msgid "&Rendering Mode:"
 msgstr "渲染模式(&R)"
 
+msgid ""
+"WinMerge allows hiding some common message boxes. Press the Reset button to "
+"make all message boxes visible again."
+msgstr ""
+"WinMerge 允许隐藏一些常见的提示框。点“重置”按钮可以恢复显示隐藏的消息框。"
+
+msgid "Reset"
+msgstr "重置"
+
 msgid "File Filters"
 msgstr ""
 
@@ -1595,6 +1628,9 @@ msgstr "启用压缩文件支持(&E)"
 msgid "&Detect archive type from file signature"
 msgstr "根据文件头检测压缩文件类型(&D)"
 
+msgid "Items saved to or restored from the project file:"
+msgstr ""
+
 msgid "Compare Statistics"
 msgstr "比较结果统计"
 
@@ -1778,6 +1814,12 @@ msgstr "启用插件(&E)"
 msgid "File filters:"
 msgstr "文件过滤器:"
 
+msgid "&Plugin arguments:"
+msgstr ""
+
+msgid "Enable &automatic unpacking/prediffing for the plugin"
+msgstr ""
+
 msgid "Shell Integration"
 msgstr "外壳集成"
 
@@ -1812,8 +1854,8 @@ msgstr "遇到首处差异后停止(&T)"
 msgid "Ign&ore time differences less than 3 seconds"
 msgstr "忽略小于3秒的时间差异(&O)"
 
-msgid "&Include unique subfolders contents"
-msgstr "包含仅在单侧的子文件夹内容(&I)"
+msgid "Include &unique subfolders contents"
+msgstr "包含仅在单侧的子文件夹内容(&U)"
 
 msgid "&Automatically expand all subfolders"
 msgstr "自动展开所有子文件夹(&A)"
@@ -2024,11 +2066,8 @@ msgstr "全部跳过(&A)"
 msgid "Don't display this &message again."
 msgstr "不再显示此消息(&M)"
 
-msgid ""
-"To make this message box visible again, press the Reset button on the "
-"General page of the Options dialog."
+msgid "To make this message box visible again, press the Reset button on the Message Boxes page of the Options dialog."
 msgstr ""
-"如需重新显示这些提示框，请在“选项”对话框的“常规”选项卡中点击“重置”按钮。"
 
 msgid "Syntax"
 msgstr "语法"
@@ -2039,9 +2078,15 @@ msgstr "配色方案"
 msgid "Folder Compare"
 msgstr "文件夹比较"
 
+msgid "Project"
+msgstr ""
+
 msgid "Differences"
 msgstr "差异"
 
+msgid "Message Boxes"
+msgstr ""
+
 msgid "To:"
 msgstr "到:"
 
@@ -2121,6 +2166,27 @@ msgstr ""
 msgid "Extension"
 msgstr "扩展名"
 
+msgid "Message"
+msgstr ""
+
+msgid "Answer"
+msgstr ""
+
+msgid "Item"
+msgstr ""
+
+msgid "Load"
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Include Subfolders"
+msgstr ""
+
+msgid "Compare Options"
+msgstr ""
+
 msgid "Name"
 msgstr "名称"
 
@@ -2753,6 +2819,12 @@ msgctxt "DirView|ColumnHeader"
 msgid "Binary"
 msgstr "二进制"
 
+msgid "Unpacker"
+msgstr "解包器"
+
+msgid "Prediffer"
+msgstr "预处理器"
+
 msgid "Unable to compare files"
 msgstr "无法比较文件"
 
@@ -2949,6 +3021,12 @@ msgstr "文件中的差异数。不包括忽略的差异。"
 msgid "Shows an asterisk (*) if the file is binary."
 msgstr "在二进制文件处显示星号(*)。"
 
+msgid "Unpacker plugin name or pipeline."
+msgstr ""
+
+msgid "Prediffer plugin name or pipeline."
+msgstr ""
+
 #, c-format
 msgid "Compare %1 with %2"
 msgstr "比较 %1 和 %2"
@@ -3159,9 +3237,6 @@ msgstr "请指定输出文件。"
 msgid "Cannot create a patch file from binary files."
 msgstr "无法为二进制文件创建补丁。"
 
-msgid "Cannot create a patch file from directories."
-msgstr "无法为文件夹创建补丁。"
-
 msgid ""
 "Please save all files first.\n"
 "\n"
@@ -3226,12 +3301,6 @@ msgstr "新模式"
 msgid "Type"
 msgstr "类型"
 
-msgid "Unpacker"
-msgstr "解包器"
-
-msgid "Prediffer"
-msgstr "预处理器"
-
 msgid "Editor script"
 msgstr "编辑器脚本"
 
@@ -3404,12 +3473,6 @@ msgstr "插件设置"
 msgid "WSH not found - .sct scripts disabled"
 msgstr "WSH 未找到 - .sct 脚本已禁用"
 
-msgid "<None>"
-msgstr "<无>"
-
-msgid "<Automatic>"
-msgstr "<自动>"
-
 #, c-format
 msgid "G&o to Line %1"
 msgstr "转到第 %1 行(&O)"
@@ -3592,13 +3655,21 @@ msgid "Dist: %g, %g  "
 msgstr "色距: %g, %g  "
 
 #, c-format
-msgid "Page: %d/%d  Zoom: %d%%  %dx%dpx  %dbpp"
-msgstr "页: %d/%d  缩放: %d%%  %dx%dpx  %dbpp"
+msgid "Page: %d/%d  Zoom: %d%%  %dx%dpx  %dbpp  "
+msgstr "页: %d/%d  缩放: %d%%  %dx%dpx  %dbpp  "
 
 #, c-format
 msgid "Rc: (%d, %d)  "
 msgstr ""
 
+#, c-format
+msgid "Flipped: %s  "
+msgstr ""
+
+#, c-format
+msgid "Rotated: %d  "
+msgstr ""
+
 msgid "<Edit here>"
 msgstr ""
 
@@ -3628,3 +3699,143 @@ msgstr "只允许运行一个实例"
 
 msgid "Allow only one instance to run and wait for the instance to terminate"
 msgstr ""
+
+msgid "Al&l"
+msgstr ""
+
+msgid "Prettification"
+msgstr ""
+
+msgid "Content Extraction"
+msgstr ""
+
+msgid "Visualization"
+msgstr ""
+
+msgid "Data Query"
+msgstr ""
+
+msgid "Validation"
+msgstr ""
+
+msgid "Decompilation"
+msgstr ""
+
+msgid "&Others"
+msgstr ""
+
+msgid "Make Uppercase"
+msgstr ""
+
+msgid "Make Lowercase"
+msgstr ""
+
+msgid "Remove Duplicate Lines"
+msgstr ""
+
+msgid "Count Duplicate Lines"
+msgstr ""
+
+msgid "Sort Lines Ascending"
+msgstr ""
+
+msgid "Sort Lines Descending"
+msgstr ""
+
+msgid "Reverse Columns"
+msgstr ""
+
+msgid "Reverse Lines"
+msgstr ""
+
+msgid "Replace..."
+msgstr ""
+
+msgid "Apply Filter Command..."
+msgstr ""
+
+msgid "Tokenize..."
+msgstr ""
+
+msgid "Trim Spaces"
+msgstr ""
+
+msgid "Select Columns..."
+msgstr ""
+
+msgid "Select Lines..."
+msgstr ""
+
+msgid "Insert Date"
+msgstr ""
+
+msgid "Insert Time"
+msgstr ""
+
+msgid "Apply Patch..."
+msgstr ""
+
+msgid "Ignore Columns"
+msgstr ""
+
+msgid "Ignore Comments (C-Family Languages)"
+msgstr ""
+
+msgid "Ignore CSV Fields"
+msgstr ""
+
+msgid "Ignore TSV Fields"
+msgstr ""
+
+msgid "Apply Prediff Substitution Filters"
+msgstr ""
+
+msgid "Prettify HTML"
+msgstr ""
+
+msgid "Prettify JSON"
+msgstr ""
+
+msgid "Prettify XML"
+msgstr ""
+
+msgid "Prettify YAML"
+msgstr ""
+
+msgid "Visualize Graphviz"
+msgstr ""
+
+msgid "Query CSV Data..."
+msgstr ""
+
+msgid "Query TSV Data..."
+msgstr ""
+
+msgid "Query JSON Data..."
+msgstr ""
+
+msgid "Query YAML Data..."
+msgstr ""
+
+msgid "Validate HTML"
+msgstr ""
+
+msgid "Disassemble JVM Bytecode"
+msgstr ""
+
+msgid "Disassemble IL Code"
+msgstr ""
+
+msgid "Disassemble Native Code"
+msgstr ""
+
+#, c-format
+msgid "Missing plugin name in plugin pipeline: %1"
+msgstr ""
+
+#, c-format
+msgid "Missing quotation mark in plugin pipeline: %1"
+msgstr ""
+
+msgid "Specify plugin arguments"
+msgstr ""