Files
SpaceDroid/Droid 2/Library/Artifacts/3d/3dd3d6542d1fe47fc5f9d93d00645387
T

947 lines
21 KiB
Plaintext
Raw Normal View History

2025-01-17 13:04:56 +01:00

aTX
 0.0.0þÿÿÿÿÿ0v²,¾|pØäA Ê@Ã3Ë7€ÿÿÿÿ¦€²E Þ€).€2;a Þ€).€2€r Þ€) .€2
H€«€ÿÿÿÿ 1€1€ÿÿÿÿ @Þ
Q€jñ€PÿÿÿÿÀ1€1€ÿÿÿÿÞ€j€ÿÿÿÿb€ÿÿÿÿH€xÿÿÿÿ1€1€ÿÿÿÿ@ÞQ€jH€}ÿÿÿÿ1€1€ÿÿÿÿ@ÞQ€jH€†ÿÿÿÿ1€1€ÿÿÿÿ@ÞQ€jy
 Þ€)!.€2"€‹ÿÿÿÿ#@1€1€ÿÿÿÿ$Þ%.€j&H€™ÿÿÿÿ'1€1€ÿÿÿÿ(@Þ)Q€j*H€¤ÿÿÿÿ+1€1€ÿÿÿÿ,@Þ-Q€j.H€¶ÿÿÿÿ/1€1€ÿÿÿÿ0@Þ1Q€j2TextScriptImporterPPtr<EditorExtension>m_FileIDm_PathIDPPtr<PrefabInstance>m_ExternalObjectsSourceAssetIdentifiertypeassemblynamem_UsedFileIDsm_UserDatam_AssetBundleNamem_AssetBundleVariant1ÿÿeF¼_1Ch_Þ‰Ž$=O€7€ÿÿÿÿ¦€²E Þ.(a Þ.€r Þ .
H€«€ÿÿÿÿ 1€1€ÿÿÿÿ @Þ
Q€jH€ê€ÿÿÿÿ1€1€ÿÿÿÿ@ÞQ€jPPtr<EditorExtension>m_FileIDm_PathIDPPtr<PrefabInstance>H ÄJHpI ÄJmergetool.zh-Hans)I== 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 ==
文件太大,无法显示内容。