暫無描述
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

semantic.en.txt 18KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646
  1. == Base ==
  2. Base:
  3. == ChangedResultFile ==
  4. Do you want to save the result file?
  5. == ChangedDestinationFile ==
  6. Do you want to save the destination file?
  7. == CloseButton ==
  8. Close
  9. == ConfiguredStatus ==
  10. configured!
  11. == NotConfigureStatus ==
  12. not configured
  13. == Destination ==
  14. Destination:
  15. == ErrorAutomaticOptionNeeded ==
  16. In silent mode the automatic merge option is needed
  17. == ErrorComparisonMethod ==
  18. Invalid comparison method
  19. == ErrorConflictCanNotBeApplied ==
  20. The conflict resolution cannot be applied because it depends on other conflict's resolution. Please try to resolve conflicts in a different order. The conflict resolution returned the following error: {0}
  21. == ErrorContributorsMustBeSpecified ==
  22. The contributors must be specified
  23. == ErrorEncoding ==
  24. Specified encoding cannot be identified ({0}).
  25. == ErrorExecutingExternalDiffTool ==
  26. An error occurred when executing external diff tool:
  27. == ErrorExecutingExternalMergeTool ==
  28. An error occurred when executing external merge tool:
  29. == ErrorExecutingExternal2WayMergeTool ==
  30. An error occurred when executing external 2-way merge tool:
  31. == ErrorFileTitleType ==
  32. Oops! We do not support your language... yet!
  33. == ErrorFileType ==
  34. SemanticMerge received the following files: {0}.
  35. The file extensions are not recognized as supported languages.
  36. You can run your default text-based {1} tool.
  37. Note: in case you know these files contain a supported language check how to use the -l param in SemanticMerge.
  38. == ErrorJVMNotAvailableTitle ==
  39. Oops! JVM not found - required to parse your files
  40. == ErrorJVMNotAvailable ==
  41. SemanticMerge requires a valid JVM installation available
  42. in order to parse your {0} files.
  43. You can run your default text-based {1} tool instead.
  44. == ErrorNumberOfContributorsDoesNotMatch ==
  45. The number of contributors does not match
  46. == ErrorTabSpaces ==
  47. Invalid tab spaces
  48. == ErrorVersionControl ==
  49. Invalid version control to configure
  50. == OpenDialogFilterForExecutableFile ==
  51. Executable Files (*.exe)|*.exe
  52. == OpenDialogTitleForConfigFile ==
  53. Browse for config file
  54. == OpenDialogTitleForExecutableFile ==
  55. Browse for executable file
  56. == PlasticSCMConfigurationNotification ==
  57. Changes won't take effect until you reopen the Plastic SCM GUI
  58. == RestartMergeWithConfigChangesMessage ==
  59. In order to apply the new saved configuration, the merge should be restarted.
  60. == RestartDiffWithConfigChangesMessage ==
  61. In order to apply the new saved configuration, the diff should be restarted.
  62. == RestartMergeQuestion ==
  63. You have already resolved {0} conflict(s) that will be lost. Are you sure you want to restart the merge?
  64. == ResultNeeded ==
  65. A result file path must be specified
  66. == Source ==
  67. Source:
  68. == UnsolvedPendingConflicts ==
  69. The file still has {0} unsolved conflicts.
  70. == UnexpectedError ==
  71. An unexpected error has occurred.
  72. == Usage ==
  73. Usage: semanticmerge [<configureversioncontrol> | <mergeOptions>]
  74. configureversioncontrol: {--configure-version-control}=<versioncontrolkey>
  75. versioncontrolkey: {plasticscm | git}
  76. mergeOptions: <files> [-a|--automatic] [--silent] [--merge-decl] [--process-all-merges]
  77. [--nolangwarn] [--nostructurewarn] [--include-format-change] [--log-external-parser]
  78. [<contributorSymbolicNames>] [<generalOptions>]
  79. [<contributorExtendedInfo>]
  80. files: {<sortedFiles> | <unsortedFiles>}
  81. sortedFiles: <filename1> <filename2> <filename3> <filename4> <fileparamorder>
  82. fileparamorder: {-fpo | --fileparamorder}=<list of keys separated by a semicolon>
  83. The default value is --fileparamorder=s;d;b;r
  84. unsortedFiles: <sourceFile> <destinationFile> <baseFile> <resultFile>
  85. sourceFile: {-s | --source}=<filename>
  86. destinationFile: {-d | --destination}=<filename>
  87. baseFile: {-b | --base}=<filename>
  88. resultFile: {-r | --result}=<filename>
  89. -a | --automatic: Automatically merge without user interaction unless conflicts are found.
  90. --silent: This option must be used combined with the --automatic option.
  91. When a merge can't be solved automatically, this option causes the tool to return immediately
  92. with a non-zero exit code (no semanticmerge tool is shown).
  93. If the tool was able to solve the merge automatically, the program returns exit code 0.
  94. --merge-decl: Merge automatically as many declarations* as possible.
  95. --process-all-merges: Merge automatically as many declarations* as possible and
  96. run the external text based tool for each non-automatic merge declaration.
  97. *A declaration is the statement that defines any of the supported syntax elements: classes, methods, attributes, etc.
  98. Depending on the element type (e.g. classes, methods), they include a body where the element is implemented.
  99. --nolangwarn: Run the external text based tool directly when the language is not supported.
  100. --nostructurewarn: Run the external text-based tool directly if structure errors are found.
  101. --include-format-change: Include changes where only indentation and EOLs have been modified.
  102. This includes differences in white spaces and tabs at the beginning of lines and
  103. differences in EOLs. It also includes white lines at the beginning of declarations.
  104. By default all these differences are ignored to simplify the merge/diff.
  105. --log-external-parser: Enable logging the file contents to debug external parsers.
  106. contributorSymbolicNames: <srcSymbolicName> <dstSymbolicName> <baseSymbolicName>
  107. srcSymbolicName: {-sn | --srcsymbolicname}=<symbolicname>
  108. dstSymbolicName: {-dn | --dstsymbolicname}=<symbolicname>
  109. baseSymbolicName: {-bn | --basesymbolicname}=<symbolicname>
  110. generalOptions: [<defaultEncoding>] [<resultEncoding>] [<fileLanguage>] [<virtualMachine>]
  111. [<externalMergeTool>] [<external2WayMerge>] [<externalDiffTool>]
  112. [<tabSpaces>] [<extrainfofile>] [<progress>]
  113. defaultEncoding: {-e | --defaultencoding}=<encoding>
  114. resultEncoding: {-re | --resultencoding}=<encoding>
  115. encoding: {ascii | ansi | unicode | bigendian | utf7 | utf8 | utf8bom | utf32be | utf32le}
  116. fileLanguage: {-l | --fileslanguage}={csharp | vb | java | cplusplus | php}
  117. virtualMachine: {-vm | --virtualmachine}=<path to the Java Virtual Machine executable>
  118. externalParser: {-ep | --externalparser}=<command to execute the external parser>
  119. externalMergeTool: {-emt | --externalmergetool}={default | <user_defined_tool>}
  120. external2WayMerge: {-e2mt | --external2waymergetool}={ <user_defined_tool>}
  121. externalDiffTool: {-edt | --externalDiffTool}={default | <user_defined_tool>}
  122. tabSpaces: {-ts | --tabspaces}={4 | <user_defined>}
  123. extrainfofile: {-ei | --extrainfofile}={path to a file containing extra merge information}
  124. progress: {-pg | --progress}={string representing the progress in the whole merge process}
  125. contributorExtendedInfo: <contributorOwnerName> <contributorBranchName>
  126. <contributorChangeset> <contributorComment>
  127. contributorOwnerName: <srcOwnerName> <dstOwnerName> <baseOwnerName>
  128. srcOwnerName: {-so | --srcowner}=<ownername>
  129. dstOwnerName: {-do | --dstowner}=<ownername>
  130. baseOwnerName: {-bo | --baseowner}=<ownername>
  131. contributorBranchName: <srcBranchName>; <dstBranchName> <baseBranchName>
  132. srcBranchName: {-sb | --srcbranch}=<name>
  133. dstBranchName: {-db | --dstbranch}=<branchname>
  134. baseBranchName: {-bb | --basebranch}=<branchname>
  135. contributorChangeset: <srcChangeset> <dstChangeset> <baseChangeset>
  136. srcChangeset: {-sc | --srccset}=<changeset>
  137. dstChangeset: {-dc | --dstcset}=<changeset>
  138. baseChangeset: {-bc | --basecset}=<changeset>
  139. contributorComment: <srcComment> <dstComment> <baseComment>
  140. srcComment: {-sm | --srccomment}=<changeset>
  141. dstComment: {-dm | --dstcomment}=<changeset>
  142. baseComment: {-bm | --basecomment}=<changeset>
  143. Examples:
  144. semanticmergetool -b=base.cs -d=dst.cs -s=src.cs -r=result.cs
  145. semanticmergetool base.cs dst.cs src.cs result.cs --fileparamorder=b;d;s;r
  146. semanticmergetool -b=base.cs -d=dst.cs -s=src.cs -r=result.cs
  147. -e2mt=""kdiff3.exe #sourcefile #destinationfile -o #output""
  148. semanticmergetool -b=base.cs -d=dst.cs -s=src.cs -r=result.cs
  149. -emt=""kdiff3.exe #basefile #sourcefile #destinationfile -o #output""
  150. == UsageCaption ==
  151. SemanticMerge Tool usage
  152. == WarningNoExternalDiffTool ==
  153. No external diff tool has been specified in order to proceed with the diff.
  154. == WarningNoExternal2MergeTool ==
  155. No external 2-way merge tool has been specified in order to merge the contents of the selected conflict.
  156. == WarningNoExternalMergeTool ==
  157. No external merge tool has been specified in order to proceed with the merge.
  158. == WarningExternalToolNotFound ==
  159. Tool not found, please introduce a valid one
  160. == WarningSemanticToolNotFound ==
  161. SemanticMerge tool not found, please introduce a valid one
  162. == WarningConfigFileNotFound ==
  163. Config file not found, please introduce a valid one
  164. == WarningInvalidJavaVirtualMachinePath ==
  165. Java Virtual Machine path not found
  166. == WarningInvalidTabSize ==
  167. Invalid tab size
  168. == RenameWindowTitle ==
  169. Renaming source
  170. == RenameWindowLabel ==
  171. New name for {0}:
  172. == RenameButton ==
  173. Rename
  174. == CancelButton ==
  175. _Cancel
  176. == PendingConflictsToSolve ==
  177. {0}/{1} - Conflicts to solve: {2}
  178. == NextConflictButtonTooltip ==
  179. Next conflict (Ctrl+PagDown)
  180. == PreviousConflictButtonTooltip ==
  181. Previous conflict (Ctrl+PageUp)
  182. == SaveAndExitExplanation ==
  183. save the result file and exit the tool
  184. == SaveAndExitButton ==
  185. _Save & Exit
  186. == ExitWithoutSavingButton ==
  187. _Exit without saving
  188. == MergeWaitingAnimation ==
  189. Calculating conflicts. Please wait...
  190. == SyncDeclarationMenuItem ==
  191. Sync Declaration
  192. == OptionsButton ==
  193. Options
  194. == FindMenuItem ==
  195. Find...
  196. == OptionsMenuItem ==
  197. Options
  198. == ConfigureFontsAndColorsMenuItem ==
  199. Configure fonts and colors...
  200. == DisplayInfoAboutThisMerge ==
  201. Display info about this merge
  202. == LeftEncodingMenuItem ==
  203. Left encoding
  204. == RightEncodingMenuItem ==
  205. Right encoding
  206. == SkipFormatChangesMenuItem ==
  207. Skip format changes
  208. == ReformatSourceCode ==
  209. Reformat source code
  210. == ConfigurationMenuItem ==
  211. Configuration...
  212. == GetLicense ==
  213. Get license
  214. == ShowUserGuideMenuItem ==
  215. User guide
  216. == UserGuideURL ==
  217. https://semanticmerge.com/documentation
  218. == ShowIntroGuideMenuItem ==
  219. Show intro guide
  220. == OpenSamplesDirectoryMenuItem ==
  221. Open samples
  222. == FollowSemanticmergeMenuItem ==
  223. Follow @semanticmerge
  224. == AboutSemanticmergeMenuItem ==
  225. About
  226. == VisualDiffWindowTitle ==
  227. visual diff
  228. == VisualDiffExplanation ==
  229. shows a graphic that explains the diff
  230. == VisualDiffOptionExplanation ==
  231. select two declarations and click diff in order to see the differences
  232. == VisualDiffControlExplanation ==
  233. use the control key with the scroll wheel to zoom in and zoom out
  234. == ZoomInExplanation ==
  235. zoom in on the graphic; you can also use the control key with the scroll wheel to zoom in
  236. == ZoomOutExplanation ==
  237. zoom out on the graphic; you can also use the control key with the scroll wheel to zoom out
  238. == VisualMergeWindowTitle ==
  239. visual merge
  240. == VisualMerge ==
  241. _Visual Merge
  242. == VisualMergeExplanation ==
  243. shows a graphic that explains the merge
  244. == RunTextMerge ==
  245. Run _text merge
  246. == RunTextMergeExplanation ==
  247. runs the traditional, text based, merge tool
  248. == RestartMerge ==
  249. R_estart merge
  250. == RestartMergeExplanation ==
  251. discards all the changes and restarts the merge operation
  252. == ProcessAllMerges ==
  253. Process all merges
  254. == ProcessAllMergesExplanation ==
  255. merges automatically as many declarations as possible and runs the external text based tool for each non-automatic merge declaration
  256. == VisualDiffButton ==
  257. _Visual diff
  258. == RestartDiffButton ==
  259. _Restart diff
  260. == RestartDiffExplanation ==
  261. restarts the diff operation
  262. == RunTextDiffButton ==
  263. Run _text diff
  264. == RunTextDiffExplanation ==
  265. runs the traditional, text based, diff tool
  266. == OutlinePanelVisualDiffButton ==
  267. _visual diff
  268. == OutlinePanelRunTextDiffButton ==
  269. run _text diff
  270. == DivergentMoveDetails ==
  271. divergent move details
  272. == ShowMergeInfoExplanation ==
  273. displays the merge information
  274. == MergeInfoResultFile ==
  275. Result file:
  276. == MergeInfoLanguage ==
  277. Language:
  278. == MergeInfoBaseFile ==
  279. Base file
  280. == MergeInfoSourceFile ==
  281. Source file
  282. == MergeInfoDestinationFile ==
  283. Destination file
  284. == MergeInfoFileName ==
  285. Name:
  286. == MergeInfoFilePath ==
  287. Path:
  288. == MergeInfoExtraInfo ==
  289. Extra info
  290. == SemanticOutline ==
  291. Semantic Outline
  292. == ExpandSemanticOutlineTooltip ==
  293. Expand Semantic Outline
  294. == CollapseSemanticOutlineTooltip ==
  295. Collapse Semantic Outline
  296. == PendingConflicts ==
  297. Conflicts to solve ({0})
  298. == PendingConflictsExplanation ==
  299. shows the conflicts that need to be solved manually: happens when the same element has been modified both in 'their changes' and 'your changes'
  300. == SelectTwoDeclarationsToSeeDifferences ==
  301. Please, select two declarations in order to see the differences.
  302. == DiffExplanation ==
  303. shows the diffs of this element
  304. == SourceDifferences ==
  305. Src - their changes ({0})
  306. == SourceDifferencesExplanation ==
  307. the changes made in the code you're merging from (theirs). Shows the differences between the base and the source contributor
  308. == DestinationDifferences ==
  309. Dst - your changes ({0})
  310. == DestinationDifferencesExplanation ==
  311. the changes on your working copy (yours). Shows the differences between the base and the destination contributor
  312. == NoConflictMessageText ==
  313. There are no conflicts to check.
  314. == NoConflictMessageDetail ==
  315. It means that the tool can solve the merge without user intervention.
  316. Probably you're seeing this because you want to review the merge anyway.
  317. But in case you prefer to automate the conflict resolution as much as possible: add the \"-a\" argument to the semanticmerge commandline.
  318. == MaximizeButtonLeftTooltip ==
  319. Maximize left panel
  320. == RestoreButtonLeftTooltip ==
  321. Restore left panel
  322. == MaximizeButtonSrcTooltip ==
  323. Maximize source panel
  324. == RestoreButtonSrcTooltip ==
  325. Restore source panel
  326. == MaximizeButtonDstTooltip ==
  327. Maximize destination panel
  328. == RestoreButtonDstTooltip ==
  329. Restore destination panel
  330. == MaximizeButtonBaseTooltip ==
  331. Maximize base panel
  332. == RestoreButtonBaseTooltip ==
  333. Restore base panel
  334. == MaximizeButtonResultTooltip ==
  335. Maximize result panel
  336. == RestoreButtonResultTooltip ==
  337. Restore result panel
  338. == CopyToClipboard ==
  339. Copy to clipboard
  340. == BackButtonTooltip ==
  341. Back
  342. == FindMatchesButton ==
  343. find _matches
  344. == DiffMatchButton ==
  345. _diff
  346. == MatchButton ==
  347. _match
  348. == UnMatchButton ==
  349. _unmatch
  350. == SelectElementToMatch ==
  351. Select an element to match
  352. == EditResultExplanation ==
  353. You cannot edit the result file until all conflicts are resolved. There are {0} conflict(s) remaining.
  354. == KeepSourceExplanation ==
  355. keeps the source changes
  356. == KeepDestinationExplanation ==
  357. keeps the destination changes
  358. == KeepBothExplanation ==
  359. keeps both changes
  360. == RenameExplanation ==
  361. renames the destination
  362. == MergeExplanation ==
  363. runs the external text merge tool to solve this conflict
  364. == TwoWayMergeExplanation ==
  365. launches the external 2 way mergetool to solve this conflict
  366. == DisplayConfigurationWindowExplanation ==
  367. shows the configuration window
  368. == DisplayAboutWindowExplanation ==
  369. shows the about window
  370. == HideUnchangedSelectionExplanation ==
  371. show only changed declarations
  372. == ShowUnchangedSelectionExplanation ==
  373. show the complete tree files, so you can check every declaration
  374. == GroupUnchangedSelectionExplanation ==
  375. show changed declarations grouping the rest of the declarations into an unchanged one
  376. == ExplainMoveMoveExplanation ==
  377. explains how the element was moved to different locations on source and destination contributors
  378. == SourceFileExplanation ==
  379. source contributor file
  380. == BaseFileExplanation ==
  381. base file, the ancestor of the source and destination files used during merge
  382. == DestinationFileExplanation ==
  383. destination contributor file
  384. == FindMatchesExplanation ==
  385. opens the matches window for matching an adedd with a deleted
  386. == UnmatchExplanation ==
  387. unmatch - in case methods were wrongly matched between base and this contributor, you can unmatch, convert them to added/deleted and correct the match manually
  388. == MatchExplanation ==
  389. applies the match to the selected item
  390. == InvalidEmail ==
  391. Invalid email
  392. == InvalidReport ==
  393. Invalid report
  394. == EnterValidEmailAndReport ==
  395. Please enter your email address, the subject and the comments.
  396. == EnterValidEmailAddress ==
  397. Please enter a valid email address.
  398. == ErrorReadingSampleTitle ==
  399. Error reading sample
  400. == ErrorReadingSampleDescription ==
  401. Cannot parse sample from file {0}: {1}
  402. == SamplesWindowExplanation ==
  403. For every sample case, we recommend you run the traditional merge tool and compare it with SemanticMerge
  404. == ShowIntroGuideButton ==
  405. show intro _guide
  406. == RunTextMergetoolButton ==
  407. text
  408. == RunSemanticMergetoolButton ==
  409. semantic
  410. == WelcomeSemantic20 ==
  411. Welcome to SemanticMerge 2.0
  412. == WelcomeExplanation1 ==
  413. Semantic is a different kind of merge tool. It parses the code before calculating the merge, which makes it possible to detect and automatically solve most conflicts.
  414. == WelcomeExplanation2 ==
  415. It is different than most merge tools you have used so far, so it is worth investing a few minutes browsing the sample cases to become a real merge master and get the best out of the tool.
  416. == ExploreTheSamplesButton ==
  417. _explore the samples
  418. == ReadTheIntroGuideLinkText1 ==
  419. To learn more about the SemanticMerge fundamentals
  420. == ReadTheIntroGuideLinkText2 ==
  421. read the Intro Guide
  422. == ReadTheIntroGuideLinkText3 ==
  423. (3 minutes read).
  424. == DontShowThisDialogOnStartup ==
  425. Don't _show this dialog on start up
  426. == RunTheToolButton ==
  427. run the _tool
  428. == ParsingErrorsLabel ==
  429. Some issues were found while processing these files.
  430. == ShowParsingErrorsButton ==
  431. Show parsing errors
  432. == ReleaseNotesBaseUrl ==
  433. https://www.plasticscm.com/download/releasenotes
  434. == MultifileCurrentFile ==
  435. File {0} of {1}:
  436. == MultifileCurrentFileExplanation ==
  437. This is the current file. To change file use the conflict navigation buttons and also the multi-file moves.
  438. == Ready ==
  439. Ready