説明なし
選択できるのは25トピックまでです。 トピックは、先頭が英数字で、英数字とダッシュ('-')を使用した35文字以内のものにしてください。

mergetool.en.txt 26KB

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