648 lines
20 KiB
Plaintext
648 lines
20 KiB
Plaintext
|
|
|||
|
|
a Oœ
|
|||
|
|
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 P ¬D ÄJ semantic.zh-HantkD == 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 - 這是剖�您的檔案所必備
|
|||
|
|
|
|||
|
|
== 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:<檔案> [-a|--automatic] [--silent] [--merge-decl] [--process-all-merges]
|
|||
|
|
[--nolangwarn] [--nostructurewarn] [--include-format-change] [--log-external-parser]
|
|||
|
|
[<contributorSymbolicNames>] [<generalOptions>]
|
|||
|
|
[<contributorExtendedInfo>]
|
|||
|
|
|
|||
|
|
檔案:{<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:包�僅修改縮排和 EOL 的變更。
|
|||
|
|
這包括在æ¯�行開é 的空白å—元和定ä½�å—元間的差異以å�Š
|
|||
|
|
EOL ä¸çš„差異。當ä¸ä¹ŸåŒ…括在宣告開é 的空白行。
|
|||
|
|
é �è¨æœƒå¿½ç•¥æ‰€æœ‰é€™äº›å·®ç•°ï¼Œä»¥ç°¡åŒ–å�ˆä½µ/差異比å°�。
|
|||
|
|
|
|||
|
|
--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 ==
|
|||
|
|
使用控制é�µæ�é…�滾輪進行放大和縮å°�
|
|||
|
|
|
|||
|
|
== ZoomInExplanation ==
|
|||
|
|
放大圖形; 您也å�¯ä»¥åœ¨ä½¿ç”¨æŽ§åˆ¶é�µæ�é…�滾軸來放大
|
|||
|
|
|
|||
|
|
== ZoomOutExplanation ==
|
|||
|
|
縮å°�圖形; 您也å�¯ä»¥åœ¨ä½¿ç”¨æŽ§åˆ¶é�µæ�é…�滾軸來縮å°�
|
|||
|
|
|
|||
|
|
== 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 ==
|
|||
|
|
檔案 {1} 之 {0}:
|
|||
|
|
|
|||
|
|
== MultifileCurrentFileExplanation ==
|
|||
|
|
這是目�的檔案。若�變更檔案，請使用���覽按鈕，還有多檔案移動。
|
|||
|
|
|
|||
|
|
== Options ==
|
|||
|
|
é�¸é …
|
|||
|
|
|