942 lines
18 KiB
Plaintext
942 lines
18 KiB
Plaintext
== MergetoolWindowTitle ==
|
||
Unity Version Control 合并工具
|
||
|
||
== FirstConflictButtonTooltip ==
|
||
转到第一个冲突 (Ctrl + Shift + -)
|
||
|
||
== PrevConflictButtonTooltip ==
|
||
上一个冲突 (Ctrl + -)
|
||
|
||
== NextConflictButtonTooltip ==
|
||
下一个冲突 (Ctrl + +)
|
||
|
||
== LastConflictButtonTooltip ==
|
||
转到最后一个冲突 (Ctrl + Shift + +)
|
||
|
||
== PrevNotAutomaticConflictButtonTooltip ==
|
||
上一个非自动冲突 (Ctrl + PageUp)
|
||
|
||
== NextNotAutomaticConflictButtonTooltip ==
|
||
下一个非自动冲突 (Ctrl + PageDown)
|
||
|
||
== PendingAutomaticConflictsLabel ==
|
||
当前冲突：{0} / {1}
|
||
|
||
== PendingNonAutomaticConflictsLabel ==
|
||
待定未解决冲突：{0} / {1}
|
||
|
||
== NonAutomaticConflictsLabelTooltip ==
|
||
当前未解决非自动冲突
|
||
|
||
== CurrentConflictLabelTooltip ==
|
||
当前合并冲突
|
||
|
||
== NonAutomaticConflictsNavigationTooltip ==
|
||
浏览当前未解决的冲突
|
||
|
||
== AutomaticConflictsNavigationTooltip ==
|
||
浏览合并冲突
|
||
|
||
== AutomaticConflictMarkup ==
|
||
当前冲突是<span foreground='green'>自动</span>的。无需用户干预。
|
||
|
||
== NonAutomaticConflictMarkup ==
|
||
当前冲突是<span foreground='red'>非自动</span>的。通过单击上面的按钮、编辑结果文件或将冲突标记为已解决来解决冲突。
|
||
|
||
== NonAutomaticConflictMarkedAsResolvedMarkup ==
|
||
当前冲突是<span foreground='green'>非自动</span>的，并且用户<span foreground='green'>已解决</span>该冲突。
|
||
|
||
== MarkAsResolvedButton ==
|
||
标记为已解决
|
||
|
||
== MarkAsUnresolvedButton ==
|
||
标记为未解决
|
||
|
||
== WinMergetoolUsageTitle ==
|
||
Mergetool 用法
|
||
|
||
== WinMergetoolUsage ==
|
||
用法：mergetool [<diffOptions> | <mergeOptions>]
|
||
|
||
diffOptions:<generalFiles> [<generalOptions>]
|
||
|
||
mergeOptions:<generalFiles> <baseFile> [<baseSymbolicName>] [[<automatic>] [<silent>] <resultFile>] [<mergeType>] [<generalOptions>]
|
||
|
||
baseFile:{-b | --base}=<filename>
|
||
baseSymbolicName:{-bn | --basesymbolicname}=<symbolicname>
|
||
automatic:-a | --automatic
|
||
silent:--silent
|
||
resultFile:{-r | --result}=<filename>
|
||
mergeType:{-m | --mergeresolutiontype}={onlyone | onlysrc | onlydst | try | forced}
|
||
|
||
generalFiles:<sourceFile> [<srcSymbolicName>] <destination> [<dstSymbolicName>]
|
||
|
||
sourceFile:{-s | --source}=<filename>
|
||
srcSymbolicName:{-sn | --srcsymbolicname}=<symbolicname>
|
||
destinationFile:{-d | --destination}=<filename>
|
||
dstSymbolicName:{-dn | --dstsymbolicname}=<symbolicname>
|
||
|
||
generalOptions:[<defaultEncoding>] [<comparisonMethod>] [<fileType>] [<resultEncoding>]
|
||
|
||
defaultEncoding:{-e | --encoding}={none |ascii | unicode | bigendian | utf7 | utf8}
|
||
comparisonMethod:{-i | --ignore}={none | eol | whitespaces | eol&whitespaces}
|
||
fileType:{-t | --filestype}={text/csharp | text/XML | text}
|
||
resultEncoding:{-re | --resultencoding}={none |ascii | unicode | bigendian | utf7 | utf8}
|
||
progress:{--progress}=指示当前进度的进度字符串，例如：正在合并文件 1/8
|
||
extraInfoFile:{--extrainfofile}=文件的路径，文件中包含有关合并的额外信息
|
||
|
||
备注：
|
||
|
||
-a | --automatic:尝试自动解决合并。
|
||
如果无法自动解决合并（需要用户交互），则会显示合并工具。
|
||
--silent:此选项必须与 --automatic 选项结合使用。
|
||
当无法自动解决合并时，此选项将使该工具立即返回
|
||
一个非零退出代码（不显示任何合并工具）。
|
||
如果该工具能够自动解决合并，则程序将返回退出代码 0。
|
||
|
||
示例：
|
||
|
||
mergetool
|
||
mergetool -s=file1.txt -d=file2.txt
|
||
mergetool -s=file1.txt -b=file0.txt --destination=file2.txt
|
||
mergetool --base=file0.txt -d=file2.txt --source=file1.txt --automatic --result=result.txt
|
||
mergetool -b=file0.txt -s=file1.txt -d=file2.txt -a -r=result.txt -e=utf7 -i=eol -t=text/csharp -m=onlyone
|
||
|
||
== BrowseForSaveFileTitle ==
|
||
保存文件
|
||
|
||
== PendingUnsolvedConflicts ==
|
||
该文件仍然有 {0} 个未解决的冲突。
|
||
|
||
== FileChangedSinceSaved ==
|
||
自上次保存以来，该文件已更改。
|
||
|
||
== SaveAndExitDialogButton ==
|
||
保存并退出
|
||
|
||
== ExitWithoutSavingButton ==
|
||
退出但不保存
|
||
|
||
== CloseButton ==
|
||
关闭
|
||
|
||
== OkButton ==
|
||
确定
|
||
|
||
== CancelButton ==
|
||
取消
|
||
|
||
== SourceHeaderButton ==
|
||
选择源：'{0}'
|
||
|
||
== SourceHeaderPressedButton ==
|
||
取消选择选择源：'{0}'
|
||
|
||
== SourceHeaderButtonTooltip ==
|
||
(Ctrl+1)
|
||
|
||
== BaseHeaderButton ==
|
||
选择基项：'{0}'
|
||
|
||
== BaseHeaderPressedButton ==
|
||
取消选择基项：'{0}'
|
||
|
||
== BaseHeaderButtonTooltip ==
|
||
(Ctrl+2)
|
||
|
||
== DestinationHeaderButton ==
|
||
选择目标：'{0}'
|
||
|
||
== DestinationHeaderPressedButton ==
|
||
取消选择目标：'{0}'
|
||
|
||
== DestinationHeaderButtonTooltip ==
|
||
(Ctrl+3)
|
||
|
||
== ResultButton ==
|
||
选择结果
|
||
|
||
== ResultPressedButton ==
|
||
取消选择结果
|
||
|
||
== ResultButtonTooltip ==
|
||
(Ctrl+4)
|
||
|
||
== SaveAndExitButton ==
|
||
保存并退出
|
||
|
||
== SaveAndExitTooltip ==
|
||
保存结果并关闭 Mergetool
|
||
|
||
== SaveAsTooltip ==
|
||
将结果保存到新文件中
|
||
|
||
== SaveButton ==
|
||
保存
|
||
|
||
== SaveButtonTooltip ==
|
||
保存更改 (Ctrl+S)
|
||
|
||
== SaveAsMenu ==
|
||
另存为...
|
||
|
||
== MergeButton ==
|
||
合并
|
||
|
||
== KeepSrcMenu ==
|
||
保留源参与者并退出
|
||
|
||
== KeepBaseMenu ==
|
||
保留基项参与者并退出
|
||
|
||
== KeepDstMenu ==
|
||
保留目标参与者并退出
|
||
|
||
== SrcNeeded ==
|
||
需要源文件名
|
||
|
||
== DstNeeded ==
|
||
需要目标文件名
|
||
|
||
== ResultNeeded ==
|
||
在自动合并中，需要结果文件名
|
||
|
||
== AutomaticNeeded ==
|
||
在静默模式中，需要自动合并选项
|
||
|
||
== FileTypeError ==
|
||
{0} 不是用于强调语法的有效文件类型
|
||
|
||
== CompMethodError ==
|
||
无效的比较方法
|
||
|
||
== ArgError ==
|
||
指定的参数无效
|
||
|
||
== SrcEncodingMenuTitle ==
|
||
源编码
|
||
|
||
== DstEncodingMenuTitle ==
|
||
目标编码
|
||
|
||
== BaseEncodingMenuTitle ==
|
||
基项编码
|
||
|
||
== ResultEncodingMenuTitle ==
|
||
结果编码
|
||
|
||
== SplitBlocksMenuTitle ==
|
||
拆分冲突块
|
||
|
||
== ComparisonMethodMenuTitle ==
|
||
比较方法
|
||
|
||
== RecognizeAll ==
|
||
识别全部
|
||
|
||
== IgnoreEol ==
|
||
忽略行尾
|
||
|
||
== IgnoreWhitespace ==
|
||
忽略空格
|
||
|
||
== IgnoreEolWhitespace ==
|
||
忽略行尾和空格
|
||
|
||
== EncodingDialogTitle ==
|
||
选择编码
|
||
|
||
== EncodingDialogDescription ==
|
||
选择字符编码
|
||
|
||
== EncodingDialogLabel ==
|
||
编码：
|
||
|
||
== DefaultEncoding ==
|
||
默认编码：
|
||
|
||
== ResultEncoding ==
|
||
结果编码：
|
||
|
||
== NoneEncoding ==
|
||
无
|
||
|
||
== AsciiEncoding ==
|
||
ASCII
|
||
|
||
== UnicodeEncoding ==
|
||
Unicode
|
||
|
||
== UnicodeBigEndianEncoding ==
|
||
Unicode Big-Endian
|
||
|
||
== Utf8Encoding ==
|
||
UTF-8
|
||
|
||
== OtherEncoding ==
|
||
其他...
|
||
|
||
== ChangeEncoding ==
|
||
更改...
|
||
|
||
== Options ==
|
||
选项
|
||
|
||
== FindButton ==
|
||
查找...
|
||
|
||
== MatchCase ==
|
||
匹配大小写
|
||
|
||
== MergeResolutionOptionsTooltip ==
|
||
合并解决选项
|
||
|
||
== MergeOptionsTooltip ==
|
||
显示和计算选项
|
||
|
||
== SyntaxHighlight ==
|
||
语法强调
|
||
|
||
== FirstDiffButtonTooltip ==
|
||
第一个差异
|
||
|
||
== PrevDiffButtonTooltip ==
|
||
上一个差异
|
||
|
||
== NextDiffButtonTooltip ==
|
||
下一个差异
|
||
|
||
== LastDiffButtonTooltip ==
|
||
最后一个差异
|
||
|
||
== FirstDiffButtonTooltipWithShortcut ==
|
||
第一个差异 (Ctrl + Shift + n)
|
||
|
||
== PrevDiffButtonTooltipWithShortcut ==
|
||
上一个差异 (Ctrl + n)
|
||
|
||
== NextDiffButtonTooltipWithShortcut ==
|
||
下一个差异 (Ctrl + m)
|
||
|
||
== LastDiffButtonTooltipWithShortcut ==
|
||
最后一个差异 (Ctrl + Shift + m)
|
||
|
||
== CurrentDifference ==
|
||
当前：{0}/{1}
|
||
|
||
== LeftEncoding ==
|
||
左侧编码
|
||
|
||
== RightEncoding ==
|
||
右侧编码
|
||
|
||
== DifferencesWindowTitle ==
|
||
差异
|
||
|
||
== AutomaticConflictChunk1 ==
|
||
当前冲突是
|
||
|
||
== AutomaticConflictChunk2 ==
|
||
自动冲突
|
||
|
||
== AutomaticConflictChunk3 ==
|
||
.无需用户干预。
|
||
|
||
== SolvedConflictChunk1 ==
|
||
当前冲突是
|
||
|
||
== SolvedConflictChunk2 ==
|
||
非自动冲突
|
||
|
||
== SolvedConflictChunk3 ==
|
||
，并且已被
|
||
|
||
== SolvedConflictChunk4 ==
|
||
解决
|
||
|
||
== SolvedConflictChunk5 ==
|
||
（由用户解决）。
|
||
|
||
== NonAutomaticConflictChunk1 ==
|
||
当前冲突是
|
||
|
||
== NonAutomaticConflictChunk2 ==
|
||
非自动冲突
|
||
|
||
== NonAutomaticConflictChunk3 ==
|
||
.通过单击上面的按钮、编辑结果文件或将冲突标记为已解决来解决冲突。
|
||
|
||
== PatternNotFound ==
|
||
找不到模式
|
||
|
||
== PreviousSearchButtonTooltip ==
|
||
搜索上一个匹配项
|
||
|
||
== NextSearchButtonTooltip ==
|
||
搜索下一个匹配项
|
||
|
||
== UnexpectedError ==
|
||
发生了意外错误。
|
||
|
||
== GoToLineMenuItem ==
|
||
转到行...
|
||
|
||
== AddDiffSelectionMenuItem ==
|
||
添加差异比较选择项
|
||
|
||
== DiffWithPreviousSelectionMenuItem ==
|
||
与前一个选择项进行差异比较
|
||
|
||
== FindMenuItem ==
|
||
查找...
|
||
|
||
== FindNextMenuItem ==
|
||
查找下一个
|
||
|
||
== FirstSelection ==
|
||
第一个选择项
|
||
|
||
== SecondSelection ==
|
||
第二个选择项
|
||
|
||
== SemanticDiffMovedCode ==
|
||
差异比较已移动的代码...
|
||
|
||
== SemanticGoToMovedCode ==
|
||
转到已移动的代码
|
||
|
||
== SemanticDiffChangedCode ==
|
||
差异比较已更改的代码...
|
||
|
||
== SyncMovedCode ==
|
||
同步顶部已移动的代码
|
||
|
||
== UnsyncMovedCode ==
|
||
还原滚动位置
|
||
|
||
== OutliningMenu ==
|
||
大纲
|
||
|
||
== CollapseRegionsWithoutDiffsMenu ==
|
||
折叠没有差异的区域
|
||
|
||
== CollapseToDefinitionsMenu ==
|
||
折叠到定义
|
||
|
||
== ExpandAllMenu ==
|
||
全部展开
|
||
|
||
== Merged ==
|
||
已合并
|
||
|
||
== LoadingAnnotations ==
|
||
正在加载批注...
|
||
|
||
== AnnotateLineInfoChangeset ==
|
||
变更集
|
||
|
||
== AnnotateLineInfoTimeStamp ==
|
||
创建日期
|
||
|
||
== AnnotateLineInfoOwner ==
|
||
所有者
|
||
|
||
== AnnotateLineInfoComments ==
|
||
注释
|
||
|
||
== AnnotateColorByAuthor ==
|
||
按作者着色
|
||
|
||
== AnnotateColorByDate ==
|
||
按日期着色
|
||
|
||
== AnnotateContextMenu ==
|
||
批注
|
||
|
||
== AnnotateShowAuthor ==
|
||
显示作者
|
||
|
||
== AnnotateShowBranch ==
|
||
显示分支
|
||
|
||
== AnnotateShowChangeInMerge ==
|
||
显示是否在合并中更改了行
|
||
|
||
== AnnotateShowChangeset ==
|
||
显示变更集
|
||
|
||
== AnnotateShowDateModified ==
|
||
显示修改日期
|
||
|
||
== AnnotateShowLineAge ==
|
||
显示行的存在时间
|
||
|
||
== BigFileMessage ==
|
||
该文件很大。计算差异可能需要一段时间。如果确实要计算此文件的差异，请单击按钮。
|
||
|
||
== CalculateDifferencesButton ==
|
||
计算差异
|
||
|
||
== BranchChanges ==
|
||
分支更改
|
||
|
||
== BranchChangesTooltip ==
|
||
突出显示分支中所做的更改
|
||
|
||
== ConflictChanges ==
|
||
冲突更改
|
||
|
||
== ConflictChangesTooltip ==
|
||
突出显示用户在合并期间已解决冲突的更改
|
||
|
||
== MergedChanges ==
|
||
已合并更改
|
||
|
||
== MergedChangesTooltip ==
|
||
突出显示来自合并的更改
|
||
|
||
== CaseSensitiveCheckBox ==
|
||
匹配大小写
|
||
|
||
== ColorsConfigurationMenuItem ==
|
||
配置字体和颜色...
|
||
|
||
== ComparisonMethodMenuItem ==
|
||
比较方法
|
||
|
||
== ComparisonMethodIgnoreEolMenuItem ==
|
||
忽略行尾
|
||
|
||
== ComparisonMethodIgnoreWhitespacesMenuItem ==
|
||
忽略空格
|
||
|
||
== ComparisonMethodIgnoreEolWhitespacesMenuItem ==
|
||
忽略行尾和空格
|
||
|
||
== ComparisonMethodRecognizeAllMenuItem ==
|
||
识别全部
|
||
|
||
== Content ==
|
||
{0} 的内容
|
||
|
||
== CopyToClipboard ==
|
||
复制到剪贴板
|
||
|
||
== DiffWaitingAnimation ==
|
||
正在计算差异...
|
||
|
||
== DiscardButton ==
|
||
放弃
|
||
|
||
== DiscardButtonTooltip ==
|
||
放弃更改
|
||
|
||
== EditorOptions ==
|
||
编辑器选项
|
||
|
||
== EditorOptionsConvertTabsToSpaces ==
|
||
编辑时将制表符转换为空格
|
||
|
||
== EditorOptionsWhistespaces ==
|
||
查看空格
|
||
|
||
== EditorOptionsTabs ==
|
||
制表符
|
||
|
||
== EditorOptionsTabsSpacesNumber ==
|
||
{0} 个空格
|
||
|
||
== EditorOptionsColumnGuides ==
|
||
分列辅助线
|
||
|
||
== EditorOptionsColumnsNumber ==
|
||
{0} 列
|
||
|
||
== EditorOptionsBorderLines ==
|
||
查看未选定区域的边界线
|
||
|
||
== EncodingDifferences ==
|
||
编码已从 {0} 更改为 {1}。
|
||
|
||
== FsProtectionDifferences ==
|
||
文件系统权限已从 {0} 更改为 {1}
|
||
|
||
== UnableCalculateDiffs ==
|
||
无法计算差异。
|
||
|
||
== HideUnchanged ==
|
||
隐藏未更改项
|
||
|
||
== HideUnchangedTooltip ==
|
||
仅显示已更改的声明
|
||
|
||
== ShowUnchanged ==
|
||
显示未更改项
|
||
|
||
== ShowUnchangedTooltip ==
|
||
显示完整的文件树，以便能够检查每个声明
|
||
|
||
== GroupUnchanged ==
|
||
将未更改项分组
|
||
|
||
== GroupUnchangedTooltip ==
|
||
显示已更改的声明，并将其余声明分组为单个未更改项
|
||
|
||
== ZoomIn ==
|
||
放大
|
||
|
||
== ZoomInTooltip ==
|
||
放大图形 - 也可以在按住 Control 键的同时使用滚轮
|
||
|
||
== ZoomOut ==
|
||
缩小
|
||
|
||
== ZoomOutTooltip ==
|
||
缩小图形 - 也可以在按住 Control 键的同时使用滚轮
|
||
|
||
== ErrorSavingFile ==
|
||
保存文件时发生了错误：{0}
|
||
|
||
== Find ==
|
||
查找：
|
||
|
||
== FindCloseButtonTooltip ==
|
||
关闭搜索栏
|
||
|
||
== FindPreviousButtonTooltip ==
|
||
搜索上一个匹配项
|
||
|
||
== FindNextButtonTooltip ==
|
||
搜索下一个匹配项
|
||
|
||
== MovedDetectionMenuItem ==
|
||
已移动检测
|
||
|
||
== MovedDetectionDialogMenuItem ==
|
||
已移动检测...
|
||
|
||
== EnableMoveDetectionMenuItem ==
|
||
启用已移动检测
|
||
|
||
== MoveDetectionRatio ==
|
||
移动检测比率
|
||
|
||
== MinimumLinesInDifference ==
|
||
最少差异行数
|
||
|
||
== MaximizeButtonLeftTooltip ==
|
||
最大化左侧面板
|
||
|
||
== MaximizeButtonRightTooltip ==
|
||
最大化右侧面板
|
||
|
||
== RestoreButtonLeftTooltip ==
|
||
还原左侧面板
|
||
|
||
== RestoreButtonRightTooltip ==
|
||
还原右侧面板
|
||
|
||
== OutliningPreferencesTitle ==
|
||
大纲首选项
|
||
|
||
== OutliningPreferencesCaption ==
|
||
大纲首选项
|
||
|
||
== OutliningPreferencesDetails ==
|
||
选择加载文件时首选的大纲模式
|
||
|
||
== OutliningPreferencesExplanation ==
|
||
加载文件后，使用以下大纲模式：
|
||
|
||
== OutliningPreferencesCollapseWithoutDiffs ==
|
||
折叠没有差异的区域
|
||
|
||
== OutliningPreferencesCollapseToDefinitions ==
|
||
折叠到定义
|
||
|
||
== OutliningPreferencesExpandAll ==
|
||
全部展开
|
||
|
||
== NavigationTooltip ==
|
||
转到已移动的片段
|
||
|
||
== XDiffTooltip ==
|
||
并排显示已移动的片段的差异
|
||
|
||
== XDiffFragment ==
|
||
[片段]
|
||
|
||
== FontsAndColorsMenuItem ==
|
||
字体和颜色
|
||
|
||
== FontDoesNotSupportStrikeout ==
|
||
字体 {0} 不支持应用程序使用的删除线样式。请选择其他字体。
|
||
|
||
== ChangeFontMenuItem ==
|
||
更改字体...
|
||
|
||
== LeftDiffColorMenuItem ==
|
||
左侧差异颜色
|
||
|
||
== RightDiffColorMenuItem ==
|
||
右侧差异颜色
|
||
|
||
== RestoreDefaultsMenuItem ==
|
||
还原默认值
|
||
|
||
== FilesIdentical ==
|
||
文件相同。
|
||
|
||
== AddDiffSelection ==
|
||
添加差异比较选择项
|
||
|
||
== DiffWithPreviousSelection ==
|
||
与前一个选择项进行差异比较
|
||
|
||
== DiffSourceWithBase ==
|
||
差异比较基项和源参与者
|
||
|
||
== DiffDestinationWithBase ==
|
||
差异比较基项和目标参与者
|
||
|
||
== DiffDestinationWithSource ==
|
||
差异比较源参与者和目标参与者
|
||
|
||
== Encoding ==
|
||
编码
|
||
|
||
== FontMenuItem ==
|
||
字体
|
||
|
||
== DuplicatedArg ==
|
||
重复参数 {0}。
|
||
|
||
== MergeTypeError ==
|
||
{0} 不是有效的合并解决类型
|
||
|
||
== MergeExplanation ==
|
||
此选项将启动一个三向合并工具，涉及基项文件、源文件和目标文件。您将能够将结果保存到另一个文件中。
|
||
|
||
== DifferencesExplanation ==
|
||
此选项将启动可视文本文件差异比较工具。请选择两个文件以查看它们之间的文本差异。
|
||
|
||
== XMergeNoChanges ==
|
||
Xmerge 结果为空。不会执行任何更改。
|
||
|
||
== XMergeConfirmationMessage ==
|
||
Xmerge 结果将替换您的选择，并会丢弃非自动冲突。是否要继续？
|
||
|
||
== SourceDesc ==
|
||
源（要合并的代码）
|
||
|
||
== SourceLoc ==
|
||
在源中
|
||
|
||
== DestinationDesc ==
|
||
目标（工作副本）
|
||
|
||
== DestinationLoc ==
|
||
在目标中
|
||
|
||
== HowXMergeFormat ==
|
||
您有一个合并冲突，但{0}不再存在于该处。
|
||
|
||
发生了什么情况？一名开发者很可能已经移动了一段代码 ({1})，而另一名开发者已经在原始位置 ({2}) 修改了这段代码。
|
||
|
||
== UnauthorizedAccessFile ==
|
||
无法保存文件 '{0}'，因为您没有权限。您可以将文件保存在其他路径中。
|
||
|
||
== AutomaticConflictMarkup1 ==
|
||
当前冲突是
|
||
|
||
== AutomaticConflictMarkup2 ==
|
||
自动冲突
|
||
|
||
== AutomaticConflictMarkup3 ==
|
||
.无需用户干预。
|
||
|
||
== SolvedConflictMarkup1 ==
|
||
当前冲突是
|
||
|
||
== SolvedConflictMarkup2 ==
|
||
非自动冲突
|
||
|
||
== SolvedConflictMarkup3 ==
|
||
，并且已被
|
||
|
||
== SolvedConflictMarkup4 ==
|
||
解决
|
||
|
||
== SolvedConflictMarkup5 ==
|
||
（由用户解决）。
|
||
|
||
== NonAutomaticConflictMarkup1 ==
|
||
当前冲突是
|
||
|
||
== NonAutomaticConflictMarkup2 ==
|
||
非自动冲突
|
||
|
||
== NonAutomaticConflictMarkup3 ==
|
||
.通过单击上面的按钮、编辑结果文件或将冲突标记为已解决来解决冲突。
|
||
|
||
== MarkAsResolvedExplanation ==
|
||
使用下面的按钮选择应转到结果文件的参与者（源、基项或目标）。或者，如果建议的结果已经很好，请单击“标记为已解决”
|
||
|
||
== MarkAsUnresolvedButton ==
|
||
标记为未解决
|
||
|
||
== SourceFileName ==
|
||
源文件：{0}
|
||
|
||
== BaseFileName ==
|
||
基项文件：{0}
|
||
|
||
== DestinationFileName ==
|
||
目标文件：{0}
|
||
|
||
== RestoreButtonSrcTooltip ==
|
||
还原源面板
|
||
|
||
== RestoreButtonBaseTooltip ==
|
||
还原基项面板
|
||
|
||
== RestoreButtonDstTooltip ==
|
||
还原目标面板
|
||
|
||
== RestoreButtonResultTooltip ==
|
||
还原结果面板
|
||
|
||
== MaximizeButtonSrcTooltip ==
|
||
最大化源面板
|
||
|
||
== MaximizeButtonBaseTooltip ==
|
||
最大化基项面板
|
||
|
||
== MaximizeButtonDstTooltip ==
|
||
最大化目标面板
|
||
|
||
== MaximizeButtonResultTooltip ==
|
||
最大化结果面板
|
||
|
||
== PendingNonAutomatic ==
|
||
待解决：{0}/{1}
|
||
|
||
== PreviousConflictButtonTooltip ==
|
||
上一个冲突 (Ctrl+-)
|
||
|
||
== PreviousUnsolvedConflictButtonTooltip ==
|
||
上一个非自动冲突 (Ctrl+PageUp)
|
||
|
||
== NextUnsolvedConflictButtonTooltip ==
|
||
下一个非自动冲突 (Ctrl+PagDown)
|
||
|
||
== OptionsButton ==
|
||
选项
|
||
|
||
== BaseEncodingMenuItem ==
|
||
基项编码
|
||
|
||
== SrcEncodingMenuItem ==
|
||
源编码
|
||
|
||
== DstEncodingMenuItem ==
|
||
目标编码
|
||
|
||
== ResultEncodingMenuItem ==
|
||
结果编码
|
||
|
||
== SplitMenuItem ==
|
||
拆分冲突块
|
||
|
||
== XmergeButton ==
|
||
XMerge...
|
||
|
||
== XmergeButtonTooltip ==
|
||
启动 XMerge 向导
|
||
|
||
== XmergeMenuItem ==
|
||
XMerge...
|
||
|
||
== XmergeNoTextSelected ==
|
||
未选择文本。无法执行 Xmerge。
|
||
|
||
== XmergeNotEnoughInfo ==
|
||
没有足够的信息来执行 XMerge
|
||
|
||
== XmergeRemovedTextSelected ==
|
||
选择的行已被删除。它们不再是有效的 Xmerge 选择项。
|
||
|
||
== XmergeStartTip ==
|
||
此窗口显示已移动和已修改的代码片段。已移动的代码位于{0} ({1})。{2} ({3}) 是在移动代码之前的已修改代码。请解决剩余的手动冲突，然后单击“保存并退出”。
|
||
|
||
== UnsolvedPendingConflicts ==
|
||
该文件仍然有 {0} 个未解决的冲突。
|
||
|
||
== ChangedFile ==
|
||
自上次保存以来，该文件已更改。
|
||
|
||
== MergeWaitingAnimation ==
|
||
正在计算冲突。请稍候...
|
||
|
||
== SaveAsButton ==
|
||
另存为...
|
||
|
||
== SaveBaseContributor ==
|
||
保留基项参与者并退出
|
||
|
||
== SaveDstContributor ==
|
||
保留目标参与者并退出
|
||
|
||
== SaveSrcContributor ==
|
||
保留源参与者并退出
|
||
|
||
== ExtraInfoButton ==
|
||
有关此合并的信息
|
||
|
||
== ExtraInfoButtonTooltip ==
|
||
在面板中显示有关此合并的信息
|
||
|
||
== Left ==
|
||
左侧
|
||
|
||
== Right ==
|
||
右侧
|
||
|
||
== SourceContributor ==
|
||
源参与者
|
||
|
||
== DestinationContributor ==
|
||
目标参与者
|
||
|
||
== MovedCode ==
|
||
已移动代码段。
|
||
|
||
== ModifiedCode ==
|
||
原始位置中已修改代码段。
|
||
|
||
== OriginalCode ==
|
||
原始代码段。
|
||
|
||
== ResultFile ==
|
||
结果文件
|
||
|
||
== AnnotateOptions ==
|
||
批注选项
|
||
|
||
== Copy ==
|
||
复制
|
||
|
||
== Cut ==
|
||
剪切
|
||
|
||
== Paste ==
|
||
粘贴
|
||
|
||
== SelectAll ==
|
||
全选
|
||
|
||
== FileTooLargeToDisplay ==
|
||
文件太大，无法显示内容。
|
||
|
||
== BinMergeToolUnsupportedFileTypeForDiff ==
|
||
二进制文件差异比较不支持的文件类型。仅支持图像 |