648 lines
20 KiB
Plaintext
648 lines
20 KiB
Plaintext
|
|
|||
|
|
a P
|
|||
|
|
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 TextScriptImporter PPtr<EditorExtension> m_FileID m_PathID PPtr<PrefabInstance> m_ExternalObjects SourceAssetIdentifier type assembly name m_UsedFileIDs m_UserData m_AssetBundleName m_AssetBundleVariant 1 ÿÿ e F¼_1Ch_Þ‰Ž$ = O €7 €ÿÿÿÿ € ¦ €² € E € Þ € € . € € ( a € Þ € € . € € † €r € Þ € € . €
|
|||
|
|
€ H €« €ÿÿÿÿ € 1 €1 €ÿÿÿÿ @ Þ € €
|
|||
|
|
Q €j € H €ê €ÿÿÿÿ € 1 €1 €ÿÿÿÿ @ Þ € € Q €j € PPtr<EditorExtension> m_FileID m_PathID PPtr<PrefabInstance> H ÄJ H ,E ÄJ semantic.zh-HansêD == Base ==
|
|||
|
|
基项
|
|||
|
|
|
|||
|
|
== ChangedResultFile ==
|
|||
|
|
是å�¦è¦�ä¿�å˜ç»“果文件？
|
|||
|
|
|
|||
|
|
== ChangedDestinationFile ==
|
|||
|
|
是å�¦è¦�ä¿�å˜ç›®æ ‡æ–‡ä»¶ï¼Ÿ
|
|||
|
|
|
|||
|
|
== CloseButton ==
|
|||
|
|
å…³é—
|
|||
|
|
|
|||
|
|
== ConfiguredStatus ==
|
|||
|
|
已�置�
|
|||
|
|
|
|||
|
|
== NotConfigureStatus ==
|
|||
|
|
未�置
|
|||
|
|
|
|||
|
|
== Destination ==
|
|||
|
|
ç›®æ ‡
|
|||
|
|
|
|||
|
|
== ErrorAutomaticOptionNeeded ==
|
|||
|
|
在é�™é»˜æ¨¡å¼�ä¸ï¼Œéœ€è¦�自动å�ˆå¹¶é€‰é¡¹
|
|||
|
|
|
|||
|
|
== ErrorComparisonMethod ==
|
|||
|
|
æ— æ•ˆçš„æ¯”è¾ƒæ–¹æ³•
|
|||
|
|
|
|||
|
|
== ErrorConflictCanNotBeApplied ==
|
|||
|
|
æ— æ³•åº”ç”¨å†²çª�è§£å†³æ–¹æ¡ˆï¼Œå› ä¸ºå®ƒå�–决于其他冲çª�的解决方案。请å°�试以其他顺åº�解决冲çª�。冲çª�解决方案返回了以下错误：{0}
|
|||
|
|
|
|||
|
|
== ErrorContributorsMustBeSpecified ==
|
|||
|
|
必须指定�与者
|
|||
|
|
|
|||
|
|
== ErrorEncoding ==
|
|||
|
|
æ— æ³•è¯†åˆ«æŒ‡å®šçš„ç¼–ç � ({0})。
|
|||
|
|
|
|||
|
|
== ErrorExecutingExternalDiffTool ==
|
|||
|
|
执行外部差异比较工具时�生了错误：
|
|||
|
|
|
|||
|
|
== ErrorExecutingExternalMergeTool ==
|
|||
|
|
执行外部�并工具时�生了错误：
|
|||
|
|
|
|||
|
|
== ErrorExecutingExternal2WayMergeTool ==
|
|||
|
|
执行外部���并工具时�生了错误：
|
|||
|
|
|
|||
|
|
== ErrorFileTitleType ==
|
|||
|
|
糟糕ï¼�我们目å‰�还ä¸�支æŒ�您的è¯è¨€ï¼�
|
|||
|
|
|
|||
|
|
== ErrorFileType ==
|
|||
|
|
SemanticMerge 收到了以下文件：{0}。
|
|||
|
|
文件扩展å��ä¸�能被识别为å�—支æŒ�çš„è¯è¨€ã€‚
|
|||
|
|
您�以�行默认基于文本的 {1} 工具。
|
|||
|
|
|
|||
|
|
注æ„�：如果您知é�“这些文件包å�«å�—支æŒ�çš„è¯è¨€ï¼Œè¯·æŸ¥çœ‹å¦‚何在 SemanticMerge ä¸ä½¿ç”¨ -l å�‚数。
|
|||
|
|
|
|||
|
|
== ErrorJVMNotAvailableTitle ==
|
|||
|
|
糟糕�找�到 JVM - 解�文件时需� JVM
|
|||
|
|
|
|||
|
|
== ErrorJVMNotAvailable ==
|
|||
|
|
SemanticMerge 需�有效的 JVM 安装
|
|||
|
|
�能解�您的 {0} 文件。
|
|||
|
|
|
|||
|
|
您�以改为�行默认基于文本的 {1} 工具。
|
|||
|
|
|
|||
|
|
== ErrorNumberOfContributorsDoesNotMatch ==
|
|||
|
|
�与者数��匹�
|
|||
|
|
|
|||
|
|
== ErrorTabSpaces ==
|
|||
|
|
æ— æ•ˆçš„åˆ¶è¡¨ç¬¦ç©ºæ ¼ä½�
|
|||
|
|
|
|||
|
|
== ErrorVersionControl ==
|
|||
|
|
è¦�é…�ç½®çš„ç‰ˆæœ¬æŽ§åˆ¶æ— æ•ˆ
|
|||
|
|
|
|||
|
|
== OpenDialogFilterForExecutableFile ==
|
|||
|
|
�执行文件 (*.exe)|*.exe
|
|||
|
|
|
|||
|
|
== OpenDialogTitleForConfigFile ==
|
|||
|
|
�览�置文件
|
|||
|
|
|
|||
|
|
== OpenDialogTitleForExecutableFile ==
|
|||
|
|
�览�执行文件
|
|||
|
|
|
|||
|
|
== PlasticSCMConfigurationNotification ==
|
|||
|
|
在�新打开 Unity VCS GUI 之�，更改�会生效
|
|||
|
|
|
|||
|
|
== RestartMergeWithConfigChangesMessage ==
|
|||
|
|
为了应用新ä¿�å˜çš„é…�置，应é‡�æ–°å�¯åŠ¨å�ˆå¹¶ã€‚
|
|||
|
|
|
|||
|
|
== RestartDiffWithConfigChangesMessage ==
|
|||
|
|
为了应用新ä¿�å˜çš„é…�置，应é‡�æ–°å�¯åŠ¨å·®å¼‚比较。
|
|||
|
|
|
|||
|
|
== RestartMergeQuestion ==
|
|||
|
|
您已解决的 {0} 个冲�将会丢失。是�确定��新�动�并？
|
|||
|
|
|
|||
|
|
== ResultNeeded ==
|
|||
|
|
必须指定结果文件路径
|
|||
|
|
|
|||
|
|
== Source ==
|
|||
|
|
�
|
|||
|
|
|
|||
|
|
== UnsolvedPendingConflicts ==
|
|||
|
|
该文件�然有 {0} 个未解决的冲�。
|
|||
|
|
|
|||
|
|
== UnexpectedError ==
|
|||
|
|
�生了�外错误。
|
|||
|
|
|
|||
|
|
== Usage ==
|
|||
|
|
用法：semanticmerge [<configureversioncontrol> | <mergeOptions>]
|
|||
|
|
|
|||
|
|
configureversioncontrol:{--configure-version-control}=<versioncontrolkey>
|
|||
|
|
versioncontrolkey:{plasticscm | git}
|
|||
|
|
|
|||
|
|
mergeOptions:<files> [-a|--automatic] [--silent] [--merge-decl] [--process-all-merges]
|
|||
|
|
[--nolangwarn] [--nostructurewarn] [--include-format-change] [--log-external-parser]
|
|||
|
|
[<contributorSymbolicNames>] [<generalOptions>]
|
|||
|
|
[<contributorExtendedInfo>]
|
|||
|
|
|
|||
|
|
files:{<sortedFiles> | <unsortedFiles>}
|
|||
|
|
sortedFiles:<filename1> <filename2> <filename3> <filename4> <fileparamorder>
|
|||
|
|
fileparamorder:{-fpo | --fileparamorder}=<用分�分隔的键列表>
|
|||
|
|
默认值为 --fileparamorder=s;d;b;r
|
|||
|
|
|
|||
|
|
unsortedFiles:<sourceFile> <destinationFile> <baseFile> <resultFile>
|
|||
|
|
sourceFile:{-s | --source}=<filename>
|
|||
|
|
destinationFile:{-d | --destination}=<filename>
|
|||
|
|
baseFile:{-b | --base}=<filename>
|
|||
|
|
resultFile:{-r | --result}=<filename>
|
|||
|
|
|
|||
|
|
-a | --automatic:除é�žå�‘现冲çª�，å�¦åˆ™è‡ªåŠ¨å�ˆå¹¶ï¼Œæ— 需用户交互。
|
|||
|
|
|
|||
|
|
--silent:æ¤é€‰é¡¹å¿…须与 --automatic 选项结å�ˆä½¿ç”¨ã€‚
|
|||
|
|
å½“æ— æ³•è‡ªåŠ¨è§£å†³å�ˆå¹¶æ—¶ï¼Œæ¤é€‰é¡¹å°†ä½¿è¯¥å·¥å…·ç«‹å�³è¿”回
|
|||
|
|
一个é�žé›¶é€€å‡ºä»£ç �（ä¸�显示任何 semanticmerge 工具）。
|
|||
|
|
如果该工具能够自动解决å�ˆå¹¶ï¼Œåˆ™ç¨‹åº�将返回退出代ç � 0。
|
|||
|
|
|
|||
|
|
--merge-decl:自动�并尽�能多的声明*。
|
|||
|
|
|
|||
|
|
--process-all-merges：自动�并尽�能多的声明* 并
|
|||
|
|
为�个�自动�并声明�行基于文本的外部工具。
|
|||
|
|
|
|||
|
|
*声明是定义以下任何å�—支æŒ�è¯æ³•å…ƒç´ çš„è¯å�¥ï¼šç±»ã€�方法ã€�属性ç‰ã€‚
|
|||
|
|
æ ¹æ�®å…ƒç´ 类型（例如类ã€�方法），它们包å�«å®žçŽ°å…ƒç´ 的主体。
|
|||
|
|
|
|||
|
|
--nolangwarn:ä¸�支æŒ�该è¯è¨€æ—¶ï¼Œç›´æŽ¥è¿�行基于文本的外部工具。
|
|||
|
|
|
|||
|
|
--nostructurewarn:如果�现结构错误，直接�行基于文本的外部工具。
|
|||
|
|
|
|||
|
|
--include-format-change：包�仅修改了缩进和行尾的更改。
|
|||
|
|
è¿™åŒ…æ‹¬è¡Œé¦–ç©ºæ ¼å’Œåˆ¶è¡¨ç¬¦çš„å·®å¼‚ä»¥å�Š
|
|||
|
|
行尾的差异。还包括�于声明开头的空行。
|
|||
|
|
默认情况下，为简化�并/差异比较，所有这些差异都将被忽略。
|
|||
|
|
|
|||
|
|
--log-external-parser：�用文件内容的日志记录以便调试外部解�器。
|
|||
|
|
|
|||
|
|
contributorSymbolicNames:<srcSymbolicName> <dstSymbolicName> <baseSymbolicName>
|
|||
|
|
srcSymbolicName:{-sn | --srcsymbolicname}=<symbolicname>
|
|||
|
|
dstSymbolicName:{-dn | --dstsymbolicname}=<symbolicname>
|
|||
|
|
baseSymbolicName:{-bn | --basesymbolicname}=<symbolicname>
|
|||
|
|
|
|||
|
|
generalOptions:[<defaultEncoding>] [<resultEncoding>] [<fileLanguage>] [<virtualMachine>]
|
|||
|
|
[<externalMergeTool>] [<external2WayMerge>] [<externalDiffTool>]
|
|||
|
|
[<tabSpaces>] [<extrainfofile>] [<progress>]
|
|||
|
|
defaultEncoding:{-e | --defaultencoding}=<encoding>
|
|||
|
|
resultEncoding:{-re | --resultencoding}=<encoding>
|
|||
|
|
encoding:{ascii | ansi | unicode | bigendian | utf7 | utf8 | utf8bom | utf32be | utf32le}
|
|||
|
|
fileLanguage:{-l | --fileslanguage}={csharp | vb | java | cplusplus | php}
|
|||
|
|
virtualMachine:{-vm | --virtualmachine}=<Java 虚拟机�执行文件的路径>
|
|||
|
|
externalParser:{-ep | --externalparser}=<执行外部解�器的命令>
|
|||
|
|
externalMergeTool:{-emt | --externalmergetool}={default | <用户定义的工具>}
|
|||
|
|
external2WayMerge:{-e2mt | --external2waymergetool}={ <用户定义的工具>}
|
|||
|
|
externalDiffTool:{-edt | --externalDiffTool}={default | <用户定义的工具>}
|
|||
|
|
tabSpaces:{-ts | --tabspaces}={4 | <由用户定义>}
|
|||
|
|
extrainfofile:{-ei | --extrainfofile}={包��外�并信�的文件的路径}
|
|||
|
|
progress:{-pg | --progress}={表示整个å�ˆå¹¶è¿‡ç¨‹è¿›åº¦çš„å—符串}
|
|||
|
|
|
|||
|
|
contributorExtendedInfo:<contributorOwnerName> <contributorBranchName>
|
|||
|
|
<contributorChangeset> <contributorComment>
|
|||
|
|
|
|||
|
|
contributorOwnerName:<srcOwnerName> <dstOwnerName> <baseOwnerName>
|
|||
|
|
srcOwnerName:{-so | --srcowner}=<ownername>
|
|||
|
|
dstOwnerName:{-do | --dstowner}=<ownername>
|
|||
|
|
baseOwnerName:{-bo | --baseowner}=<ownername>
|
|||
|
|
|
|||
|
|
contributorBranchName:<srcBranchName>; <dstBranchName> <baseBranchName>
|
|||
|
|
srcBranchName:{-sb | --srcbranch}=<name>
|
|||
|
|
dstBranchName:{-db | --dstbranch}=<branchname>
|
|||
|
|
baseBranchName:{-bb | --basebranch}=<branchname>
|
|||
|
|
|
|||
|
|
contributorChangeset:<srcChangeset> <dstChangeset> <baseChangeset>
|
|||
|
|
srcChangeset:{-sc | --srccset}=<changeset>
|
|||
|
|
dstChangeset:{-dc | --dstcset}=<changeset>
|
|||
|
|
baseChangeset:{-bc | --basecset}=<changeset>
|
|||
|
|
|
|||
|
|
contributorComment:<srcComment> <dstComment> <baseComment>
|
|||
|
|
srcComment:{-sm | --srccomment}=<changeset>
|
|||
|
|
dstComment:{-dm | --dstcomment}=<changeset>
|
|||
|
|
baseComment:{-bm | --basecomment}=<changeset>
|
|||
|
|
|
|||
|
|
|
|||
|
|
示例：
|
|||
|
|
|
|||
|
|
semanticmergetool -b=base.cs -d=dst.cs -s=src.cs -r=result.cs
|
|||
|
|
|
|||
|
|
semanticmergetool base.cs dst.cs src.cs result.cs --fileparamorder=b;d;s;r
|
|||
|
|
|
|||
|
|
semanticmergetool -b=base.cs -d=dst.cs -s=src.cs -r=result.cs
|
|||
|
|
-e2mt=""kdiff3.exe #sourcefile #destinationfile -o #output""
|
|||
|
|
|
|||
|
|
semanticmergetool -b=base.cs -d=dst.cs -s=src.cs -r=result.cs
|
|||
|
|
-emt=""kdiff3.exe #basefile #sourcefile #destinationfile -o #output""
|
|||
|
|
|
|||
|
|
== UsageCaption ==
|
|||
|
|
SemanticMerge 工具用法
|
|||
|
|
|
|||
|
|
== WarningNoExternalDiffTool ==
|
|||
|
|
未指定外部差异比较工具æ�¥ç»§ç»å¤„ç�†å·®å¼‚比较。
|
|||
|
|
|
|||
|
|
== WarningNoExternal2MergeTool ==
|
|||
|
|
未指定外部���并工具��并所选冲�的内容。
|
|||
|
|
|
|||
|
|
== WarningNoExternalMergeTool ==
|
|||
|
|
未指定外部å�ˆå¹¶å·¥å…·æ�¥ç»§ç»å¤„ç�†å�ˆå¹¶ã€‚
|
|||
|
|
|
|||
|
|
== WarningExternalToolNotFound ==
|
|||
|
|
找�到工具，请引入一个有效的工具
|
|||
|
|
|
|||
|
|
== WarningSemanticToolNotFound ==
|
|||
|
|
找�到 SemanticMerge 工具，请引入一个有效的工具
|
|||
|
|
|
|||
|
|
== WarningConfigFileNotFound ==
|
|||
|
|
找�到�置文件，请引入一个有效的�置文件
|
|||
|
|
|
|||
|
|
== WarningInvalidJavaVirtualMachinePath ==
|
|||
|
|
找�到 Java 虚拟机路径
|
|||
|
|
|
|||
|
|
== WarningInvalidTabSize ==
|
|||
|
|
æ— æ•ˆçš„åˆ¶è¡¨ç¬¦å¤§å°�
|
|||
|
|
|
|||
|
|
== RenameWindowTitle ==
|
|||
|
|
�命��
|
|||
|
|
|
|||
|
|
== RenameWindowLabel ==
|
|||
|
|
{0} 的新�称：
|
|||
|
|
|
|||
|
|
== RenameButton ==
|
|||
|
|
�命�
|
|||
|
|
|
|||
|
|
== CancelButton ==
|
|||
|
|
�消
|
|||
|
|
|
|||
|
|
== PendingConflictsToSolve ==
|
|||
|
|
{0}/{1} - 待解决冲�：{2}
|
|||
|
|
|
|||
|
|
== NextConflictButtonTooltip ==
|
|||
|
|
下一个冲� (Ctrl+PagDown)
|
|||
|
|
|
|||
|
|
== PreviousConflictButtonTooltip ==
|
|||
|
|
上一个冲� (Ctrl+PageUp)
|
|||
|
|
|
|||
|
|
== SaveAndExitExplanation ==
|
|||
|
|
ä¿�å˜ç»“果文件并退出工具
|
|||
|
|
|
|||
|
|
== SaveAndExitButton ==
|
|||
|
|
ä¿�å˜å¹¶é€€å‡º(_X)
|
|||
|
|
|
|||
|
|
== MergeWaitingAnimation ==
|
|||
|
|
æ£åœ¨è®¡ç®—冲çª�。请ç¨�候...
|
|||
|
|
|
|||
|
|
== SyncDeclarationMenuItem ==
|
|||
|
|
å�Œæ¥å£°æ˜Ž
|
|||
|
|
|
|||
|
|
== OptionsButton ==
|
|||
|
|
选项
|
|||
|
|
|
|||
|
|
== FindMenuItem ==
|
|||
|
|
查找...
|
|||
|
|
|
|||
|
|
== OptionsMenuItem ==
|
|||
|
|
选项
|
|||
|
|
|
|||
|
|
== ConfigureFontsAndColorsMenuItem ==
|
|||
|
|
é…�ç½®å—体和颜色...
|
|||
|
|
|
|||
|
|
== DisplayInfoAboutThisMerge ==
|
|||
|
|
显示有关æ¤å�ˆå¹¶çš„ä¿¡æ�¯
|
|||
|
|
|
|||
|
|
== LeftEncodingMenuItem ==
|
|||
|
|
左侧编ç �
|
|||
|
|
|
|||
|
|
== RightEncodingMenuItem ==
|
|||
|
|
å�³ä¾§ç¼–ç �
|
|||
|
|
|
|||
|
|
== SkipFormatChangesMenuItem ==
|
|||
|
|
è·³è¿‡æ ¼å¼�更改
|
|||
|
|
|
|||
|
|
== ReformatSourceCode ==
|
|||
|
|
é‡�æ–°æ ¼å¼�化æº�代ç �
|
|||
|
|
|
|||
|
|
== ConfigurationMenuItem ==
|
|||
|
|
�置...
|
|||
|
|
|
|||
|
|
== GetLicense ==
|
|||
|
|
获�许��
|
|||
|
|
|
|||
|
|
== ShowUserGuideMenuItem ==
|
|||
|
|
用户指�
|
|||
|
|
|
|||
|
|
== UserGuideURL ==
|
|||
|
|
https://semanticmerge.com/documentation
|
|||
|
|
|
|||
|
|
== ShowIntroGuideMenuItem ==
|
|||
|
|
显示介�指�
|
|||
|
|
|
|||
|
|
== OpenSamplesDirectoryMenuItem ==
|
|||
|
|
打开示例
|
|||
|
|
|
|||
|
|
== FollowSemanticmergeMenuItem ==
|
|||
|
|
关注 @semanticmerge
|
|||
|
|
|
|||
|
|
== AboutSemanticmergeMenuItem ==
|
|||
|
|
关于和许��
|
|||
|
|
|
|||
|
|
== VisualDiffWindowTitle ==
|
|||
|
|
�视化差异比较
|
|||
|
|
|
|||
|
|
== VisualDiffExplanation ==
|
|||
|
|
显示一个解释差异的图形
|
|||
|
|
|
|||
|
|
== VisualDiffOptionExplanation ==
|
|||
|
|
选择两个声明并�击差异比较以查看差异
|
|||
|
|
|
|||
|
|
== VisualDiffControlExplanation ==
|
|||
|
|
使用 Control 键和滚轮进行放大和缩�
|
|||
|
|
|
|||
|
|
== ZoomInExplanation ==
|
|||
|
|
放大图形；也�以使用 Control 键和滚轮进行放大
|
|||
|
|
|
|||
|
|
== ZoomOutExplanation ==
|
|||
|
|
缩�图形；也�以使用 Control 键和滚轮进行缩�
|
|||
|
|
|
|||
|
|
== VisualMergeWindowTitle ==
|
|||
|
|
�视化�并
|
|||
|
|
|
|||
|
|
== VisualMerge ==
|
|||
|
|
�视化�并(_V)
|
|||
|
|
|
|||
|
|
== VisualMergeExplanation ==
|
|||
|
|
显示一个解释�并的图形
|
|||
|
|
|
|||
|
|
== RunTextMerge ==
|
|||
|
|
�行文本�并(_T)
|
|||
|
|
|
|||
|
|
== RunTextMergeExplanation ==
|
|||
|
|
è¿�è¡ŒåŸºäºŽæ–‡æœ¬çš„ä¼ ç»Ÿå�ˆå¹¶å·¥å…·
|
|||
|
|
|
|||
|
|
== RestartMerge ==
|
|||
|
|
�新�动�并(_E)
|
|||
|
|
|
|||
|
|
== RestartMergeExplanation ==
|
|||
|
|
放弃所有更改并�新�动�并�作
|
|||
|
|
|
|||
|
|
== ProcessAllMerges ==
|
|||
|
|
处�所有�并
|
|||
|
|
|
|||
|
|
== ProcessAllMergesExplanation ==
|
|||
|
|
自动�并尽�能多的声明，并为�个�自动�并声明�行基于文本的外部工具
|
|||
|
|
|
|||
|
|
== VisualDiffButton ==
|
|||
|
|
�视化差异比较(_V)
|
|||
|
|
|
|||
|
|
== RestartDiffButton ==
|
|||
|
|
�新�动差异比较(_R)
|
|||
|
|
|
|||
|
|
== RestartDiffExplanation ==
|
|||
|
|
�新�动差异比较�作
|
|||
|
|
|
|||
|
|
== RunTextDiffButton ==
|
|||
|
|
�行文本差异比较(_T)
|
|||
|
|
|
|||
|
|
== RunTextDiffExplanation ==
|
|||
|
|
è¿�è¡ŒåŸºäºŽæ–‡æœ¬çš„ä¼ ç»Ÿå·®å¼‚æ¯”è¾ƒå·¥å…·
|
|||
|
|
|
|||
|
|
== OutlinePanelVisualDiffButton ==
|
|||
|
|
�视化差异比较(_V)
|
|||
|
|
|
|||
|
|
== OutlinePanelRunTextDiffButton ==
|
|||
|
|
�行文本差异比较(_T)
|
|||
|
|
|
|||
|
|
== DivergentMoveDetails ==
|
|||
|
|
分æ§ç§»åŠ¨è¯¦ç»†ä¿¡æ�¯
|
|||
|
|
|
|||
|
|
== ShowMergeInfoExplanation ==
|
|||
|
|
显示�并信�
|
|||
|
|
|
|||
|
|
== MergeInfoResultFile ==
|
|||
|
|
结果文件：
|
|||
|
|
|
|||
|
|
== MergeInfoLanguage ==
|
|||
|
|
è¯è¨€ï¼š
|
|||
|
|
|
|||
|
|
== MergeInfoBaseFile ==
|
|||
|
|
基项文件
|
|||
|
|
|
|||
|
|
== MergeInfoSourceFile ==
|
|||
|
|
�文件
|
|||
|
|
|
|||
|
|
== MergeInfoDestinationFile ==
|
|||
|
|
ç›®æ ‡æ–‡ä»¶
|
|||
|
|
|
|||
|
|
== MergeInfoFileName ==
|
|||
|
|
�称：
|
|||
|
|
|
|||
|
|
== MergeInfoFilePath ==
|
|||
|
|
路径：
|
|||
|
|
|
|||
|
|
== MergeInfoExtraInfo ==
|
|||
|
|
�外信�
|
|||
|
|
|
|||
|
|
== SemanticOutline ==
|
|||
|
|
è¯ä¹‰å¤§çº²
|
|||
|
|
|
|||
|
|
== ExpandSemanticOutlineTooltip ==
|
|||
|
|
展开è¯ä¹‰å¤§çº²
|
|||
|
|
|
|||
|
|
== CollapseSemanticOutlineTooltip ==
|
|||
|
|
折å� è¯ä¹‰å¤§çº²
|
|||
|
|
|
|||
|
|
== PendingConflicts ==
|
|||
|
|
待解决冲� ({0})
|
|||
|
|
|
|||
|
|
== PendingConflictsExplanation ==
|
|||
|
|
显示需è¦�手动解决的冲çª�：在“他人的更改â€�和“您的更改â€�ä¸ä¿®æ”¹äº†ç›¸å�Œå…ƒç´ æ—¶å�‘生
|
|||
|
|
|
|||
|
|
== DiffExplanation ==
|
|||
|
|
显示æ¤å…ƒç´ 的差异
|
|||
|
|
|
|||
|
|
== SourceDifferences ==
|
|||
|
|
� - 他人的更改 ({0})
|
|||
|
|
|
|||
|
|
== SourceDifferencesExplanation ==
|
|||
|
|
您è¦�å�ˆå¹¶çš„æº�代ç �ä¸æ‰€å�šçš„更改（他人的更改）。显示基项å�‚与者和æº�å�‚与者之间的差异
|
|||
|
|
|
|||
|
|
== DestinationDifferences ==
|
|||
|
|
ç›®æ ‡ - 您的更改 ({0})
|
|||
|
|
|
|||
|
|
== DestinationDifferencesExplanation ==
|
|||
|
|
您的工作副本上的更改（您的更改）。显示基项å�‚ä¸Žè€…å’Œç›®æ ‡å�‚与者之间的差异
|
|||
|
|
|
|||
|
|
== NoConflictMessageText ==
|
|||
|
|
没有�检查的冲�。
|
|||
|
|
|
|||
|
|
== NoConflictMessageDetail ==
|
|||
|
|
è¿™æ„�味ç�€è¯¥å·¥å…·æ— 需用户干预å�³å�¯è§£å†³å�ˆå¹¶é—®é¢˜ã€‚
|
|||
|
|
|
|||
|
|
您看到æ¤æ¶ˆæ�¯çš„åŽŸå› å�¯èƒ½æ˜¯æ‚¨ä»�然希望查看å�ˆå¹¶ã€‚
|
|||
|
|
|
|||
|
|
但是，如果您更希望尽å�¯èƒ½è‡ªåŠ¨è§£å†³å†²çª�，请将“-aâ€�å�‚æ•°æ·»åŠ åˆ° semanticmerge 命令行。
|
|||
|
|
|
|||
|
|
== MaximizeButtonLeftTooltip ==
|
|||
|
|
最大化左侧��
|
|||
|
|
|
|||
|
|
== RestoreButtonLeftTooltip ==
|
|||
|
|
还原左侧��
|
|||
|
|
|
|||
|
|
== MaximizeButtonSrcTooltip ==
|
|||
|
|
最大化���
|
|||
|
|
|
|||
|
|
== RestoreButtonSrcTooltip ==
|
|||
|
|
还原���
|
|||
|
|
|
|||
|
|
== MaximizeButtonDstTooltip ==
|
|||
|
|
æœ€å¤§åŒ–ç›®æ ‡é�¢æ�¿
|
|||
|
|
|
|||
|
|
== RestoreButtonDstTooltip ==
|
|||
|
|
è¿˜åŽŸç›®æ ‡é�¢æ�¿
|
|||
|
|
|
|||
|
|
== MaximizeButtonBaseTooltip ==
|
|||
|
|
最大化基项��
|
|||
|
|
|
|||
|
|
== RestoreButtonBaseTooltip ==
|
|||
|
|
还原基项��
|
|||
|
|
|
|||
|
|
== MaximizeButtonResultTooltip ==
|
|||
|
|
最大化结果��
|
|||
|
|
|
|||
|
|
== RestoreButtonResultTooltip ==
|
|||
|
|
还原结果��
|
|||
|
|
|
|||
|
|
== CopyToClipboard ==
|
|||
|
|
�制到剪贴�
|
|||
|
|
|
|||
|
|
== BackButtonTooltip ==
|
|||
|
|
返回
|
|||
|
|
|
|||
|
|
== FindMatchesButton ==
|
|||
|
|
查找匹�项(_M)
|
|||
|
|
|
|||
|
|
== DiffMatchButton ==
|
|||
|
|
差异比较(_D)
|
|||
|
|
|
|||
|
|
== MatchButton ==
|
|||
|
|
匹�(_M)
|
|||
|
|
|
|||
|
|
== UnMatchButton ==
|
|||
|
|
�消匹�(_U)
|
|||
|
|
|
|||
|
|
== SelectElementToMatch ==
|
|||
|
|
选择一个è¦�匹é…�çš„å…ƒç´
|
|||
|
|
|
|||
|
|
== EditResultExplanation ==
|
|||
|
|
在解决所有冲çª�之å‰�ï¼Œæ‚¨æ— æ³•ç¼–è¾‘ç»“æžœæ–‡ä»¶ã€‚è¿˜æœ‰ {0} 个冲çª�。
|
|||
|
|
|
|||
|
|
== KeepSourceExplanation ==
|
|||
|
|
�留�更改
|
|||
|
|
|
|||
|
|
== KeepDestinationExplanation ==
|
|||
|
|
ä¿�ç•™ç›®æ ‡æ›´æ”¹
|
|||
|
|
|
|||
|
|
== KeepBothExplanation ==
|
|||
|
|
�留两�更改
|
|||
|
|
|
|||
|
|
== RenameExplanation ==
|
|||
|
|
é‡�命å��ç›®æ ‡
|
|||
|
|
|
|||
|
|
== MergeExplanation ==
|
|||
|
|
è¿�行外部文本å�ˆå¹¶å·¥å…·æ�¥è§£å†³æ¤å†²çª�
|
|||
|
|
|
|||
|
|
== TwoWayMergeExplanation ==
|
|||
|
|
å�¯åŠ¨å¤–部å�Œå�‘ Mergetool æ�¥è§£å†³æ¤å†²çª�
|
|||
|
|
|
|||
|
|
== DisplayConfigurationWindowExplanation ==
|
|||
|
|
显示�置窗�
|
|||
|
|
|
|||
|
|
== DisplayAboutWindowExplanation ==
|
|||
|
|
显示关于窗�
|
|||
|
|
|
|||
|
|
== HideUnchangedSelectionExplanation ==
|
|||
|
|
仅显示已更改的声明
|
|||
|
|
|
|||
|
|
== ShowUnchangedSelectionExplanation ==
|
|||
|
|
æ˜¾ç¤ºå®Œæ•´æ–‡ä»¶æ ‘ï¼Œä»¥ä¾¿èƒ½å¤Ÿæ£€æŸ¥æ¯�个声明
|
|||
|
|
|
|||
|
|
== GroupUnchangedSelectionExplanation ==
|
|||
|
|
显示已更改的声明，并将其余声明分组为一个未更改项
|
|||
|
|
|
|||
|
|
== ExplainMoveMoveExplanation ==
|
|||
|
|
è¯´æ˜Žå¦‚ä½•å°†å…ƒç´ ç§»åŠ¨åˆ°æº�å�‚ä¸Žè€…å’Œç›®æ ‡å�‚与者上的ä¸�å�Œä½�ç½®
|
|||
|
|
|
|||
|
|
== SourceFileExplanation ==
|
|||
|
|
��与者文件
|
|||
|
|
|
|||
|
|
== BaseFileExplanation ==
|
|||
|
|
基项文件，å�³å�ˆå¹¶æœŸé—´ä½¿ç”¨çš„æº�æ–‡ä»¶å’Œç›®æ ‡æ–‡ä»¶çš„ä¸Šçº§
|
|||
|
|
|
|||
|
|
== DestinationFileExplanation ==
|
|||
|
|
ç›®æ ‡å�‚与者文件
|
|||
|
|
|
|||
|
|
== FindMatchesExplanation ==
|
|||
|
|
打开匹é…�窗å�£ä»¥è¿›è¡Œæ·»åŠ é¡¹å’Œåˆ é™¤é¡¹çš„åŒ¹é…�
|
|||
|
|
|
|||
|
|
== UnmatchExplanation ==
|
|||
|
|
å�–消匹é…� - 如果基项å�‚与者和该å�‚与者之间的方法匹é…�有误，则å�¯ä»¥å�–消匹é…�，将它们转æ�¢ä¸ºå·²æ·»åŠ 项/å·²åˆ é™¤é¡¹ï¼Œç„¶å�Žæ‰‹åŠ¨æ›´æ£åŒ¹é…�
|
|||
|
|
|
|||
|
|
== MatchExplanation ==
|
|||
|
|
对所选项应用匹�
|
|||
|
|
|
|||
|
|
== InvalidEmail ==
|
|||
|
|
æ— æ•ˆçš„ç”µå�邮件地å�€
|
|||
|
|
|
|||
|
|
== InvalidReport ==
|
|||
|
|
æ— æ•ˆçš„æŠ¥å‘Š
|
|||
|
|
|
|||
|
|
== EnterValidEmailAndReport ==
|
|||
|
|
请输入您的电å�邮件地å�€ã€�主题和æ„�è§�。
|
|||
|
|
|
|||
|
|
== EnterValidEmailAddress ==
|
|||
|
|
请输入有效的电å�邮件地å�€ã€‚
|
|||
|
|
|
|||
|
|
== ErrorReadingSampleTitle ==
|
|||
|
|
读�示例时出错
|
|||
|
|
|
|||
|
|
== ErrorReadingSampleDescription ==
|
|||
|
|
æ— æ³•ä»Žæ–‡ä»¶ {0} 解æž�示例：{1}
|
|||
|
|
|
|||
|
|
== SamplesWindowExplanation ==
|
|||
|
|
对于æ¯�个示例案例，我们建议您è¿�è¡Œä¼ ç»Ÿçš„å�ˆå¹¶å·¥å…·å¹¶å°†å…¶ä¸Ž SemanticMerge 进行比较
|
|||
|
|
|
|||
|
|
== ShowIntroGuideButton ==
|
|||
|
|
显示介�指�(_G)
|
|||
|
|
|
|||
|
|
== RunTextMergetoolButton ==
|
|||
|
|
文本
|
|||
|
|
|
|||
|
|
== RunSemanticMergetoolButton ==
|
|||
|
|
è¯ä¹‰
|
|||
|
|
|
|||
|
|
== WelcomeSemantic20 ==
|
|||
|
|
欢迎使用 SemanticMerge 2.0
|
|||
|
|
|
|||
|
|
== WelcomeExplanation1 ==
|
|||
|
|
è¯ä¹‰æ˜¯å�¦ä¸€ç§�å�ˆå¹¶å·¥å…·ã€‚æ¤å·¥å…·åœ¨è®¡ç®—å�ˆå¹¶ä¹‹å‰�解æž�代ç �，从而å�¯ä»¥æ£€æµ‹å¹¶è‡ªåŠ¨è§£å†³å¤§å¤šæ•°å†²çª�。
|
|||
|
|
|
|||
|
|
== WelcomeExplanation2 ==
|
|||
|
|
æ¤å·¥å…·ä¸Žæ‚¨åˆ°ç›®å‰�为æ¢ä½¿ç”¨çš„大多数å�ˆå¹¶å·¥å…·éƒ½ä¸�å�Œï¼Œå› æ¤å€¼å¾—èŠ±å‡ åˆ†é’Ÿçš„æ—¶é—´æµ�览示例案例，以便帮助您æˆ�为真æ£çš„å�ˆå¹¶ä¸“家并充分利用æ¤å·¥å…·ã€‚
|
|||
|
|
|
|||
|
|
== ExploreTheSamplesButton ==
|
|||
|
|
探索示例(_E)
|
|||
|
|
|
|||
|
|
== ReadTheIntroGuideLinkText1 ==
|
|||
|
|
è¦�进一æ¥äº†è§£ SemanticMerge 基础知识
|
|||
|
|
|
|||
|
|
== ReadTheIntroGuideLinkText2 ==
|
|||
|
|
阅读介�指�
|
|||
|
|
|
|||
|
|
== ReadTheIntroGuideLinkText3 ==
|
|||
|
|
（3 分钟阅读）。
|
|||
|
|
|
|||
|
|
== DontShowThisDialogOnStartup ==
|
|||
|
|
在å�¯åŠ¨æ—¶ä¸�显示æ¤å¯¹è¯�框(_S)
|
|||
|
|
|
|||
|
|
== RunTheToolButton ==
|
|||
|
|
è¿�è¡Œæ¤å·¥å…·(_T)
|
|||
|
|
|
|||
|
|
== ParsingErrorsLabel ==
|
|||
|
|
处�这些文件时�现一些问题。
|
|||
|
|
|
|||
|
|
== ShowParsingErrorsButton ==
|
|||
|
|
显示解�错误
|
|||
|
|
|
|||
|
|
== ReleaseNotesBaseUrl ==
|
|||
|
|
https://www.plasticscm.com/download/releasenotes
|
|||
|
|
|
|||
|
|
== MultifileCurrentFile ==
|
|||
|
|
文件 {0} / {1}：
|
|||
|
|
|
|||
|
|
== MultifileCurrentFileExplanation ==
|
|||
|
|
这是当�文件。�更改文件，请使用冲�导航按钮以�多文件移动功能。
|
|||
|
|
|
|||
|
|
== Options ==
|
|||
|
|
选项
|
|||
|
|
|