Ei kuvausta
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.

mergetool.en.txt 27KB

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