No Description
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.es.txt 28KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986
  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 Unity VCS 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. == UsageDescription ==
  73. Please read below the usage of the tool
  74. == UsageAvalonia ==
  75. Usage: {0} semanticmerge [<mergeOptions>]
  76. mergeOptions: <files> [-a|--automatic] [--silent] [--merge-decl] [--process-all-merges]
  77. [--include-format-change] [--log-external-parser]
  78. [<contributorSymbolicNames>] [<generalOptions>] [<contributorExtendedInfo>]
  79. files: {{<sortedFiles> | <unsortedFiles>}}
  80. sortedFiles: <filename1> <filename2> <filename3> <filename4> <fileparamorder>
  81. fileparamorder: {{-fpo | --fileparamorder}}=<list of keys separated by a semicolon>
  82. The default value is --fileparamorder=s;d;b;r
  83. unsortedFiles: <sourceFile> <destinationFile> <baseFile> <resultFile>
  84. sourceFile: {{-s | --source}}=<filename>
  85. destinationFile: {{-d | --destination}}=<filename>
  86. baseFile: {{-b | --base}}=<filename>
  87. resultFile: {{-r | --result}}=<filename>
  88. -a | --automatic: Automatically merge without user interaction unless conflicts are found.
  89. --silent: This option must be used combined with the --automatic option.
  90. When a merge can't be solved automatically, this option causes the tool to return immediately
  91. with a non-zero exit code (no semanticmerge tool is shown).
  92. If the tool was able to solve the merge automatically, the program returns exit code 0.
  93. --merge-decl: Merge automatically as many declarations* as possible.
  94. --process-all-merges: Merge automatically as many declarations* as possible and
  95. run the external text based tool for each non-automatic merge declaration.
  96. *A declaration is the statement that defines any of the supported syntax elements: classes, methods, attributes, etc.
  97. Depending on the element type (e.g. classes, methods), they include a body where the element is implemented.
  98. --include-format-change: Include changes where only indentation and EOLs have been modified.
  99. This includes differences in white spaces and tabs at the beginning of lines and
  100. differences in EOLs. It also includes white lines at the beginning of declarations.
  101. By default all these differences are ignored to simplify the merge/diff.
  102. --log-external-parser: Enable logging the file contents to debug external parsers.
  103. contributorSymbolicNames: <srcSymbolicName> <dstSymbolicName> <baseSymbolicName>
  104. srcSymbolicName: {{-sn | --srcsymbolicname}}=<symbolicname>
  105. dstSymbolicName: {{-dn | --dstsymbolicname}}=<symbolicname>
  106. baseSymbolicName: {{-bn | --basesymbolicname}}=<symbolicname>
  107. generalOptions: [<defaultEncoding>] [<resultEncoding>] [<fileLanguage>] [<virtualMachine>]
  108. [<externalMergeTool>] [<external2WayMerge>] [<externalDiffTool>]
  109. [<tabSpaces>] [<extrainfofile>] [<progress>]
  110. defaultEncoding: {{-e | --defaultencoding}}=<encoding>
  111. resultEncoding: {{-re | --resultencoding}}=<encoding>
  112. encoding: {{ascii | ansi | unicode | bigendian | utf7 | utf8 | utf8bom | utf32be | utf32le}}
  113. fileLanguage: {{-l | --fileslanguage}}={{csharp | vb | java | cplusplus | php}}
  114. virtualMachine: {{-vm | --virtualmachine}}=<path to the Java Virtual Machine executable>
  115. tabSpaces: {{-ts | --tabspaces}}={{4 | <user_defined>}}
  116. extrainfofile: {{-ei | --extrainfofile}}={{path to a file containing extra merge information}}
  117. progress: {{-pg | --progress}}={{string representing the progress in the whole merge process}}
  118. contributorExtendedInfo: <contributorOwnerName> <contributorBranchName>
  119. <contributorChangeset> <contributorComment>
  120. contributorOwnerName: <srcOwnerName> <dstOwnerName> <baseOwnerName>
  121. srcOwnerName: {{-so | --srcowner}}=<ownername>
  122. dstOwnerName: {{-do | --dstowner}}=<ownername>
  123. baseOwnerName: {{-bo | --baseowner}}=<ownername>
  124. contributorBranchName: <srcBranchName>; <dstBranchName> <baseBranchName>
  125. srcBranchName: {{-sb | --srcbranch}}=<name>
  126. dstBranchName: {{-db | --dstbranch}}=<branchname>
  127. baseBranchName: {{-bb | --basebranch}}=<branchname>
  128. contributorChangeset: <srcChangeset> <dstChangeset> <baseChangeset>
  129. srcChangeset: {{-sc | --srccset}}=<changeset>
  130. dstChangeset: {{-dc | --dstcset}}=<changeset>
  131. baseChangeset: {{-bc | --basecset}}=<changeset>
  132. contributorComment: <srcComment> <dstComment> <baseComment>
  133. srcComment: {{-sm | --srccomment}}=<changeset>
  134. dstComment: {{-dm | --dstcomment}}=<changeset>
  135. baseComment: {{-bm | --basecomment}}=<changeset>
  136. Examples:
  137. {0} semanticmerge -b=base.cs -d=dst.cs -s=src.cs -r=result.cs
  138. {0} semanticmerge base.cs dst.cs src.cs result.cs --fileparamorder=b;d;s;r
  139. == Usage ==
  140. Usage: semanticmerge [<configureversioncontrol> | <mergeOptions>]
  141. configureversioncontrol: {--configure-version-control}=<versioncontrolkey>
  142. versioncontrolkey: {plasticscm | git}
  143. mergeOptions: <files> [-a|--automatic] [--silent] [--merge-decl] [--process-all-merges]
  144. [--nolangwarn] [--nostructurewarn] [--include-format-change] [--log-external-parser]
  145. [<contributorSymbolicNames>] [<generalOptions>]
  146. [<contributorExtendedInfo>]
  147. files: {<sortedFiles> | <unsortedFiles>}
  148. sortedFiles: <filename1> <filename2> <filename3> <filename4> <fileparamorder>
  149. fileparamorder: {-fpo | --fileparamorder}=<list of keys separated by a semicolon>
  150. The default value is --fileparamorder=s;d;b;r
  151. unsortedFiles: <sourceFile> <destinationFile> <baseFile> <resultFile>
  152. sourceFile: {-s | --source}=<filename>
  153. destinationFile: {-d | --destination}=<filename>
  154. baseFile: {-b | --base}=<filename>
  155. resultFile: {-r | --result}=<filename>
  156. -a | --automatic: Automatically merge without user interaction unless conflicts are found.
  157. --silent: This option must be used combined with the --automatic option.
  158. When a merge can't be solved automatically, this option causes the tool to return immediately
  159. with a non-zero exit code (no semanticmerge tool is shown).
  160. If the tool was able to solve the merge automatically, the program returns exit code 0.
  161. --merge-decl: Merge automatically as many declarations* as possible.
  162. --process-all-merges: Merge automatically as many declarations* as possible and
  163. run the external text based tool for each non-automatic merge declaration.
  164. *A declaration is the statement that defines any of the supported syntax elements: classes, methods, attributes, etc.
  165. Depending on the element type (e.g. classes, methods), they include a body where the element is implemented.
  166. --nolangwarn: Run the external text based tool directly when the language is not supported.
  167. --nostructurewarn: Run the external text-based tool directly if structure errors are found.
  168. --include-format-change: Include changes where only indentation and EOLs have been modified.
  169. This includes differences in white spaces and tabs at the beginning of lines and
  170. differences in EOLs. It also includes white lines at the beginning of declarations.
  171. By default all these differences are ignored to simplify the merge/diff.
  172. --log-external-parser: Enable logging the file contents to debug external parsers.
  173. contributorSymbolicNames: <srcSymbolicName> <dstSymbolicName> <baseSymbolicName>
  174. srcSymbolicName: {-sn | --srcsymbolicname}=<symbolicname>
  175. dstSymbolicName: {-dn | --dstsymbolicname}=<symbolicname>
  176. baseSymbolicName: {-bn | --basesymbolicname}=<symbolicname>
  177. generalOptions: [<defaultEncoding>] [<resultEncoding>] [<fileLanguage>] [<virtualMachine>]
  178. [<externalMergeTool>] [<external2WayMerge>] [<externalDiffTool>]
  179. [<tabSpaces>] [<extrainfofile>] [<progress>]
  180. defaultEncoding: {-e | --defaultencoding}=<encoding>
  181. resultEncoding: {-re | --resultencoding}=<encoding>
  182. encoding: {ascii | ansi | unicode | bigendian | utf7 | utf8 | utf8bom | utf32be | utf32le}
  183. fileLanguage: {-l | --fileslanguage}={csharp | vb | java | cplusplus | php}
  184. virtualMachine: {-vm | --virtualmachine}=<path to the Java Virtual Machine executable>
  185. externalParser: {-ep | --externalparser}=<command to execute the external parser>
  186. externalMergeTool: {-emt | --externalmergetool}={default | <user_defined_tool>}
  187. external2WayMerge: {-e2mt | --external2waymergetool}={ <user_defined_tool>}
  188. externalDiffTool: {-edt | --externalDiffTool}={default | <user_defined_tool>}
  189. tabSpaces: {-ts | --tabspaces}={4 | <user_defined>}
  190. extrainfofile: {-ei | --extrainfofile}={path to a file containing extra merge information}
  191. progress: {-pg | --progress}={string representing the progress in the whole merge process}
  192. contributorExtendedInfo: <contributorOwnerName> <contributorBranchName>
  193. <contributorChangeset> <contributorComment>
  194. contributorOwnerName: <srcOwnerName> <dstOwnerName> <baseOwnerName>
  195. srcOwnerName: {-so | --srcowner}=<ownername>
  196. dstOwnerName: {-do | --dstowner}=<ownername>
  197. baseOwnerName: {-bo | --baseowner}=<ownername>
  198. contributorBranchName: <srcBranchName>; <dstBranchName> <baseBranchName>
  199. srcBranchName: {-sb | --srcbranch}=<name>
  200. dstBranchName: {-db | --dstbranch}=<branchname>
  201. baseBranchName: {-bb | --basebranch}=<branchname>
  202. contributorChangeset: <srcChangeset> <dstChangeset> <baseChangeset>
  203. srcChangeset: {-sc | --srccset}=<changeset>
  204. dstChangeset: {-dc | --dstcset}=<changeset>
  205. baseChangeset: {-bc | --basecset}=<changeset>
  206. contributorComment: <srcComment> <dstComment> <baseComment>
  207. srcComment: {-sm | --srccomment}=<changeset>
  208. dstComment: {-dm | --dstcomment}=<changeset>
  209. baseComment: {-bm | --basecomment}=<changeset>
  210. Examples:
  211. semanticmergetool -b=base.cs -d=dst.cs -s=src.cs -r=result.cs
  212. semanticmergetool base.cs dst.cs src.cs result.cs --fileparamorder=b;d;s;r
  213. semanticmergetool -b=base.cs -d=dst.cs -s=src.cs -r=result.cs
  214. -e2mt=""kdiff3.exe #sourcefile #destinationfile -o #output""
  215. semanticmergetool -b=base.cs -d=dst.cs -s=src.cs -r=result.cs
  216. -emt=""kdiff3.exe #basefile #sourcefile #destinationfile -o #output""
  217. == UsageCaption ==
  218. SemanticMerge Tool usage
  219. == WarningNoExternalDiffTool ==
  220. No external diff tool has been specified in order to proceed with the diff.
  221. == WarningNoExternal2MergeTool ==
  222. No external 2-way merge tool has been specified in order to merge the contents of the selected conflict.
  223. == WarningNoExternalMergeTool ==
  224. No external merge tool has been specified in order to proceed with the merge.
  225. == WarningExternalToolNotFound ==
  226. Tool not found, please introduce a valid one
  227. == WarningSemanticToolNotFound ==
  228. SemanticMerge tool not found, please introduce a valid one
  229. == WarningConfigFileNotFound ==
  230. Config file not found, please introduce a valid one
  231. == WarningInvalidJavaVirtualMachinePath ==
  232. Java Virtual Machine path not found
  233. == WarningInvalidTabSize ==
  234. Invalid tab size
  235. == RenameWindowTitle ==
  236. Renaming source
  237. == RenameWindowLabel ==
  238. New name for {0}:
  239. == RenameButton ==
  240. Rename
  241. == CancelButton ==
  242. _Cancel
  243. == PendingConflictsToSolve ==
  244. {0}/{1} - Conflicts to solve: {2}
  245. == NextConflictButtonTooltip ==
  246. Next conflict (Ctrl+PagDown)
  247. == PreviousConflictButtonTooltip ==
  248. Previous conflict (Ctrl+PageUp)
  249. == NextConflictButtonTooltipPrefix ==
  250. Next conflict ({0})
  251. == PreviousConflictButtonTooltipPrefix ==
  252. Previous conflict ({0})
  253. == SaveAndExitExplanation ==
  254. save the result file and exit the tool
  255. == SaveAndExitButton ==
  256. _Save & Exit
  257. == ExitWithoutSavingButton ==
  258. _Exit without saving
  259. == MergeWaitingAnimation ==
  260. Calculating conflicts. Please wait...
  261. == SyncDeclarationMenuItem ==
  262. Sync Declaration
  263. == OptionsButton ==
  264. Options
  265. == FindMenuItem ==
  266. Find...
  267. == OptionsMenuItem ==
  268. Options
  269. == ConfigureFontsAndColorsMenuItem ==
  270. Configure fonts and colors...
  271. == DisplayInfoAboutThisMerge ==
  272. Display info about this merge
  273. == LeftEncodingMenuItem ==
  274. Left encoding
  275. == RightEncodingMenuItem ==
  276. Right encoding
  277. == SkipFormatChangesMenuItem ==
  278. Skip format changes
  279. == ReformatSourceCode ==
  280. Reformat source code
  281. == ConfigurationMenuItem ==
  282. Configuration...
  283. == GetLicense ==
  284. Get license
  285. == ShowUserGuideMenuItem ==
  286. User guide
  287. == UserGuideURL ==
  288. https://semanticmerge.com/documentation
  289. == ShowIntroGuideMenuItem ==
  290. Show intro guide
  291. == OpenSamplesDirectoryMenuItem ==
  292. Open samples
  293. == FollowSemanticmergeMenuItem ==
  294. Follow @semanticmerge
  295. == AboutSemanticmergeMenuItem ==
  296. About
  297. == VisualDiffWindowTitle ==
  298. Visual Diff
  299. == VisualDiffExplanation ==
  300. Shows a graphic that explains the diff
  301. == VisualDiffOptionExplanation ==
  302. Select two declarations and click diff in order to see the differences
  303. == VisualDiffControlExplanation ==
  304. Use the control key with the scroll wheel to zoom in and zoom out
  305. == ZoomInExplanation ==
  306. Zoom in on the graphic; you can also use the control key with the scroll wheel to zoom in
  307. == ZoomOutExplanation ==
  308. Zoom out on the graphic; you can also use the control key with the scroll wheel to zoom out
  309. == VisualMergeWindowTitle ==
  310. Visual Merge
  311. == VisualMerge ==
  312. _Visual Merge
  313. == VisualMergeExplanation ==
  314. Shows a graphic that explains the merge
  315. == RunTextMerge ==
  316. Run _text merge
  317. == RunTextMergeExplanation ==
  318. Runs the traditional, text based, merge tool
  319. == RestartMerge ==
  320. R_estart merge
  321. == RestartMergeExplanation ==
  322. Discards all the changes and restarts the merge operation
  323. == ProcessAllMerges ==
  324. Process all conflicts
  325. == ProcessAllMergesExplanation ==
  326. Merges automatically as many declarations as possible and runs the external text based tool for each non-automatic merge declaration
  327. == VisualDiffButton ==
  328. _Visual diff
  329. == RestartDiffButton ==
  330. _Restart diff
  331. == RestartDiffExplanation ==
  332. Restarts the diff operation
  333. == RunTextDiffButton ==
  334. Run _text diff
  335. == RunTextDiffExplanation ==
  336. Runs the traditional, text based, diff tool
  337. == OutlinePanelVisualDiffButton ==
  338. _Visual Diff
  339. == OutlinePanelRunTextDiffButton ==
  340. Run _Text Diff
  341. == DivergentMoveDetails ==
  342. Divergent Move Details
  343. == ShowMergeInfoExplanation ==
  344. Displays the Merge information
  345. == MergeInfoResultFile ==
  346. Result file:
  347. == MergeInfoLanguage ==
  348. Language:
  349. == MergeInfoBaseFile ==
  350. Base file
  351. == MergeInfoSourceFile ==
  352. Source file
  353. == MergeInfoDestinationFile ==
  354. Destination file
  355. == MergeInfoFileName ==
  356. Name:
  357. == MergeInfoFilePath ==
  358. Path:
  359. == MergeInfoExtraInfo ==
  360. Extra info
  361. == SemanticOutline ==
  362. Semantic Outline
  363. == ExpandSemanticOutlineTooltip ==
  364. Expand Semantic Outline
  365. == CollapseSemanticOutlineTooltip ==
  366. Collapse Semantic Outline
  367. == PendingConflicts ==
  368. Conflicts to solve ({0})
  369. == PendingConflictsExplanation ==
  370. Shows the conflicts that need to be solved manually: happens when the same element has been modified both in 'their changes' and 'your changes'
  371. == SelectTwoDeclarationsToSeeDifferences ==
  372. Please, select two declarations in order to see the differences.
  373. == DiffExplanation ==
  374. Shows the diffs of this element
  375. == SourceDifferences ==
  376. Src - their changes ({0})
  377. == SourceDifferencesExplanation ==
  378. the changes made in the code you're merging from (theirs). Shows the differences between the base and the source contributor
  379. == DestinationDifferences ==
  380. Dst - your changes ({0})
  381. == DestinationDifferencesExplanation ==
  382. the changes on your working copy (yours). Shows the differences between the base and the destination contributor
  383. == NoConflictMessageText ==
  384. There are no conflicts to check.
  385. == NoConflictMessageDetail ==
  386. It means that the tool can solve the merge without user intervention.
  387. Probably you're seeing this because you want to review the merge anyway.
  388. But in case you prefer to automate the conflict resolution as much as possible: add the \"-a\" argument to the semanticmerge commandline.
  389. == MaximizeButtonLeftTooltip ==
  390. Maximize left panel
  391. == RestoreButtonLeftTooltip ==
  392. Restore left panel
  393. == MaximizeButtonSrcTooltip ==
  394. Maximize source panel
  395. == RestoreButtonSrcTooltip ==
  396. Restore source panel
  397. == MaximizeButtonDstTooltip ==
  398. Maximize destination panel
  399. == RestoreButtonDstTooltip ==
  400. Restore destination panel
  401. == MaximizeButtonBaseTooltip ==
  402. Maximize base panel
  403. == RestoreButtonBaseTooltip ==
  404. Restore base panel
  405. == MaximizeButtonResultTooltip ==
  406. Maximize result panel
  407. == RestoreButtonResultTooltip ==
  408. Restore result panel
  409. == CopyToClipboard ==
  410. Copy to clipboard
  411. == BackButtonTooltip ==
  412. Back
  413. == FindMatchesButton ==
  414. Find _matches
  415. == FindMatchesButtonNoUnderscore ==
  416. Find matches
  417. == DiffMatchButton ==
  418. _Diff
  419. == DiffMatchButtonNoUnderscore ==
  420. Diff
  421. == MatchButton ==
  422. _Match
  423. == MatchButtonNoUnderscore ==
  424. Match
  425. == UnMatchButton ==
  426. _Unmatch
  427. == UnMatchButtonNoUnderscore ==
  428. Unmatch
  429. == SelectElementToMatch ==
  430. Select an element to match
  431. == EditResultExplanation ==
  432. You cannot edit the result file until all conflicts are resolved. There are {0} conflict(s) remaining.
  433. == KeepSourceExplanation ==
  434. Keeps the source changes
  435. == KeepDestinationExplanation ==
  436. Keeps the destination changes
  437. == KeepBothExplanation ==
  438. Keeps both changes
  439. == RenameExplanation ==
  440. Renames the destination
  441. == MergeExplanation ==
  442. Runs the external text merge tool to solve this conflict
  443. == TwoWayMergeExplanation ==
  444. Launches the external 2 way mergetool to solve this conflict
  445. == DisplayConfigurationWindowExplanation ==
  446. Shows the configuration window
  447. == DisplayAboutWindowExplanation ==
  448. Shows the about window
  449. == HideUnchangedSelectionExplanation ==
  450. Show only changed declarations
  451. == ShowUnchangedSelectionExplanation ==
  452. Show the complete tree files, so you can check every declaration
  453. == GroupUnchangedSelectionExplanation ==
  454. Show changed declarations grouping the rest of the declarations into an unchanged one
  455. == ExplainMoveMoveExplanation ==
  456. Explains how the element was moved to different locations on source and destination contributors
  457. == SourceFileExplanation ==
  458. Source contributor file
  459. == BaseFileExplanation ==
  460. Base file, the ancestor of the source and destination files used during merge
  461. == DestinationFileExplanation ==
  462. Destination contributor file
  463. == FindMatchesExplanation ==
  464. Opens the matches window for matching an adedd with a deleted
  465. == UnmatchExplanation ==
  466. 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
  467. == MatchExplanation ==
  468. Applies the match to the selected item
  469. == InvalidEmail ==
  470. Invalid email
  471. == InvalidReport ==
  472. Invalid report
  473. == EnterValidEmailAndReport ==
  474. Please enter your email address, the subject and the comments.
  475. == EnterValidEmailAddress ==
  476. Please enter a valid email address.
  477. == ErrorReadingSampleTitle ==
  478. Error reading sample
  479. == ErrorReadingSampleDescription ==
  480. Cannot parse sample from file {0}: {1}
  481. == SamplesWindowExplanation ==
  482. For every sample case, we recommend you run the traditional merge tool and compare it with SemanticMerge
  483. == ShowIntroGuideButton ==
  484. Show intro _guide
  485. == RunTextMergetoolButton ==
  486. Text
  487. == RunSemanticMergetoolButton ==
  488. Semantic
  489. == WelcomeSemantic20 ==
  490. Welcome to SemanticMerge 2.0
  491. == WelcomeExplanation1 ==
  492. 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.
  493. == WelcomeExplanation2 ==
  494. 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.
  495. == ExploreTheSamplesButton ==
  496. _Explore the samples
  497. == ReadTheIntroGuideLinkText1 ==
  498. To learn more about the SemanticMerge fundamentals
  499. == ReadTheIntroGuideLinkText2 ==
  500. Read the Intro Guide
  501. == ReadTheIntroGuideLinkText3 ==
  502. (3 minutes read).
  503. == DontShowThisDialogOnStartup ==
  504. Don't _show this dialog on start up
  505. == RunTheToolButton ==
  506. Run the _tool
  507. == ParsingErrorsLabel ==
  508. Some issues were found while processing these files.
  509. == ShowParsingErrorsButton ==
  510. Show parsing errors
  511. == ReleaseNotesBaseUrl ==
  512. https://www.plasticscm.com/download/releasenotes
  513. == MultifileCurrentFile ==
  514. File {0} of {1}:
  515. == MultifileCurrentFileExplanation ==
  516. This is the current file. To change file use the conflict navigation buttons and also the multi-file moves.
  517. == Ready ==
  518. Ready
  519. == UnparsedFilesError ==
  520. Some of the files couldn't be parsed.
  521. Please continue with the external tool.
  522. == UnrebuiltFilesError ==
  523. Some of the files couldn't have their structure properly recognized.
  524. Please continue with the external tool.
  525. == ParsingErrorsDescription ==
  526. The following parsing errors have been found, the trees could be inconsistent:
  527. == ConfirmRestartMergeTitle ==
  528. Confirm restarting merge
  529. == AndText ==
  530. and
  531. == Automatic ==
  532. Automatic
  533. == AutomaticallySolvedConflictSemanticMerge ==
  534. Automatically solved using {0}
  535. == ManuallySolvedConflictSemanticMerge ==
  536. Manually solved using {0}
  537. == SolvedConflictSemanticMerge ==
  538. Solved using {0}
  539. == KeepSourceActionText ==
  540. Keep src
  541. == KeepDestinationActionText ==
  542. Keep dst
  543. == KeepBothActionText ==
  544. Keep both
  545. == RenameActionText ==
  546. Rename
  547. == MergeActionText ==
  548. Merge
  549. == TwoWayMergeActionText ==
  550. 2 merge
  551. == ChangePositionActionText ==
  552. Change position
  553. == DiffConflictButton ==
  554. Diff
  555. == KeepDstChangesButton ==
  556. Keep destination
  557. == KeepSrcChangesButton ==
  558. Keep source
  559. == MergeButton ==
  560. Merge
  561. == TwoWayMergeButton ==
  562. 2-way
  563. == ExplainMoveButton ==
  564. Explain move
  565. == ViewConflictOnResultButton ==
  566. View on result
  567. == ViewMoveSrcOnResultButton ==
  568. Source on result
  569. == ViewMoveDstOnResultButton ==
  570. Destination on result
  571. == ChangePositionButton ==
  572. Change position
  573. == AddedDifferenceName ==
  574. Added
  575. == MovedDifferenceName ==
  576. Moved
  577. == DeletedDifferenceName ==
  578. Deleted
  579. == ChangedDifferenceName ==
  580. Changed
  581. == RenamedTo ==
  582. Renamed to {0}
  583. == MovedTo ==
  584. Moved to {0}
  585. == MovedFrom ==
  586. Moved from {0}
  587. == MovedFromOtherElement ==
  588. other element
  589. == MovedFromFirstLevel ==
  590. first level
  591. == MovedPosition ==
  592. Moved {0} position
  593. == MovedPositions ==
  594. Moved {0} positions
  595. == MoveDown ==
  596. down
  597. == MoveUp ==
  598. up
  599. == XAndY ==
  600. {0} and {1}
  601. == HideUnchanged ==
  602. Hide unchanged
  603. == HideUnchangedTooltip ==
  604. Show changed declarations only
  605. == ShowUnchanged ==
  606. Show unchanged
  607. == ShowUnchangedTooltip ==
  608. Show the complete file trees, so you can check every declaration
  609. == GroupUnchanged ==
  610. Group unchanged
  611. == GroupUnchangedTooltip ==
  612. Show changed declarations grouping the rest of the declarations into an single, unchanged one
  613. == DiffButton ==
  614. Diff
  615. == ZoomIn ==
  616. Zoom in
  617. == ZoomInTooltip ==
  618. Zoom in on the graphic - you can also use the scroll wheel while holding the control key pressed
  619. == ZoomOut ==
  620. Zoom out
  621. == ZoomOutTooltip ==
  622. Zoom out on the graphic - you can also use the scroll wheel while holding the control key pressed
  623. == BaseLabel ==
  624. Base
  625. == SrcLabel ==
  626. Source (their changes)
  627. == DstLabel ==
  628. Destination (your changes)
  629. == BaseTooltip ==
  630. The common ancestor, it is the parent version of the two files you are merging. It shows how the file was originally
  631. == SrcTooltip ==
  632. The changes made in the code you're merging from (theirs). Shows the differences between the base and the source contributor
  633. == DstTooltip ==
  634. The changes on your working copy (yours). Shows the differences between the base and the destination contributor
  635. == NotResolved ==
  636. Not resolved
  637. == ChangeEditorFont ==
  638. Change editor font...
  639. == Options ==
  640. Options
  641. == EditorOptions ==
  642. Editor options
  643. == ConfigurationDialogHeader ==
  644. Configuration
  645. == ConfigurationDialogTitle ==
  646. Semantic Merge - Configuration
  647. == AutomaticCheckBox ==
  648. Automatically merge without user interaction unless conflicts are found (-a)
  649. == MergeDeclCheckBox ==
  650. Merge declaration conflicts that can be solved automatically (--merge-decl)
  651. == IncludeFormatChangeCheckBox ==
  652. Don't ignore indentation and EOL changes (--include-format-change)
  653. == ProcessAllMergesCheckBox ==
  654. Launch the external tool to process unsolved conflicts (--process-all-merges)
  655. == NoLangWarnCheckBox ==
  656. Run the external tool when the language is not supported (--nolangwarn)
  657. == NoStructureWarnCheckBox ==
  658. Run the external tool when structure errors are found (--nostructurewarn)
  659. == NoJvmWarnCheckBox ==
  660. Run the external tool when no JVM is available (Java and C++) (--nojvmwarn)
  661. == JvmPathLabel ==
  662. Path to the Java Virtual Machine
  663. == ExternalParserLabel ==
  664. Command to run the external parser
  665. == ConfigurationDialogExplanation ==
  666. Sets up various options for interacting with and resolving conflicts with semantic merge
  667. == BrowseJvmPath ==
  668. Select path to JVM
  669. == ExternalToolsAreaTitle ==
  670. External Tools
  671. == PathNotFound ==
  672. Path not found