path: root/platform/diff-api/resources/messages/DiffBundle.properties

diff.application.usage.parameters.and.description=Usage: {0} diff <left file> <right file> [<base file>]
merge.application.usage.parameters.and.description=Usage: {0} merge <left file> <right file> [<base file>] <output file>

cannot.find.file.error=Cannot find file: {0}
cannot.create.file.error=Cannot create file: {0}

dialog.title.diff.for.range=Diff for Range
diff.content.title.up.to.date=Base revision
diff.content.title.current.range=Current

refresh.failed.message=Refresh failed: {0}

rollback.change.command.name=Rollback Change
diff.content.editor.content.title=Editor
diff.content.clipboard.content.title=From clipboard
diff.clipboard.vs.editor.dialog.title=Clipboard vs Editor
diff.content.selection.from.file.content.title=Selection from {0}

diff.files.count.files.in.text=in {0}
diff.files.count.hyperlink.text={0} files
diff.files.generic.request.title=Change
diff.element.qualified.name.vs.element.qualified.name.dialog.title={0} vs {1}
merge.files.dialog.title=Merge
diff.files.dialog.title=Diff
diff.count.differences.status.text={0, choice, 0#No differences|1#1 difference|2#{0, number} differences}
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}.
diff.inactive.count.differences.status.text=({0} inactive)
diff.all.differences.ignored.text=Differences ignored
diff.highlighting.disabled.text=Differences highlighting is off
error.cant.show.diff.message=Error: Cannot show diff
select.external.diff.program.dialog.title=Select External Diff Program
select.external.merge.program.dialog.title=Select External Merge Program
diff.cant.calculate.diff=Can not calculate diff
diff.contents.are.identical.message.text=Contents are identical
error.files.too.large.to.compare.text=Files are too large to compare
diff.contents.have.differences.only.in.line.separators.message.text=Contents have differences only in line separators
diff.contents.have.differences.only.in.charset.message.text=Contents have differences only in encoding
diff.contents.have.differences.only.in.charset.and.line.separators.message.text=Contents have differences only in line separators and encoding
binary.diff.contents.are.identical.message.text=Files contents are identical
binary.diff.contents.are.different.message.text=Files contents are different
action.presentation.diff.accept.text=Accept
action.presentation.diff.revert.text=Revert
action.presentation.diff.append.text=Append
action.presentation.diff.include.into.commit.text=Include into commit
action.presentation.diff.append.to.the.side.text=Append to the {0, choice, 0#Left|1#Right}
action.presentation.merge.ignore.text=Ignore
action.presentation.merge.resolve.text=Resolve
action.presentation.merge.resolve.using.side.text=Resolve using {0, choice, 0#Left|1#Right}
action.presentation.merge.resolve.automatically.text=Resolve Automatically
merge.dialog.all.conflicts.resolved.message.text=All conflicts resolved
merge.dialog.accept.change.command=Accept change
merge.dialog.ignore.change.command=Ignore change
merge.dialog.resolve.conflict.command=Resolve conflict
merge.dialog.apply.non.conflicted.changes.command=Apply non conflicted changes
merge.dialog.exit.without.applying.changes.confirmation.message=Are you sure you want to exit without applying changes?
cancel.visual.merge.dialog.title=Cancel File Merge
apply.somehow.status.message.all.applied=All hunks resolved
apply.somehow.status.message.already.applied={0, number} {0, choice, 1#hunk is|2#hunks are} already applied
apply.somehow.status.message.cant.apply=Can''t apply {0, number} {0, choice, 1#hunk|2#hunks}
apply.somehow.status.message.cant.apply.some=Can''t apply {0, number} of {1, number} hunks
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?
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?
apply.partially.resolved.merge.dialog.title=Apply Changes
merge.all.changes.processed.message.text=All changes have been processed.<br><a href="">Save changes and finish merging</a>
apply.patch.all.changes.processed.message.text=All hunks have been processed.<br><a href=\"\">Save changes and finish resolve</a>
merge.save.and.finish.button=Save and &Finish
merge.continue.button=&Continue
merge.color.options.background.color.label=Important
merge.color.options.ignored.color.label=Ignored
merge.color.options.dialog.title=Merge Color Options
diff.type.inserted.name=Inserted
diff.type.changed.name=Changed
diff.type.deleted.name=Deleted
diff.type.conflict.name=Conflict
diff.content.selected.value=Selected Value
diff.clipboard.vs.value.dialog.title=Clipboard vs Selected Value

merge.window.title.file=Merge {0}
merge.version.title.our=Your version
merge.version.title.their=Changes from server
merge.version.title.their.with.revision=Changes from server (revision {0})
merge.version.title.base=Base version
merge.version.title.merged=Merged version
merge.version.title.merged.result=Result
merge.version.title.current=Current version
diff.version.title.before=Before
diff.version.title.after=After
configurable.DiffSettingsConfigurable.display.name=Diff \\& Merge
configurable.ExternalDiffSettingsConfigurable.display.name=External Diff Tools
settings.diff.name=Diff
settings.context.lines=Context lines:
settings.go.to.the.next.file.after.reaching.last.change=Go to the next file after reaching last change
settings.merge.text=Merge
settings.automatically.apply.non.conflicting.changes=Automatically apply non-conflicting changes
settings.highlight.modified.lines.in.gutter=Highlight modified lines in gutter
settings.external.diff.enable.external.tools=Enable external tools
settings.external.diff.path.to.executable=Path to executable:
settings.external.diff.parameters=Parameters:
settings.external.diff.use.by.default=Use by default
settings.external.diff.test.diff=Test Diff
settings.external.diff.test.three.side.diff=Test Three-Side Diff
settings.external.diff.enable.external.merge.tool=Enable external merge tool
settings.external.diff.path.to.executable.merge=Path to executable:
settings.external.diff.parameters.merge=Parameters:
settings.external.diff.trust.process.exit.code=Trust process exit code
settings.external.diff.test.merge=Test Merge
settings.external.diff.left.file.content=Left file content
settings.external.diff.right.file.content=Right file content
settings.external.diff.base.file.content=Base file content
settings.external.diff.original.output.file.content=Original output file content
settings.external.diff.merge.conflict.resolve.was.canceled=Merge conflict resolve was canceled.
settings.external.diff.merge.conflict.resolve.successful=Merge conflict resolve successful.\nResolved content is:\n{0}
settings.external.diff.test.complete=Test Complete
settings.external.diff.panel.tree.title=Configure external tools:
settings.external.diff.panel.table.title=Configure external diff/merge tools associated with a file type:

settings.external.tools.parameters.description=Different tools have different parameters. It's important to specify all necessary parameters in proper order:
settings.external.tools.parameters.diff=<b>%1</b> - left (Local changes)<br><b>%2</b> - right (Server content)<br><b>%3</b> - base (Current version without local changes)
settings.external.tools.parameters.merge=<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)

settings.external.diff.table.default.tool.name=Default
settings.external.diff.table.default.tool.builtin=Built-in
settings.external.diff.table.filetype.column=File type
settings.external.diff.table.difftool.column=External diff tool
settings.external.diff.table.mergetool.column=External merge tool
settings.external.diff.table.add.dialog.title=Configure external diff with file type
settings.external.diff.table.add.dialog.filetype=File type:
settings.external.diff.table.add.dialog.difftool=External diff tool:
settings.external.diff.table.add.dialog.mergetool=External merge tool:
settings.external.diff.table.remove.dialog.title=Remove external diff tool
settings.external.diff.table.remove.dialog.message=Are you sure you want to delete the entry?
settings.external.diff.table.validation.empty=Tool must be selected
settings.external.diff.table.validation.filetype.registered=FileType already registered

settings.external.tool.tree.remove.group.warning.title=Unable to delete a tool group
settings.external.tool.tree.remove.group.warning.message=Select the tool to be removed
settings.external.tool.tree.remove.warning.title=Unable to delete selected tool
settings.external.tool.tree.remove.warning.message=This tool is used in configuration. First remove the configuration in table
settings.external.tool.tree.add.dialog.title=Add an external tool
settings.external.tool.tree.add.dialog.field.group=Tool group
settings.external.tool.tree.add.dialog.field.tool.name=Tool name
settings.external.tool.tree.add.dialog.field.program.path=Program path
settings.external.tool.tree.add.dialog.field.argument.pattern=Argument pattern
settings.external.tool.tree.validation.empty=The external tool name must not be empty
settings.external.tool.tree.validation.already.exist={0} with "{1}" name already exists

action.use.external.tool.text=Show Diff Using: {0}

error.cannot.show.diff=Can't Show Diff
error.cannot.show.merge=Can't Show Merge
error.message.cannot.show.diff=Can't show diff
error.message.cannot.show.merge=Can't show merge
label.cant.show.diff.with.description=Can''t show diff: {0}
label.cant.show.merge.with.description=Can''t show merge: {0}
action.Anonymous.text.apply.non.conflicting.changes=Apply non-conflicting changes:
action.presentation.RefreshDirDiffAction.text=Refresh
continue.merge=Continue Merge
discard.changes.and.restart.merge=Discard Changes and Restart Merge
update.highlighting.settings=Update Highlighting Settings
changing.highlighting.requires.the.file.merge.restart=Changing highlighting requires the file merge restart. Discard unsaved changes and restart merge anyway?
apply.changes.and.mark.resolved=Apply Changes and Mark Resolved
synchronize.editors.settings=Synchronize Editors Settings
directory.viewer=Directory viewer
side.by.side.viewer=Side-by-side viewer
combined.side.by.side.viewer=Split
compare.by=Compare by:
hide.this.notification=Hide this notification
error.viewer=Error viewer
directory.diff=Directory Diff
use.space.button.to.change.operation=\ Use Space button to change operation
use.space.button.or.mouse.click=Use Space button or mouse click to change operation for the selected elements. Enter to perform.
can.t.copy.file=Can't Copy File
copy.content.to.side=Copy Content to {0, choice, 0#Left|1#Right}
merge.conflict.is.outdated=Merge conflict is outdated. Restore file content prior to conflict resolve start?
binary.file.viewer=Binary file viewer
highlighting.level=Highlighting Level
editor.settings=Settings
highlight.words=Highlight Words
synchronize.document.and.its.fragment=Synchronize document and its fragment
synchronize.document.and.its.fragment.range.error=Invalid selection range
vcs.marker.changed.line=VCS marker: changed line
do.not.ask.me.again=Do not ask me again
delete.0.items=Delete {0} items?
confirm.delete=Confirm Delete
data.has.been.changed.externally.reloading.data=Data has been changed externally. Reloading data\u2026
select.file.to.compare=Select File to Compare
diff.actions=Diff Actions
can.t.show.diff.in.external.tool=Can't Show Diff In External Tool
can.t.finish.merge.resolve=Cannot resolve merge conflicts
disable.editing=Disable Editing
collapse.unchanged.fragments=Collapse Unchanged Fragments
synchronize.scrolling=Synchronize Scrolling
compare.selected.new.files=Compare selected new files on the left side and on the right side with each other.
compare.0.with.1=Compare ''{0}'' with ''{1}''
unified.viewer=Unified viewer
combined.unified.viewer=Unified
mark.as.resolved=Mark as Resolved
merge.in.external.tool=Merge In External Tool
press.mark.as.resolve=Press \"Mark as Resolved\" when you finish resolving conflicts in the external tool
launching.external.tool=Launching External Tool\u2026
waiting.for.external.tool=Waiting for External Tool\u2026
can.t.load.some.changes=Can't load some changes
directory.diff.actions=Directory Diff Actions
can.t.show.merge.in.external.tool=Can't Show Merge In External Tool
dirdiff.mode.size.and.timestamp=Size and Timestamp
dirdiff.mode.size=Size
dirdiff.mode.text=Text
dirdiff.mode.binary.content=Binary Content
button.dirdiff.filter=&Filter:
option.inherit.ignored.color=Inherit ignored color
error.content.decoded.with.wrong.charset=Content was decoded with errors (using ''{0}'' charset)
label.default.diff.editor.tab.name=Diff
diff.file.editor.name=Diff
filetype.diff.description=Diff
message.init.merge.content.command=Init merge content
message.replace.change.command=Replace change
message.resolve.simple.conflicts.command=Resolve simple conflicted changes
message.use.selected.changes.command={0} selected changes
message.do.in.merge.command={0} in merge
action.presentation.go.to.change.text=Go To Change
button.continue.merge=Continue Merge
button.cancel.merge=Cancel Merge
button.discard.changes.and.do=Discard Changes and {0}
label.merge.unsaved.changes.discard.and.do.anyway=There are unsaved changes in the result file. Discard changes and {0} anyway?
button.merge.resolve.apply=Apply
button.merge.resolve.accept.right=Accept Right
button.merge.resolve.accept.left=Accept Left
button.merge.resolve.cancel=Cancel
tooltip.merge.ctrl.click.to.resolve.conflict=Ctrl+click to resolve conflict
error.operation.canceled=Operation was canceled
error.cant.show.diff.for.unknown.file=Cannot show diff for an unknown file type
error.cant.show.diff.file.not.found=Cannot show diff: file not found
error.cant.show.diff.content.not.found=Cannot show diff: content not found
error.cant.show.diff.cant.load.revision.content=Cannot get content from this revision
error.cant.show.diff.cant.show.for.directory=Cannot show diff for directory
error.cant.show.merge.operation.not.supported=Cannot show merge conflicts: this operation is not supported
error.cant.show.merge.project.not.found=Cannot show merge conflicts: unknown project type
error.cant.show.merge.file.not.found=Cannot show merge conflicts: file not found
error.cant.show.dirdiff.preview.cant.load.content=Cannot get content
button.associate.file.type=Associate
button.reload.diff.request=Reload
option.highlighting.level.inspections=Inspections
option.highlighting.level.syntax=Syntax
option.highlighting.level.none=None
option.highlighting.policy.group.name=Highlighting Mode
option.highlighting.policy.lines=Highlight lines
option.highlighting.policy.words=Highlight words
option.highlighting.policy.split=Highlight split changes
option.highlighting.policy.symbols=Highlight characters
option.highlighting.policy.none=Do not highlight
option.ignore.policy.group.name=Ignore Changes
option.ignore.policy.none=Do not ignore
option.ignore.policy.trim=Trim whitespaces
option.ignore.policy.whitespaces=Ignore whitespaces
option.ignore.policy.whitespaces.empty.lines=Ignore whitespaces and empty lines
option.ignore.policy.formatting=Ignore formatting
option.three.side.color.policy.left.to.right=Left to right
option.three.side.color.policy.merge.conflict=Merge conflict
option.three.side.color.policy.merge.resolved=Resolved merge conflict
notification.action.text.blank.diff.select.file=Select file\u2026
notification.action.text.blank.diff.recent=Recent
editing.viewer.hint.enable.editing.text=This view is read-only. <a href="">Enable editing</a>
column.dirdiff.name=Name
column.dirdiff.size=Size
column.dirdiff.date=Date
label.dirdiff.loading.file=Loading... {0}
configurable.diff.collapse.unchanged.ranges.disable=Disable
error.file.is.too.large.only.preview.is.loaded=File is too large. Only preview is loaded.
error.can.not.calculate.diff.operation.canceled=Can not calculate diff. Operation canceled.
error.can.not.calculate.diff.file.too.big=Can not calculate diff. File is too big and there are too many changes.
progress.title.loading.requests=Loading Requests
notification.status.content.removed=Content removed
notification.status.content.added=Content added
button.hide.notification=Hide
notification.you.can.disable.this.feature.in.0=You can disable this feature in {0}
label.diff.settings.path=Settings | Tools | Diff \\& Merge
label.diff.settings.path.macos=Preferences | Tools | Diff \\& Merge
press.again.to.go.to.the.previous.file=Press again to go to the previous file
press.again.to.go.to.the.next.file=Press again to go to the next file
error.cant.show.file=Can't show file
error.conflict.is.not.valid.and.no.longer.can.be.resolved=Conflict is not valid and no longer can be resolved.
button.abort.resolve=Abort Resolve
error.cant.resolve.conflicts.in.a.read.only.file=Can't resolve conflicts in a read-only file
action.merge.apply.non.conflicts.left.text=Left
action.merge.apply.non.conflicts.right.text=Right
action.merge.apply.non.conflicts.all.text=All
diff.utf.charset.name.bom.suffix={0} BOM
blank.diff.recent.content.summary.text.date={0} ({1})
blank.diff.recent.content.summary.text.length.date={0} ({1} symbols, {2})
advanced.settings.vcs=Version Control
advanced.setting.show.diff.as.editor.tab=Open Diff as Editor Tab 
advanced.setting.show.diff.as.editor.tab.description=If enabled, use editor tabs instead of frame windows to show Diff

action.Combined.Diff.PrevChange.text=Previous file
action.Combined.Diff.NextChange.text=Next file