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 &Ignored Substitutions"
+msgid "Add this change to Substitution &Filters"
msgstr ""
msgid "&Undo"
msgid "&With..."
msgstr "选择程序(&W)..."
+msgid "Open &Parent Folder..."
+msgstr "打开上层文件夹(&P)..."
+
msgid "S&hell Menu"
msgstr "外壳菜单(&S)"
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 "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"
msgid "Re&load\tCtrl+F5"
msgstr "重新加载(&L)\tCtrl+F5"
-msgid "&File Encoding..."
-msgstr "文件编码(&F)..."
-
msgid "Reco&mpare As"
msgstr "重新比较(&M)"
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)"
msgid "Ig&nore all"
msgstr "忽略所有空白字符(&N)"
+msgid "Ignore blan&k lines"
+msgstr "忽略空行(&K)"
+
msgid "Ignore &case"
msgstr "忽略大小写(&C)"
msgid "Ignore codepage &differences"
msgstr "忽略代码页差异(&D)"
+msgid "Ignore c&omment differences"
+msgstr ""
+
msgid "&Include Subfolders"
msgstr "包含子目录(&I)"
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 "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 "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 "Remove"
msgstr "删除"
-msgid "Ignored Substitutions"
+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."
msgid "Enable"
msgstr ""
-msgid "Completely unhighlight the ignored changes"
-msgstr ""
-
-msgid "Ignore changes in both directions"
-msgstr ""
-
-msgid "Use regular expressions"
-msgstr ""
-
msgid "Add"
msgstr ""
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)"
msgid "Enable indent &heuristic"
msgstr "启用启发式缩进(&H)"
+msgid "Completely unhighlight the ignored differences"
+msgstr ""
+
msgid "Editor"
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 "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)"
"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 "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 "合并"
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"
msgid "\nFirst File"
msgstr ""
-msgid "\nNext File"
+msgid "\nNext File (Ctrl+F8)"
msgstr ""
msgid "\nLast File"
msgstr ""
-msgid "\nPrevious File"
+msgid "\nPrevious File (Ctrl+F7)"
msgstr ""
msgid ""
msgid "Rc: (%d, %d) "
msgstr ""
-msgid "On one panel"
+msgid "<Edit here>"
msgstr ""
-msgid "On the other panel"
+msgid "No differences to select found"
msgstr ""
-msgid "<Edit here>"
+msgid "No differences found to add as substitution filter"
msgstr ""
-msgid "No differences to select found"
+msgid "The pair is already present in the list of Substitution Filters"
msgstr ""
-msgid "No differences found to add as ignored substitution"
+msgid "Add this change to Substitution Filters?"
msgstr ""
-msgid "The pair is already present in the list of Ignored Substitutions"
+msgid "Text only"
msgstr ""
-msgid "Add this change to Ignored Substitutions?"
+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 ""