From a5f4b47c12e64524ea136d76be2596ef53779c15 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Fri, 17 Jul 2020 18:24:03 +0300 Subject: [PATCH] diff: i18n - remove unused messages GitOrigin-RevId: 8487db9d2d759c1f9b62d4519734042d217e0d17 --- .../resources/messages/DiffBundle.properties | 50 ------------------- 1 file changed, 50 deletions(-) diff --git a/platform/diff-api/resources/messages/DiffBundle.properties b/platform/diff-api/resources/messages/DiffBundle.properties index 033a84ba89d3..c950f678ad40 100644 --- a/platform/diff-api/resources/messages/DiffBundle.properties +++ b/platform/diff-api/resources/messages/DiffBundle.properties @@ -2,9 +2,6 @@ diff.application.usage.parameters.and.description=Usage: {0} diff [] cannot.find.file.error=Can''t 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} dialog.title.diff.for.range=Diff for Range diff.content.title.up.to.date=Base revision @@ -18,48 +15,17 @@ compare.file.vs.file.dialog.title={0} vs {1} diff.content.editor.content.title=Editor diff.content.clipboard.content.title=From 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= -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 diff.files.dialog.title=Diff -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} 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 -cant.launch.diff.tool.error.message=Can't Launch Diff Tool error.cant.show.diff.message=Error: can't show diff -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 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 @@ -70,15 +36,11 @@ diff.contents.have.differences.only.in.charset.message.text=Contents have differ 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 -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 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} -merge.dialog.append.change.action.name=Apply selected change side 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} @@ -88,8 +50,6 @@ 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 -#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.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 @@ -101,28 +61,18 @@ apply.patch.partially.resolved.changes.confirmation.message=There {0, choice, 1# apply.partially.resolved.merge.dialog.title=Apply Changes merge.all.changes.processed.message.text=All changes have been processed.
Save changes and finish merging apply.patch.all.changes.processed.message.text=All hunks have been processed.
Save changes and finish resolve -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.color.options.background.color.label=Important merge.color.options.ignored.color.label=Ignored 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't 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: merge.window.title.file=Merge {0} merge.version.title.our=Your version merge.version.title.their=Changes from server