TP_Multimedia/Library/Artifacts/3d/3dd3d6542d1fe47fc5f9d93d00645387


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€j€


H€}ÿÿÿÿ
€

1€1€ÿÿÿÿ
@
Þ€€

Q€j€


H€†ÿÿÿÿ
€

1€1€ÿÿÿÿ
@
Þ€€

Q€j€


y€
€ 

Þ€)!
€
.€2"
€

€‹ÿÿÿÿ#
@

1€1€ÿÿÿÿ$

Þ€€%

.€j€&


H€™ÿÿÿÿ'
€

1€1€ÿÿÿÿ(
@
Þ€€)

Q€j€
*


H€¤ÿÿÿÿ+
€

1€1€ÿÿÿÿ,
@
Þ€€-

Q€j€
.


H€¶ÿÿÿÿ/
€

1€1€ÿÿÿÿ0
@
Þ€€1

Q€j€
2
TextScriptImporterPPtr<EditorExtension>m_FileIDm_PathIDPPtr<PrefabInstance>m_ExternalObjectsSourceAssetIdentifiertypeassemblynamem_UsedFileIDsm_UserDatam_AssetBundleNamem_AssetBundleVariant1ÿÿeF¼_1Ch_Þ‰Ž$=
O€7€ÿÿÿÿ€

¦€²
€



E€

Þ€
€
.€
€

(a€

Þ€
€
.€
€

†€r€

Þ€	
€
.€

€

H€«
€ÿÿÿÿ
€

1€1€ÿÿÿÿ
@
Þ€€


Q€j€



Hې
€ÿÿÿÿ
€

1€1€ÿÿÿÿ
@
Þ€€

Q€j€

PPtr<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 ==
文件太大，无法显示内容。