mergetool.en.txt 21 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998
  1. == MergetoolWindowTitle ==
  2. Plastic SCM Merge tool
  3. == FirstConflictButtonTooltip ==
  4. Go to first conflict (Ctrl + Shift + -)
  5. == PrevConflictButtonTooltip ==
  6. Previous conflict (Ctrl + -)
  7. == NextConflictButtonTooltip ==
  8. Next conflict (Ctrl + +)
  9. == LastConflictButtonTooltip ==
  10. Go to last conflict (Ctrl + Shift + +)
  11. == PrevNotAutomaticConflictButtonTooltip ==
  12. Previous not automatic conflict (Ctrl + PageUp)
  13. == NextNotAutomaticConflictButtonTooltip ==
  14. Next not automatic conflict (Ctrl + PageDown)
  15. == GtkPendingAutomaticConflictsLabel ==
  16. {0}/{1}
  17. == GtkPendingNonAutomaticConflictsLabel ==
  18. Pending non-automatic: {0}/{1}
  19. == PendingAutomaticConflictsLabel ==
  20. Current conflict: {0} of {1}
  21. == PendingNonAutomaticConflictsLabel ==
  22. Pending unsolved: {0} of {1}
  23. == NonAutomaticConflictsLabelTooltip ==
  24. Current unsolved non-automatic conflict
  25. == CurrentConflictLabelTooltip ==
  26. Current merge conflict
  27. == NonAutomaticConflictsNavigationTooltip ==
  28. Navigate through the currently unsolved conflicts
  29. == AutomaticConflictsNavigationTooltip ==
  30. Navigate through the merge conflicts
  31. == AutomaticConflictMarkup ==
  32. Current conflict is <span foreground='green'>automatic</span>. No user intervention is required.
  33. == NonAutomaticConflictMarkup ==
  34. Current conflict is <span foreground='red'>non-automatic</span>. Resolve it by clicking the buttons above, editing the result file or marking it as resolved.
  35. == NonAutomaticConflictMarkedAsResolvedMarkup ==
  36. Current conflict is <span foreground='green'>non-automatic</span>, and it has been already <span foreground='green'>resolved</span> by the user.
  37. == MarkAsResolvedButton ==
  38. Mark as resolved
  39. == MarkAsUnresolvedButton ==
  40. Mark as unresolved
  41. == MergetoolUsageTitle ==
  42. Mergetool usage
  43. == GtkMergetoolUsageHeader ==
  44. Usage: gtkmergetool
  45. == MacMergetoolUsageHeader ==
  46. Usage: macmergetool
  47. == MergetoolUsage ==
  48. mergeOptions: <sourceFile> [<sourceSymbolicName>]
  49. <baseFile> [<baseSymbolicName>]
  50. <destinationfile> [<destinationSymbolicName>]
  51. [[<autosave>] <resultFile>]
  52. [<mergeType>]
  53. [<generalOptions>]
  54. sourceFile: {-s | --source}=<filename>
  55. sourceSymbolicName: {-sn | --srcsymbolicname}=<symbolicname>
  56. baseFile: {-b | --base}=<filename>
  57. baseSymbolicName: {-bn | --basesymbolicname}=<symbolicname>
  58. destinationFile: {-d | --destination}=<filename>;
  59. destinationSymbolicName: {-dn | --dstsymbolicname}=<symbolicname>
  60. autosave: -as | --autosave
  61. automatic: -a | --automatic
  62. silent: --silent
  63. resultFile: {-r | --result}=<filename>
  64. mergeType: {-m | --mergeresolutiontype}={onlyone | onlysrc | onlydst | try | forced}
  65. generalOptions: [<defaultEncoding>] [<comparisonMethod>] [<resultEncoding>]
  66. defaultEncoding: {-e | --defaultencoding}={none |ascii | unicode | bigendian | utf7 | utf8}
  67. resultEncoding: {-re | --resultencoding}={none |ascii | unicode | bigendian | utf7 | utf8}
  68. comparisonMethod: {-i | --ignore}={none | eol | whitespaces | ""eol&whitespaces""}
  69. remarks:
  70. -a | --automatic: Tries to resolve the merge automatically.
  71. If the merge can't be resolved automatically (requires user interaction), the merge tool is shown.
  72. --silent: This option must be used combined with the --automatic option.
  73. When a merge can't be resolved automatically, this option causes the tool to return immediately
  74. with a non-zero exit code (no merge tool is shown).
  75. If the tool was able to resolve the merge automatically, the program returns exit code 0.
  76. == WinMergetoolUsage ==
  77. Usage: mergetool [<diffOptions> | <mergeOptions>]
  78. diffOptions: <generalFiles> [<generalOptions>]
  79. mergeOptions: <generalFiles> <baseFile> [<baseSymbolicName>] [[<automatic>] [<silent>] <resultFile>] [<mergeType>] [<generalOptions>]
  80. baseFile: {-b | --base}=<filename>
  81. baseSymbolicName: {-bn | --basesymbolicname}=<symbolicname>
  82. automatic: -a | --automatic
  83. silent: --silent
  84. resultFile: {-r | --result}=<filename>
  85. mergeType: {-m | --mergeresolutiontype}={onlyone | onlysrc | onlydst | try | forced}
  86. generalFiles: <sourceFile> [<srcSymbolicName>] <destination> [<dstSymbolicName>]
  87. sourceFile: {-s | --source}=<filename>
  88. srcSymbolicName: {-sn | --srcsymbolicname}=<symbolicname>
  89. destinationFile: {-d | --destination}=<filename>
  90. dstSymbolicName: {-dn | --dstsymbolicname}=<symbolicname>
  91. generalOptions: [<defaultEncoding>] [<comparisonMethod>] [<fileType>] [<resultEncoding>]
  92. defaultEncoding: {-e | --encoding}={none |ascii | unicode | bigendian | utf7 | utf8}
  93. comparisonMethod: {-i | --ignore}={none | eol | whitespaces | eol&whitespaces}
  94. fileType: {-t | --filestype}={text/csharp | text/XML | text}
  95. resultEncoding: {-re | --resultencoding}={none |ascii | unicode | bigendian | utf7 | utf8}
  96. progress: {--progress}=progress string indicating the current progress, for example: Merging file 1/8
  97. extraInfoFile: {--extrainfofile}=path to a file that contains extra info about the merge
  98. Remarks:
  99. -a | --automatic: Tries to resolve the merge automatically.
  100. If the merge can't be resolved automatically (requires user interaction), the merge tool is shown.
  101. --silent: This option must be used combined with the --automatic option.
  102. When a merge can't be resolved automatically, this option causes the tool to return immediately
  103. with a non-zero exit code (no merge tool is shown).
  104. If the tool was able to resolve the merge automatically, the program returns exit code 0.
  105. Examples:
  106. mergetool
  107. mergetool -s=file1.txt -d=file2.txt
  108. mergetool -s=file1.txt -b=file0.txt --destination=file2.txt
  109. mergetool --base=file0.txt -d=file2.txt --source=file1.txt --automatic --result=result.txt
  110. mergetool -b=file0.txt -s=file1.txt -d=file2.txt -a -r=result.txt -e=utf7 -i=eol -t=text/csharp -m=onlyone
  111. == BrowseForSaveFileTitle ==
  112. Save file
  113. == PendingUnsolvedConflicts ==
  114. The file still has {0} unsolved conflicts.
  115. == FileChangedSinceSaved ==
  116. The file has been changed since it was last saved.
  117. == SaveAndExitDialogButton ==
  118. Save & exit
  119. == ExitWithoutSavingButton ==
  120. Exit without saving
  121. == CloseButton ==
  122. Close
  123. == OkButton ==
  124. OK
  125. == CancelButton ==
  126. Cancel
  127. == SourceHeaderButton ==
  128. Select Source: '{0}'
  129. == SourceHeaderPressedButton ==
  130. Deselect Source: '{0}'
  131. == SourceHeaderButtonTooltip ==
  132. (Ctrl+1)
  133. == BaseHeaderButton ==
  134. Select Base: '{0}'
  135. == BaseHeaderPressedButton ==
  136. Deselect Base: '{0}'
  137. == BaseHeaderButtonTooltip ==
  138. (Ctrl+2)
  139. == DestinationHeaderButton ==
  140. Select Destination: '{0}'
  141. == DestinationHeaderPressedButton ==
  142. Deselect Destination: '{0}'
  143. == DestinationHeaderButtonTooltip ==
  144. (Ctrl+3)
  145. == ResultButton ==
  146. Select Result
  147. == ResultPressedButton ==
  148. Deselect Result
  149. == ResultButtonTooltip ==
  150. (Ctrl+4)
  151. == SaveAndExitButton ==
  152. Save & exit
  153. == SaveAndExitTooltip ==
  154. Save result and close mergetool
  155. == SaveAsTooltip ==
  156. Save result in a new file
  157. == SaveButton ==
  158. Save
  159. == SaveButtonTooltip ==
  160. Save changes (Ctrl+S)
  161. == SaveButtonTooltipWithCustomShortcut ==
  162. Save changes ({0})
  163. == SaveAsMenu ==
  164. Save as...
  165. == MergeButton ==
  166. Merge
  167. == KeepSrcMenu ==
  168. Keep source contributor & exit
  169. == KeepBaseMenu ==
  170. Keep base contributor & exit
  171. == KeepDstMenu ==
  172. Keep destination contributor & exit
  173. == SrcNeeded ==
  174. Source file name is needed
  175. == DstNeeded ==
  176. Destination file name is needed
  177. == ResultNeeded ==
  178. In automatic merge result file name is needed
  179. == AutomaticNeeded ==
  180. In silent mode the automatic merge option is needed
  181. == FileTypeError ==
  182. {0} isn't a valid file type for syntax highlight
  183. == CompMethodError ==
  184. Invaild comparison method
  185. == ArgError ==
  186. The specified arguments are not valid
  187. == SrcEncodingMenuTitle ==
  188. Source encoding
  189. == DstEncodingMenuTitle ==
  190. Destination encoding
  191. == BaseEncodingMenuTitle ==
  192. Base encoding
  193. == ResultEncodingMenuTitle ==
  194. Result encoding
  195. == SplitBlocksMenuTitle ==
  196. Split conflict blocks
  197. == ComparisonMethodMenuTitle ==
  198. Comparison method
  199. == RecognizeAll ==
  200. Recognize all
  201. == IgnoreEol ==
  202. Ignore EOLs
  203. == IgnoreWhitespace ==
  204. Ignore whitespaces
  205. == IgnoreEolWhitespace ==
  206. Ignore EOLs and whitespaces
  207. == EncodingDialogTitle ==
  208. Select encoding
  209. == EncodingDialogDescription ==
  210. Select a character encoding
  211. == EncodingDialogLabel ==
  212. Encoding:
  213. == DefaultEncoding ==
  214. Default encoding:
  215. == ResultEncoding ==
  216. Result encoding:
  217. == NoneEncoding ==
  218. NONE
  219. == AsciiEncoding ==
  220. ASCII
  221. == UnicodeEncoding ==
  222. Unicode
  223. == UnicodeBigEndianEncoding ==
  224. Unicode Big-Endian
  225. == Utf7Encoding ==
  226. UTF-7
  227. == Utf8Encoding ==
  228. UTF-8
  229. == OtherEncoding ==
  230. Other...
  231. == ChangeEncoding ==
  232. Change...
  233. == Options ==
  234. Options
  235. == FindButton ==
  236. Find...
  237. == MatchCase ==
  238. Match case
  239. == MergeResolutionOptionsTooltip ==
  240. Merge resolution options
  241. == MergeOptionsTooltip ==
  242. Display and calculation options
  243. == SyntaxHighlight ==
  244. Syntax highlight
  245. == FirstDiffButtonTooltip ==
  246. First difference
  247. == PrevDiffButtonTooltip ==
  248. Previous difference
  249. == NextDiffButtonTooltip ==
  250. Next difference
  251. == LastDiffButtonTooltip ==
  252. Last difference
  253. == FirstDiffButtonTooltipWithShortcut ==
  254. First difference (Ctrl + Shift + n)
  255. == PrevDiffButtonTooltipWithShortcut ==
  256. Previous difference (Ctrl + n)
  257. == NextDiffButtonTooltipWithShortcut ==
  258. Next difference (Ctrl + m)
  259. == LastDiffButtonTooltipWithShortcut ==
  260. Last difference (Ctrl + Shift + m)
  261. == CurrentDifference ==
  262. Current: {0}/{1}
  263. == LeftEncoding ==
  264. Left encoding
  265. == RightEncoding ==
  266. Right encoding
  267. == DifferencesWindowTitle ==
  268. Differences
  269. == AutomaticConflictChunk1 ==
  270. Current conflict is
  271. == AutomaticConflictChunk2 ==
  272. automatic
  273. == AutomaticConflictChunk3 ==
  274. . No user intervention is required.
  275. == SolvedConflictChunk1 ==
  276. Current conflict is
  277. == SolvedConflictChunk2 ==
  278. non-automatic
  279. == SolvedConflictChunk3 ==
  280. , and it has been already
  281. == SolvedConflictChunk4 ==
  282. resolved
  283. == SolvedConflictChunk5 ==
  284. by the user.
  285. == NonAutomaticConflictChunk1 ==
  286. Current conflict is
  287. == NonAutomaticConflictChunk2 ==
  288. non-automatic
  289. == NonAutomaticConflictChunk3 ==
  290. . Resolve it by clicking the buttons above, editing the result file or marking it as resolved.
  291. == PatternNotFound ==
  292. Pattern not found
  293. == PreviousSearchButtonTooltip ==
  294. Search previous match
  295. == NextSearchButtonTooltip ==
  296. Search next match
  297. == UnexpectedError ==
  298. An unexpected error has occurred.
  299. == GoToLineMenuItem ==
  300. Go to line...
  301. == AddDiffSelectionMenuItem ==
  302. Add diff selection
  303. == DiffWithPreviousSelectionMenuItem ==
  304. Diff with previous selection
  305. == FindMenuItem ==
  306. Find...
  307. == FindNextMenuItem ==
  308. Find next
  309. == FirstSelection ==
  310. First selection
  311. == SecondSelection ==
  312. Second selection
  313. == SemanticDiffMovedCode ==
  314. Diff moved code...
  315. == SemanticGoToMovedCode ==
  316. Go to moved code
  317. == SemanticDiffChangedCode ==
  318. Diff changed code...
  319. == SyncMovedCode ==
  320. Sync moved code on top
  321. == UnsyncMovedCode ==
  322. Restore scroll position
  323. == OutliningMenu ==
  324. Outlining
  325. == CollapseRegionsWithoutDiffsMenu ==
  326. Collapse regions without diffs
  327. == CollapseToDefinitionsMenu ==
  328. Collapse to definitions
  329. == ExpandAllMenu ==
  330. Expand all
  331. == Merged ==
  332. Merged
  333. == LoadingAnnotations ==
  334. Loading annotations...
  335. == AnnotateLineInfoChangeset ==
  336. Changeset
  337. == AnnotateLineInfoTimeStamp ==
  338. Creation date
  339. == AnnotateLineInfoOwner ==
  340. Owner
  341. == AnnotateLineInfoComments ==
  342. Comments
  343. == AnnotateColorByAuthor ==
  344. Color by author
  345. == AnnotateColorByDate ==
  346. Color by date
  347. == AnnotateContextMenu ==
  348. Annotate
  349. == AnnotateShowAuthor ==
  350. Show author
  351. == AnnotateShowBranch ==
  352. Show branch
  353. == AnnotateShowChangeInMerge ==
  354. Show whether line was changed in a merge
  355. == AnnotateShowChangeset ==
  356. Show changeset
  357. == AnnotateShowDateModified ==
  358. Show date modified
  359. == AnnotateShowLineAge ==
  360. Show line age
  361. == BigFileMessage ==
  362. The file is quite big. Calculating differences could take a while. Click the button if you really want to calculate the differences for this file.
  363. == CalculateDifferencesButton ==
  364. Calculate differences
  365. == BigFileContentsMessage ==
  366. The file is quite big. Showing the content could take a while. Click the button if you really want to show the content for this file.
  367. == ShowContentButton ==
  368. Show content
  369. == BranchChanges ==
  370. Branch changes
  371. == BranchChangesTooltip ==
  372. Highlight changes done in the branch
  373. == ConflictChanges ==
  374. Conflict changes
  375. == ConflictChangesTooltip ==
  376. Highlight changes with conflicts that the user solved during the merge
  377. == MergedChanges ==
  378. Merged changes
  379. == MergedChangesTooltip ==
  380. Highlight changes coming from a merge
  381. == CaseSensitiveCheckBox ==
  382. Match case
  383. == ColorsConfigurationMenuItem ==
  384. Configure fonts and colors...
  385. == ComparisonMethodMenuItem ==
  386. Comparison method
  387. == ComparisonMethodIgnoreEolMenuItem ==
  388. Ignore EOL
  389. == ComparisonMethodIgnoreWhitespacesMenuItem ==
  390. Ignore whitespaces
  391. == ComparisonMethodIgnoreEolWhitespacesMenuItem ==
  392. Ignore EOL and whitespaces
  393. == ComparisonMethodRecognizeAllMenuItem ==
  394. Recognize all
  395. == Content ==
  396. Content of {0}
  397. == CopyToClipboard ==
  398. Copy to clipboard
  399. == DiffWaitingAnimation ==
  400. Calculating differences...
  401. == ContentWaitingAnimation ==
  402. Calculating contents to show...
  403. == DiscardButton ==
  404. Discard
  405. == DiscardButtonTooltip ==
  406. Discard changes
  407. == EditorOptions ==
  408. Editor options
  409. == EditorOptionsConvertTabsToSpaces ==
  410. Convert tabs to spaces while editing
  411. == EditorOptionsWhistespaces ==
  412. View whitespaces
  413. == EditorOptionsTabs ==
  414. Tabs
  415. == EditorOptionsTabsSpacesNumber ==
  416. {0} spaces
  417. == EditorOptionsColumnGuides ==
  418. Column guides
  419. == EditorOptionsColumnsNumber ==
  420. {0} columns
  421. == EditorOptionsBorderLines ==
  422. View border lines for unselected regions
  423. == EncodingDifferences ==
  424. Encoding changed from {0} to {1}.
  425. == FsProtectionDifferences ==
  426. Filesystem permissions changed from {0} to {1}
  427. == UnableCalculateDiffs ==
  428. Unable to calculate the differences.
  429. == HideUnchanged ==
  430. hide unchanged
  431. == HideUnchangedTooltip ==
  432. show changed declarations only
  433. == ShowUnchanged ==
  434. show unchanged
  435. == ShowUnchangedTooltip ==
  436. show the complete file trees, so you can check every declaration
  437. == GroupUnchanged ==
  438. group unchanged
  439. == GroupUnchangedTooltip ==
  440. show changed declarations grouping the rest of the declarations into an single, unchanged one
  441. == ZoomIn ==
  442. zoom in
  443. == ZoomInTooltip ==
  444. zoom in on the graphic - you can also use the scroll wheel while holding the control key pressed
  445. == ZoomOut ==
  446. zoom out
  447. == ZoomOutTooltip ==
  448. zoom out on the graphic - you can also use the scroll wheel while holding the control key pressed
  449. == ErrorSavingFile ==
  450. An error occured saving the file: {0}
  451. == Find ==
  452. Find:
  453. == FindCloseButtonTooltip ==
  454. Close search bar
  455. == FindPreviousButtonTooltip ==
  456. Search previous match
  457. == FindNextButtonTooltip ==
  458. Search next match
  459. == MovedDetectionMenuItem ==
  460. Moved detection
  461. == MovedDetectionDialogMenuItem ==
  462. Moved detection...
  463. == EnableMoveDetectionMenuItem ==
  464. Enable moved detection
  465. == MoveDetectionRatio ==
  466. Move detection ratio
  467. == MinimumLinesInDifference ==
  468. Minimum lines in difference
  469. == MaximizeButtonLeftTooltip ==
  470. Maximize left panel
  471. == MaximizeButtonRightTooltip ==
  472. Maximize right panel
  473. == RestoreButtonLeftTooltip ==
  474. Restore left panel
  475. == RestoreButtonRightTooltip ==
  476. Restore right panel
  477. == OutliningPreferencesTitle ==
  478. Outlining preferences
  479. == OutliningPreferencesCaption ==
  480. Outlining preferences
  481. == OutliningPreferencesDetails ==
  482. Select your preferred outlining mode when a file loads
  483. == OutliningPreferencesExplanation ==
  484. After a file is loaded, use the following outlining mode:
  485. == OutliningPreferencesCollapseWithoutDiffs ==
  486. Collapse regions without differences
  487. == OutliningPreferencesCollapseToDefinitions ==
  488. Collapse to definitions
  489. == OutliningPreferencesExpandAll ==
  490. Expand all
  491. == NavigationTooltip ==
  492. Go to moved fragment
  493. == XDiffTooltip ==
  494. Show differences of moved fragment side by side
  495. == XDiffFragment ==
  496. [fragment]
  497. == FontsAndColorsMenuItem ==
  498. Fonts and colors
  499. == FontDoesNotSupportStrikeout ==
  500. The font {0} does not support the strikeout style, used by the application. Please choose other font.
  501. == ChangeFontMenuItem ==
  502. Change font...
  503. == LeftDiffColorMenuItem ==
  504. Left diff color
  505. == RightDiffColorMenuItem ==
  506. Right diff color
  507. == RestoreDefaultsMenuItem ==
  508. Restore defaults
  509. == FilesIdentical ==
  510. Files are identical.
  511. == AddDiffSelection ==
  512. Add diff selection
  513. == DiffWithPreviousSelection ==
  514. Diff with previous selection
  515. == DiffSourceWithBase ==
  516. Diff base with source contributor
  517. == DiffDestinationWithBase ==
  518. Diff base with destination contributor
  519. == DiffDestinationWithSource ==
  520. Diff source with destination contributor
  521. == Encoding ==
  522. Encoding
  523. == FontMenuItem ==
  524. Font
  525. == DuplicatedArg ==
  526. Duplicated argument {0}.
  527. == MergeTypeError ==
  528. {0} isn't a valid merge resolution type
  529. == MergeExplanation ==
  530. This option launches a 3 - way merge tool, involving base, source and destination files.You'll be able to save the result to another file.
  531. == DifferencesExplanation ==
  532. This option launches a visual text file differencing tool.Please select two files to see textual differences between them.
  533. == XMergeNoChanges ==
  534. Xmerge result is empty.No changes will be performed.
  535. == XMergeConfirmationMessage ==
  536. Xmerge result will replace your selection, and the not automatic conflict will be discarded. Do you want to continue?
  537. == SourceDesc ==
  538. source (code you are merging)
  539. == SourceLoc ==
  540. in the source
  541. == DestinationDesc ==
  542. destination (your working copy)
  543. == DestinationLoc ==
  544. in the destination
  545. == HowXMergeFormat ==
  546. You have a merge conflict but the {0} is not there anymore.
  547. What has happened? Most likely one developer has moved a piece of code ({1}) and another developer has modified that piece of code in the original location ({2}).
  548. == UnauthorizedAccessFile ==
  549. File '{0}' cannot be saved because you don't have permission. You can save the file in another path.
  550. == AutomaticConflictMarkup1 ==
  551. Current conflict is
  552. == AutomaticConflictMarkup2 ==
  553. automatic
  554. == AutomaticConflictMarkup3 ==
  555. . No user intervention is required.
  556. == SolvedConflictMarkup1 ==
  557. Current conflict is
  558. == SolvedConflictMarkup2 ==
  559. non-automatic
  560. == SolvedConflictMarkup3 ==
  561. , and it has been already
  562. == SolvedConflictMarkup4 ==
  563. resolved
  564. == SolvedConflictMarkup5 ==
  565. by the user.
  566. == NonAutomaticConflictMarkup1 ==
  567. Current conflict is
  568. == NonAutomaticConflictMarkup2 ==
  569. non-automatic
  570. == NonAutomaticConflictMarkup3 ==
  571. . Resolve it by clicking the buttons above, editing the result file or marking it as resolved.
  572. == MarkAsResolvedExplanation ==
  573. Select the contributors that should go to the result file using thee buttons below (source, base or destination). Or, if the suggested result is already good, click \"Mark as resolved\"
  574. == SourceFileName ==
  575. Source file: {0}
  576. == BaseFileName ==
  577. Base file: {0}
  578. == DestinationFileName ==
  579. Destination file: {0}
  580. == RestoreButtonSrcTooltip ==
  581. Restore src panel
  582. == RestoreButtonBaseTooltip ==
  583. Restore base panel
  584. == RestoreButtonDstTooltip ==
  585. Restore dst panel
  586. == RestoreButtonResultTooltip ==
  587. Restore result panel
  588. == MaximizeButtonSrcTooltip ==
  589. Maximize src panel
  590. == MaximizeButtonBaseTooltip ==
  591. Maximize base panel
  592. == MaximizeButtonDstTooltip ==
  593. Maximize dst panel
  594. == MaximizeButtonResultTooltip ==
  595. Maximize result panel
  596. == PendingNonAutomatic ==
  597. Pending to solve: {0}/{1}
  598. == PreviousConflictButtonTooltip ==
  599. Previous conflict(Ctrl+-)
  600. == PreviousUnsolvedConflictButtonTooltip ==
  601. Previous not automatic conflict (Ctrl+PageUp)
  602. == NextUnsolvedConflictButtonTooltip ==
  603. Next not automatic conflict (Ctrl+PagDown)
  604. == OptionsButton ==
  605. Options
  606. == BaseEncodingMenuItem ==
  607. Base encoding
  608. == SrcEncodingMenuItem ==
  609. Source encoding
  610. == DstEncodingMenuItem ==
  611. Destination encoding
  612. == ResultEncodingMenuItem ==
  613. Result encoding
  614. == SplitMenuItem ==
  615. Split conflict blocks
  616. == XmergeButton ==
  617. XMerge...
  618. == XmergeButtonTooltip ==
  619. Launch XMerge wizard
  620. == XmergeMenuItem ==
  621. XMerge...
  622. == XmergeNoTextSelected ==
  623. There is no text selected. Can't perform Xmerge.
  624. == XmergeNotEnoughInfo ==
  625. Not enough information to perform XMerge
  626. == XmergeRemovedTextSelected ==
  627. The selected lines are removed. They are not valid as Xmerge selection.
  628. == XmergeStartTip ==
  629. This window shows the moved and the modifed code fragments. The moved code is on the {0} ({1}). On the {2} ({3}) the modified code before it was moved.Solve the remaining manual conflicts and click on \"Save & Exit\".
  630. == UnsolvedPendingConflicts ==
  631. The file still has {0} unsolved conflicts.
  632. == ChangedFile ==
  633. The file has been changed since it was last saved.
  634. == MergeWaitingAnimation ==
  635. Calculating conflicts. Please wait...
  636. == SaveAsButton ==
  637. Save as...
  638. == SaveBaseContributor ==
  639. Keep base contributor & exit
  640. == SaveDstContributor ==
  641. Keep destination contributor & exit
  642. == SaveSrcContributor ==
  643. Keep source contributor & exit
  644. == ExtraInfoButton ==
  645. Info about this merge
  646. == ExtraInfoButtonTooltip ==
  647. Show the info about this merge in a panel
  648. == Left ==
  649. left
  650. == Right ==
  651. right
  652. == SourceContributor ==
  653. source contributor
  654. == DestinationContributor ==
  655. destination contributor
  656. == MovedCode ==
  657. Moved piece of code.
  658. == ModifiedCode ==
  659. Modified piece of code in the original location.
  660. == OriginalCode ==
  661. Original piece of code.
  662. == ResultFile ==
  663. Result file
  664. == AnnotateOptions ==
  665. Annotate options
  666. == Copy ==
  667. Copy
  668. == Cut ==
  669. Cut
  670. == Paste ==
  671. Paste
  672. == SelectAll ==
  673. Select all
  674. == FileTooLargeToDisplay ==
  675. File is too large to display content.