Merge branch 'master' of git.labs.intellij.net:idea/community
[idea/community.git] / platform / platform-resources-en / src / messages / DiffBundle.properties
1 diff.application.usage.parameters.and.description=Usage: idea diff <file1> <file2>
2 cannot.file.file.error.message=Cannot file file: {0}
3 save.merge.result.command.name=Merge
4 compare.file.vs.file.dialog.title={0} vs {1}
5 diff.content.editor.content.title=Editor
6 diff.content.clipboard.content.title=Clipboard
7 diff.clipboard.vs.editor.dialog.title=Clipboard vs Editor
8 diff.clipboard.vs.file.dialog.title=Clipboard vs {0}
9 diff.content.selection.from.editor.content.title=Selection from Editor
10 diff.content.selection.from.file.content.title=Selection from {0}
11
12 #element.type
13 #    directory 0
14 #    package 1
15 #    file 2
16 #    class 3
17 #    method 4
18 #    field 5
19 #    fragment 6
20 #    tag 7
21
22 diff.compare.element.type.with.editor.action.name=Compare File with Editor
23 diff.element.qualified.name.vs.editor.dialog.title={0} vs Editor
24 diff.element.qualified.name.vs.file.dialog.title={0} vs {1}
25 diff.element.qualified.name.vs.element.qualified.name.dialog.title={0} vs {1}
26 diff.acton.ignore.qhitespace.policy.do.not.ignore=Do not ignore
27 diff.acton.ignore.qhitespace.policy.leading.and.trailing=Leading and trailing
28 diff.acton.ignore.qhitespace.policy.all=All
29 ignore.whitespace.action.not.avaliable.action.name=<Not available>
30 diff.dialog.select.change.action.name=Select Change
31 diff.dialog.select.change.action.description=Select changed text in this version and corresponding in other
32 merge.files.dialog.title=Merge
33 merge.dialog.cannot.load.file.error.message=Cannot load file: {0}
34 merge.editor.replace.operation.name=Replace
35 merge.editor.insert.operation.name=Insert
36 merge.editor.remove.operation.name=Remove
37 comparison.policy.default.name=Default
38 comparison.policy.trim.space.name=Trim space
39 comparison.policy.ignore.spaces.name=Ignore spaces
40 comparison.ignore.whitespace.acton.name=Ignore whitespace:
41 diff.count.differences.status.text={0, choice, 0#no differences|1#1 difference|2#{0, number} differences}
42 cant.launch.diff.tool.error.message=Can''t Launch Diff Tool
43 binary.files.are.identical.message=Binary files are identical
44 files.are.identical.dialog.title=Files Are Identical
45 binary.files.are.different.message=Binary files are different
46 files.are.different.dialog.title=Files Are Different
47 diff.options.diff.options.border=Diff Options
48 diff.options.use.external.tool.for.files.checkbox=Use external tool to compare files:
49 diff.options.use.external.tool.for.directories.checkbox=Use external tool to compare folders:
50 select.external.diff.program.dialog.title=Select External Diff Program
51 diff.contents.are.identical.message.text=Contents are identical
52 diff.contents.have.differences.only.in.line.separators.message.text=Contents have differences only in line separators
53 no.differences.dialog.title=No Differences
54 merge.dialog.apply.change.action.name=Apply change
55 merge.dialog.ignore.change.action.name=Ignore change
56 merge.dialog.apply.all.non.conflicting.changes.action.name=Apply all non-conflicting changes
57 merge.dialog.all.conflicts.resolved.message.text=All conflicts resolved
58 #0 - changes count, 1 - conflicts count
59 merge.statistics.message={0, choice, 0#No changes|1#One change|2#{0, number} changes}. {1, choice, 0#No conflicts|1#One conflict|2#{0, number} conflicts}
60 merge.partial.diff.action.name=Compare left and right panel contents
61 merge.partial.diff.action.name.0.1=Compare middle and left panel contents
62 merge.partial.diff.action.name.1.2=Compare middle and right panel contents
63 merge.dialog.writing.to.file.command.name=Writing to File
64 merge.dialog.exit.without.applying.changes.confirmation.message=Are you sure you want to exit without applying changes?
65 cancel.visual.merge.dialog.title=Cancel Visual Merge
66 merge.all.changes.have.processed.save.and.finish.confirmation.text=All changes have been processed.\nWould you like to save changes and finish merging?
67 all.changes.processed.dialog.title=All Changes Processed
68 merge.save.and.finish.button=Save and &Finish
69 merge.continue.button=&Continue
70 merge.init.merge.content.command.name=initMergeContent
71 merge.color.options.stripe.mark.color.label=&Stripe mark color:
72 merge.color.options.background.color.label=Background &color:
73 merge.color.options.dialog.title=Merge Color Options
74 diff.content.read.only.content.title.suffix=(Read-only)
75 diff.type.inserted.name=Inserted
76 diff.type.changed.name=Changed
77 diff.type.deleted.name=Deleted
78 diff.type.conflict.name=Conflict
79 diff.type.none.name=None