-# This file is part from WinMerge <https://winmerge.org/>
+# This file is part from WinMerge <https://winmerge.org/>
# Released under the "GNU General Public License"
#
# Translators:
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2020-04-30 20:47+0000\n"
+"POT-Creation-Date: 2020-10-18 17:28+0000\n"
"PO-Revision-Date: \n"
"Last-Translator: YFdyh000 <yfdyh000@gmail.com>\n"
"Language-Team: ChineseSimplified <winmerge-translate@lists.sourceforge.net>\n"
msgid "Copy fro&m Right"
msgstr "从右侧复制(&M)"
-msgid "&Select Line Difference"
-msgstr "选中行内差异(&S)"
+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 "&Paste"
msgstr "粘贴(&P)"
-msgid "&Goto..."
-msgstr "转到(&G)..."
+msgid "&Go to...\tCtrl+G"
+msgstr "转到(&G)...\tCtrl+G"
+
+msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G"
+msgstr ""
+
+msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G"
+msgstr ""
msgid "Op&en"
msgstr "打开(&E)"
-msgid "with &Registered Application"
+msgid "With &Registered Application"
msgstr "使用默认程序(&R)"
-msgid "with &External Editor\tCtrl+Alt+E"
+msgid "With &External Editor\tCtrl+Alt+E"
msgstr "使用外部编辑器(&E)\tCtrl+Alt+E"
-msgid "&with..."
+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 "< Empty >"
msgstr "< 空 >"
-msgid "E&xit"
-msgstr "退出(&X)"
+msgid "E&xit\tCtrl+Q"
+msgstr "退出(&X)\tCtrl+Q"
msgid "&Edit"
msgstr "编辑(&E)"
msgid "&Window"
msgstr "窗口(&W)"
-msgid "Cl&ose"
-msgstr "关闭(&O)"
+msgid "Cl&ose\tCtrl+W"
+msgstr "关闭(&O)\tCtrl+W"
msgid "Clo&se All"
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 "Select &Font..."
msgstr "选择字体(&F)..."
-msgid "Use Default F&ont"
-msgstr "使用默认字体(&O)"
+msgid "Use Default Font"
+msgstr "使用默认字体"
msgid "Sw&ap Panes"
msgstr "交换左右窗格(&A)"
-msgid "Compa&re Statistics"
-msgstr "比较结果统计(&R)"
+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 "Refre&sh\tF5"
-msgstr "刷新(&S)\tF5"
+msgid "Refresh\tF5"
+msgstr "刷新\tF5"
msgid "&Refresh Selected\tCtrl+F5"
msgstr "刷新选中项(&R)\tCtrl+F5"
msgid "Save &Right As..."
msgstr "另存为右侧(&R)"
-msgid "&Print..."
-msgstr "打印(&P)..."
+msgid "&Print...\tCtrl+P"
+msgstr "打印(&P)...\tCtrl+P"
msgid "Page Set&up..."
msgstr "页面设置(&U)..."
msgid "&Convert Line Endings to"
msgstr "将换行符转换为(&C)"
-msgid "&Merge Mode\tF9"
-msgstr "合并模式(&M)\tF9"
+msgid "Mer&ge Mode\tF9"
+msgstr "合并模式(&G)\tF9"
msgid "Re&load\tCtrl+F5"
msgstr "重新加载(&L)\tCtrl+F5"
-msgid "&File Encoding..."
-msgstr "文件编码(&F)..."
-
-msgid "Recompare As"
-msgstr "重新比较"
-
-msgid "&Text"
-msgstr "文本(&T)"
-
-msgid "&Table"
-msgstr ""
+msgid "Reco&mpare As"
+msgstr "重新比较(&M)"
-#, c-format
msgid "&XML"
msgstr "&XML"
-msgid "&Binary"
-msgstr "二进制(&B)"
-
-msgid "&Image"
-msgstr "图像(&I)"
-
msgid "&Undo\tCtrl+Z"
msgstr "撤销(&U)\tCtrl+Z"
msgid "&Clear All Bookmarks"
msgstr "清除所有书签(&C)"
-msgid "&Go To...\tCtrl+G"
-msgstr "转到(&G)...\tCtrl+G"
-
msgid "Syntax Highlight"
msgstr "语法高亮"
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 "&View Whitespace"
msgstr "显示空白字符&V)"
+msgid "View E&OL"
+msgstr "显示换行字符(&O)"
+
msgid "Vie&w Line Differences"
msgstr "显示行内差异(&W)"
msgid "&Open Left"
msgstr "打开左侧(&O)"
-msgid "with &External Editor"
+msgid "With &External Editor"
msgstr "用外部编辑器(&E)"
-msgid "&Parent Folder"
-msgstr "上一层文件夹(&P)"
-
msgid "Open Midd&le"
msgstr "打开中间(&L)"
msgid "Differences to... (%1 of %2)"
msgstr "差异到... (%1 / %2)"
-msgid "&Refresh"
-msgstr "刷新(&R)"
-
msgid "Left Shell menu"
msgstr "左侧系统外壳菜单"
msgid "Auto prediffer"
msgstr "自动预处理"
-msgid "G&oto Diff"
+msgid "G&o to Diff"
msgstr "转到差异(&O)"
msgid "&No Moved Blocks"
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 "区分大小写(&T)"
+msgid "Ignore blan&k lines"
+msgstr "忽略空行(&K)"
+
+msgid "Ignore &case"
+msgstr "忽略大小写(&C)"
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "忽略换行符差异 (Windows/Unix/Mac)(&R)"
msgid "Ignore codepage &differences"
msgstr "忽略代码页差异(&D)"
+msgid "Ignore c&omment differences"
+msgstr ""
+
msgid "&Include Subfolders"
msgstr "包含子目录(&I)"
msgid "About WinMerge"
msgstr "关于 WinMerge"
-msgid "Visit the WinMerge HomePage!"
-msgstr "访问 WinMerge 首页"
+msgid "Visit the WinMerge Homepage!"
+msgstr "访问 WinMerge 首页！"
msgid "OK"
msgstr "确定"
msgid "Automatically &scroll to first difference"
msgstr "自动滚动到第一处差异(&S)"
-msgid "Cl&ose windows with ESC:"
-msgstr "按 ESC 关闭窗口(&O):"
+msgid "Automatically s&croll to first inline difference"
+msgstr ""
+
+msgid "Cl&ose windows with 'Esc':"
+msgstr "按 'Esc' 关闭窗口(&O):"
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 ""
-"WinMerge allows hiding some common messageboxes. Press the Reset button to "
-"make all messageboxes visible again."
+"WinMerge allows hiding some common message boxes. Press the Reset button to "
+"make all message boxes visible again."
msgstr ""
"WinMerge 允许隐藏一些常见的提示框。点“重置”按钮可以恢复显示隐藏的消息框。"
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 "File unpacker:"
msgstr "文件解包程序:"
-msgid "Display all unpackers, don't check the extension"
-msgstr "不检查扩展名，显示所有解包器"
+msgid "Display all unpackers, don't check the extension."
+msgstr "不检查扩展名，显示所有解包器。"
msgid "Extensions list:"
msgstr "扩展名:"
msgid "Items total:"
msgstr "项目总计:"
-msgid "Go To"
+msgid "Go to"
msgstr "转到"
-msgid "G&oto:"
+msgid "G&o to:"
msgstr "转到(&O):"
msgid "File"
msgstr "文件"
-msgid "Goto what"
+msgid "Go to what"
msgstr "转到类别"
msgid "Li&ne"
msgid "&Difference"
msgstr "差异(&D)"
-msgid "&Go To"
+msgid "&Go to"
msgstr "转到(&G)"
msgid "Compare"
msgid "I&gnore all"
msgstr "忽略所有空白字符(&G)"
-msgid "Ignore blan&k lines"
-msgstr "忽略空行(&K)"
-
-msgid "Ignore &case"
-msgstr "忽略大小写(&C)"
-
msgid "E&nable moved block detection"
msgstr "启用块移动检测(&N)"
msgid "Enable indent &heuristic"
msgstr "启用启发式缩进(&H)"
-msgid "Comments"
-msgstr "注释"
-
-msgid "Filter Comments"
-msgstr "过滤注释"
+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"
-"need to restart session"
+"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"
-"need to restart session"
+"Detect codepage for text files with mlang.dll\n"
+"Need to restart session."
msgstr ""
"使用 mlang.dll 检查文本文件的代码页\n"
-"需要重启会话"
+"需要重启会话。"
msgid "System codepage"
msgstr "系统代码页"
msgid "Options"
msgstr "选项"
-msgid " Categories"
-msgstr " 分类"
-
msgid "Import..."
msgstr "导入..."
msgid "Test Filter"
msgstr "测试过滤器"
-msgid "Testing filter..."
-msgstr "正在测试过滤器..."
+msgid "Testing filter:"
+msgstr "正在测试过滤器:"
msgid "&Enter text to test:"
msgstr "输入用以测试的文本(&E):"
msgstr "关闭(&C)"
msgid "Table"
-msgstr ""
+msgstr "表格"
msgid "File type"
-msgstr ""
+msgstr "文件类型"
msgid "&CSV"
-msgstr ""
+msgstr "&CSV"
msgid "&TSV"
-msgstr ""
+msgstr "&TSV"
msgid "Custom &Delimiter-Separated Values"
-msgstr ""
+msgstr "自定义分隔符的数值集(&D)"
msgid "D&elimiter character:"
-msgstr ""
+msgstr "自定义分隔字符(&E):"
msgid "&Allow newlines in quotes"
-msgstr ""
+msgstr "允许引号内换行(&A)"
msgid "&Quote character:"
-msgstr ""
+msgstr "引号字符(&Q):"
msgid "&Use customized text colors"
msgstr "使用自定义的文字颜色(&U)"
msgid "Backup filename:"
msgstr "备份文件名："
-msgid "&Append .bak -extension"
+msgid "&Append .bak extension"
msgstr "追加 .bak 扩展名(&A)"
msgid "A&ppend timestamp"
msgid "To right"
msgstr "到右侧"
+msgid "Don't ask this &question again."
+msgstr "不再询问此问题(&Q)"
+
msgid "Yes"
msgstr "是"
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)"
"比较使用的线程数 (负数则使用可用的所有 CPU 核心) (&N):"
msgid "&CSV File Patterns:"
-msgstr ""
+msgstr "&CSV 文件模式:"
msgid "&TSV File Patterns:"
-msgstr ""
+msgstr "&TSV 文件模式:"
msgid "Custom Delimiter-Separated Values"
-msgstr ""
+msgstr "自定义分隔符的数值集"
msgid "File Patterns:"
-msgstr ""
+msgstr "文件模式:"
msgctxt "Options dialog|Categories"
msgid "Binary"
msgid "&Enable image compare in folder compare"
msgstr "在文件夹比较中启用图像比较(&E)"
+msgid "OCR result:"
+msgstr ""
+
msgid "&Hex View"
msgstr "十六进制查看(&H)"
"\n"
"保存 (Ctrl+S)"
-msgid "Unknown error attempting to open project file"
-msgstr "打开工程文件时发生未知错误"
+msgid "Unknown error attempting to open project file."
+msgstr "打开工程文件时发生未知错误。"
-msgid "Unknown error attempting to save project file"
-msgstr "保存工程文件时发生未知错误"
+msgid "Unknown error attempting to save project file."
+msgstr "保存工程文件时发生未知错误。"
msgid "Project file successfully loaded."
msgstr "工程文件加载完成。"
"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."
msgid "Don't display this &message again."
msgstr "不再显示此消息(&M)"
-msgid "Don't ask this &question again."
-msgstr "不再询问此问题(&Q)"
-
msgid ""
-"To make this messagebox visible again, press the Reset button on the General "
-"page of the Options dialog."
+"To make this message box visible again, press the Reset button on the "
+"General page of the Options dialog."
msgstr ""
"如需重新显示这些提示框，请在“选项”对话框的“常规”选项卡中点击“重置”按钮。"
-msgid "Color Schemes"
-msgstr "配色方案"
-
msgid "Syntax"
msgstr "语法"
+msgid "Color Schemes"
+msgstr "配色方案"
+
msgid "Folder Compare"
msgstr "文件夹比较"
msgid "To right:"
msgstr "到右侧:"
+msgid "From middle:"
+msgstr "从中间:"
+
+msgid "To middle:"
+msgstr "到中间:"
+
#, c-format
msgid "Version %1"
msgstr "版本 %1"
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "XML 文件 (*.xml)|*.xml|所有文件 (*.*)|*.*||"
+msgid "File Type"
+msgstr ""
+
+msgid "Extension"
+msgstr "扩展名"
+
msgid "Name"
msgstr "名称"
msgid ""
"Filters were updated. Do you want to refresh all open folder compares?\n"
"\n"
-"If you do not want to refresh all compares now you can select No and refresh "
-"compares later."
+"If you do not want to refresh all compares now you can select 'No' and "
+"refresh compares later."
msgstr ""
"过滤器已经更新。是否刷新已打开的文件夹比较？\n"
"\n"
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 "合并"
msgid "Items: %1"
msgstr "项目: %1"
-msgid "Select two existing folders or files to compare"
-msgstr "选择两个现有的文件或文件夹来进行比较"
+msgid "Select two existing folders or files to compare."
+msgstr "选择两个现有的文件或文件夹来进行比较。"
msgid "Folder Selection"
msgstr "选择文件夹"
msgid "All paths are invalid!"
msgstr "所有路径均无效！"
-msgid "Only enabled for File comparisons"
+msgid "Only enabled for file comparisons"
msgstr "仅启用文件比较"
msgid "Cannot compare file and folder!"
#, c-format
msgid ""
-"%1 is marked read-only. Would you like to override the read-only file ? (No "
+"%1 is marked read-only. Would you like to override the read-only file? (No "
"to save as new filename.)"
msgstr "%1 标记为只读。您希望覆盖只读文件吗？（选“否”使用新文件名保存）"
"%1\n"
"%2\n"
"Do you want to:\n"
-"\t- use a different filename (Press Ok)\n"
+"\t- use a different filename (Press OK)\n"
"\t- abort the current operation (Press Cancel)?"
msgstr ""
"保存文件失败。\n"
"是否将未打包的版本另存为其他文件？"
#, 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"
"%1\n"
"吗？"
-msgid "Are you sure you want to copy:"
-msgstr "您确定要复制:"
+msgid "Are you sure you want to copy?"
+msgstr "您确定要复制？"
#, c-format
-msgid "Are you sure you want to copy %d items:"
-msgstr "您确定要复制 %d 个项目:"
+msgid "Are you sure you want to copy %d items?"
+msgstr "您确定要复制 %d 个项目？"
#, c-format
msgid ""
"\n"
"请刷新比较窗口。"
-msgid "Are you sure you want to move:"
-msgstr "您确定要移动:"
+msgid "Are you sure you want to move?"
+msgstr "您确定要移动？"
#, c-format
-msgid "Are you sure you want to move %d items:"
-msgstr "您确定要移动 %d 个项目:"
+msgid "Are you sure you want to move %d items?"
+msgstr "您确定要移动 %d 个项目？"
msgid "Confirm Move"
msgstr "确认移动"
msgid "Middle Date"
msgstr "中间日期"
-msgid "Extension"
-msgstr "扩展名"
-
msgid "Left Size"
msgstr "左侧大小"
msgstr "右侧文件的换行符类型。"
msgid "Middle side file EOL type."
-msgstr "中间文件的换行符类型"
+msgstr "中间文件的换行符类型。"
msgid "Left side encoding."
msgstr "左侧文件的字符编码。"
msgid "The report has been created successfully."
msgstr "报告创建成功."
+msgid "Cannot add a synchronization point at this line."
+msgstr "无法在该行添加同步点。"
+
msgid "The same file is opened in both panels."
msgstr "两侧打开的是同一个文件。"
"comparison?\n"
"\n"
"Note: If you always want to treat all carriage return types as equivalent, "
-"set the option 'Ignore carriage return differences..' in the Compare tab of "
-"the options dialog (available under Edit/Options)."
+"set the option 'Ignore carriage return differences (Windows/Unix/Mac)' in "
+"the Compare tab of the options dialog (available under Edit/Options)."
msgstr ""
-"è¿\99äº\9bæ\96\87件ä¸ä½¿ç\94¨äº\86ä¸\8då\90\8cç±»å\9e\8bç\9a\84æ\8d¢è¡\8c符ã\80\82\n"
+"这些文件使用了不同类型的换行符。\n"
"\n"
-"要在此次比较中忽略换行符差异吗？\n"
+"是否在本次比较中将所有类型的换行符视作相等？\n"
"\n"
-"提示：如果您想始终忽略换行符的差异，请在“编辑/选项”的“比较”选项卡中勾选“忽略"
-"换行符差异”。"
+"小提示：如果您希望始终将所有类型的换行符视为相等，点击“编辑”菜单的“选项”子菜"
+"单，在选项对话框中的“比较”一栏中设置“忽略换行符差异（Windows/Unix/Mac）”选"
+"项。"
msgid "The selected folder is invalid."
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"
msgstr "已替换 %1 个字符串。"
#, c-format
-msgid "Cannot find string \"%s\""
-msgstr "找不到字符串“%s”"
+msgid "Cannot find string \"%s\"."
+msgstr "找不到字符串“%s”。"
msgid ""
"You are now entering Merge Mode. If you want to turn off Merge Mode, press "
-"F9 key"
-msgstr "您正在进入合并模式。如果您想关闭合并模式，请按 F9 键"
+"F9 key."
+msgstr "您正在进入合并模式。如果您想关闭合并模式，请按 F9 键。"
#, c-format
msgid ""
"自动合并变更数：%1\n"
"未解决的冲突数：%2"
-msgid "The change of codepage has been merged"
-msgstr "代码页的变更已被合并"
+msgid "The change of codepage has been merged."
+msgstr "代码页的变更已被合并。"
-msgid "The changes of codepage are conflicting"
-msgstr "代码页的变更存在冲突"
+msgid "The changes of codepage are conflicting."
+msgstr "代码页的变更存在冲突。"
-msgid "The change of EOL has been merged"
-msgstr "换行符的变更已被合并"
+msgid "The change of EOL has been merged."
+msgstr "换行符的变更已被合并。"
-msgid "The changes of EOL are conflicting"
-msgstr "换行符的变更存在冲突"
+msgid "The changes of EOL are conflicting."
+msgstr "换行符的变更存在冲突。"
msgid "Location Pane"
msgstr "定位窗格"
msgid "The specified output path is not an absolute path: %1"
msgstr "指定的路径不是绝对路径: %1"
-msgid "Specify an output file"
-msgstr "请指定输出文件"
+msgid "Specify an output file."
+msgstr "请指定输出文件。"
msgid "Cannot create a patch file from binary files."
msgstr "无法为二进制文件创建补丁。"
msgid "Folder does not exist."
msgstr "文件夹不存在。"
-msgid ""
-"Archive support is not enabled.\n"
-"All needed components (7-zip and/or Merge7z*.dll) for archive support cannot "
-"be found.\n"
-"See manual for more info about archive support and how to enable it."
+msgid "Archive support is not enabled.\nAll needed components (7-Zip and/or Merge7z*.dll) for archive support cannot be found.\nSee manual for more info about archive support and how to enable it."
msgstr ""
"没有启用压缩包支持。\n"
-"没有找到压缩包支持所必需的组件（7-zip 和/或 Merge7z*.dll）。\n"
+"没有找到压缩包支持所必需的组件（7-Zip 和/或 Merge7z*.dll）。\n"
"请查看手册获取有关压缩包支持及如何启用的更多信息。"
msgid "Select file for export"
msgid "Marker Color %d"
msgstr "标记颜色 %d"
+msgid "New Pattern"
+msgstr "新模式"
+
msgid "Type"
msgstr "类型"
"\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)"
-msgstr "在两个文件上应用适当的解包程序 (文件只需要有适当的扩展名)"
+"extension)."
+msgstr "在两个文件上应用适当的解包程序 (文件只需要有适当的扩展名)。"
msgid "No prediffer (normal)"
msgstr "不使用预处理器 (标准)"
msgid "Private Build: %1"
msgstr "Private Build: %1"
-msgid "Your software is up to date"
-msgstr "您的软件是最新的"
+msgid "Your software is up to date."
+msgstr "您的软件是最新的。"
#, c-format
msgid ""
msgstr "<自动>"
#, c-format
-msgid "G&oto Line %1"
+msgid "G&o to Line %1"
msgstr "转到第 %1 行(&O)"
+msgid "Go to Moved Line\tCtrl+Shift+G"
+msgstr ""
+
msgid "Disabled"
msgstr "禁用"
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 "Enable &Auto Max Width"
msgstr "启用自动最大宽度(&A)"
-msgid "frhed is not installed"
-msgstr "frhed 未安装"
+msgid "Frhed is not installed."
+msgstr "Frhed 未安装"
#, c-format
msgid "%1 does not exist. Do you want to create it?"
msgstr "页:"
#, c-format
-msgid "Pt:(%d, %d) RGBA : (%d, %d, %d, %d) "
-msgstr ""
+msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
+msgstr "像素: (%d, %d) RGBA: (%d, %d, %d, %d) "
#, c-format
-msgid "Dist:%g "
-msgstr ""
+msgid "Dist: %g "
+msgstr "色距: %g "
#, c-format
-msgid "Dist:%g,%g "
-msgstr ""
+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"
#, c-format
-msgid "Page:%d/%d Zoom:%d%% %dx%dpx %dbpp"
-msgstr "页:%d/%d 缩放:%d%% %dx%dpx %dbpp"
+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 ""
OSDN Git Service
