msgid "Copy fro&m Right"
msgstr "从右侧复制(&M)"
+msgid "Copy Selected Line(s) to Right"
+msgstr ""
+
+msgid "Copy Selected Line(s) to Left"
+msgstr ""
+
+msgid "Copy Selected Line(s) from Left"
+msgstr ""
+
+msgid "Copy Selected Line(s) from Right"
+msgstr ""
+
msgid "&Select Line Difference\tF4"
msgstr "选中行内差异(&S)\tF4"
+msgid "Add this change to Substitution &Filters"
+msgstr ""
+
msgid "&Undo"
msgstr "撤销(&U)"
msgid "&With..."
msgstr "选择程序(&W)..."
+msgid "Open &Parent Folder..."
+msgstr "打开上层文件夹(&P)..."
+
msgid "S&hell Menu"
msgstr "外壳菜单(&S)"
msgid "&Horizontal Wipe"
msgstr "水平擦拭(&H)"
+msgid "&Rectangle Select"
+msgstr ""
+
msgid "&Set Background Color"
msgstr "设置背景颜色(&S)"
msgid "&Vector Image Scaling"
msgstr "矢量图形缩放 (&V)"
+msgid "Compare Extracted &Text From Image"
+msgstr ""
+
msgid "&File"
msgstr "文件(&F)"
-msgid "&New\tCtrl+N"
-msgstr "新建(&N)\tCtrl+N"
+msgid "&New"
+msgstr "新建(&N)"
+
+msgid "&Text"
+msgstr "文本(&T)"
+
+msgid "T&able"
+msgstr "表格(&A)"
+
+msgid "&Binary"
+msgstr "二进制(&B)"
+
+msgid "&Image"
+msgstr "图像(&I)"
msgid "New (&3 panes)"
msgstr "新建三路比较(&3)"
msgid "Ri&ght Read-only"
msgstr "右侧只读(&G)"
-msgid "File En&coding..."
-msgstr "文件编码(&C)"
+msgid "&File Encoding..."
+msgstr "文件编码(&F)..."
msgid "Select &All\tCtrl+A"
msgstr "全选(&A)\tCtrl+A"
msgid "Sw&ap Panes"
msgstr "交换左右窗格(&A)"
+msgid "Swap &1st | 2nd"
+msgstr "交换组&1与组2"
+
+msgid "Swap &2nd | 3rd"
+msgstr "交换组&2与组3"
+
+msgid "Swap 1st | &3rd"
+msgstr "交换组1与组&3"
+
msgid "Com&pare Statistics..."
msgstr "比较结果统计(&P)..."
msgid "Re&load\tCtrl+F5"
msgstr "重新加载(&L)\tCtrl+F5"
-msgid "&File Encoding..."
-msgstr "文件编码(&F)..."
-
msgid "Reco&mpare As"
msgstr "重新比较(&M)"
-msgid "&Text"
-msgstr "文本(&T)"
-
-msgid "T&able"
-msgstr "表格(&A)"
-
msgid "&XML"
msgstr "&XML"
-msgid "&Binary"
-msgstr "二进制(&B)"
-
-msgid "&Image"
-msgstr "图像(&I)"
-
msgid "&Undo\tCtrl+Z"
msgstr "撤销(&U)\tCtrl+Z"
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "在所有行与 0-9 行之间切换\tCtrl+D"
+msgid "&Invert (Hide Different Lines)"
+msgstr ""
+
msgid "&Lock Panes"
msgstr "锁定窗格(&L)"
msgid "with &External Editor"
msgstr "用外部编辑器(&E)"
-msgid "Open &Parent Folder..."
-msgstr "打开上层文件夹(&P)..."
-
msgid "Open Midd&le"
msgstr "打开中间(&L)"
msgid "&All Moved Blocks"
msgstr "所有移动的区块(&A)"
-msgid "Moved Block for &Current Diff"
-msgstr "当前差异处的移动的区块(&C)"
-
msgid "W&hitespaces"
msgstr "空白字符(&H)"
msgid "Ig&nore all"
msgstr "忽略所有空白字符(&N)"
-msgid "Case sensi&tive"
-msgstr "å\8cºå\88\86大å°\8få\86\99(&T)"
+msgid "Ignore &case"
+msgstr "忽ç\95¥å¤§å°\8få\86\99(&C)"
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "忽略换行符差异 (Windows/Unix/Mac)(&R)"
msgid "&Automatically verify paths in Open-dialog"
msgstr "“打开”对话框中自动验证路径(&A)"
-msgid "All&ow only one instance to run"
-msgstr "只允许运行一个实例(&O)"
+msgid "Single instance mode:"
+msgstr ""
msgid "As&k when closing multiple windows"
msgstr "关闭多个窗口时询问我(&K)"
msgid "Find &Prev"
msgstr "查找上一个(&P)"
-msgid "&OK"
+msgid "&Ok"
msgstr "确定(&O)"
msgid "Replace"
msgid "&Background color:"
msgstr "背景颜色(&B)"
-msgid "&Ok"
-msgstr "确定(&O)"
-
msgid "&Apply"
msgstr "应用(&A)"
-msgid "Linefilters"
-msgstr "行过滤器"
+msgid "Line Filters"
+msgstr ""
msgid "Enable Line Filters"
msgstr "忽略符合下列样式的行"
msgid "Remove"
msgstr "删除"
+msgid "Substitution Filters"
+msgstr ""
+
+msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
+msgstr ""
+
+msgid "Enable"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Clear"
+msgstr ""
+
msgid "Colors"
msgstr "颜色"
msgid "Ignore blan&k lines"
msgstr "忽略空行(&K)"
-msgid "Ignore &case"
-msgstr "忽略大小写(&C)"
-
msgid "Ignore c&omment differences"
msgstr ""
msgid "Enable indent &heuristic"
msgstr "启用启发式缩进(&H)"
+msgid "Completely unhighlight the ignored differences"
+msgstr ""
+
msgid "Editor"
msgstr "编辑器"
msgid "&Rendering Mode:"
msgstr "渲染模式(&R)"
-msgid "Filefilters"
-msgstr "文件过滤器"
+msgid "File Filters"
+msgstr ""
msgid "Test..."
msgstr "测试..."
msgstr "请选择当加载“非 Unicode 文件”时默认假定的代码页:"
msgid ""
-"Detect codepage info for these files: .html, .rc, .xml\n"
+"Detect codepage info for these type of files: .html, .rc, .xml\n"
"Need to restart session."
msgstr ""
"检测下列文件的代码页:.html, .rc, .xml \n"
"需要重启会话。"
msgid ""
-"Detect codepage for text files using mlang.dll\n"
+"Detect codepage for text files with mlang.dll\n"
"Need to restart session."
msgstr ""
"使用 mlang.dll 检查文本文件的代码页\n"
msgid "&Enable image compare in folder compare"
msgstr "在文件夹比较中启用图像比较(&E)"
+msgid "OCR result:"
+msgstr ""
+
msgid "&Hex View"
msgstr "十六进制查看(&H)"
"WinMerge 文件夹比较"
msgid ""
-"Developers:\n"
-"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi "
-"Sawanaka, Gal Hammer, Alexander Skinner"
-msgstr ""
-"开发者:\n"
-"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi "
-"Sawanaka, Gal Hammer, Alexander Skinner"
-
-msgid ""
"WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you "
"are welcome to redistribute it under certain circumstances; see the GNU "
"General Public License in the Help menu for details."
msgstr ""
"如需重新显示这些提示框,请在“选项”对话框的“常规”选项卡中点击“重置”按钮。"
-msgid "Color Schemes"
-msgstr "配色方案"
-
msgid "Syntax"
msgstr "语法"
+msgid "Color Schemes"
+msgstr "配色方案"
+
msgid "Folder Compare"
msgstr "文件夹比较"
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML 文件 (*.xml)|*.xml|所有文件 (*.*)|*.*||"
+msgid "File Type"
+msgstr ""
+
+msgid "Extension"
+msgstr "扩展名"
+
msgid "Name"
msgstr "名称"
msgid "Untitled right"
msgstr "未命名 右"
+msgid "Base File"
+msgstr ""
+
msgid "Theirs File"
msgstr "他们的文件"
msgid "Mine File"
msgstr "我的文件"
+msgid "Original File"
+msgstr ""
+
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "行: %s 列: %d/%d 字符: %d/%d 换行符: %s"
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "行: %s 列: %d/%d 字符: %d/%d"
+#, c-format
+msgid " Sel: %d | %d"
+msgstr ""
+
msgid "Merge"
msgstr "合并"
"是否将未打包的版本另存为其他文件?"
#, c-format
+msgid "Plugin '%2' cannot pack your changes to the middle file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
+msgstr ""
+
+#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
"\n"
msgid "Middle Date"
msgstr "中间日期"
-msgid "Extension"
-msgstr "扩展名"
-
msgid "Left Size"
msgstr "左侧大小"
msgid "Do you want to move to the previous page?"
msgstr "您是否要移动到上一页?"
+msgid "Do you want to move to the first file?"
+msgstr ""
+
+msgid "Do you want to move to the last file?"
+msgstr ""
+
#, c-format
msgid ""
"Different codepages found in left (cp%d) and right (cp%d) files.\n"
"\n"
"自动合并 (Ctrl+Alt+M)"
+msgid "\nFirst File"
+msgstr ""
+
+msgid "\nNext File (Ctrl+F8)"
+msgstr ""
+
+msgid "\nLast File"
+msgstr ""
+
+msgid "\nPrevious File (Ctrl+F7)"
+msgstr ""
+
msgid ""
"The adapted unpacker is applied to both files (one file only needs the "
"extension)."
msgid "Batch"
msgstr "批处理文件"
-msgid "Lua"
-msgstr "Lua"
-
msgid "Portable Object"
msgstr "Portable Object"
msgid "Shell"
msgstr "Shell"
-msgid "VHDL"
-msgstr "VHDL"
-
msgid "Close &Left Tabs"
msgstr "关闭左侧标签页(&L)"
msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp"
msgstr "页: %d/%d 缩放: %d%% %dx%dpx %dbpp"
+#, c-format
+msgid "Rc: (%d, %d) "
+msgstr ""
+
+msgid "<Edit here>"
+msgstr ""
+
+msgid "No differences to select found"
+msgstr ""
+
+msgid "No differences found to add as substitution filter"
+msgstr ""
+
+msgid "The pair is already present in the list of Substitution Filters"
+msgstr ""
+
+msgid "Add this change to Substitution Filters?"
+msgstr ""
+
+msgid "Text only"
+msgstr ""
+
+msgid "Line-by-line position and text"
+msgstr ""
+
+msgid "Word-by-word position and text"
+msgstr ""
+
+msgid "Allow only one instance to run"
+msgstr "只允许运行一个实例"
+
+msgid "Allow only one instance to run and wait for the instance to terminate"
+msgstr ""