diff options
Diffstat (limited to 'platform/platform-resources-en')
10 files changed, 81 insertions, 52 deletions
diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties index cf3ca0152b2d..1c05af27102c 100644 --- a/platform/platform-resources-en/src/messages/ActionsBundle.properties +++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties @@ -110,7 +110,7 @@ action.EditorMoveDownAndScrollWithSelection.text=Move Down and Scroll with Selec action.EditorAddOrRemoveCaret.text=Add or Remove Caret action.EditorCloneCaretBelow.text=Clone Caret Below action.EditorCloneCaretAbove.text=Clone Caret Above -action.SelectNextOccurrence.text=Select Next Occurrence +action.SelectNextOccurrence.text=Add Selection for Next Occurrence action.SelectAllOccurrences.text=Select All Occurrences action.UnselectPreviousOccurrence.text=Unselect Occurrence action.EditorToggleStickySelection.text=Toggle Sticky Selection @@ -329,10 +329,10 @@ action.FindModal.text=_Find... action.FindModal.description=Find a string in active editor, shows modal dialog action.Replace.text=_Replace... action.Replace.description=Replace a string in active editor with another string -action.FindNext.text=Find _Next -action.FindNext.description=Repeat the last Find/Replace operation -action.FindPrevious.text=Find Pre_vious -action.FindPrevious.description=Repeat the last Find/Replace operation in reverse direction +action.FindNext.text=Find _Next / Move to Next Occurrence +action.FindNext.description=Repeat the last Find/Replace operation, or moving to next occurrence of selected text +action.FindPrevious.text=Find Pre_vious / Move to Previous Occurrence +action.FindPrevious.description=Repeat the last Find/Replace operation in reverse direction, or moving to previous occurrence of selected text action.FindWordAtCaret.text=Find _Word at Caret action.FindWordAtCaret.description=Find next occurrence of the word at caret action.IncrementalSearch.text=Incrementa_l Search @@ -1014,6 +1014,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.EditSourceAction.text=Edit Source action.Vcs.EditSourceAction.description=Edit source action.Vcs.ExcludeAction.text=Exclude from Commit @@ -1391,3 +1393,9 @@ action.FillParagraph.description=Reformat string literal or comment to fit maxim action.SaveDocument.text=Save Document action.SaveDocument.description=Saves only the file opened in the current editor + +action.StructuralSearchPlugin.StructuralSearchAction.text=Search S_tructurally... +action.StructuralSearchPlugin.StructuralSearchAction.description=Structural Search +action.StructuralSearchPlugin.StructuralReplaceAction.text=Repla_ce Structurally... +action.StructuralSearchPlugin.StructuralReplaceAction.description=Structural Replace + diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties index fb3d47133256..bbd737afedf1 100644 --- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties +++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties @@ -575,7 +575,6 @@ title.tabs.and.indents=Tabs and Indents watcher.slow.sync=External file changes sync may be slow watcher.exe.not.found=Native file watcher executable not found watcher.exe.not.exe=Native file watcher is not executable: <a href="{0}">{0}</a> -watcher.exe.outdated=Native file watcher executable is outdated watcher.failed.to.start=File watcher failed to start watcher.gave.up=File watcher gave up to operate watcher.non.watchable.project=Project files cannot be watched (are they under network mount?) @@ -642,4 +641,6 @@ checkbox.reformat.on.typing.rbrace=Reformat block on typing '}' group.richcopy=Rich-text copy combobox.richcopy.color.scheme=Color scheme -combobox.richcopy.color.scheme.active=Active scheme
\ No newline at end of file +combobox.richcopy.color.scheme.active=Active scheme + +settings.code.style.default.general=Default (General)
\ No newline at end of file diff --git a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties index 23931e72104b..e7a7b43bf223 100644 --- a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties +++ b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties @@ -244,11 +244,11 @@ intention.settings.category.text=<html><body><font face=\"verdana\" size=\"-1\"> <center>To enable/disable a particular intention, select the intention inside this category.</center>\ </font></body></html> templates.postfix.settings.category.text=<html><body><font face=\"verdana\" size=\"-1\">\ - <center>You have selected the postfix completion language.</center>\ - <center>By clicking the checkbox, you can enable/disable all postfix completions for the language.</center>\ - <center>To enable/disable a particular postfix completion select the postfix completion inside the language.</center>\ + You have selected the postfix completion language.<br>\ + By clicking the checkbox, you can enable/disable all postfix templates for the language.<br>\ + To enable/disable a postfix template select it inside the group.<br>\ </font></body></html> -templates.postfix.settings.category.before=The sample code featuring selected intention will be shown here.\n \ +templates.postfix.settings.category.before=The sample code featuring selected template will be shown here.\n \ <spot>Flashing rectangle</spot> shows the place where intention is applicable. templates.postfix.settings.category.after=Postfix completion invocation result will be shown here. javadoc.description.copied.from.interface=Description copied from interface: diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties index 7a3e4e2f03c0..016c62b9f601 100644 --- a/platform/platform-resources-en/src/messages/IdeBundle.properties +++ b/platform/platform-resources-en/src/messages/IdeBundle.properties @@ -23,7 +23,7 @@ button.wizard.previous=&Previous button.wizard.next=&Next title.system.error=System Error title.select.path.to.browser=Select Path to Browser -title.general=General +title.general=System Settings editbox.default.encoding.for.properties.files=Default encoding for properties files: checkbox.transparent.native.to.ascii.conversion=Transparent native-to-ascii conversion checkbox.autodetect.utf=Autodetect UTF-encoded files diff --git a/platform/platform-resources-en/src/messages/InspectionsBundle.properties b/platform/platform-resources-en/src/messages/InspectionsBundle.properties index 0e423f5e6a6e..40940d687471 100644 --- a/platform/platform-resources-en/src/messages/InspectionsBundle.properties +++ b/platform/platform-resources-en/src/messages/InspectionsBundle.properties @@ -347,6 +347,7 @@ inspection.error.loading.message=Error reading inspection profile {0, choice, 0# inspection.errors.occurred.dialog.title=Errors Occurred inspection.profiles.presentable.name=Inspection profiles inspection.severity=Se&verity: +inspection.scopes.and.severities=Scopes and Se&vereties: inspection.description.title=Description inspection.as=As {0} inspection.new.profile.dialog.title=Create new profile diff --git a/platform/platform-resources-en/src/messages/OptionsBundle.properties b/platform/platform-resources-en/src/messages/OptionsBundle.properties index b1c60ece9896..aa2d1047c66e 100644 --- a/platform/platform-resources-en/src/messages/OptionsBundle.properties +++ b/platform/platform-resources-en/src/messages/OptionsBundle.properties @@ -198,6 +198,17 @@ options.xml.display.name=XML settings.panel.title=Settings +configurable.group.appearance.settings.display.name=Appearance and Behavior +configurable.group.editor.settings.display.name=Editor +configurable.group.project.settings.display.name=Current Project +configurable.group.build.settings.display.name=Build, Execution, Deployment +configurable.group.language.settings.display.name=Languages and Frameworks +configurable.group.tools.settings.display.name=Tools +configurable.group.null.settings.display.name=Other Settings + +configurable.default.project.tooltip=For default project +configurable.current.project.tooltip=For current project + control.panel.classic.view.button=Classic &View options.page.modified.save.message.text=The page has been modified. Save changes made on this page? options.save.changes.message.title=Save Changes diff --git a/platform/platform-resources-en/src/messages/XDebuggerBundle.properties b/platform/platform-resources-en/src/messages/XDebuggerBundle.properties index 523c8b697627..878c814e4764 100644 --- a/platform/platform-resources-en/src/messages/XDebuggerBundle.properties +++ b/platform/platform-resources-en/src/messages/XDebuggerBundle.properties @@ -1,6 +1,8 @@ xdebugger.colors.page.name=Debugger debugger.configurable.display.name=Debugger +debugger.dataViews.display.name=Data Views +debugger.stepping.display.name=Stepping xdebugger.default.content.title=Debug xdebugger.debugger.tab.title=Debugger @@ -52,6 +54,7 @@ xdebugger.button.evaluate=E&valuate xdebugger.evaluate.dialog.close=Close xdebugger.dialog.title.evaluate.expression=Evaluate Expression xdebugger.evaluate.label.expression=Expression: +xdebugger.evaluate.addtowatches.hint=Use Control+Enter to add to Watches dialog.title.evaluate.code.fragment=Evaluate Code Fragment button.text.code.fragment.mode=Code Fragment &Mode button.text.expression.mode=Expression &Mode @@ -110,4 +113,11 @@ scope.catch = Catch scope.class = Class scope.instance = Instance scope.library = Library -scope.unknown = Unknown
\ No newline at end of file +scope.unknown = Unknown + +setting.value.tooltip.delay.label=&Value tooltip delay (ms): +setting.enable.auto.expressions.label=Enable auto expressions in Variables view +setting.sort.alphabetically.label=Sort a&lphabetically + +setting.hide.window.label=Hide debug &window on process termination +setting.focus.app.on.breakpoint.label=Focus application on breakpoint diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties index 8febeb004c43..0f430e0fee58 100644 --- a/platform/platform-resources-en/src/misc/registry.properties +++ b/platform/platform-resources-en/src/misc/registry.properties @@ -1,26 +1,21 @@ localHistory.daysToKeep=5 -# suppress inspection "UnusedProperty" localHistory.daysToKeep.description=Specify how many working days changes should be remembered.\n\ WARNING: Do not use local history as main version control since it may become corrupted if the IDE hangs. undo.globalUndoLimit=10 undo.documentUndoLimit=100 actionSystem.fixLostTyping=true -# suppress inspection "UnusedProperty" actionSystem.fixLostTyping.description=Redispatch events, lost between actions and dialog show/close. actionSystem.fixStickyFocusedWindows=true actionSystem.fixNullFocusedComponent=true actionSystem.noDefaultComponent=true actionSystem.commandProcessingTimeout=30000 -# suppress inspection "UnusedProperty" actionSystem.commandProcessingTimeout.description=Timeout after which currently processed command is forcibly cancelled. actionSystem.typeAheadTimeBeforeDialog=2000 -# suppress inspection "UnusedProperty" actionSystem.typeAheadTimeBeforeDialog.description=If dialog shown as a result of some typing, all key types withing this time\ will be re-dispatched after dialog is closed. actionSystem.typeAheadTimeAfterPopupAction=500 actionSystem.playback.delay=20 -# suppress inspection "UnusedProperty" actionSystem.playback.delay.description=Delay between events generated by the playback runner. actionSystem.playback.useDirectActionCall=true actionSystem.playback.useTypingTargets=true @@ -29,7 +24,6 @@ actionSystem.mac.screenMenuNotUpdatedFix=false actionSystem.keyGestures.enabled=false actionSystem.keyGestureDblClickTime=650 actionSystem.suspendFocusTransferIfApplicationInactive=true -actionSystem.doNotStealFocus=false actionSystem.xWindow.remove.focus.from.nonFocusable.popups=true actionSystem.xWindow.remove.focus.from.nonFocusable.popups.delay=50 actionSystem.noContextComponentWhileFocusTransfer=true @@ -42,31 +36,33 @@ actionSystem.quickAccessEnabled=false actionSystem.quickAccessModifiers= actionSystem.quickAccessShowSpotsTime=1500 actionSystem.win.suppressAlt=true +actionSystem.win.suppressAlt.new=true actionSystem.mouseGesturesEnabled=true actionSystem.assertFocusAccessFromEdt=true actionSystem.enableAbbreviations=true ide.firstStartup=true ide.debugMode=false -# suppress inspection "UnusedProperty" ide.debugMode.description=Record additional information to make bug reports more informative. ide.debug.minProgressTime=0 ide.forcedShowTooltip=alt -# suppress inspection "UnusedProperty" ide.forcedShowTooltip.description=Shortcut for forced show tooltip. ide.popup.dropShadow=false ide.consumeKnownToolkitBugs=true ide.highlight.match.in.selected.only=true ide.lazyIconLoading=true ide.checkDuplicateMnemonics=false -# suppress inspection "UnusedProperty" ide.checkDuplicateMnemonics.description=Check for duplicate mnemonics. ide.dnd.textHints=false ide.max.recent.projects=25 +ide.hide.excluded.files=true +ide.hide.excluded.files.restartRequired=true +ide.hide.excluded.files.description=Do not show excluded files in Project View and exclude them from VCS + idea.fix.mac.env=true -# suppress inspection "UnusedProperty" -idea.fix.mac.env.description=On Mac, use shell environment for external processes (effective on restart). +idea.fix.mac.env.restartRequired=true +idea.fix.mac.env.description=On Mac, use shell environment for external processes. ide.x11.override.wm=true @@ -125,6 +121,8 @@ editor.smarterSelectionQuoting=true editor.skip.copy.and.cut.for.empty.selection=false editor.distraction.free.mode=false +editor.add.carets.on.double.control.arrows=true + ide.showIndexRebuildMessage=false ide.tabbedPane.bufferedPaint=true @@ -143,9 +141,9 @@ ide.mac.show.native.help=true ide.mac.useNativeClipboard=false ide.mac.boldEditorTabs=false ide.mac.disableMacScrollbars=false -ide.mac.disableMacScrollbars.description=Disables OS X overlay scrollbars (effective on restart) +ide.mac.disableMacScrollbars.restartRequired=true +ide.mac.disableMacScrollbars.description=Disables OS X overlay scrollbars ide.perProjectModality=false -# suppress inspection "UnusedProperty" ide.perProjectModality.description=New modality approach. All dialogs are DOCUMENT_MODAL expect ide-wide dialogs ide.mac.retina.disableDrawingFix=false @@ -154,25 +152,21 @@ ide.new.preferences=false ide.new.license.dialog=true debugger.valueTooltipAutoShow=true -# suppress inspection "UnusedProperty" debugger.valueTooltipAutoShow.description=Auto show tooltip on mouse over. debugger.mayBringFrameToFrontOnBreakpoint=true debugger.breakpoint.message.full.trace=false -# suppress inspection "UnusedProperty" debugger.breakpoint.message.full.trace.description='Log message to console' breakpoint action will out full stacktrace\ for the thread that hit the breakpoint. +debugger.batch.evaluation=false analyze.exceptions.on.the.fly=false -# suppress inspection "UnusedProperty" analyze.exceptions.on.the.fly.description=Automatically analyze clipboard on frame activation,\ and if there is a stacktrace calls Analyze Stacktrace. compiler.perform.outputs.refresh.on.start=false -# suppress inspection "UnusedProperty" compiler.perform.outputs.refresh.on.start.description=Whether to perform initial FS refresh before compilation starts.\ Need this to detect external changes to output dirs. compiler.max.static.constants.searches=3000 -# suppress inspection "UnusedProperty" compiler.max.static.constants.searches.description=If the number of changed compile time constants exceeds this value,\ make will start full-project rebuild @@ -180,29 +174,24 @@ compiler.process.jdk= compiler.process.jdk.description=Path to a JDK home. Force build process to be run using the JDK specified. It is assumed that the jdk is at least of version 1.6. compiler.process.32bit.vm.on.mac=true -# suppress inspection "UnusedProperty" compiler.process.32bit.vm.on.mac.description=Force -d32 VM option on Mac (recommended for faster startup and lower memory footprint). compiler.process.use.memory.temp.cache=true -# suppress inspection "UnusedProperty" compiler.process.use.memory.temp.cache.description=Store temporary data in memory for faster compilation;\ requires larger heap size for the build process. If parallel build is enabled, the option is ignored and temp data is always stored in memory. compiler.process.use.external.javac=false -# suppress inspection "UnusedProperty" compiler.process.use.external.javac.description=Run javac compiler in a separate process (allows to run build process with smaller heap size). compiler.process.debug.port=-1 compiler.automake.trigger.delay=300 -# suppress inspection "UnusedProperty" compiler.automake.trigger.delay.description=Delay in milliseconds before triggering auto-make in response to file system events compiler.automake.force.fs.rescan=false compiler.automake.force.fs.rescan.description=When enabled, for all automatically started builds (automake) collected VFS changes will be ignored and modified files will be determined with FS rescan will be forces compiler.document.save.trigger.delay=1500 -# suppress inspection "UnusedProperty" compiler.document.save.trigger.delay.description=Delay in milliseconds before triggering save in response to document changes vcs.show.colored.annotations=true @@ -244,22 +233,17 @@ java.completion.make.outer.variables.final.description=Make variables accessed f documentation.component.editor.font=false ide.completion.show.better.matching.classes=true -# suppress inspection "UnusedProperty" ide.completion.show.better.matching.classes.description=Show non-imported but good matching classes in basic completion ide.completion.show.lower.case.classes=false -# suppress inspection "UnusedProperty" ide.completion.show.lower.case.classes.description=Show non-imported classes starting with a lowercase letter in basic completion ide.completion.delay.autopopup.until.completed=false -# suppress inspection "UnusedProperty" ide.completion.delay.autopopup.until.completed.description=Controls if completion autopopup is shown immediately and populated in background, or delayed until all suggestion are calculated ide.completion.middle.matching=true -# suppress inspection "UnusedProperty" ide.completion.middle.matching.description=Suggest items in completion that contain the entered string somewhere in the middle. ide.goto.middle.matching=true -# suppress inspection "UnusedProperty" ide.goto.middle.matching.description=Suggest items in goto actions that contain the entered string somewhere in the middle. ide.goto.rebuild.delay=0 @@ -275,21 +259,17 @@ ide.dfa.getters.with.side.effects.description=A regex on qualified names of meth ide.enable.toolwindow.stack=false change.signature.awesome.mode=true -# suppress inspection "UnusedProperty" change.signature.awesome.mode.description=Enables list view for change signature. enable.groovy.hotswap=true -# suppress inspection "UnusedProperty" enable.groovy.hotswap.description=Whether IDEA should add a special java agent to the debugged process\ which allows to hot-swap Groovy changes in some cases dump.threads.on.empty.lookup=false -# suppress inspection "UnusedProperty" dump.threads.on.empty.lookup.description=Whether IDEA should issue a thread dump when an empty completion lookup appears. file.structure.tree.mode=true disable.toolwindow.overlay=true -# suppress inspection "UnusedProperty" disable.toolwindow.overlay.description=Disable transparent toolwindow stripes. core.pooled.threads=20 @@ -300,7 +280,6 @@ type.ahead.logging.enabled=false fast.tree.expand.in.structure.view=false ide.goto.implementation.show.interfaces=true -# suppress inspection "UnusedProperty" ide.goto.implementation.show.interfaces.description=Whether to show sub-interfaces when invoking\ 'Go to Implementation' action (Ctrl+Alt+B) on an interface. @@ -340,20 +319,15 @@ svn.use.incoming.optimization=false completion.enable.relevant.method.chain.suggestions=false ide.mac.message.sheets.java.emulation=false -# suppress inspection "UnusedProperty" ide.mac.message.sheets.java.emulation.description=Use Java message sheets instead of native ones ide.mac.message.sheets.java.emulation.dialogs=true -# suppress inspection "UnusedProperty" ide.mac.message.sheets.java.emulation.dialogs.description=Use Java message sheets based on awt dialogs instead of native sheets linux.native.menu=false linux.native.menu.description=Enables native menu on Ubuntu windows.jumplist=true -# suppress inspection "UnusedProperty" windows.jumplist.description=Enables JumpLists on Windows -# suppress inspection "UnusedProperty" GRADLE.system.in.process=true -# suppress inspection "UnusedProperty" GRADLE.system.in.process.description=Whether IDEA should use 'in-process' mode for interaction with gradle api grails.advanced.mode=false @@ -363,7 +337,6 @@ darcula.use.native.fonts.on.linux=true darcula.use.native.fonts.on.linux.description=If false, uses DejaVu Sans 13pt idea.4.5.laf.enabled=false ide.libnotify.enabled=true -# suppress inspection "UnusedProperty" ide.libnotify.enabled.description=Enables notifications via LibNotify cvs.roots.refresh.uses.vfs=true cvs.roots.refresh.uses.vfs.description=Should CVS roots refresh after update use VFS @@ -378,6 +351,7 @@ dsm.retina.darcula.legend=true dsm.retina.darcula.legend.description=Experimental DSM legend component ide.scratch.enabled=false +ide.show.progress.without.status.bar=false editor.injected.highlighting.enabled=true editor.injected.highlighting.enabled.description=Disables injected fragments highlighting (requires project reopening) @@ -398,15 +372,24 @@ focus.fix.lost.cursor.description=See IDEA-79312 ide.inertial.mouse.fix=false ide.inertial.mouse.fix.description=See IDEA-71508 +ide.log.focuses=false +ide.log.focuses.description=Enables logging of focuses (Time consuming) + emmet.segments.limit=50 +emmet.template.length.limit.kilobytes=15 command.line.execution.timeout=30 console.too.much.text.buffer.ratio=10 console.too.much.text.buffer.ratio.description=Used for disabling of console processing(console filters for highlights, foldings...),\n\ when there is too much of text to process.\n\ The ratio is used against the console cycle buffer size (idea.cycle.buffer.size/theRatio=maxTextLength). +ide.file.settings.order.new=false ide.new.project.settings=false ide.new.project.settings.description=Temporary key for new project settings dialog UI commonjs.complete.required.filename.with.extension=false commonjs.complete.required.filename.with.extension.description=If checked, required filenames are completed with extension + + +fix.jdk7.alt.shortcuts=true +fix.jdk7.alt.shortcuts.description=Allow to use alt for shortcuts on MacOSX with jdk7+
\ No newline at end of file diff --git a/platform/platform-resources-en/src/tips/QuickEvaluateExpression.html b/platform/platform-resources-en/src/tips/QuickEvaluateExpression.html new file mode 100644 index 000000000000..f625c3e3b0bd --- /dev/null +++ b/platform/platform-resources-en/src/tips/QuickEvaluateExpression.html @@ -0,0 +1,15 @@ +<html> +<head> + <link rel="stylesheet" type="text/css" href="css/tips.css"> +</head> +<body> + + <p>To quickly evaluate the value of any expression while debugging the program, + hold Alt and click this expression to see its value and calculate it, call a method, etc. </p> + + <p class="image"> + <img src="images/quick_evaluate.png"> + </p> + +</body> +</html> diff --git a/platform/platform-resources-en/src/tips/images/quick_evaluate.png b/platform/platform-resources-en/src/tips/images/quick_evaluate.png Binary files differnew file mode 100644 index 000000000000..13c6c4a2a1e6 --- /dev/null +++ b/platform/platform-resources-en/src/tips/images/quick_evaluate.png |
