blob: 598cc9714697e7aa9193f181bc9390269cf3c3e5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
|
diff.application.usage.parameters.and.description=Usage: {0} diff <file1> <file2>
cannot.file.file.error=Cannot find file: {0}
cannot.create.diff.error=Cannot create diff element from: {0}
cannot.compare.error=Diff manager cannot compare ''{0}' and ''{1}''
unknown.file.type.error=Unknown file type: {0}
save.merge.result.command.name=Merge
compare.file.vs.file.dialog.title={0} vs {1}
diff.content.editor.content.title=Editor
diff.content.clipboard.content.title=Clipboard
diff.clipboard.vs.editor.dialog.title=Clipboard vs Editor
diff.clipboard.vs.file.dialog.title=Clipboard vs {0}
diff.content.selection.from.editor.content.title=Selection from Editor
diff.content.selection.from.file.content.title=Selection from {0}
#element.type
# directory 0
# package 1
# file 2
# class 3
# method 4
# field 5
# fragment 6
# tag 7
diff.compare.element.type.with.editor.action.name=Compare File with Editor
diff.element.qualified.name.vs.editor.dialog.title={0} vs Editor
diff.element.qualified.name.vs.file.dialog.title={0} vs {1}
diff.element.qualified.name.vs.element.qualified.name.dialog.title={0} vs {1}
diff.acton.ignore.whitespace.policy.do.not.ignore=Do not ignore
diff.acton.ignore.whitespace.policy.leading.and.trailing=Leading and trailing
diff.acton.ignore.whitespace.policy.all=All
ignore.whitespace.acton.name=Ignore whitespace:
diff.panel.combo.box.action.not.available.action.name=<Not available>
diff.dialog.select.change.action.name=Select Change
diff.dialog.select.change.action.description=Select changed text in this version and corresponding in other
merge.files.dialog.title=Merge
merge.dialog.cannot.load.file.error.message=Cannot load file: {0}
merge.editor.replace.operation.name=Replace
merge.editor.insert.operation.name=Insert
merge.editor.remove.operation.name=Remove
diff.count.differences.status.text={0, choice, 0#no differences|1#1 difference|2#{0, number} differences}
cant.launch.diff.tool.error.message=Can''t Launch Diff Tool
binary.files.are.identical.message=Binary files are identical
files.are.identical.dialog.title=Files Are Identical
binary.files.are.different.message=Binary files are different
files.are.different.dialog.title=Files Are Different
diff.options.diff.options.border=Diff Options
diff.options.use.external.tool.for.files.checkbox=Use external tool to compare files:
diff.options.use.external.tool.for.directories.checkbox=Use external tool to compare folders:
diff.options.use.external.merge.tool.for.files.checkbox=Use external merge tool:
select.external.diff.program.dialog.title=Select External Diff Program
diff.contents.are.identical.message.text=Contents are identical
diff.contents.have.differences.only.in.line.separators.message.text=Contents have differences only in line separators
diff.contents.have.differences.only.in.line.separators.or.whitespaces=Contents have differences only in line separators or whitespaces
show.diff.anyway.dialog.message=Show diff anyway?
no.differences.dialog.title=No Differences
merge.dialog.apply.change.action.name=Apply change
merge.dialog.ignore.change.action.name=Ignore change
merge.dialog.apply.all.non.conflicting.changes.action.name=Apply all non-conflicting changes
merge.dialog.all.conflicts.resolved.message.text=All conflicts resolved
#0 - changes count, 1 - conflicts count
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}
merge.partial.diff.action.name=Compare left and right panel contents
merge.partial.diff.action.name.0.1=Compare left and middle panel contents
merge.partial.diff.action.name.1.2=Compare middle and right panel contents
merge.dialog.exit.without.applying.changes.confirmation.message=Are you sure you want to exit without applying changes?
cancel.visual.merge.dialog.title=Cancel Visual Merge
merge.all.changes.have.processed.save.and.finish.confirmation.text=All changes have been processed.\nWould you like to save changes and finish merging?
all.changes.processed.dialog.title=All Changes Processed
merge.save.and.finish.button=Save and &Finish
merge.continue.button=&Continue
merge.init.merge.content.command.name=initMergeContent
merge.color.options.stripe.mark.color.label=&Stripe mark color:
merge.color.options.background.color.label=Background &color:
merge.color.options.dialog.title=Merge Color Options
diff.content.read.only.content.title.suffix=(Read-only)
diff.type.inserted.name=Inserted
diff.type.changed.name=Changed
diff.type.deleted.name=Deleted
diff.type.conflict.name=Conflict
diff.type.none.name=None
diff.content.selected.value=Selected Value
diff.clipboard.vs.value.dialog.title=Clipboard vs Selected Value
diff.can.not.show.unknown=Can not show diff for unknown file type
diff.can.not.show=Can not show diff
diff.acton.highlight.mode.action.by.word=By word
diff.acton.highlight.mode.action.by.line=By line
diff.acton.highlight.mode.action.no.highlighting=Do not highlight
diff.acton.highlight.mode.action.name=Highlight:
|
