diff options
Diffstat (limited to 'platform/platform-resources-en/src/messages')
8 files changed, 22 insertions, 4 deletions
diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties index 1c05af27102c..47c4cef92207 100644 --- a/platform/platform-resources-en/src/messages/ActionsBundle.properties +++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties @@ -596,6 +596,8 @@ action.MemberPushDown.text=Pu_sh Members Down... action.MemberPushDown.description=Push class members down to directly inheriting subclasses action.InheritanceToDelegation.text=Replace _Inheritance with Delegation... action.InheritanceToDelegation.description=Replace inheritance with delegation +action.RenameFile.text=Rename File... +action.RenameFile.description=Rename selected file action.Inline.text=I_nline... action.Inline.description=Inline the selected method or variable action.AnonymousToInner.text=Convert Anon_ymous to Inner... @@ -1014,8 +1016,8 @@ action.Vcs.ShowDiffAction.text=Show Changes action.Vcs.ShowDiffAction.description=Show changes action.Vcs.RollbackChanges.text=Rollback Changes action.Vcs.RollbackChanges.description=Rollback changes -action.RollbackLineStatusChanges.text=Rollback -action.RollbackLineStatusChanges.description=Rollback selected local changes +action.Vcs.RollbackChangedLines.text=Rollback +action.Vcs.RollbackChangedLines.description=Rollback changes in selected lines action.Vcs.EditSourceAction.text=Edit Source action.Vcs.EditSourceAction.description=Edit source action.Vcs.ExcludeAction.text=Exclude from Commit diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties index bbd737afedf1..5d539357ca3d 100644 --- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties +++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties @@ -360,6 +360,7 @@ label.collapse.by.default=Collapse by default: checkbox.show.code.folding.outline=Show code folding outline group.tab.appearance=Tab Appearance editbox.tab.limit=Tab limit: +editbox.tab.title.limit=Tab title limit: combobox.editor.tab.placement=Placement: checkbox.editor.tabs.in.single.row=Show tabs in single row checkbox.editor.tabs.show.close.button=Show "close" button on editor tabs diff --git a/platform/platform-resources-en/src/messages/CommonBundle.properties b/platform/platform-resources-en/src/messages/CommonBundle.properties index 46750d536a06..1fbbd0a61f57 100644 --- a/platform/platform-resources-en/src/messages/CommonBundle.properties +++ b/platform/platform-resources-en/src/messages/CommonBundle.properties @@ -31,7 +31,6 @@ action.close=&Close action.help=Help action.rerun=Rerun button.reset=&Reset -button.reset.to.default=&Reset to Default button.delete=Delete button.copy=Copy... button.close=&Close diff --git a/platform/platform-resources-en/src/messages/DiffBundle.properties b/platform/platform-resources-en/src/messages/DiffBundle.properties index 598cc9714697..aafd6884a3d6 100644 --- a/platform/platform-resources-en/src/messages/DiffBundle.properties +++ b/platform/platform-resources-en/src/messages/DiffBundle.properties @@ -67,6 +67,8 @@ 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.dialog.apply.partially.resolved.changes.confirmation.message=There 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.\nAre you sure you want to save changes and finish merging? +apply.partially.resolved.merge.dialog.title=Apply Changes 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 diff --git a/platform/platform-resources-en/src/messages/FindBundle.properties b/platform/platform-resources-en/src/messages/FindBundle.properties index 293d013fe8d6..8a857db74fd0 100644 --- a/platform/platform-resources-en/src/messages/FindBundle.properties +++ b/platform/platform-resources-en/src/messages/FindBundle.properties @@ -29,6 +29,7 @@ find.open.in.new.tab.checkbox=Open in new ta&b find.options.group=Options find.options.search.for.text.occurences.checkbox=Search for text &occurrences find.options.skip.results.tab.with.one.usage.checkbox=S&kip results tab with one usage +find.options.skip.results.tab.with.one.occurrence.checkbox=S&kip results tab when only one occurrence is found find.options.include.overloaded.methods.checkbox=Include o&verloaded methods find.scope.label=&Scope find.searched.elements.have.been.changed.error=Searched elements have been changed.\nCannot search for usages. @@ -69,6 +70,14 @@ find.text.to.find.label=Text to &find: find.replace.with.label=Replace &with: find.filter.file.name.group=File name filter find.filter.file.mask.checkbox=File m&ask(s) +find.context.combo.label=Conte&xt: +find.context.anywhere.scope.label=anywhere +find.context.in.comments.scope.label=in comments +find.context.in.literals.scope.label=in string literals +find.context.except.literals.scope.label=except string literals +find.context.except.comments.scope.label=except comments +find.context.except.comments.and.literals.scope.label=except comments and string literals + find.directory.not.found.error=Directory {0} is not found find.invalid.regular.expression.error=Bad pattern \"{0}\": {1} find.empty.match.regular.expression.error=Regular expression matches empty string diff --git a/platform/platform-resources-en/src/messages/VcsBundle.properties b/platform/platform-resources-en/src/messages/VcsBundle.properties index 3d34252c9c7a..573cff8e6261 100644 --- a/platform/platform-resources-en/src/messages/VcsBundle.properties +++ b/platform/platform-resources-en/src/messages/VcsBundle.properties @@ -308,7 +308,7 @@ changes.action.rollback.custom.title={0} Changes changes.action.rollback.nothing=Nothing to {0} changes.dialog.editchangelist.error.already.exists=A changelist named ''{0}'' already exists error.adding.files.prompt=The following problems have occurred when adding the files: -error.adding.files.title=Error adding files +error.adding.files.title=Error Adding Files column.name.revision.list.committer=User column.name.revision.list.number=Number column.name.revision.list.description=Description diff --git a/platform/platform-resources-en/src/messages/XDebuggerBundle.properties b/platform/platform-resources-en/src/messages/XDebuggerBundle.properties index 878c814e4764..058e446bc896 100644 --- a/platform/platform-resources-en/src/messages/XDebuggerBundle.properties +++ b/platform/platform-resources-en/src/messages/XDebuggerBundle.properties @@ -3,6 +3,8 @@ xdebugger.colors.page.name=Debugger debugger.configurable.display.name=Debugger debugger.dataViews.display.name=Data Views debugger.stepping.display.name=Stepping +# suppress inspection "UnusedProperty" +debugger.hotswap.display.name=HotSwap xdebugger.default.content.title=Debug xdebugger.debugger.tab.title=Debugger diff --git a/platform/platform-resources-en/src/messages/XmlBundle.properties b/platform/platform-resources-en/src/messages/XmlBundle.properties index 70e26de6ffeb..7343727c5b72 100644 --- a/platform/platform-resources-en/src/messages/XmlBundle.properties +++ b/platform/platform-resources-en/src/messages/XmlBundle.properties @@ -233,3 +233,6 @@ start.browser.with.js.debugger=with &JavaScript debugger javascript.debugger.settings.choose.file.title=Select javascript.debugger.settings.choose.file.subtitle=Select file to debug JavaScript in + +setting.value.builtin.server.port.label=Built-in server &port: +setting.value.can.accept.external.connections=Can accept &external connections
\ No newline at end of file |