-# This file is part from WinMerge <http://winmerge.org/>
+# This file is part from WinMerge <http://winmerge.org/>
# Released under the "GNU General Public License"
#
# Translators:
# * Liaobin <liaobin at jite. net>
# * xmpdhml <xmpdhml at users.sourceforge.net>
+# * MaysWind <i at mayswind.net>
#
# ID line follows -- this is updated by SVN
# $Id: ChineseSimplified.po 6851 2009-06-14 13:59:11Z gerundt $
"Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: \n"
-"Last-Translator: xmpdhml <xmpdhml@users.sourceforge.net>\n"
+"Last-Translator: MaysWind <i@mayswind.net>\n"
"Language-Team: ChineseSimplified <winmerge-translate@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
#: Merge.rc:6FC398B6
#, c-format
msgid "Copy &from Left"
-msgstr ""
+msgstr "从左侧复制(&F)"
#: Merge.rc:8AF7E68
#, c-format
msgid "Copy fro&m Right"
-msgstr ""
+msgstr "从右侧复制(&M)"
#: Merge.rc:381D79E4
#, c-format
msgid "&Select Line Difference"
-msgstr "选中行内不同(&S)"
+msgstr "选中行内差异(&S)"
#: Merge.rc:43017E40
#, c-format
#: Merge.rc:37625055
#, c-format
msgid "with &Registered Application"
-msgstr "用默认程序(&R)"
+msgstr "使用默认程序(&R)"
#: Merge.rc:321D741E
#, c-format
msgid "with &External Editor\tCtrl+Alt+E"
-msgstr ""
+msgstr "使用外部编辑器(&E)\tCtrl+Alt+E"
#: Merge.rc:AC3AA12
#, c-format
#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
-msgstr ""
+msgstr "查看差异(&D)"
#: Merge.rc:71E3C8E3
#, c-format
msgid "Diff &Block Size"
-msgstr ""
+msgstr "差异块大小(&B)"
#: Merge.rc:67D67717
#, c-format
msgid "&Ignore Color Difference (Color Distance Threshold)"
-msgstr ""
+msgstr "忽略颜色差异 (色彩距离阈值) (&I)"
#: Merge.rc:5A9A7139
#, c-format
msgid "&Previous Page"
-msgstr ""
+msgstr "上一页(&P)"
#: Merge.rc:68816EE1
#, c-format
msgid "&Next Page"
-msgstr ""
+msgstr "下一页(&N)"
#: Merge.rc:4DE14271
#, c-format
msgid "&Active Pane"
-msgstr ""
+msgstr "活动窗格(&A)"
#: Merge.rc:43017E43
#, c-format
#: Merge.rc:AC3AA13
#, c-format
msgid "&Overlay"
-msgstr ""
+msgstr "遮罩(&O)"
#: Merge.rc:43017E44
#, c-format
#: Merge.rc:4DE14272
#, c-format
msgid "&Alpha Blend"
-msgstr ""
+msgstr "Alpha 混合(&A)"
#: Merge.rc:237A0532
#, c-format
msgid "Alpha &Blend Animation"
-msgstr ""
+msgstr "Alpha 混合动画(&B)"
#: Merge.rc:5806E58F
#, c-format
msgid "Dragging &Mode"
-msgstr ""
+msgstr "拖放模式(&M)"
#: Merge.rc:43017E45
#, c-format
#: Merge.rc:5A9A713A
#, c-format
msgid "&Adjust Offset"
-msgstr ""
+msgstr "调整偏移(&A)"
#: Merge.rc:100AAFAC
#, c-format
msgid "&Set Background Color"
-msgstr ""
+msgstr "设置背景颜色(&S)"
#: Merge.rc:43017E46
#, c-format
#: Merge.rc:2C8061AC
#, c-format
msgid "New (&3 panes)"
-msgstr ""
+msgstr "新建三路比较(&3)"
#: Merge.rc:1DC30E61
#, c-format
#: Merge.rc:73E9B1DA
#, c-format
msgid "Recent F&iles Or Folders"
-msgstr ""
+msgstr "最近打开的文件或文件夹(&I)"
#: Merge.rc:29D50B4A
#, c-format
#: Merge.rc:43017E49
#, c-format
msgid "&Huge"
-msgstr ""
+msgstr "超大(&H)"
#: Merge.rc:27AC6D7F
#, c-format
#: Merge.rc:4C6CFD95
#, c-format
msgid "P&lugin Settings..."
-msgstr ""
+msgstr "插件设置(&L)"
#: Merge.rc:729280D7
#, c-format
msgid "Ma&nual Prediffer"
-msgstr ""
+msgstr "手动预处理(&N)"
#: Merge.rc:7CF93368
#, c-format
msgid "A&utomatic Prediffer"
-msgstr ""
+msgstr "自动预处理(&U)"
#: Merge.rc:1A9EBDEC
#, c-format
#: Merge.rc:714B45FD
#, c-format
msgid "&Edit with Unpacker..."
-msgstr ""
+msgstr "使用解包器编辑(&E)..."
#: Merge.rc:78B3B622
#, c-format
msgid "&Reload plugins"
-msgstr "重新装入插件(&R)"
+msgstr "重新加载插件(&R)"
#: Merge.rc:89AF4F7
#, c-format
#: Merge.rc:3938FFC1
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr "&WinMerge帮助\tF1"
+msgstr "WinMerge 帮助(&W)\tF1"
#: Merge.rc:1B17601E
#, c-format
msgid "R&elease Notes"
-msgstr ""
+msgstr "发行说明(&E)"
#: Merge.rc:6E470BE7
#, c-format
msgid "&Translations"
-msgstr ""
+msgstr "翻译(&T)"
#: Merge.rc:1C6125F4
#, c-format
#: Merge.rc:175DEEEB
#, c-format
msgid "&GNU General Public License"
-msgstr "&GNU General Public License"
+msgstr "GNU General Public License(&G)"
#: Merge.rc:3938FFC2
#, c-format
#: Merge.rc:68816EE2
#, c-format
msgid "&Read-only"
-msgstr ""
+msgstr "只读(&R)"
#: Merge.rc:71676C45
#, c-format
#: Merge.rc:729280D8
#, c-format
msgid "M&iddle Read-only"
-msgstr ""
+msgstr "中间只读(&I)"
#: Merge.rc:32BFDBA9
#, c-format
#: Merge.rc:453F5DDB
#, c-format
msgid "File En&coding..."
-msgstr ""
+msgstr "文件编码(&C)"
#: Merge.rc:E44718
#, c-format
msgid "Select &All\tCtrl+A"
-msgstr "选择所有(&A)\tCtrl+A"
+msgstr "选择全部(&A)\tCtrl+A"
#: Merge.rc:58EEEB7E
#, c-format
#: Merge.rc:28A1C3B4
#, c-format
msgid "Show Midd&le Unique Items"
-msgstr ""
+msgstr "显示只在中间的项目(&L)"
#: Merge.rc:43600E8F
#, c-format
#: Merge.rc:5A9A713B
#, c-format
msgid "&3-way Compare"
-msgstr ""
+msgstr "三路比较(&3)"
#: Merge.rc:200AD0D1
#, c-format
msgid "Show &Left Only Different Items"
-msgstr ""
+msgstr "显示只在左侧不同的项目(&L)"
#: Merge.rc:4899EBE1
#, c-format
msgid "Show &Middle Only Different Items"
-msgstr ""
+msgstr "显示只在中间不同的项目(&M)"
#: Merge.rc:614F49A9
#, c-format
msgid "Show &Right Only Different Items"
-msgstr ""
+msgstr "显示只在右侧不同的项目(&R)"
#: Merge.rc:6F833C17
#, c-format
#: Merge.rc:311E1D87
#, c-format
msgid "Tree &Mode"
-msgstr ""
+msgstr "树状模式(&M)"
#: Merge.rc:3E934D
#, c-format
msgid "E&xpand All Subfolders"
-msgstr ""
+msgstr "展开所有子文件夹(&X)"
#: Merge.rc:4B91C2CF
#, c-format
msgid "&Collapse All Subfolders"
-msgstr ""
+msgstr "折叠所有子文件夹(&C)"
#: Merge.rc:E6D7EE
#, c-format
#: Merge.rc:3E681460
#, c-format
msgid "Compa&re Statistics"
-msgstr "对比结果统计(&R)"
+msgstr "比较结果统计(&R)"
#: Merge.rc:507A4C02
#, c-format
#: Merge.rc:6FC398B7
#, c-format
msgid "Co&mpare\tEnter"
-msgstr "对比(&M)\tEnter"
+msgstr "比较(&M)\tEnter"
#: Merge.rc:2E2C5207
#, c-format
msgid "&Next Difference\tAlt+Down"
-msgstr "下一处不同(&N)\tAlt+Down"
+msgstr "下一处差异(&N)\tAlt+Down"
#: Merge.rc:545FEEA0
#, c-format
msgid "&Previous Difference\tAlt+Up"
-msgstr "上一处不同(&P)\tAlt+Up"
+msgstr "上一处差异(&P)\tAlt+Up"
#: Merge.rc:175DEEEC
#, c-format
msgid "&First Difference\tAlt+Home"
-msgstr "第一处不同(&F)\tAlt+Home"
+msgstr "第一处差异(&F)\tAlt+Home"
#: Merge.rc:3C1ECDD9
#, c-format
msgid "&Current Difference\tAlt+Enter"
-msgstr "当前不同(&C)\tAlt+Enter"
+msgstr "当前差异(&C)\tAlt+Enter"
#: Merge.rc:26A69749
#, c-format
msgid "&Last Difference\tAlt+End"
-msgstr "最后一处不同(&L)\tAlt+End"
+msgstr "最后一处差异(&L)\tAlt+End"
#: Merge.rc:334E25B0
#, c-format
#: Merge.rc:125AD721
#, c-format
msgid "Sav&e"
-msgstr ""
+msgstr "保存(&E)"
#: Merge.rc:751AB58E
#, c-format
#: Merge.rc:194397DD
#, c-format
msgid "Save &Middle"
-msgstr ""
+msgstr "保存中间(&M)"
#: Merge.rc:2E3BFCA2
#, c-format
#: Merge.rc:79321BE1
#, c-format
msgid "Save &As"
-msgstr ""
+msgstr "另存为(&A)"
#: Merge.rc:1BF42626
#, c-format
msgid "Save &Left As..."
-msgstr ""
+msgstr "另存为左侧(&L)"
#: Merge.rc:6F833C18
#, c-format
msgid "Save &Middle As..."
-msgstr ""
+msgstr "另存为中间(&L)"
#: Merge.rc:62909ED4
#, c-format
msgid "Save &Right As..."
-msgstr ""
+msgstr "另存为右侧(&R)"
#: Merge.rc:4DB19837
#, c-format
#: Merge.rc:32BFDBAA
#, c-format
msgid "Re&load\tCtrl+F5"
-msgstr ""
+msgstr "重新加载(&L)\tCtrl+F5"
#: Merge.rc:1A9EBDED
#, c-format
#: Merge.rc:507A4C03
#, c-format
msgid "Recompare As"
-msgstr ""
+msgstr "重新比较"
#: Merge.rc:43017E4B
#, c-format
msgid "&Text"
-msgstr ""
+msgstr "文本(&T)"
#: Merge.rc:22956A7
#, c-format
#: Merge.rc:89AF4F8
#, c-format
msgid "&Binary"
-msgstr ""
+msgstr "二进制(&B)"
#: Merge.rc:1D2E49FA
#, c-format
msgid "&Image"
-msgstr ""
+msgstr "图片(&I)"
#: Merge.rc:6E470BE9
#, c-format
#: Merge.rc:73FB245
#, c-format
msgid "Select Line &Difference\tF4"
-msgstr "选中行内不同(&D)\tF4"
+msgstr "选中行内差异(&D)\tF4"
#: Merge.rc:444C5DDB
#, c-format
#: Merge.rc:4B91C2D1
#, c-format
msgid "&Marker...\tCtrl+Shift+M"
-msgstr ""
+msgstr "标记(&M)...\tCtrl+Shift+M"
#: Merge.rc:669F87F4
#, c-format
#: Merge.rc:6E470BEC
#, c-format
msgid "&Diff Context"
-msgstr ""
+msgstr "差异上下文(&D)"
#: Merge.rc:68816EE4
#, c-format
msgid "&All Lines"
-msgstr ""
+msgstr "全部行(&A)"
#: Merge.rc:AC3AA17
#, c-format
msgid "&0 Lines"
-msgstr ""
+msgstr "0行(&0)"
#: Merge.rc:89AF4F9
#, c-format
msgid "&1 Line"
-msgstr ""
+msgstr "1行(&1)"
#: Merge.rc:AC3AA18
#, c-format
msgid "&3 Lines"
-msgstr ""
+msgstr "3行(&3)"
#: Merge.rc:AC3AA19
#, c-format
msgid "&5 Lines"
-msgstr ""
+msgstr "5行(&5)"
#: Merge.rc:AC3AA1A
#, c-format
msgid "&7 Lines"
-msgstr ""
+msgstr "7行(&7)"
#: Merge.rc:AC3AA1B
#, c-format
msgid "&9 Lines"
-msgstr ""
+msgstr "9行(&9)"
#: Merge.rc:44B58195
#, c-format
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
-msgstr ""
+msgstr "切换全部行和 0-9 行\tCtrl+D"
#: Merge.rc:27AC6D81
#, c-format
#: Merge.rc:1DC30E62
#, c-format
msgid "&View Whitespace"
-msgstr "æ\98¾ç¤ºç©ºç\99½å\92\8cå\88¶è¡¨ç¬¦(&V)"
+msgstr "æ\98¾ç¤ºç©ºç\99½å\97符&V)"
#: Merge.rc:4A81EF3E
#, c-format
msgid "Vie&w Line Differences"
-msgstr "显示行内不同(&W)"
+msgstr "显示行内差异(&W)"
#: Merge.rc:37660CE9
#, c-format
#: Merge.rc:62909ED5
#, c-format
msgid "Split V&ertically"
-msgstr ""
+msgstr "垂直分隔(&E)"
#: Merge.rc:70E79DFF
#, c-format
#: Merge.rc:3534E273
#, c-format
msgid "Lo&cation Pane"
-msgstr "位置窗格(&C)"
+msgstr "定位窗格(&C)"
#: Merge.rc:59B87E1C
#, c-format
msgid "Ne&xt Conflict\tAlt+Shift+Down"
-msgstr ""
+msgstr "下一处冲突(&X)\tAlt+Shift+Down"
#: Merge.rc:3BDD62C2
#, c-format
msgid "Pre&vious Conflict\tAlt+Shift+Up"
-msgstr ""
+msgstr "上一处冲突(&V)\tAlt+Shift+Up"
#: Merge.rc:6D5176E5
#, c-format
msgid "A&dvanced"
-msgstr ""
+msgstr "高级(&D)"
#: Merge.rc:9DA4F24
#, c-format
msgid "Next Difference Between Left and Middle\tAlt+1"
-msgstr ""
+msgstr "下一处左侧和中间的差异\tAlt+1"
#: Merge.rc:2EBE17F8
#, c-format
msgid "Previous Difference Between Left And Middle\tAlt+Shift+1"
-msgstr ""
+msgstr "上一处左侧和中间的差异\tAlt+Shift+1"
#: Merge.rc:21599F72
#, c-format
msgid "Next Difference Between Left and Right\tAlt+2"
-msgstr ""
+msgstr "下一处左侧和右侧的差异\tAlt+2"
#: Merge.rc:5416A5EC
#, c-format
msgid "Previous Difference Between Left And Right\tAlt+Shift+2"
-msgstr ""
+msgstr "上一处左侧和右侧的差异\tAlt+Shift+2"
#: Merge.rc:316F95AC
#, c-format
msgid "Next Difference Between Middle and Right\tAlt+3"
-msgstr ""
+msgstr "下一处中间和右侧的差异\tAlt+3"
#: Merge.rc:2904E763
#, c-format
msgid "Previous Difference Between Middle And Right\tAlt+Shift+3"
-msgstr ""
+msgstr "上一处中间和右侧的差异\tAlt+Shift+3"
#: Merge.rc:4D91737D
#, c-format
msgid "Next Left Only Difference\tAlt+7"
-msgstr ""
+msgstr "下一处只有左边的差异\tAlt+7"
#: Merge.rc:4BFD42D
#, c-format
msgid "Previous Left Only Difference\tAlt+Shift+7"
-msgstr ""
+msgstr "上一处只有左边的差异\tAlt+Shift+7"
#: Merge.rc:2F029443
#, c-format
msgid "Next Middle Only Difference\tAlt+8"
-msgstr ""
+msgstr "下一处只有中间的差异\tAlt+8"
#: Merge.rc:541B8710
#, c-format
msgid "Previous Middle Only Difference\tAlt+Shift+8"
-msgstr ""
+msgstr "上一处只有中间的差异\tAlt+Shift+8"
#: Merge.rc:649CFC83
#, c-format
msgid "Next Right Only Difference\tAlt+9"
-msgstr ""
+msgstr "下一处只有右边的差异\tAlt+9"
#: Merge.rc:133AB1C4
#, c-format
msgid "Previous Right Only Difference\tAlt+Shift+9"
-msgstr ""
+msgstr "上一处只有右边的差异\tAlt+Shift+9"
#: Merge.rc:30FF7A4C
#, c-format
msgid "Copy from Left\tAlt+Shift+Right"
-msgstr ""
+msgstr "从左侧复制\tAlt+Shift+Right"
#: Merge.rc:30FF7A4D
#, c-format
msgid "Copy from Right\tAlt+Shift+Left"
-msgstr ""
+msgstr "从右侧复制\tAlt+Shift+Right"
#: Merge.rc:28C70E7F
#, c-format
#: Merge.rc:4BC6A157
#, c-format
msgid "A&uto Merge\tAlt+Ctrl+M"
-msgstr ""
+msgstr "自动合并(&U)"
#: Merge.rc:13D827C3
#, c-format
msgid "Add &Synchronization Point\tAlt+S"
-msgstr ""
+msgstr "添加同步点(&S)\tAlt+S"
#: Merge.rc:6F88EC67
#, c-format
msgid "Clear Sync&hronization Points"
-msgstr ""
+msgstr "清空同步点(&H)"
#: Merge.rc:68816EE5
#, c-format
msgid "&Prediffer"
-msgstr "é¢\84对æ¯\94(&P)"
+msgstr "é¢\84å¤\84ç\90\86(&P)"
#: Merge.rc:AC3AA1C
#, c-format
#: Merge.rc:39000D56
#, c-format
msgid "Sp&lit"
-msgstr ""
+msgstr "分隔(&L)"
#: Merge.rc:4C3E0A2B
#, c-format
msgid "Comp&are"
-msgstr "对比(&A)"
+msgstr "比较(&A)"
#: Merge.rc:334E25B1
#, c-format
msgid "Compare Non-hor&izontally"
-msgstr ""
+msgstr "非横向比较(&I)"
#: Merge.rc:20F0A449
#, c-format
msgid "First &left item with second left item"
-msgstr ""
+msgstr "第一个的左侧项目与第二个的左侧项目(&L)"
#: Merge.rc:2758BFC0
#, c-format
msgid "First &right item with second right item"
-msgstr ""
+msgstr "第一个的右侧项目与第二个的右侧项目(&R)"
#: Merge.rc:56380EAD
#, c-format
msgid "&First left item with second right item"
-msgstr ""
+msgstr "第一个的左侧项目与第二个的右侧项目(&F)"
#: Merge.rc:56380EAE
#, c-format
msgid "&Second left item with first right item"
-msgstr ""
+msgstr "第二个的左侧项目与第一个的右侧项目(&S)"
#: Merge.rc:67A28B28
#, c-format
msgid "Co&mpare As"
-msgstr ""
+msgstr "重新比较(&M)"
#: Merge.rc:4D4D2E92
#, c-format
msgid "Left to Middle (%1 of %2)"
-msgstr ""
+msgstr "左侧到中间 (%1 共 %2)"
#: Merge.rc:1723859F
#, c-format
msgid "Left to Right (%1 of %2)"
-msgstr "左侧到右侧 (%1 共%2)"
+msgstr "左侧到右侧 (%1 共 %2)"
#: Merge.rc:20155F58
#, c-format
msgid "Left to... (%1 of %2)"
-msgstr "左侧到... (%1 共%2)"
+msgstr "左侧到... (%1 共 %2)"
#: Merge.rc:6CA26872
#, c-format
msgid "Middle to Left (%1 of %2)"
-msgstr ""
+msgstr "中间到左侧 (%1 共 %2)"
#: Merge.rc:27AAA635
#, c-format
msgid "Middle to Right (%1 of %2)"
-msgstr ""
+msgstr "中间到右侧 (%1 共 %2)"
#: Merge.rc:7F2E4118
#, c-format
msgid "Middle to... (%1 of %2)"
-msgstr ""
+msgstr "中间到... (%1 共 %2)"
#: Merge.rc:2044B100
#, c-format
msgid "Right to Middle (%1 of %2)"
-msgstr ""
+msgstr "右侧到中间 (%1 共 %2)"
#: Merge.rc:73E9B1DB
#, c-format
msgid "Right to Left (%1 of %2)"
-msgstr "右侧到左侧 (%1 共%2)"
+msgstr "右侧到左侧 (%1 共 %2)"
#: Merge.rc:6DBD6123
#, c-format
msgid "Right to... (%1 of %2)"
-msgstr "右侧到... (%1 共%2)"
+msgstr "右侧到... (%1 共 %2)"
#: Merge.rc:89AF4FA
#, c-format
#: Merge.rc:89AF4FB
#, c-format
msgid "&Middle"
-msgstr ""
+msgstr "中间(&M)"
#: Merge.rc:1D2E49FB
#, c-format
#: Merge.rc:22956A8
#, c-format
msgid "&All"
-msgstr ""
+msgstr "全部(&A)"
#: Merge.rc:4876CD3D
#, c-format
#: Merge.rc:5A9A713D
#, c-format
msgid "&Parent Folder"
-msgstr ""
+msgstr "上一级文件夹(&P)"
#: Merge.rc:761E6872
#, c-format
msgid "Open Midd&le"
-msgstr ""
+msgstr "打开中间(&L)"
#: Merge.rc:1C95A043
#, c-format
#: Merge.rc:71676C46
#, c-format
msgid "Left (%1 of %2)"
-msgstr "左侧 (%1 共%2)"
+msgstr "左侧 (%1 共 %2)"
#: Merge.rc:729280D9
#, c-format
msgid "Middle (%1 of %2)"
-msgstr ""
+msgstr "中间 (%1 共 %2)"
#: Merge.rc:32BFDBAB
#, c-format
msgid "Right (%1 of %2)"
-msgstr "右侧 (%1 共%2)"
+msgstr "右侧 (%1 共 %2)"
#: Merge.rc:36B164C3
#, c-format
msgid "Both (%1 of %2)"
-msgstr "两侧 (%1 共%2)"
+msgstr "两侧 (%1 共 %2)"
#: Merge.rc:2515A6BA
#, c-format
msgid "All (%1 of %2)"
-msgstr ""
+msgstr "全部 (%1 共 %2)"
#: Merge.rc:6FC398B9
#, c-format
#: Merge.rc:4BFA4345
#, c-format
msgid "Copy Items To Clip&board"
-msgstr ""
+msgstr "复制项目到剪贴板(&B)"
#: Merge.rc:22956A9
#, c-format
msgid "&Zip"
-msgstr "&Zip"
+msgstr "Zip (&Z)"
#: Merge.rc:7370E045
#, c-format
msgid "Both to... (%1 of %2)"
-msgstr ""
+msgstr "两者到... (%1 共 %2)"
#: Merge.rc:7CF93369
#, c-format
msgid "All to... (%1 of %2)"
-msgstr ""
+msgstr "全部到... (%1 共 %2)"
#: Merge.rc:31EF0955
#, c-format
msgid "Differences to... (%1 of %2)"
-msgstr ""
+msgstr "差异到... (%1 共 %2)"
#: Merge.rc:AC3AA1D
#, c-format
#: Merge.rc:71676C47
#, c-format
msgid "Left Shell menu"
-msgstr ""
+msgstr "左侧系统外壳菜单"
#: Merge.rc:729280DA
#, c-format
msgid "Middle Shell menu"
-msgstr ""
+msgstr "中间系统外壳菜单"
#: Merge.rc:32BFDBAC
#, c-format
msgid "Right Shell menu"
-msgstr ""
+msgstr "右侧系统外壳菜单"
#: Merge.rc:3CF9F84
#, c-format
msgid "Copy"
-msgstr ""
+msgstr "复制"
#: Merge.rc:78B3B625
#, c-format
#: Merge.rc:27A06B44
#, c-format
msgid "Prediffer Settings"
-msgstr "预对比设置"
+msgstr "设置预处理器"
#: Merge.rc:6E470BED
#, c-format
msgid "&No prediffer"
-msgstr "不使用(&N)"
+msgstr "不使用预处理器(&N)"
#: Merge.rc:2515A6BB
#, c-format
msgid "Auto prediffer"
-msgstr "自动"
+msgstr "自动预处理"
#: Merge.rc:24F1D5E9
#, c-format
msgid "G&oto Diff"
-msgstr "转到不同(&O)"
+msgstr "转到差异(&O)"
#: Merge.rc:1DC30E63
#, c-format
msgid "&No Moved Blocks"
-msgstr "不显示移动区块(&N)"
+msgstr "不显示移动的区块(&N)"
#: Merge.rc:1A9EBDEF
#, c-format
msgid "&All Moved Blocks"
-msgstr "所有移动区块(&A)"
+msgstr "所有移动的区块(&A)"
#: Merge.rc:BA50068
#, c-format
msgid "Moved Block for &Current Diff"
-msgstr "当前不同处移动区块(&C)"
+msgstr "当前差异处的移动的区块(&C)"
#: Merge.rc:3C68C747
#, c-format
msgid "W&hitespaces"
-msgstr "空白(&H)"
+msgstr "空白字符(&H)"
#: Merge.rc:4C3E0A2C
#, c-format
msgid "Com&pare"
-msgstr "对比(&P)"
+msgstr "比较空白字符(&P)"
#: Merge.rc:4630D06B
#, c-format
msgid "I&gnore changes"
-msgstr "忽ç\95¥ç©ºç\99½å\92\8cå\88¶è¡¨ç¬¦æ\9b´æ\94¹(G)"
+msgstr "忽ç\95¥ç©ºç\99½å\97符ç\9a\84å\8f\98å\8c\96(G)"
#: Merge.rc:21C15B6
#, c-format
msgid "Ig&nore all"
-msgstr "忽ç\95¥æ\89\80æ\9c\89空ç\99½å\92\8cå\88¶è¡¨符(&N)"
+msgstr "忽ç\95¥æ\89\80æ\9c\89空ç\99½å\97符(&N)"
#: Merge.rc:6FC398BA
#, c-format
#: Merge.rc:620FF1AC
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr "忽略换行符差异(Windows/Unix/Mac)(&R)"
+msgstr "忽略换行符差异 (Windows/Unix/Mac)(&R)"
#: Merge.rc:6DE6F873
#, c-format
#: Merge.rc:1DC30E64
#, c-format
msgid "&Compare method:"
-msgstr ""
+msgstr "比较方法(&C):"
#: Merge.rc:7A4CFAFB
#, c-format
#: Merge.rc:36B164C4
#, c-format
msgid "Binary Contents"
-msgstr ""
+msgstr "二进制内容"
#: Merge.rc:2CEE4748
#, c-format
#: Merge.rc:1DC30E65
#, c-format
msgid "&Load Project..."
-msgstr ""
+msgstr "加载工程(&L)"
#: Merge.rc:2515A6BC
#, c-format
#: Merge.rc:58E210FA
#, c-format
msgid "Select Files or Folders"
-msgstr "选择文件或文件夹..."
+msgstr "选择文件或文件夹"
#: Merge.rc:6DE6F874
#, c-format
msgid "&1st File or Folder"
-msgstr ""
+msgstr "第1个文件或文件夹 (&1)"
#: Merge.rc:39174D96
#, c-format
#: Merge.rc:56BD1FBA
#, c-format
msgid "Swap 1st | 2nd"
-msgstr ""
+msgstr "交换 第1个 | 第2个"
#: Merge.rc:68816EE7
#, c-format
#: Merge.rc:6DE6F875
#, c-format
msgid "&2nd File or Folder"
-msgstr ""
+msgstr "第2个文件或文件夹 (&2)"
#: Merge.rc:39174D97
#, c-format
msgid "Rea&d-only"
-msgstr ""
+msgstr "只读(&D)"
#: Merge.rc:56BD1FBB
#, c-format
msgid "Swap 2nd | 3rd"
-msgstr ""
+msgstr "交换 第2个 | 第3个"
#: Merge.rc:78E0CE0E
#, c-format
#: Merge.rc:3C1ECDDA
#, c-format
msgid "&3rd File or Folder (Optional)"
-msgstr ""
+msgstr "第3个文件或文件夹 (可选) (&3)"
#: Merge.rc:39174D98
#, c-format
msgid "Read-o&nly"
-msgstr ""
+msgstr "只读(&N)"
#: Merge.rc:56BD1FBC
#, c-format
msgid "Swap 1st | 3rd"
-msgstr ""
+msgstr "交换 第1个 | 第3个"
#: Merge.rc:146A5938
#, c-format
#: Merge.rc:22467E6E
#, c-format
msgid " Folder: Filter"
-msgstr ""
+msgstr " 文件夹: 过滤器"
#: Merge.rc:68816EE8
#, c-format
#: Merge.rc:662470D5
#, c-format
msgid " File: Unpacker Plugin"
-msgstr ""
+msgstr " 文件: 解包插件"
#: Merge.rc:751AB58F
#, c-format
msgid "Se&lect..."
-msgstr ""
+msgstr "选择(&L)"
#: Merge.rc:4C3E0A2D
msgid "Co&mpare"
-msgstr ""
+msgstr "比较(&M)"
#: Merge.rc:4E65D340
#, c-format
#: Merge.rc:237AB485
#, c-format
msgid "Automatically &scroll to first difference"
-msgstr "自动滚动到第一处不同(&S)"
+msgstr "自动滚动到第一处差异(&S)"
#: Merge.rc:69AD3BF8
#, c-format
msgid "Cl&ose windows with ESC"
-msgstr "ESC关闭窗口(&O)"
+msgstr "按 ESC 关闭窗口(&O)"
#: Merge.rc:6574B7FB
#, c-format
msgid "&Automatically verify paths in Open-dialog"
-msgstr "在“打开”对话框中自动验证路径(&A)"
+msgstr "在 \"打开\" 对话框中自动校验路径(&A)"
#: Merge.rc:631E0F7B
#, c-format
#: Merge.rc:6D5B7718
#, c-format
msgid "&Preserve file time in file compare"
-msgstr "对比时保持文件时间不变(&P)"
+msgstr "比较时保持文件时间不变(&P)"
#: Merge.rc:17F0E759
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr ""
+msgstr "启动时显示 \"选择文件或文件夹\" 对话框"
#: Merge.rc:1AD99579
#, c-format
msgid "Close \"Select Files or Folders\" Dialog on clicking OK button"
-msgstr ""
+msgstr "点击\"确定\"按钮时关闭 \"选择文件或文件夹\" 对话框"
#: Merge.rc:44776ACE
#, c-format
msgid "O&pen-dialog Auto-Completion:"
-msgstr "“打开”对话框自动完成(&P):"
+msgstr "\"打开\" 对话框自动完成(&P):"
#: Merge.rc:1B63306F
#, c-format
msgid "Language:"
-msgstr ""
+msgstr "语言:"
#: Merge.rc:516450B
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
-msgstr "WinMerge允许隐藏一些常见的提示信息, 点击“重置”按钮可以使隐藏的信息新显示."
+msgstr "WinMerge 允许隐藏一些常见的提示信息, 点击\"重置\"按钮可以重新显示隐藏的信息."
#: Merge.rc:10976EC1
#, c-format
#: Merge.rc:545FEEA2
#, c-format
msgid "&Don't close this dialog box"
-msgstr ""
+msgstr "不要关闭对话框(&D)"
#: Merge.rc:68EE6DF0
#, c-format
msgid "Find &Prev"
-msgstr ""
+msgstr "查找上一个(&P)"
#: Merge.rc:68816EE9
#, c-format
msgid "&Find Next"
-msgstr "找下一个(&F)"
+msgstr "æ\9f¥æ\89¾ä¸\8bä¸\80个(&F)"
#: Merge.rc:11D980
#, c-format
#: Merge.rc:2FC0BA7B
#, c-format
msgid "Markers"
-msgstr ""
+msgstr "标记"
#: Merge.rc:61E8009D
#, c-format
msgid "Enable &Markers"
-msgstr ""
+msgstr "启用标记(&M)"
#: Merge.rc:24A380
#, c-format
#: Merge.rc:3938FFC4
#, c-format
msgid "&Background color:"
-msgstr ""
+msgstr "背景颜色(&B)"
#: Merge.rc:1D2E49FC
#, c-format
#: Merge.rc:2C0C2240
#, c-format
msgid "Difference:"
-msgstr "不同:"
+msgstr "差异:"
#: Merge.rc:1BA49C3B
#, c-format
msgid "Selected Difference:"
-msgstr "已选择:"
+msgstr "选中的差异:"
#: Merge.rc:2756A765
#, c-format
msgid "Ignored Difference:"
-msgstr "略过的不同:"
+msgstr "忽略的差异:"
#: Merge.rc:7106378D
#, c-format
msgid "Moved:"
-msgstr "移动区块:"
+msgstr "移动的区块:"
#: Merge.rc:E6D7EF
#, c-format
msgid "Selected Moved:"
-msgstr "选中的移动区块:"
+msgstr "选中的移动的区块:"
#: Merge.rc:73FB246
#, c-format
msgid "Same As The Next (3 panes):"
-msgstr ""
+msgstr "与临近的相同 (三路合并):"
#: Merge.rc:60B696AF
#, c-format
msgid "Same As The Next (Selected):"
-msgstr ""
+msgstr "与临近的相同 (已选中):"
#: Merge.rc:40C55014
#, c-format
msgid "Word Difference:"
-msgstr "单词不同:"
+msgstr "单词差异:"
#: Merge.rc:E4471A
#, c-format
msgid "Selected Word Diff:"
-msgstr "选中的单词不同:"
+msgstr "选中的单词差异:"
#: Merge.rc:7F0D4B46
#, c-format
#: Merge.rc:34C1157D
#, c-format
msgid "Display all unpackers, don't check the extension"
-msgstr "不检查扩展名，显示所有解包程序。"
+msgstr "不检查扩展名, 显示所有解包程序"
#: Merge.rc:5B18135F
#, c-format
#: Merge.rc:D109E01
#, c-format
msgid "Pause"
-msgstr ""
+msgstr "暂停"
#: Merge.rc:4C3E0A2E
#, c-format
msgid "Continue"
-msgstr ""
+msgstr "继续"
#: Merge.rc:1AC98D0A
#, c-format
msgid "Comparing items..."
-msgstr "正在对比..."
+msgstr "正在比较..."
#: Merge.rc:4630D06C
#, c-format
msgid "Items compared:"
-msgstr "已对比:"
+msgstr "已比较:"
#: Merge.rc:4166A153
#, c-format
#: Merge.rc:27AC6D83
#, c-format
msgid "&Difference"
-msgstr "不同处(&D)"
+msgstr "差异(&D)"
#: Merge.rc:1D2E49FD
#, c-format
#: Merge.rc:7E5494F6
#, c-format
msgid "Compare"
-msgstr "对比"
+msgstr "比较"
#: Merge.rc:65285570
#, c-format
#: Merge.rc:AC3AA20
#, c-format
msgid "&Compare"
-msgstr "对比空白和制表符(&C)"
+msgstr "比较空白字符(&C)"
#: Merge.rc:5A9A713E
#, c-format
msgid "&Ignore change"
-msgstr "忽ç\95¥ç©ºç\99½å\92\8cå\88¶è¡¨ç¬¦æ\9b´æ\94¹(&I)"
+msgstr "忽ç\95¥ç©ºç\99½å\97符ç\9a\84å\8f\98å\8c\96(&I)"
#: Merge.rc:21C15B7
#, c-format
msgid "I&gnore all"
-msgstr "忽ç\95¥æ\89\80æ\9c\89空ç\99½å\92\8cå\88¶è¡¨符(&G)"
+msgstr "忽ç\95¥æ\89\80æ\9c\89空ç\99½å\97符(&G)"
#: Merge.rc:2756A767
#, c-format
#: Merge.rc:6C318DC8
#, c-format
msgid "Ignore codepage &differences"
-msgstr ""
+msgstr "忽略代码页差异(&D)"
#: Merge.rc:285B56CE
#, c-format
msgid "E&nable moved block detection"
-msgstr "å\85\81许æ£\80æµ\8b移å\8a¨区块(&N)"
+msgstr "å\90¯ç\94¨æ£\80æµ\8b移å\8a¨ç\9a\84区块(&N)"
#: Merge.rc:4EF8162F
#, c-format
#: Merge.rc:172385A0
#, c-format
msgid "Line Difference Coloring"
-msgstr "è¡\8cå\86\85对æ¯\94"
+msgstr "è¡\8cå\86\85å·®å¼\82ç\9d\80è\89²"
#: Merge.rc:4CB9DE6A
#, c-format
msgid "View line differences"
-msgstr "显示行内不同"
+msgstr "显示行内差异"
#: Merge.rc:1DC30E66
#, c-format
#: Merge.rc:14AF463A
#, c-format
msgid "W&ord break characters:"
-msgstr ""
+msgstr "单词分隔字符:"
#: Merge.rc:34DF5070
#, c-format
#: Merge.rc:1BA49C3C
#, c-format
msgid "Save modified files?"
-msgstr "保存修改后的文件吗？"
+msgstr "保存修改后的文件吗?"
#: Merge.rc:3534E274
#, c-format
#: Merge.rc:24BA673E
#, c-format
msgid "Middle side file"
-msgstr ""
+msgstr "中间文件"
#: Merge.rc:F2F641C
#, c-format
msgid "Sa&ve changes"
-msgstr ""
+msgstr "保存修改(&V)"
#: Merge.rc:71E3C8E4
#, c-format
msgid "Disca&rd changes"
-msgstr ""
+msgstr "放弃修改(&R)"
#: Merge.rc:47D4A3FB
#, c-format
#: Merge.rc:5578260F
#, c-format
msgid "Disca&rd All"
-msgstr ""
+msgstr "放弃全部(&R)"
#: Merge.rc:4C3E0A30
#, c-format
#: Merge.rc:132D699F
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
-msgstr "请选择打开非Unicode文件时默认的代码页"
+msgstr "请选择打开 非Unicode 文件时默认的代码页:"
#: Merge.rc:5CC85DF4
#, c-format
msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
-msgstr ""
+msgstr "检查下列文件的代码页: .html, .rc, .xml \n需要重启会话"
#: Merge.rc:3BCD5104
#, c-format
msgid "Detect codepage for text files using mlang.dll\nneed to restart session"
-msgstr ""
+msgstr "使用 mlang.dll 检查文本文件的代码页\n需要重启会话"
#: Merge.rc:E6D7F1
#, c-format
#: Merge.rc:8AF7E6A
#, c-format
msgid "Custom codepage:"
-msgstr ""
+msgstr "自定义代码页:"
#: Merge.rc:6CD65B95
#, c-format
#: Merge.rc:2CEE4749
#, c-format
msgid "Marker colors"
-msgstr ""
+msgstr "标记颜色"
#: Merge.rc:56BD1FBD
#, c-format
msgid "Search Marker:"
-msgstr ""
+msgstr "搜索标记:"
#: Merge.rc:7B76381B
#, c-format
msgid "User Defined Marker1:"
-msgstr ""
+msgstr "用户定义的标记1:"
#: Merge.rc:7B76381C
#, c-format
msgid "User Defined Marker2:"
-msgstr ""
+msgstr "用户定义的标记2:"
#: Merge.rc:7B76381D
#, c-format
msgid "User Defined Marker3:"
-msgstr ""
+msgstr "用户定义的标记3:"
#: Merge.rc:387F7980
#, c-format
msgid "Folder Compare Report"
-msgstr "文件夹对比报告"
+msgstr "文件夹比较报告"
#: Merge.rc:3ECF34A3
#, c-format
#: Merge.rc:545FEEA4
#, c-format
msgid "&Include File Compare Report"
-msgstr ""
+msgstr "导入文件比较报告(&I)"
#: Merge.rc:3938FFC5
#, c-format
#: Merge.rc:74E96E1E
#, c-format
msgid "Which type of filter do you want to create?"
-msgstr "您要创建哪种过滤器？"
+msgstr "您要创建哪种过滤器?"
#: Merge.rc:444EF527
#, c-format
msgid "Shared Filter (for all users on this machine)"
-msgstr "共享过滤器(为本机的所有用户)"
+msgstr "共享过滤器 (为本机的所有用户)"
#: Merge.rc:11304E6
#, c-format
msgid "Private Filter (only for current user)"
-msgstr "私有过滤器(只为当前用户)"
+msgstr "私有过滤器 (只为当前用户)"
#: Merge.rc:7D9F30CF
#, c-format
#: Merge.rc:1AC98D0B
#, c-format
msgid "Compare Statistics"
-msgstr "对比结果统计"
+msgstr "比较结果统计"
#: Merge.rc:64ABCD7D
#, c-format
#: Merge.rc:2FC0BA7C
#, c-format
msgid "Middle:"
-msgstr ""
+msgstr "中间:"
#: Merge.rc:2CEE474A
#, c-format
msgid "Missing Left:"
-msgstr ""
+msgstr "左侧缺失:"
#: Merge.rc:2A79A039
#, c-format
msgid "Missing Middle:"
-msgstr ""
+msgstr "中间缺失:"
#: Merge.rc:70DAA20F
#, c-format
msgid "Missing Right:"
-msgstr ""
+msgstr "右侧缺失:"
#: Merge.rc:413EF3DC
#, c-format
#: Merge.rc:72A593B8
#, c-format
msgid "Test Filter"
-msgstr "过滤器测试"
+msgstr "测试过滤器"
#: Merge.rc:5CCED708
#, c-format
#: Merge.rc:2FC0BA7D
#, c-format
msgid "Margin:"
-msgstr ""
+msgstr "边缘:"
#: Merge.rc:43E58E59
#, c-format
#: Merge.rc:78B3B627
#, c-format
msgid "&Folder compare"
-msgstr "文件夹对比(&F)"
+msgstr "文件夹比较(&F)"
#: Merge.rc:7A4CFAFD
#, c-format
msgid "Fil&e compare"
-msgstr "文件对比(&E)"
+msgstr "文件比较(&E)"
#: Merge.rc:334E25B2
#, c-format
#: Merge.rc:B612C23
#, c-format
msgid "Plugins"
-msgstr ""
+msgstr "插件"
#: Merge.rc:78B3B628
#, c-format
msgid "&Enable plugins"
-msgstr ""
+msgstr "启用插件(&E)"
#: Merge.rc:62909ED6
#, c-format
msgid "Shell Integration"
-msgstr ""
+msgstr "外壳集成"
#: Merge.rc:31DC8C62
#, c-format
msgid "Explorer"
-msgstr ""
+msgstr "资源管理器"
#: Merge.rc:673BD331
#, c-format
msgid "E&nable advanced menu"
-msgstr "å\85\81许高级菜单(&N)"
+msgstr "å\90¯ç\94¨高级菜单(&N)"
#: Merge.rc:4EF81631
#, c-format
msgid "&Add to context menu"
-msgstr ""
+msgstr "添加到上下文菜单(&A)"
#: Merge.rc:26A6974B
#, c-format
msgid "&Register shell extension"
-msgstr ""
+msgstr "注册到外壳扩展(&R)"
#: Merge.rc:175DEEEF
#, c-format
msgid "&Unregister shell extension"
-msgstr ""
+msgstr "取消注册到外壳扩展(&U)"
#: Merge.rc:7262BE24
#, c-format
#: Merge.rc:60B696B0
#, c-format
msgid "S&top after first difference"
-msgstr "遇到首处不同后停止(&T)"
+msgstr "遇到首处差异后停止(&T)"
#: Merge.rc:7FF2B80B
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
-msgstr "忽略不足3秒的时间差别(&O)"
+msgstr "忽略小于3秒的时间差异(&O)"
#: Merge.rc:6D5B7719
#, c-format
msgid "&Include unique subfolders contents"
-msgstr ""
+msgstr "包含仅在单侧的子文件夹内容(&I)"
#: Merge.rc:3E136C28
#, c-format
msgid "&Automatically expand all subfolders"
-msgstr ""
+msgstr "自动展开所有子文件夹(&A)"
#: Merge.rc:5D032167
#, c-format
msgid "Ignore &Reparse Points"
-msgstr ""
+msgstr "忽略重新解析点(&R)"
#: Merge.rc:2E2C5208
#, c-format
msgid "&Quick compare limit (MB):"
-msgstr ""
+msgstr "快速比较限制 (MB) (&Q):"
#: Merge.rc:2188DD49
#, c-format
msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
-msgstr ""
+msgstr "比较使用的线程数 (负数表示使用所有可用的 CPU 核心数) (&N):"
#: Merge.rc:17BC2F9E
#, c-format
#: Merge.rc:7AAB28B8
#, c-format
msgid "Binary File &Patterns:"
-msgstr ""
+msgstr "二进制文件扩展名 (&P):"
#: Merge.rc:4F5264C9
#, c-format
msgid "Frhed settings"
-msgstr ""
+msgstr "Frhed 设置"
#: Merge.rc:1A8FADD4
#, c-format
msgid "View &Settings..."
-msgstr ""
+msgstr "查看设置 (&S)"
#: Merge.rc:78B3B629
#, c-format
msgid "&Binary Mode..."
-msgstr ""
+msgstr "二进制模式(&B)"
#: Merge.rc:1A9EBDF3
#, c-format
msgid "&Character Set..."
-msgstr ""
+msgstr "字符集(&C)"
#: Merge.rc:B8C361
#, c-format
msgid "Image"
-msgstr ""
+msgstr "图片"
#: Merge.rc:2C4A6C6D
#, c-format
msgid "Image File &Patterns:"
-msgstr ""
+msgstr "图片文件扩展名 (&P):"
#: Merge.rc:4DB19839
#, c-format
msgid "&Hex View"
-msgstr ""
+msgstr "十六进制查看(&H)"
#: Merge.rc:206940
#, c-format
#: Merge.rc:E8950E9
#, c-format
msgid "\nNew Documents (Ctrl+N)"
-msgstr ""
+msgstr "\n新建文档 (Ctrl+N)"
#: Merge.rc:28AAB7D
#, c-format
msgid "\nOpen (Ctrl+O)"
-msgstr ""
+msgstr "\n打开 (Ctrl+O)"
#: Merge.rc:28AAB7E
#, c-format
msgid "\nSave (Ctrl+S)"
-msgstr ""
+msgstr "\n保存 (Ctrl+S)"
#: Merge.rc:524AB109
#, c-format
#: Merge.rc:28AAB7F
#, c-format
msgid "\nUndo (Ctrl+Z)"
-msgstr ""
+msgstr "\n撤销 (Ctrl+Z)"
#: Merge.rc:28AAB80
#, c-format
msgid "\nRedo (Ctrl+Y)"
-msgstr ""
+msgstr "\n重复 (Ctrl+Y)"
#: Merge.rc:2B78E95D
#, c-format
msgid "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge File Compare"
-msgstr "\nnFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge 文件对比"
+msgstr "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge 文件比较"
#: Merge.rc:293A824F
#, c-format
msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
-msgstr "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
+msgstr "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge 文件夹比较"
#: Merge.rc:74BA5C8C
msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaka, Gal Hammer, Alexander Skinner"
-msgstr "开发人员:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaka, Gal Hammer, Alexander Skinner"
+msgstr "开发者:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaka, Gal Hammer, Alexander Skinner"
#: Merge.rc:3EF068BF
#, c-format
#: Merge.rc:77C09B82
#, c-format
msgid "Don't display this &message again."
-msgstr "不再提示此消息(&M)。"
+msgstr "不再提示此消息(&M)."
#: Merge.rc:57F02FB4
#, c-format
msgid "Don't ask this &question again."
-msgstr "不再询问此问题(&Q)。"
+msgstr "不再询问此问题(&Q)."
#: Merge.rc:78ACB5DB
#, c-format
msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
-msgstr ""
+msgstr "如需重新显示这些提示消息, 请在\"选项\"对话框中\"常规\"选项卡中点击\"重置\"按钮."
#: Merge.rc:39000D58
#, c-format
msgid "Syntax"
-msgstr ""
+msgstr "语法"
#: Merge.rc:2C0C2241
#, c-format
msgid "Differences"
-msgstr "不同处"
+msgstr "差异"
#: Merge.rc:277500
#, c-format
#: Merge.rc:295600
#, c-format
msgid "X64"
-msgstr ""
+msgstr "X64"
#: Merge.rc:761E6873
#, c-format
#: Merge.rc:4BDBDC64
#, c-format
msgid "All message boxes are now displayed again."
-msgstr "所有提示信息已经重设为显示。"
+msgstr "所有提示信息已经重设为显示."
#: Merge.rc:37825D6A
#, c-format
"\n"
"Please select filter folder in Options/System."
msgstr ""
-"自定义过滤器路径未设定!\n"
+"自定义过滤器路径未设置!\n"
"\n"
"请在选项/系统中选择一个路径."
msgstr ""
"过滤器文件安装失败.\n"
"\n"
-"或许是无法将新文件复制到过滤器路径?"
+"可能无法将新过滤器文件复制到过滤器目录."
#: Merge.rc:5704C4AC
#, c-format
#: Merge.rc:34BD4316
#, c-format
msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
-msgstr ""
+msgstr "过滤器已经更新. 您是否要刷新所有打开的文件夹比较?\n\n如果您不想现在刷新所有比较, 您可以选择 \"否\" 然后之后刷新比较."
#: Merge.rc:114DD351
#, c-format
msgid "Folder Comparison Results"
-msgstr "文件夹对比结果"
+msgstr "文件夹比较结果"
#: Merge.rc:1AFA3493
#, c-format
msgid "File Comparison"
-msgstr "文件对比"
+msgstr "文件比较"
#: Merge.rc:2FEFC30D
#, c-format
#: Merge.rc:730B3FD4
#, c-format
msgid "Untitled middle"
-msgstr ""
+msgstr "未命名 中"
#: Merge.rc:4E089EF3
#, c-format
#: Merge.rc:DD21174
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
-msgstr ""
+msgstr "行: %s 列: %d/%d 字符: %d/%d 换行符: %s"
#: Merge.rc:15875423
#, c-format
#: Merge.rc:6F3BCB35
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
-msgstr ""
+msgstr "行: %s 列: %d/%d 字符: %d/%d"
#: Merge.rc:7C664E1
#, c-format
#: Merge.rc:7A8FD78B
#, c-format
msgid "Difference %1 of %2"
-msgstr "第 %1 处不同(共 %2 处)"
+msgstr "第 %1 处差异(共 %2 处)"
#: Merge.rc:62773E9
#, c-format
msgid "%1 Differences Found"
-msgstr "共找到 %1 处不同"
+msgstr "共找到 %1 处差异"
#: Merge.rc:6B78A819
#, c-format
msgid "1 Difference Found"
-msgstr "找到 1 处不同"
+msgstr "找到 1 处差异"
#. Abbreviation from "Read Only"
#: Merge.rc:13E12
#: Merge.rc:6B6D8965
#, c-format
msgid "Item %1 of %2"
-msgstr "第 %1 项目，共 %2"
+msgstr "第 %1 项目, 共 %2"
#: Merge.rc:2618897A
#, c-format
#: Merge.rc:6C6653C7
#, c-format
msgid "Select two existing folders or files to compare"
-msgstr "选择两个已存在的文件夹或文件进行对比"
+msgstr "选择两个已存在的文件夹或文件进行比较"
#: Merge.rc:444C5DDC
#, c-format
#: Merge.rc:3080B693
#, c-format
msgid "Select two (or three) folders or two (or three) files to compare."
-msgstr ""
+msgstr "选择两个(或三个)文件夹或两个(或三个)文件进行比较."
#: Merge.rc:2EBBDDD6
#, c-format
msgid "Left (1st) path is invalid!"
-msgstr ""
+msgstr "左侧 (第1个) 路径无效!"
#: Merge.rc:BA50069
#, c-format
msgid "Middle (2nd) path is invalid!"
-msgstr ""
+msgstr "中间 (第2个) 路径无效!"
#: Merge.rc:21DC7C32
#, c-format
msgid "Right (2nd) path is invalid!"
-msgstr ""
+msgstr "右侧 (第2个) 路径无效!"
#: Merge.rc:21DC7C33
#, c-format
msgid "Right (3rd) path is invalid!"
-msgstr ""
+msgstr "右侧 (第3个) 路径无效!"
#: Merge.rc:5AB9EEA7
#, c-format
msgid "Both paths are invalid!"
-msgstr "两个路径都不存在!"
+msgstr "两个路径都无效!"
#: Merge.rc:585E8EC0
#, c-format
msgid "Left (1st) and Middle (2nd) paths are invalid!"
-msgstr ""
+msgstr "左侧 (第1个) 和中间 (第2个) 路径无效!"
#: Merge.rc:135DE390
#, c-format
msgid "Left (1st) and Right (3rd) paths are invalid!"
-msgstr ""
+msgstr "左侧 (第1个) 和右侧 (第3个) 路径无效!"
#: Merge.rc:72716FA6
#, c-format
msgid "Middle (2nd) and Right (3rd) paths are invalid!"
-msgstr ""
+msgstr "中间 (第2个) 和右侧 (第3个) 路径无效!"
#: Merge.rc:237A0533
#, c-format
msgid "All paths are invalid!"
-msgstr ""
+msgstr "所有路径都无效!"
#: Merge.rc:1235F930
#, c-format
msgid "Only enabled for File comparisons"
-msgstr ""
+msgstr "仅文件比较启用"
#: Merge.rc:30FF7A4E
#, c-format
msgid "Cannot compare file and folder!"
-msgstr "不能在文件和文件夹之间进行对比!"
+msgstr "不能在文件和文件夹之间进行比较!"
#: Merge.rc:62AC5DDB
#, c-format
#: Merge.rc:53CCF475
#, c-format
msgid "Failed to parse conflict file."
-msgstr "解析冲突文件时失败"
+msgstr "解析冲突文件时失败."
#: Merge.rc:5A765252
#, c-format
msgid "The file\n%1\nis not a conflict file."
-msgstr "文件\n%1\n不是一个冲突文件"
+msgstr "文件\n%1\n不是一个冲突文件."
#: Merge.rc:67019DCC
#, c-format
#: Merge.rc:E4471C
#, c-format
msgid "Save changes to %1?"
-msgstr "保存更改到 %1？"
+msgstr "保存更改到 %1?"
#: Merge.rc:6A1C6855
#, c-format
msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
-msgstr "%1 标记为只读。您希望覆盖只读文件吗？选“否”可以用其它文件名保存。"
+msgstr "%1 标记为只读. 您希望覆盖只读文件吗? (选\"否\"使用其它文件名保存.)"
#: Merge.rc:673BD332
#, c-format
"无法备份原文件:\n"
"%1\n"
"\n"
-"仍然继续吗？"
+"仍然继续吗?"
#: Merge.rc:69020931
#, c-format
"\t-use a different filename (Press Ok)\n"
"\t-abort the current operation (Press Cancel)?"
msgstr ""
-"保存文件失败。\n"
+"保存文件失败.\n"
"%1\n"
"%2\n"
"请选择:\n"
-"\t-用其它文件名保存(点击“确定”)\n"
-"\t-中止当前操作(点击“取消”)"
+"\t-使用其它文件名保存 (点击\"确定\")\n"
+"\t-中止当前操作 (点击\"取消\")?"
#: Merge.rc:3895053E
#, c-format
"\n"
"Do you want to save the unpacked version to another file?"
msgstr ""
-"插件 '%2' 无法将您对左侧文件的修改打包到 '%1' 中。\n"
+"插件 '%2' 无法将您对左侧文件的修改打包到 '%1' 中.\n"
"\n"
-"原文件不会改变。\n"
+"原文件不会改变.\n"
"\n"
-"您要将未打包的版本保存为其它文件吗？"
+"您是否要将未打包的版本保存为其它文件?"
#: Merge.rc:5A0BA2DF
#, c-format
"\n"
"Do you want to save the unpacked version to another file?"
msgstr ""
-"插件 '%2' 无法将您对右侧文件的修改打包到 '%1' 中。\n"
+"插件 '%2' 无法将您对右侧文件的修改打包到 '%1' 中.\n"
"\n"
-"原文件不会改变。\n"
+"原文件不会改变.\n"
"\n"
-"您要将未打包的版本保存为其它文件吗？"
+"您是否要将未打包的版本保存为其它文件?"
#: Merge.rc:78367A47
#, c-format
"Overwrite changed file?"
msgstr ""
"%1\n"
-"在 WinMerge 打开此文件后，\n"
-"其它程序又对它进行了修改。\n"
+"在 WinMerge 打开此文件后,\n"
+"其它程序又对它进行了修改.\n"
"\n"
-"要覆盖已被修改的文件吗？"
+"要覆盖已被修改的文件吗?"
#: Merge.rc:462FB760
#, c-format
"is marked read-only. Would you like to override the read-only item?"
msgstr ""
"%1\n"
-"文件标记为只读。您要覆盖只读的文件吗？"
+"文件标记为只读. 您要覆盖只读的文件吗?"
#: Merge.rc:B9192B
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"
-msgstr ""
+msgstr "其他应用程序已经更新了文件\n%1\nWinMerge 已经扫描了该文件的最后时间.\n\n您是否要重新加载该文件?"
#: Merge.rc:62909ED7
#, c-format
#: Merge.rc:E4471D
#, c-format
msgid "Save Middle File As"
-msgstr ""
+msgstr "中间文件另存为"
#: Merge.rc:6F833C19
#, c-format
#: Merge.rc:3C4620F
#, c-format
msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
-msgstr ""
+msgstr "文件\n%1\n已经不存在. 请保存文件的副本继续."
#: Merge.rc:4BFC8F0D
#, c-format
"\n"
"Refresh documents before continuing."
msgstr ""
-"文档不同步，无法进行合并。\n"
+"文档不同步, 无法进行合并.\n"
"\n"
-"请刷新文档后再继续。"
+"请刷新文档后再继续."
#: Merge.rc:2405135
msgid "Break at whitespace"
#: Merge.rc:52D3F9F6
#, c-format
msgid "Right to Middle (%1)"
-msgstr ""
+msgstr "右侧到中间 (%1)"
#: Merge.rc:17F5B413
#, c-format
msgid "Middle to Left (%1)"
-msgstr ""
+msgstr "中间到左侧 (%1)"
#: Merge.rc:66C0CE9F
#, c-format
msgid "Middle to Right (%1)"
-msgstr ""
+msgstr "中间到右侧 (%1)"
#: Merge.rc:7271FF80
#, c-format
#: Merge.rc:5BCDF0E7
#, c-format
msgid "Left to Middle (%1)"
-msgstr ""
+msgstr "左侧到中间 (%1)"
#: Merge.rc:71676C48
#, c-format
#: Merge.rc:729280DB
#, c-format
msgid "Middle to... (%1)"
-msgstr ""
+msgstr "中间到... (%1)"
#: Merge.rc:32BFDBAD
#, c-format
#: Merge.rc:36B164C5
#, c-format
msgid "Both to... (%1)"
-msgstr ""
+msgstr "两者到... (%1)"
#: Merge.rc:2515A6BD
#, c-format
msgid "All to... (%1)"
-msgstr ""
+msgstr "全部到... (%1)"
#: Merge.rc:290D6FC6
#, c-format
msgid "Differences to... (%1)"
-msgstr ""
+msgstr "差异到... (%1)"
#: Merge.rc:1B633070
#, c-format
#: Merge.rc:13C27215
#, c-format
msgid "Middle (%1)"
-msgstr ""
+msgstr "中间 (%1)"
#: Merge.rc:39174D9A
#, c-format
#: Merge.rc:669F87F5
#, c-format
msgid "All (%1)"
-msgstr ""
+msgstr "全部 (%1)"
#: Merge.rc:DD21175
#, c-format
#: Merge.rc:2B480620
#, c-format
msgid "Middle side - select destination folder:"
-msgstr ""
+msgstr "中间 - 请选择目标文件夹:"
#: Merge.rc:5BBC5591
#, c-format
"您确定要删除\n"
"\n"
"%1\n"
-"吗？"
+"吗?"
#: Merge.rc:2019BE6D
#, c-format
msgid "Are you sure you want to copy:"
-msgstr "您确定要复制吗:"
+msgstr "您确定要复制:"
#: Merge.rc:2B0F0BA3
#, c-format
msgid "Are you sure you want to copy %d items:"
-msgstr "您确定要复制 %d 个项目吗:"
+msgstr "您确定要复制 %d 个项目:"
#: Merge.rc:59B96CF
#, c-format
#: Merge.rc:2019BE6E
#, c-format
msgid "Are you sure you want to move:"
-msgstr ""
+msgstr "您确定要移动:"
#: Merge.rc:2B0F0BA4
#, c-format
msgid "Are you sure you want to move %d items:"
-msgstr ""
+msgstr "您确定要移动 %d 个项目:"
#: Merge.rc:CAEDA37
#, c-format
msgid "Confirm Move"
-msgstr ""
+msgstr "确认移动"
#: Merge.rc:1E9E7AFF
#, c-format
msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
-msgstr ""
+msgstr "您正要关闭正在比较文件夹的窗口. 您确定要关闭这些窗口吗?"
#: Merge.rc:4B6299EF
#, c-format
#: Merge.rc:D404EDE
#, c-format
msgid "Comparison result"
-msgstr "对比结果"
+msgstr "比较结果"
#: Merge.rc:1B633071
#, c-format
#: Merge.rc:13C27216
#, c-format
msgid "Middle Date"
-msgstr ""
+msgstr "中间日期"
#: Merge.rc:9B50030
#, c-format
#: Merge.rc:13C27217
#, c-format
msgid "Middle Size"
-msgstr ""
+msgstr "中间文件大小"
#: Merge.rc:237A128
#, c-format
#: Merge.rc:17F5B414
#, c-format
msgid "Middle Size (Short)"
-msgstr ""
+msgstr "中间文件大小 (简短)"
#: Merge.rc:7271FF81
#, c-format
#: Merge.rc:66C0CEA0
#, c-format
msgid "Middle Creation Time"
-msgstr ""
+msgstr "中间创建时间"
#: Merge.rc:4909ADB5
#, c-format
#: Merge.rc:17F5B415
#, c-format
msgid "Middle File Version"
-msgstr ""
+msgstr "中间文件版本"
#: Merge.rc:194397DE
#, c-format
#: Merge.rc:729280DC
#, c-format
msgid "Middle Attributes"
-msgstr ""
+msgstr "中间属性"
#: Merge.rc:15875424
#, c-format
#: Merge.rc:D0645BD
#, c-format
msgid "Middle EOL"
-msgstr ""
+msgstr "中间换行符"
#: Merge.rc:5F87E5D
#, c-format
#: Merge.rc:2A79A03A
#, c-format
msgid "Middle Encoding"
-msgstr ""
+msgstr "中间文件编码"
#: Merge.rc:6B6D8966
#, c-format
msgid "Ignored Diff."
-msgstr "忽略的不同处"
+msgstr "忽略的差异."
#: Merge.rc:76C8AB99
#, c-format
msgid "Unable to compare files"
-msgstr "无法对比文件"
+msgstr "无法比较文件"
#: Merge.rc:4166A155
#, c-format
#: Merge.rc:2A79A03B
#, c-format
msgid "Middle only: %1"
-msgstr ""
+msgstr "仅在中间: %1"
#: Merge.rc:1B176021
#, c-format
#: Merge.rc:576B1A36
#, c-format
msgid "Does not exist in %1"
-msgstr ""
+msgstr "%1 中不存在"
#: Merge.rc:6B248E76
#, c-format
#: Merge.rc:387F7982
#, c-format
msgid "Folders are different"
-msgstr ""
+msgstr "文件夹不同"
#: Merge.rc:1B633073
#, c-format
#: Merge.rc:13C27218
#, c-format
msgid "Middle Only"
-msgstr ""
+msgstr "只存在中间"
#: Merge.rc:638BD42C
#, c-format
msgid "No item in left"
-msgstr ""
+msgstr "左侧无项目"
#: Merge.rc:DEEB1BA
#, c-format
msgid "No item in right"
-msgstr ""
+msgstr "右侧无项目"
#: Merge.rc:2FE785D7
#, c-format
msgid "No item in middle"
-msgstr ""
+msgstr "中间无项目"
#: Merge.rc:79AB21E1
#, c-format
#: Merge.rc:12D66B44
#, c-format
msgid "Text files are identical"
-msgstr ""
+msgstr "文本文件完全相同"
#: Merge.rc:1DEEB161
#, c-format
msgid "(Middle and right are identical)"
-msgstr ""
+msgstr "(中间和右侧完全相同)"
#: Merge.rc:1D99B043
#, c-format
msgid "(Left and right are identical)"
-msgstr ""
+msgstr "(左侧和右侧完全相同)"
#: Merge.rc:159C584C
#, c-format
msgid "(Left and middle are identical)"
-msgstr ""
+msgstr "(左侧和中间完全相同)"
#: Merge.rc:12D66B45
#, c-format
msgid "Text files are different"
-msgstr ""
+msgstr "文本文件不同"
#: Merge.rc:203BBC7B
#, c-format
#: Merge.rc:3A5D5963
#, c-format
msgid "Filename or folder name."
-msgstr "文件名或文件夹名。"
+msgstr "文件名或文件夹名."
#: Merge.rc:A7628EE
#, c-format
msgid "Subfolder name when subfolders are included."
-msgstr "所处的子文件夹名。"
+msgstr "所处的子文件夹名."
#: Merge.rc:6F88EC68
#, c-format
msgid "Comparison result, long form."
-msgstr "对比结果，较长的格式。"
+msgstr "比较结果, 较长的格式."
#: Merge.rc:28BFDD41
#, c-format
msgid "Left side modification date."
-msgstr "左侧的最后修改日期。"
+msgstr "左侧的最后修改日期."
#: Merge.rc:19B30A68
#, c-format
msgid "Right side modification date."
-msgstr "右侧的最后修改日期。"
+msgstr "右侧的最后修改日期."
#: Merge.rc:68FB0CE7
#, c-format
msgid "Middle side modification date."
-msgstr ""
+msgstr "中间的最后修改日期."
#: Merge.rc:453F5DDC
#, c-format
msgid "File's extension."
-msgstr "文件的扩展名。"
+msgstr "文件的扩展名."
#: Merge.rc:172385A1
#, c-format
msgid "Left file size in bytes."
-msgstr "左侧文件长度字节数。"
+msgstr "左侧文件大小字节数."
#: Merge.rc:94C89D4
#, c-format
msgid "Right file size in bytes."
-msgstr "右侧文件长度字节数。"
+msgstr "右侧文件大小字节数."
#: Merge.rc:27AAA636
#, c-format
msgid "Middle file size in bytes."
-msgstr ""
+msgstr "中间文件大小字节数."
#: Merge.rc:2EBBDDD7
#, c-format
msgid "Left file size abbreviated."
-msgstr "左侧文件长度的简短表示."
+msgstr "左侧文件大小的简短表示."
#: Merge.rc:21DC7C34
#, c-format
msgid "Right file size abbreviated."
-msgstr "右侧文件长度的简短表示."
+msgstr "右侧文件大小的简短表示."
#: Merge.rc:BA5006A
#, c-format
msgid "Middle file size abbreviated."
-msgstr ""
+msgstr "中间文件大小的简短表示."
#: Merge.rc:172385A2
#, c-format
msgid "Left side creation time."
-msgstr "左侧的创建时间。"
+msgstr "左侧的创建时间."
#: Merge.rc:94C89D5
#, c-format
msgid "Right side creation time."
-msgstr "右侧的创建时间。"
+msgstr "右侧的创建时间."
#: Merge.rc:27AAA637
#, c-format
msgid "Middle side creation time."
-msgstr ""
+msgstr "中间的创建时间."
#: Merge.rc:4B4CD318
#, c-format
msgid "Tells which side has newer modification date."
-msgstr "æ\98¾ç¤ºå\87ºå\93ªè¾¹æ\98¯è¾\83æ\99\9aä¿®æ\94¹è¿\87ç\9a\84ã\80\82"
+msgstr "æ\98¾ç¤ºå\93ªè¾¹æ\98¯è¾\83æ\99\9aä¿®æ\94¹è¿\87ç\9a\84."
#: Merge.rc:3AF5EAD7
#, c-format
msgid "Left side file version, only for some filetypes."
-msgstr "左侧文件的版本，只对一些文件类型有效。"
+msgstr "左侧文件的版本, 只对一些文件类型有效."
#: Merge.rc:7413D0D6
#, c-format
msgid "Right side file version, only for some filetypes."
-msgstr "右侧文件的版本，只对一些文件类型有效。"
+msgstr "右侧文件的版本, 只对一些文件类型有效."
#: Merge.rc:5EB13952
#, c-format
msgid "Middle side file version, only for some filetypes."
-msgstr ""
+msgstr "中间文件的版本, 只对一些文件类型有效."
#: Merge.rc:43600E91
#, c-format
msgid "Short comparison result."
-msgstr "ç\9fæ ¼å¼\8fç\9a\84对æ¯\94ç»\93æ\9e\9cã\80\82"
+msgstr "ç®\80ç\9fæ ¼å¼\8fç\9a\84æ¯\94è¾\83ç»\93æ\9e\9c."
#: Merge.rc:20155F59
#, c-format
msgid "Left side attributes."
-msgstr "左侧的属性。"
+msgstr "左侧的属性."
#: Merge.rc:6DBD6124
#, c-format
msgid "Right side attributes."
-msgstr "右侧的属性。"
+msgstr "右侧的属性."
#: Merge.rc:7F2E4119
#, c-format
msgid "Middle side attributes."
-msgstr ""
+msgstr "中间的属性."
#: Merge.rc:703AF3C8
#, c-format
#: Merge.rc:6CA26873
#, c-format
msgid "Middle side file EOL type"
-msgstr ""
+msgstr "中间文件的换行符类型"
#: Merge.rc:5BCDF0E8
#, c-format
msgid "Left side encoding."
-msgstr "左侧文件的字符编码。"
+msgstr "左侧文件的字符编码."
#: Merge.rc:52D3F9F7
#, c-format
msgid "Right side encoding."
-msgstr "右侧文件的字符编码。"
+msgstr "右侧文件的字符编码."
#: Merge.rc:715905A6
#, c-format
msgid "Middle side encoding."
-msgstr ""
+msgstr "中间文件的字符编码."
#: Merge.rc:58398DFF
#, c-format
msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
-msgstr "被略过的不同数. 由WinMerge忽略的不同, 无法对它们进行合并."
+msgstr "文件中已忽略的差异数. 由 WinMerge 忽略的差异, 无法对它们进行合并."
#: Merge.rc:6A6D5CB6
#, c-format
msgid "Number of differences in file. This number does not include ignored differences."
-msgstr "文件中的不同数. 不包括忽略的不同."
+msgstr "文件中的差异数. 不包括忽略的差异."
#: Merge.rc:A7628EF
#, c-format
msgid "Shows an asterisk (*) if the file is binary."
-msgstr "在二进制文件处显示星号(*)。"
+msgstr "在二进制文件处显示星号(*)."
#: Merge.rc:1AC98D0D
#, c-format
msgid "Compare %1 with %2"
-msgstr "对比 %1 和 %2"
+msgstr "比较 %1 和 %2"
#: Merge.rc:E9A77F2
#, c-format
#: Merge.rc:2E3BFCA3
#, c-format
msgid "Simple HTML"
-msgstr "简单HTML"
+msgstr "简单 HTML"
#: Merge.rc:751AB591
#, c-format
msgid "Simple XML"
-msgstr "简单XML"
+msgstr "简单 XML"
#: Merge.rc:67FDA050
#, c-format
msgid "The report file already exists. Do you want to overwrite existing file?"
-msgstr "报告文件已经存在，要覆盖吗？"
+msgstr "报告文件已经存在, 您是否要覆盖已经存在的文件?"
#: Merge.rc:630F8340
#, c-format
#: Merge.rc:37B243DF
#, c-format
msgid "The report has been created successfully."
-msgstr "æ\88\90å\8a\9få\88\9b建æ\8a¥å\91\8aã\80\82"
+msgstr "æ\8a¥å\91\8aå\88\9b建æ\88\90å\8a\9f."
#: Merge.rc:162B12F9
#, c-format
msgid "The same file is opened in both panels."
-msgstr "两侧打开的是同一个文件。"
+msgstr "两侧打开的是同一个文件."
#: Merge.rc:7632E88D
#, c-format
msgid "The selected files are identical."
-msgstr "选择的文件完全相同。"
+msgstr "选择的文件完全相同."
#: Merge.rc:44565DBD
#, c-format
msgid "An error occurred while comparing the files."
-msgstr "一个错误发生于对比文件时。"
+msgstr "比较文件时发生错误."
#: Merge.rc:5F16D9DC
#, c-format
msgid "Temporary files could not be created. Check your temporary path settings."
-msgstr "无法创建临时文件。请检查您的临时路径设置。"
+msgstr "无法创建临时文件. 请检查您的临时路径设置."
#: Merge.rc:11E6F584
#, c-format
msgstr ""
"文件含有不同的换行符\n"
"\n"
-"您要在此次对比中忽略换行符的差别吗？\n"
+"您要在此次比较中忽略换行符的差别吗?\n"
"\n"
-"提示：如果您总是忽略换行符的不同，请在“编辑/选项”的“对比”页中勾选“忽略换行符差异”。"
+"提示: 如果您想总是忽略换行符的不同, 请在\"编辑/选项\"的\"比较\"选项卡中勾选\"忽略换行符差异\"."
#: Merge.rc:46FB8639
#, c-format
msgid "The selected folder is invalid."
-msgstr "选中的文件夹无效。"
+msgstr "选中的文件夹无效."
#: Merge.rc:4BC3EDDB
#, c-format
msgid "Cannot open a binary file to editor."
-msgstr "无法用编辑器打开二进制文件。"
+msgstr "无法用编辑器打开二进制文件."
#: Merge.rc:279EB840
#, c-format
msgid "The folder exists only in other side and cannot be opened.\n\nDo you want to create a matching folder:\n%1\nto the other side and open these folders?"
-msgstr "这个文件夹只存在于一侧所以无法打开。\n\n是否要在另一侧创建一个对应的文件夹：\n%1\n并且打开这两个文件夹？"
+msgstr "这个文件夹只存在于一侧所以无法打开.\n\n是否要在另一侧创建一个对应的文件夹:\n%1\n并且打开这两个文件夹?"
#: Merge.rc:36F211E1
#, c-format
msgid "Do you want to move to the next file?"
-msgstr ""
+msgstr "您是否要移动到下一个文件?"
#: Merge.rc:6A0A36F1
#, c-format
msgid "Do you want to move to the previous file?"
-msgstr ""
+msgstr "您是否要移动到上一个文件?"
#: Merge.rc:36F211E2
#, c-format
msgid "Do you want to move to the next page?"
-msgstr ""
+msgstr "您是否要移动到下一页?"
#: Merge.rc:6A0A36F2
#, c-format
msgid "Do you want to move to the previous page?"
-msgstr ""
+msgstr "您是否要移动到上一页?"
#: Merge.rc:4A700AB0
#, c-format
"Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n"
"Would you like to treat both files as being in the default Windows codepage (recommended)?"
msgstr ""
-"左右两侧为不同代码页的文件(左侧为cp%d，右侧为cp%d)。\n"
-"分别以不同代码页显示将会有较好的效果，但是合并/复制会有危险。\n"
-"您要以Windows默认的代码页显示两个文件吗(推荐)？"
+"左右两侧为不同代码页的文件 (左侧为 cp%d, 右侧为 cp%d).\n"
+"分别以不同代码页显示将会有较好的效果, 但是合并/复制会有风险.\n"
+"您是否要以 Windows 默认的代码页显示两个文件吗 (推荐)?"
#: Merge.rc:5851E4C8
#, c-format
msgid "Information lost due to encoding errors: both files"
-msgstr "由于字符编码错误造成两个文件信息丢失"
+msgstr "由于文件的字符编码错误导致两个文件信息丢失"
#: Merge.rc:5851E4C9
#, c-format
msgid "Information lost due to encoding errors: first file"
-msgstr ""
+msgstr "由于文件的字符编码错误导致第一个文件信息丢失"
#: Merge.rc:31EAB496
#, c-format
msgid "Information lost due to encoding errors: second file"
-msgstr ""
+msgstr "由于文件的字符编码错误导致第二个文件信息丢失"
#: Merge.rc:5851E4CA
#, c-format
msgid "Information lost due to encoding errors: third file"
-msgstr ""
+msgstr "由于文件的字符编码错误导致第三个文件信息丢失"
#: Merge.rc:7D4E76C0
#, c-format
msgid "No difference"
-msgstr "没有不同"
+msgstr "没有差异"
#: Merge.rc:71676C4A
#, c-format
msgid "Line difference"
-msgstr "行内不同"
+msgstr "行内差异"
#: Merge.rc:6DBD6125
#, c-format
msgid "Replaced %1 string(s)."
-msgstr "已替换 %1 个字符串。"
+msgstr "已替换 %1 个字符串."
#: Merge.rc:334E25B3
#, c-format
msgid "Cannot find string \"%s\""
-msgstr "æ\97 æ³\95æ\9f¥æ\89¾å\97符串ã\80\8c%sã\80\8d"
+msgstr "æ\89¾ä¸\8då\88°å\97符串 \"%s\""
#: Merge.rc:34855CF1
#, c-format
msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
-msgstr ""
+msgstr "您正在进入合并模式. 如果您想关闭合并模式, 请按 F9"
#: Merge.rc:5E0C549
#, c-format
msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2"
-msgstr ""
+msgstr "自动合并的变更数: %1\n未解决的冲突数: %2"
#: Merge.rc:7453F857
#, c-format
msgid "The change of codepage has been merged"
-msgstr ""
+msgstr "代码页的变更已经被合并"
#: Merge.rc:162B12FA
#, c-format
msgid "The changes of codepage are conflicting"
-msgstr ""
+msgstr "代码页的变更存在冲突"
#: Merge.rc:7632E88E
#, c-format
msgid "The change of EOL has been merged"
-msgstr ""
+msgstr "换行符的变更已经被合并"
#: Merge.rc:502A2983
#, c-format
msgid "The changes of EOL are conflicting"
-msgstr ""
+msgstr "换行符的变更存在冲突"
#: Merge.rc:5C8E17D1
#, c-format
msgid "Location Pane"
-msgstr "位置示意"
+msgstr "定位窗格"
#: Merge.rc:629C1DDE
#, c-format
msgid "Diff Pane"
-msgstr "不同处显示"
+msgstr "差异窗格"
#: Merge.rc:3BDD62C4
#, c-format
msgid "Patch file successfully written."
-msgstr "成功写入patch文件。"
+msgstr "补丁文件写入成功."
#: Merge.rc:74C5055A
#, c-format
msgid "1. item is not found or is directory!"
-msgstr "1. 条目未找到或者它是一个文件夹!"
+msgstr "1. 项目未找到或者它是一个文件夹!"
#: Merge.rc:7EFD4961
#, c-format
msgid "2. item is not found or is directory!"
-msgstr "2. 条目未找到或者它是一个文件夹!"
+msgstr "2. 项目未找到或者它是一个文件夹!"
#: Merge.rc:E611488
#, c-format
msgid "The patch file already exists. Do you want to overwrite it?"
-msgstr "patch文件已经存在，您要覆盖它吗？"
+msgstr "补丁文件已经存在. 您是否要覆盖它?"
#: Merge.rc:62226073
#, c-format
#: Merge.rc:27AFDB30
#, c-format
msgid "Normal"
-msgstr "æ\99®é\80\9a"
+msgstr "æ£å¸¸æ ¼å¼\8f (Normal)"
#: Merge.rc:7E5494F7
#, c-format
msgid "Context"
-msgstr "上下文"
+msgstr "上下文格式 (Context)"
#: Merge.rc:24173EE8
#, c-format
msgid "Unified"
-msgstr "统一"
+msgstr "合并格式 (Unified)"
#: Merge.rc:185B8391
#, c-format
msgid "Could not write to file %1."
-msgstr "无法写入文件 %1。"
+msgstr "无法写入文件 %1."
#: Merge.rc:64D049AA
#, c-format
#: Merge.rc:54711616
#, c-format
msgid "Cannot create a patch file from binary files."
-msgstr "无法为二进制文件创建 patch。"
+msgstr "无法为二进制文件创建补丁."
#: Merge.rc:133D7451
#, c-format
msgid "Cannot create a patch file from directories."
-msgstr "无法为文件夹创建 patch。"
+msgstr "无法为文件夹创建补丁."
#: Merge.rc:34FF26C7
#, c-format
"\n"
"Creating a patch requires that there are no unsaved changes in files."
msgstr ""
-"请保存文件。\n"
+"请先保存所有文件.\n"
"\n"
-"创建 patch 要求文件中没有未保存的改动。"
+"创建补丁时要求文件中没有未保存的变更."
#: Merge.rc:576FB6D3
#, c-format
msgid "Folder does not exist."
-msgstr "文件夹不存在。"
+msgstr "文件夹不存在."
#: Merge.rc:3377B7B5
#, c-format
"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."
msgstr ""
-"没有启用压缩包支持。\n"
-" \n"
-"没找到支持压缩包所需要的组件(7-zip 或 Merge7z*.dll)。\n"
-"请查看手册获得有关压缩包支持及如何启用的更多信息。"
+"没有启用压缩包支持.\n"
+"没有找到支持压缩包所需要的组件 (7-zip 或 Merge7z*.dll).\n"
+"请查看手册获得有关压缩包支持及如何启用的更多信息."
#: Merge.rc:44EE84AB
#, c-format
"You are about to close several compare windows.\n"
"\n"
"Do you want to continue?"
-msgstr "您正要关闭多个对比窗口。\n是否继续？"
+msgstr "您正要关闭多个比较窗口.\n是否继续?"
#: Merge.rc:7C664E2
#, c-format
#: Merge.rc:4C72B57
#, c-format
msgid "Type"
-msgstr ""
+msgstr "类型"
#: Merge.rc:5ED09E18
#, c-format
msgid "Unpacker"
-msgstr ""
+msgstr "解包器"
#: Merge.rc:37C6B9B8
#, c-format
msgid "Prediffer"
-msgstr ""
+msgstr "预处理器"
#: Merge.rc:29ECCB83
#, c-format
msgid "Editor script"
-msgstr ""
+msgstr "编辑器脚本"
#: Merge.rc:51A4FE5F
#, c-format
msgid "\nDifference in the Current Line"
-msgstr ""
+msgstr "\n当前行中差异"
#: Merge.rc:CF15594
#, c-format
msgid "\nOptions"
-msgstr ""
+msgstr "\n选项"
#: Merge.rc:6F90DC3A
#, c-format
msgid "\nRefresh (F5)"
-msgstr ""
+msgstr "\n刷新 (F5)"
#: Merge.rc:414AF01
#, c-format
msgid "\nPrevious Difference (Alt+Up)"
-msgstr ""
+msgstr "\n上一处差异 (Alt+Up)"
#: Merge.rc:16618519
#, c-format
msgid "\nNext Difference (Alt+Down)"
-msgstr ""
+msgstr "\n下一处差异 (Alt+Down)"
#: Merge.rc:7C5EF083
#, c-format
msgid "\nPrevious Conflict (Alt+Shift+Up)"
-msgstr ""
+msgstr "\n上一处冲突 (Alt+Shift+Up)"
#: Merge.rc:51A4FE60
#, c-format
msgid "\nNext Conflict (Alt+Shift+Down)"
-msgstr ""
+msgstr "\n下一处冲突 (Alt+Shift+Down)"
#: Merge.rc:35CF1E68
#, c-format
msgid "\nFirst Difference (Alt+Home)"
-msgstr ""
+msgstr "\n第一处差异 (Alt+Home)"
#: Merge.rc:51A4FE61
#, c-format
msgid "\nCurrent Difference (Alt+Enter)"
-msgstr ""
+msgstr "\n当前差异 (Alt+Enter)"
#: Merge.rc:1DA00C8A
#, c-format
msgid "\nLast Difference (Alt+End)"
-msgstr ""
+msgstr "\n最后一处差异 (Alt+End)"
#: Merge.rc:E8950EA
#, c-format
msgid "\nCopy Right (Alt+Right)"
-msgstr ""
+msgstr "\n复制到右侧 (Alt+Right)"
#: Merge.rc:55A8C466
#, c-format
msgid "\nCopy Left (Alt+Left)"
-msgstr ""
+msgstr "\n复制到左侧 (Alt+Left)"
#: Merge.rc:1E864A56
#, c-format
msgid "\nCopy Right and Advance (Ctrl+Alt+Right)"
-msgstr ""
+msgstr "\n复制到右侧并前进 (Ctrl+Alt+Right)"
#: Merge.rc:7FE60896
#, c-format
msgid "\nCopy Left and Advance (Ctrl+Alt+Left)"
-msgstr ""
+msgstr "\n复制到左侧并前进 (Ctrl+Alt+Left)"
#: Merge.rc:15F24C75
#, c-format
msgid "\nAll Right"
-msgstr ""
+msgstr "\n全部复制到右侧"
#: Merge.rc:11395D4B
#, c-format
msgid "\nAll Left"
-msgstr ""
+msgstr "\n全部复制到左侧"
#: Merge.rc:42A0CC96
#, c-format
msgid "\nAuto Merge (Ctrl+Alt+M)"
-msgstr ""
+msgstr "\n自动合并 (Ctrl+Alt+M)"
#: Merge.rc:6107F02B
#, c-format
#: Merge.rc:429CABF5
#, c-format
msgid "No prediffer (normal)"
-msgstr "没有预对比程序 (普通)"
+msgstr "不使用预处理器 (正常)"
#: Merge.rc:62909ED8
#, c-format
#: Merge.rc:40D543C8
#, c-format
msgid "Your software is up to date"
-msgstr ""
+msgstr "您的软件是最新的"
#: Merge.rc:43B4B204
#, c-format
msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?"
-msgstr ""
+msgstr "WinMerge 的新版本已经可用.\n当前最新版本为 %1 (您当前使用的为 %2). 您是否要现在下载?"
#: Merge.rc:696AAFE9
#, c-format
msgid "Failed to download latest version information"
-msgstr ""
+msgstr "下载最新版本信息失败"
#: Merge.rc:55B03C14
#, c-format
#: Merge.rc:638BD42D
#, c-format
msgid "No Highlighting"
-msgstr ""
+msgstr "无高亮"
#: Merge.rc:7460E8C0
#, c-format
msgid "Batch"
-msgstr "批处理"
+msgstr "批处理文件"
#: Merge.rc:23B300
msgid "Lua"
-msgstr ""
+msgstr "Lua"
#: Merge.rc:55B03C15
#, c-format
#: Merge.rc:4E44AD6
#, c-format
msgid "VHDL"
-msgstr ""
+msgstr "VHDL"
#: Merge.rc:8AF7E6B
#, c-format
msgid "Close &Left Tabs"
-msgstr ""
+msgstr "关闭左侧标签页(&L)"
#: Merge.rc:D404EDF
#, c-format
msgid "Close R&ight Tabs"
-msgstr ""
+msgstr "关闭右侧标签页(&R)"
#: Merge.rc:D404EE0
#, c-format
msgid "Close &Other Tabs"
-msgstr ""
+msgstr "关闭其他标签页(&O)"
#: Merge.rc:3E934E
#, c-format
msgid "Enable &Auto Max Width"
-msgstr ""
+msgstr "启用自动最大宽度(&A)"
#: Merge.rc:3D9427A9
#, c-format
msgid "frhed is not installed"
-msgstr ""
+msgstr "frhed 没有安装"
#: Merge.rc:73B321AA
#, c-format
msgid "%1 does not exist. Do you want to create it?"
-msgstr ""
+msgstr "%1 不存在. 是否要创建它?"
#: Merge.rc:3A5D5964
#, c-format
msgid "Failed to create folder."
-msgstr ""
+msgstr "创建文件夹失败."
#: Merge.rc:64F70DD6
#, c-format
msgid "You can specify the following parameters to the path:\n$file: Path name of the current file\n$linenum: Line number of the current cursor position"
-msgstr ""
-
+msgstr "您可以在路径中指定下列参数:\n$file: 当前文件的路径名\n$linenum: 当前游标位置的行号"
OSDN Git Service
