IDEA-97493 diff: support "Create Patch" action from DiffViewer
[idea/community.git] / platform / diff-api / resources / messages / DiffBundle.properties
1 diff.application.usage.parameters.and.description=Usage: {0} diff <left file> <right file> [<base file>]
2 merge.application.usage.parameters.and.description=Usage: {0} merge <left file> <right file> [<base file>] <output file>
3
4 cannot.find.file.error=Cannot find file: {0}
5 cannot.create.file.error=Cannot create file: {0}
6
7 dialog.title.diff.for.range=Diff for Range
8 diff.content.title.up.to.date=Base revision
9 diff.content.title.current.range=Current
10
11 refresh.failed.message=Refresh failed: {0}
12
13 save.merge.result.command.name=Merge
14 rollback.change.command.name=Rollback Change
15 compare.file.vs.file.dialog.title={0} vs {1}
16 diff.content.editor.content.title=Editor
17 diff.content.clipboard.content.title=From clipboard
18 diff.clipboard.vs.editor.dialog.title=Clipboard vs Editor
19 diff.content.selection.from.file.content.title=Selection from {0}
20
21 diff.files.generic.request.title=Change
22 diff.element.qualified.name.vs.element.qualified.name.dialog.title={0} vs {1}
23 merge.files.dialog.title=Merge
24 diff.files.dialog.title=Diff
25 diff.count.differences.status.text={0, choice, 0#No differences|1#1 difference|2#{0, number} differences}
26 merge.differences.status.text={0, choice, 0#No changes|1#1 change|2#{0, number} changes}. {1, choice, 0#No conflicts|1#1 conflict|2#{1, number} conflicts}.
27 diff.inactive.count.differences.status.text=({0} inactive)
28 diff.all.differences.ignored.text=Differences ignored
29 diff.highlighting.disabled.text=Differences highlighting is off
30 error.cant.show.diff.message=Error: Cannot show diff
31 select.external.diff.program.dialog.title=Select External Diff Program
32 select.external.merge.program.dialog.title=Select External Merge Program
33 diff.cant.calculate.diff=Can not calculate diff
34 diff.contents.are.identical.message.text=Contents are identical
35 error.files.too.large.to.compare.text=Files are too large to compare
36 diff.contents.have.differences.only.in.line.separators.message.text=Contents have differences only in line separators
37 diff.contents.have.differences.only.in.charset.message.text=Contents have differences only in encoding
38 diff.contents.have.differences.only.in.charset.and.line.separators.message.text=Contents have differences only in line separators and encoding
39 binary.diff.contents.are.identical.message.text=Files contents are identical
40 binary.diff.contents.are.different.message.text=Files contents are different
41 action.presentation.diff.accept.text=Accept
42 action.presentation.diff.revert.text=Revert
43 action.presentation.diff.append.text=Append
44 action.presentation.diff.include.into.commit.text=Include into commit
45 action.presentation.diff.append.to.the.side.text=Append to the {0, choice, 0#Left|1#Right}
46 action.presentation.merge.ignore.text=Ignore
47 action.presentation.merge.resolve.text=Resolve
48 action.presentation.merge.resolve.using.side.text=Resolve using {0, choice, 0#Left|1#Right}
49 action.presentation.merge.resolve.automatically.text=Resolve Automatically
50 merge.dialog.all.conflicts.resolved.message.text=All conflicts resolved
51 merge.dialog.accept.change.command=Accept change
52 merge.dialog.ignore.change.command=Ignore change
53 merge.dialog.resolve.conflict.command=Resolve conflict
54 merge.dialog.apply.non.conflicted.changes.command=Apply non conflicted changes
55 merge.dialog.exit.without.applying.changes.confirmation.message=Are you sure you want to exit without applying changes?
56 cancel.visual.merge.dialog.title=Cancel File Merge
57 apply.somehow.status.message.all.applied=All hunks resolved
58 apply.somehow.status.message.already.applied={0, number} {0, choice, 1#hunk is|2#hunks are} already applied
59 apply.somehow.status.message.cant.apply=Can''t apply {0, number} {0, choice, 1#hunk|2#hunks}
60 apply.somehow.status.message.cant.apply.some=Can''t apply {0, number} of {1, number} hunks
61 merge.dialog.apply.partially.resolved.changes.confirmation.message=There {0, choice, 0#'{1, choice, 1#is|2#are}'|1#is|2#are} {0, choice, 0#|1#one change|2#{0, number} changes}{0, choice, 0#|1#'{1, choice, 0#|1# and }'}{1, choice, 0#|1#one conflict|2#{1, number} conflicts} left unprocessed.\nSave changes and mark the conflict resolved anyway?
62 apply.patch.partially.resolved.changes.confirmation.message=There {0, choice, 1#is one hunk|2#are {0, number} hunks} left unprocessed.\nSave changes and finish resolve?
63 apply.partially.resolved.merge.dialog.title=Apply Changes
64 merge.all.changes.processed.message.text=All changes have been processed.<br><a href="">Save changes and finish merging</a>
65 apply.patch.all.changes.processed.message.text=All hunks have been processed.<br><a href=\"\">Save changes and finish resolve</a>
66 merge.save.and.finish.button=Save and &Finish
67 merge.continue.button=&Continue
68 merge.color.options.background.color.label=Important
69 merge.color.options.ignored.color.label=Ignored
70 merge.color.options.dialog.title=Merge Color Options
71 diff.type.inserted.name=Inserted
72 diff.type.changed.name=Changed
73 diff.type.deleted.name=Deleted
74 diff.type.conflict.name=Conflict
75 diff.content.selected.value=Selected Value
76 diff.clipboard.vs.value.dialog.title=Clipboard vs Selected Value
77
78 merge.window.title.file=Merge {0}
79 merge.version.title.our=Your version
80 merge.version.title.their=Changes from server
81 merge.version.title.their.with.revision=Changes from server (revision {0})
82 merge.version.title.base=Base version
83 merge.version.title.merged=Merged version
84 merge.version.title.merged.result=Result
85 merge.version.title.current=Current version
86 diff.version.title.before=Before
87 diff.version.title.after=After
88 configurable.DiffSettingsConfigurable.display.name=Diff \\& Merge
89 configurable.ExternalDiffSettingsConfigurable.display.name=External Diff Tools
90 settings.diff.name=Diff
91 settings.context.lines=Context lines:
92 settings.go.to.the.next.file.after.reaching.last.change=Go to the next file after reaching last change
93 settings.merge.text=Merge
94 settings.automatically.apply.non.conflicting.changes=Automatically apply non-conflicting changes
95 settings.highlight.modified.lines.in.gutter=Highlight modified lines in gutter
96 settings.external.diff.enable.external.diff.tool=Enable external diff tool
97 settings.external.diff.path.to.executable=Path to executable:
98 settings.external.diff.parameters=Parameters:
99 settings.external.diff.use.by.default=Use by default
100 settings.external.diff.test.diff=Test Diff
101 settings.external.diff.test.three.side.diff=Test Three-Side Diff
102 settings.external.diff.enable.external.merge.tool=Enable external merge tool
103 settings.external.diff.path.to.executable.merge=Path to executable:
104 settings.external.diff.parameters.merge=Parameters:
105 settings.external.diff.trust.process.exit.code=Trust process exit code
106 settings.external.diff.test.merge=Test Merge
107 settings.diff.tools.parameters=<html>Different tools have different parameters. It's important to specify all necessary parameters in proper order<br><b>%1</b> - left (Local changes)<br><b>%2</b> - right (Server content)<br><b>%3</b> - base (Current version without local changes)<br><b>%4</b> - output (Merge result)</html>
108 settings.external.diff.left.file.content=Left file content
109 settings.external.diff.right.file.content=Right file content
110 settings.external.diff.base.file.content=Base file content
111 settings.external.diff.original.output.file.content=Original output file content
112 settings.external.diff.merge.conflict.resolve.was.canceled=Merge conflict resolve was canceled.
113 settings.external.diff.merge.conflict.resolve.successful=Merge conflict resolve successful.\nResolved content is:\n{0}
114 settings.external.diff.test.complete=Test Complete
115 error.cannot.show.diff=Can't Show Diff
116 error.cannot.show.merge=Can't Show Merge
117 error.message.cannot.show.diff=Can't show diff
118 error.message.cannot.show.merge=Can't show merge
119 label.cant.show.diff.with.description=Can''t show diff: {0}
120 label.cant.show.merge.with.description=Can''t show merge: {0}
121 action.Anonymous.text.change.diff.operation=Change diff operation
122 action.Anonymous.text.apply.non.conflicting.changes=Apply non-conflicting changes:
123 action.presentation.RefreshDirDiffAction.text=Refresh
124 continue.merge=Continue Merge
125 discard.changes.and.restart.merge=Discard Changes and Restart Merge
126 update.highlighting.settings=Update Highlighting Settings
127 changing.highlighting.requires.the.file.merge.restart=Changing highlighting requires the file merge restart. Discard unsaved changes and restart merge anyway?
128 apply.changes.and.mark.resolved=Apply Changes and Mark Resolved
129 synchronize.editors.settings=Synchronize Editors Settings
130 directory.viewer=Directory viewer
131 side.by.side.viewer=Side-by-side viewer
132 compare.by=Compare by:
133 hide.this.notification=Hide this notification
134 error.viewer=Error viewer
135 directory.diff=Directory Diff
136 use.space.button.to.change.operation=\ Use Space button to change operation
137 use.space.button.or.mouse.click=Use Space button or mouse click to change operation for the selected elements. Enter to perform.
138 can.t.copy.file=Can't Copy File
139 copy.content.to.side=Copy Content to {0, choice, 0#Left|1#Right}
140 merge.conflict.is.outdated=Merge conflict is outdated. Restore file content prior to conflict resolve start?
141 binary.file.viewer=Binary file viewer
142 highlighting.level=Highlighting Level
143 editor.settings=Editor Settings
144 highlight.words=Highlight Words
145 synchronize.document.and.its.fragment=Synchronize document and its fragment
146 synchronize.document.and.its.fragment.range.error=Invalid selection range
147 vcs.marker.changed.line=VCS marker: changed line
148 do.not.ask.me.again=Do not ask me again
149 delete.0.items=Delete {0} items?
150 confirm.delete=Confirm Delete
151 data.has.been.changed.externally.reloading.data=Data has been changed externally. Reloading data...
152 select.file.to.compare=Select File to Compare
153 diff.actions=Diff Actions
154 can.t.show.diff.in.external.tool=Can't Show Diff In External Tool
155 can.t.finish.merge.resolve=Can't Finish Merge Resolve
156 disable.editing=Disable Editing
157 collapse.unchanged.fragments=Collapse Unchanged Fragments
158 synchronize.scrolling=Synchronize Scrolling
159 compare.selected.new.files=Compare selected new files on the left side and on the right side with each other.
160 compare.0.with.1=Compare ''{0}'' with ''{1}''
161 unified.viewer=Unified viewer
162 mark.as.resolved=Mark as Resolved
163 merge.in.external.tool=Merge In External Tool
164 press.mark.as.resolve=Press \"Mark as Resolved\" when you finish resolving conflicts in the external tool
165 launching.external.tool=Launching External Tool...
166 waiting.for.external.tool=Waiting for External Tool...
167 can.t.load.some.changes=Can't load some changes
168 directory.diff.actions=Directory Diff Actions
169 can.t.show.merge.in.external.tool=Can't Show Merge In External Tool
170 file.is.too.big.and.there.are.too.many.changes=File is too big and there are too many changes.
171 dirdiff.mode.size.and.timestamp=Size and Timestamp
172 dirdiff.mode.size=Size
173 dirdiff.mode.text=Text
174 dirdiff.mode.binary.content=Binary Content
175 button.dirdiff.filter=&Filter:
176 option.inherit.ignored.color=Inherit ignored color
177 error.content.decoded.with.wrong.charset=Content was decoded with errors (using ''{0}'' charset)
178 label.default.diff.editor.tab.name=Diff
179 diff.file.editor.name=Diff
180 filetype.diff.description=Diff
181 message.init.merge.content.command=Init merge content
182 message.finish.merge.content.command=Merge changes
183 message.replace.change.command=Replace change
184 message.resolve.simple.conflicts.command=Resolve simple conflicted changes
185 message.use.selected.changes.command={0} selected changes
186 message.do.in.merge.command={0} in merge
187 action.presentation.go.to.change.text=Go To Change
188 button.continue.merge=Continue Merge
189 button.cancel.merge=Cancel Merge
190 button.discard.changes.and.do=Discard Changes and {0}
191 label.merge.unsaved.changes.discard.and.do.anyway=There are unsaved changes in the result file. Discard changes and {0} anyway?
192 button.merge.resolve.apply=Apply
193 button.merge.resolve.accept.right=Accept Right
194 button.merge.resolve.accept.left=Accept Left
195 button.merge.resolve.cancel=Cancel
196 tooltip.merge.ctrl.click.to.resolve.conflict=Ctrl+click to resolve conflict
197 error.operation.canceled=Operation was canceled
198 error.cant.show.diff.for.unknown.file=Cannot show diff for an unknown file type
199 error.cant.show.diff.file.not.found=Cannot show diff: file not found
200 error.cant.show.diff.content.not.found=Cannot show diff: content not found
201 error.cant.show.diff.cant.load.revision.content=Cannot get content from this revision
202 error.cant.show.diff.cant.show.for.directory=Cannot show diff for directory
203 error.cant.show.merge.operation.not.supported=Cannot show merge conflicts: this operation is not supported
204 error.cant.show.merge.project.not.found=Cannot show merge conflicts: unknown project type
205 error.cant.show.merge.file.not.found=Cannot show merge conflicts: file not found
206 error.cant.show.dirdiff.preview.cant.load.content=Cannot get content
207 button.associate.file.type=Associate
208 button.reload.diff.request=Reload
209 option.highlighting.level.inspections=Inspections
210 option.highlighting.level.syntax=Syntax
211 option.highlighting.level.none=None
212 option.highlighting.policy.lines=Highlight lines
213 option.highlighting.policy.words=Highlight words
214 option.highlighting.policy.split=Highlight split changes
215 option.highlighting.policy.symbols=Highlight characters
216 option.highlighting.policy.none=Do not highlight
217 option.ignore.policy.none=Do not ignore
218 option.ignore.policy.trim=Trim whitespaces
219 option.ignore.policy.whitespaces=Ignore whitespaces
220 option.ignore.policy.whitespaces.empty.lines=Ignore whitespaces and empty lines
221 option.ignore.policy.formatting=Ignore formatting
222 option.three.side.color.policy.left.to.right=Left to right
223 option.three.side.color.policy.merge.conflict=Merge conflict
224 option.three.side.color.policy.merge.resolved=Resolved merge conflict
225 notification.action.text.blank.diff.select.file=Select file...
226 notification.action.text.blank.diff.recent=Recent
227 editing.viewer.hint.enable.editing.text=This view is read-only. <a href="">Enable editing</a>
228 column.dirdiff.name=Name
229 column.dirdiff.size=Size
230 column.dirdiff.date=Date
231 label.dirdiff.loading.file=Loading... {0}
232 configurable.diff.collapse.unchanged.ranges.disable=Disable
233 error.file.is.too.large.only.preview.is.loaded=File is too large. Only preview is loaded.
234 error.can.not.calculate.diff.operation.canceled=Can not calculate diff. Operation canceled.
235 error.can.not.calculate.diff.file.too.big=Can not calculate diff. File is too big and there are too many changes.
236 progress.title.loading.requests=Loading Requests
237 notification.status.content.removed=Content removed
238 notification.status.content.added=Content added
239 button.hide.notification=Hide
240 notification.you.can.disable.this.feature.in.0=You can disable this feature in {0}
241 label.diff.settings.path=Settings | Tools | Diff \\& Merge
242 label.diff.settings.path.macos=Preferences | Tools | Diff \\& Merge
243 press.again.to.go.to.the.previous.file=Press again to go to the previous file
244 press.again.to.go.to.the.next.file=Press again to go to the next file
245 error.cant.show.file=Can't show file
246 error.conflict.is.not.valid.and.no.longer.can.be.resolved=Conflict is not valid and no longer can be resolved.
247 button.abort.resolve=Abort Resolve
248 error.cant.resolve.conflicts.in.a.read.only.file=Can't resolve conflicts in a read-only file
249 action.merge.apply.non.conflicts.left.text=Left
250 action.merge.apply.non.conflicts.right.text=Right
251 action.merge.apply.non.conflicts.all.text=All
252 diff.utf.charset.name.bom.suffix={0} BOM
253 blank.diff.recent.content.summary.text.date={0} ({1})
254 blank.diff.recent.content.summary.text.length.date={0} ({1} symbols, {2})