947 lines
21 KiB
Plaintext
947 lines
21 KiB
Plaintext
|
|
|||
|
|
a T¬
|
|||
|
|
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 ÄI ÄJ mergetool.zh-Hant I == MergetoolWindowTitle ==
|
|||
|
|
Unity Version Control �併工具
|
|||
|
|
|
|||
|
|
== FirstConflictButtonTooltip ==
|
|||
|
|
移至第一個�� (Ctrl + Shift + -)
|
|||
|
|
|
|||
|
|
== PrevConflictButtonTooltip ==
|
|||
|
|
上一個�� (Ctrl + -)
|
|||
|
|
|
|||
|
|
== NextConflictButtonTooltip ==
|
|||
|
|
下一個�� (Ctrl + +)
|
|||
|
|
|
|||
|
|
== LastConflictButtonTooltip ==
|
|||
|
|
移至最後一個�� (Ctrl + Shift + +)
|
|||
|
|
|
|||
|
|
== PrevNotAutomaticConflictButtonTooltip ==
|
|||
|
|
上一個�自動�� (Ctrl + PageUp)
|
|||
|
|
|
|||
|
|
== NextNotAutomaticConflictButtonTooltip ==
|
|||
|
|
下一個�自動�� (Ctrl + PageDown)
|
|||
|
|
|
|||
|
|
== PendingAutomaticConflictsLabel ==
|
|||
|
|
目���:{1} 之 {0}
|
|||
|
|
|
|||
|
|
== PendingNonAutomaticConflictsLabel ==
|
|||
|
|
æš«æ¢æœªè§£æ±º:{1} 之 {0}
|
|||
|
|
|
|||
|
|
== 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>] [[<自動>] [<無訊�>] <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 ==
|
|||
|
|
忽略 EOL
|
|||
|
|
|
|||
|
|
== IgnoreWhitespace ==
|
|||
|
|
å¿½ç•¥ç©ºæ ¼
|
|||
|
|
|
|||
|
|
== IgnoreEolWhitespace ==
|
|||
|
|
忽略 EOL å’Œç©ºæ ¼
|
|||
|
|
|
|||
|
|
== 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 ==
|
|||
|
|
忽略 EOL
|
|||
|
|
|
|||
|
|
== ComparisonMethodIgnoreWhitespacesMenuItem ==
|
|||
|
|
å¿½ç•¥ç©ºæ ¼
|
|||
|
|
|
|||
|
|
== ComparisonMethodIgnoreEolWhitespacesMenuItem ==
|
|||
|
|
忽略 EOL å’Œç©ºæ ¼
|
|||
|
|
|
|||
|
|
== 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 ==
|
|||
|
|
放大圖形 - 您也�以在按�控制�時使用滾軸
|
|||
|
|
|
|||
|
|
== ZoomOut ==
|
|||
|
|
縮�
|
|||
|
|
|
|||
|
|
== ZoomOutTooltip ==
|
|||
|
|
縮�圖形 - 您也�以在按�控制�時使用滾軸
|
|||
|
|
|
|||
|
|
== 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 ==
|
|||
|
|
æ¤é�¸é …會啟動 3 å�‘å�ˆä½µå·¥å…·ï¼Œæ¶‰å�ŠåŸºåº•ã€�來æº�å’Œç›®çš„åœ°æª”æ¡ˆã€‚æ‚¨å°‡èƒ½å¤ å°‡çµ�果儲å˜åˆ°å�¦ä¸€å€‹æª”案。
|
|||
|
|
|
|||
|
|
== 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+PageDown)
|
|||
|
|
|
|||
|
|
== 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 ==
|
|||
|
|
檔案太大而無法顯示內容。
|
|||
|
|
|