summaryrefslogtreecommitdiff
path: root/platform/platform-resources-en/src/messages
diff options
context:
space:
mode:
Diffstat (limited to 'platform/platform-resources-en/src/messages')
-rw-r--r--platform/platform-resources-en/src/messages/ApplicationBundle.properties11
-rw-r--r--platform/platform-resources-en/src/messages/ExecutionBundle.properties17
-rw-r--r--platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties2
-rw-r--r--platform/platform-resources-en/src/messages/IdeBundle.properties16
-rw-r--r--platform/platform-resources-en/src/messages/InspectionsBundle.properties2
-rw-r--r--platform/platform-resources-en/src/messages/OptionsBundle.properties24
-rw-r--r--platform/platform-resources-en/src/messages/RefactoringBundle.properties2
-rw-r--r--platform/platform-resources-en/src/messages/UIBundle.properties1
8 files changed, 48 insertions, 27 deletions
diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
index 75d0f242e38c..42fd4e94be46 100644
--- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties
+++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
@@ -212,6 +212,8 @@ wrapping.parameters.annotation=Parameter annotations
wrapping.local.variables.annotation=Local variable annotations
wrapping.enum.constants=Enum constants
wrapping.long.lines=Ensure right margin is not exceeded
+wrapping.comments=Comments
+wrapping.comments.wrap.at.right.margin=Wrap at right margin
checkbox.align.multiline.chained.methods=Chained methods
checkbox.align.multiline.method.parameters=Method parameters
@@ -621,6 +623,7 @@ arrangement.settings.additional.force.rearrange.always=Always
arrangement.settings.additional.force.rearrange.never=Never
arrangement.settings.additional.force.rearrange.according.to.dialog=Use current mode (toggled in the Reformat Code dialog)
arrangement.settings.additional.title=Additional settings
+arrangement.settings.validation.duplicate.matching.rule=Matching rule have to be unique in the current settings. Duplicated rules will be ignored.
arrangement.settings.validation.duplicate.section.text=Section text have to be unique in the current settings. Rule with duplicated text will be ignored.
arrangement.settings.validation.empty.section.rule=Section should contain at least one arrangement entry otherwise it will be never inserted.
arrangement.settings.validation.end.section.rule.without.start=Can not find start section rule for the current end rule.
@@ -644,4 +647,10 @@ group.richcopy=Rich-text copy
combobox.richcopy.color.scheme=Color scheme
combobox.richcopy.color.scheme.active=Active scheme
-settings.code.style.default.general=Default (General) \ No newline at end of file
+settings.code.style.default.general=Default (General)
+wrapping.wrap.if.multiple.annotations=Wrap if multiple
+wrapping.after.annotations=After last field annotation
+
+reformat.changed.text.file.too.big.notification.groupId=Reformat changed text
+reformat.changed.text.file.too.big.notification.title=Couldn't calculate changed ranges
+reformat.changed.text.file.too.big.notification.text=file {0} is too big or there are too many changes \ No newline at end of file
diff --git a/platform/platform-resources-en/src/messages/ExecutionBundle.properties b/platform/platform-resources-en/src/messages/ExecutionBundle.properties
index 183dda3d52b8..508ac2ad2801 100644
--- a/platform/platform-resources-en/src/messages/ExecutionBundle.properties
+++ b/platform/platform-resources-en/src/messages/ExecutionBundle.properties
@@ -40,9 +40,12 @@ jre.not.valid.error.message=''{0}'' is not valid JRE home
applet.configuration.description=Applet configuration
applet.configuration.name=Applet
-application.configuration.description=Application configuration
+application.configuration.description=Java application configuration
application.configuration.name=Application
+jar.application.configuration.description=Configuration to run a JAR file using 'java -jar' command
+jar.application.configuration.name=JAR Application
+
run.configuration.norunner.selected.label=No runner selected
run.configuration.configuration.tab.title=Configuration
run.configuration.startup.connection.rab.title=Startup/Connection
@@ -132,10 +135,10 @@ junit.runing.info.errors.count.message=E:{0}
junit.runing.info.passed.count.message=P:{0}
junit.runing.info.ignored.count.message=I:{0}
-junit.runing.info.status.completed.from.total.failed={0} of {1} Failed: {2}
-junit.runing.info.status.completed.from.total={0} of {1}
-junit.runing.info.status.running.number.with.name=Running: {0} {1}
-junit.runing.info.failed.to.start.error.message=Failed to start
+junit.running.info.status.completed.from.total.failed={0} of {1} Failed: {2}
+junit.running.info.status.completed.from.total={0} of {1}
+junit.running.info.status.running.number.with.name=Running: {0} {1}
+junit.running.info.failed.to.start.error.message=Failed to start
junit.runing.info.tests.failed.label=Tests Failed
junit.runing.info.tests.passed.label=Tests Passed
tests.passed.with.warnings.message=Tests passed (with warnings)
@@ -274,8 +277,8 @@ environment.variables.helper.use.arguments.jdk13.label=<html><body>For JDK 1.3.x
environment.variables.helper.use.arguments.jdk14.label=<html><body>For JDK 1.4.x</body></html>
select.run.configuration.for.item.action.name=Select ''{0}''
save.run.configuration.for.item.action.name=Save ''{0}''
-junit.runing.info.status.done.count=Done: {0}
-junit.runing.info.status.terminated.count=Terminated: {0}
+junit.running.info.status.done.count=Done: {0}
+junit.running.info.status.terminated.count=Terminated: {0}
junit.runing.info.tests.in.progress.done.tree.node=Tests in Progress: Done
junit.runing.info.tests.in.progress.terminated.tre.node=Tests in Progress: Terminated
delete.confirmation.dialog.title=Delete Confirmation
diff --git a/platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties b/platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties
index 9a94f1f267bc..346399cfe60e 100644
--- a/platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties
+++ b/platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties
@@ -121,4 +121,4 @@ find.recent.search=Recent searches history
find.completion=Completion in Find Bar
switcher=Switcher
dir.diff=Directory Diff
-jar.diff=Jar Files Diff
+jar.diff=JAR Files Diff
diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties
index 3b3773a07e06..2c0a81a8fcd0 100644
--- a/platform/platform-resources-en/src/messages/IdeBundle.properties
+++ b/platform/platform-resources-en/src/messages/IdeBundle.properties
@@ -641,6 +641,7 @@ checkbox.widescreen.tool.window.layout=Widescreen tool window layout
checkbox.left.toolwindow.layout=Side-by-side layout on the left
checkbox.right.toolwindow.layout=Side-by-side layout on the right
checkbox.show.editor.preview.popup=Show editor preview tooltip
+checkbox.use.preview.window=Navigate to preview
checkbox.show.tool.window.numbers=Show tool window numbers
checkbox.animate.windows=Animate windows
group.transparency=Transparency
@@ -941,10 +942,10 @@ predefined.scope.tests.name=Tests
scope.editor.legend.recursively.included.label=Recursively included
scope.editor.legend.partly.included.label=Partially included
toolwindow.palette=Palette
-jar.build.on.make=Build jars on &make
-jar.build.modules.to.jar=Choose Modules to Jar
-jar.build.module.0.jar.settings=Module ''{0}'' Jar Settings
-jar.build.include.in.jar.file=Include in jar file:
+jar.build.on.make=Build JARs on &make
+jar.build.modules.to.jar=Choose Modules to JAR
+jar.build.module.0.jar.settings=Module ''{0}'' JAR Settings
+jar.build.include.in.jar.file=Include in JAR file:
search.textfield.title=&Search:
select.in.scope=Scope
scope.view.title=Scopes
@@ -1018,7 +1019,7 @@ button.fix=Fix\u2026
setup.library.dialog.title=Setup Library
label.library.will.be.created.description.text={0} level library <b>{1}</b> with {2} {2, choice, 1#file|2#files} will be created
new.library.file.chooser.title=New Library Files
-new.library.file.chooser.description=Select jar files in which library classes are located
+new.library.file.chooser.description=Select JAR files in which library classes are located
create.default.library.type.action.name=Java
popup.title.select.library.type=Select Library Type
@@ -1141,8 +1142,9 @@ whatsnew.action.custom.text=What''s _New in {0}
whatsnew.action.custom.description=Find out about the new features in this version of {0}
diff.dialog.title=Diff Between ''{0}'' and ''{1}''
-goto.custom.region.command=Go to Custom Region
-goto.custom.region.message.dumb.mode=Go to Custom Region action is not available until indices are built.
+goto.custom.region.menu.item=Custom Folding Region...
+goto.custom.region.command=Go to Custom Folding Region
+goto.custom.region.message.dumb.mode=Go to Custom Folding Region action is not available until indices are built.
goto.custom.region.message.unavailable=There are no custom folding regions in the current file.
alphabetical.mode.is.on.warning=Alphabetical order for tabs is ON. Switch it OFF?
diff --git a/platform/platform-resources-en/src/messages/InspectionsBundle.properties b/platform/platform-resources-en/src/messages/InspectionsBundle.properties
index 98e0045a31f3..bccf8c48411f 100644
--- a/platform/platform-resources-en/src/messages/InspectionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/InspectionsBundle.properties
@@ -116,6 +116,8 @@ inspection.redundant.throws.problem.descriptor2=The declared exception {0} is ne
inspection.equals.hashcode.display.name=equals() and hashCode() not paired
inspection.equals.hashcode.only.one.defined.problem.descriptor=Class has {0} defined but does not define {1}
+inspection.equals.hashcode.generate.equals.quickfix=Generate 'equals()'
+inspection.equals.hashcode.generate.hashcode.quickfix=Generate 'hashCode()'
inspection.1.5.display.name=Usages of API documented as @since 1.5 (1.6|1.7)
inspection.1.5.problem.descriptor=Usage of API documented as @since {0}+
diff --git a/platform/platform-resources-en/src/messages/OptionsBundle.properties b/platform/platform-resources-en/src/messages/OptionsBundle.properties
index 2c06b31b53f7..537dec1d8f92 100644
--- a/platform/platform-resources-en/src/messages/OptionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/OptionsBundle.properties
@@ -198,31 +198,35 @@ options.xml.display.name=XML
settings.panel.title=Settings
-node.configurable.build.tools.display.name=Build Tools
-node.configurable.build.tools.settings.description=<html><body>\
- Default view for Build Tools
-
configurable.group.appearance.settings.display.name=Appearance and Behavior
configurable.group.appearance.settings.description=<html><body>\
- Default view for Appearance and Behavior
+ Personalize IntelliJ appearance and behavior: change themes and font size, tune the keymap,\
+ configure plugins and system settings, such as password policies, HTTP proxy, updates and more.
configurable.group.editor.settings.display.name=Editor
configurable.group.editor.settings.description=<html><body>\
- Default view for Editor
+ Personalize source code appearance by changing fonts, highlighting styles, indents, etc.\
+ Customize the Editor from line numbers, caret placement and tabs to source code inspections,\
+ setting up templates and file encodings.
configurable.group.project.settings.display.name=Current Project
configurable.group.project.settings.description=<html><body>\
Default view for Current Project
configurable.group.build.settings.display.name=Build, Execution, Deployment
configurable.group.build.settings.description=<html><body>\
- Default view for Build, Execution, Deployment
+ Configure you project integration with different build tools (Maven, Gradle or Gant),\
+ modify the default compiler settings, manage server access configurations, customize the Debugger behavior, etc.
+configurable.group.build.tools.settings.display.name=Build Tools
+configurable.group.build.tools.settings.description=<html><body>\
+ Configure your project integration with different build tools: Maven, Gradle or Gant.
configurable.group.language.settings.display.name=Languages and Frameworks
configurable.group.language.settings.description=<html><body>\
- Default view for Languages and Frameworks
+ Configure the settings related to specific frameworks and technologies used in your project.
configurable.group.tools.settings.display.name=Tools
configurable.group.tools.settings.description=<html><body>\
- Default view for Tools
+ Configure integration with third-party applications, specify the SSH Terminal connection settings,\
+ manage server certificates and tasks, configure diagrams layout, etc.
configurable.group.null.settings.display.name=Other Settings
configurable.group.null.settings.description=<html><body>\
- Default view for Other Settings
+ Settings that are related to non-bundled custom plugins and are not assigned to any other category.
configurable.default.project.tooltip=For default project
configurable.current.project.tooltip=For current project
diff --git a/platform/platform-resources-en/src/messages/RefactoringBundle.properties b/platform/platform-resources-en/src/messages/RefactoringBundle.properties
index 48d0e63d60c0..72b1cd7ad131 100644
--- a/platform/platform-resources-en/src/messages/RefactoringBundle.properties
+++ b/platform/platform-resources-en/src/messages/RefactoringBundle.properties
@@ -671,7 +671,7 @@ static.initializer.description=static initializer of class {0}
instance.initializer.description=instance initializer of class {0}
file.description=File {0}
directory.description=Directory {0}
-0.is.located.in.a.jar.file={0} is located in a jar file.\n
+0.is.located.in.a.jar.file={0} is located in a JAR file.\n
0.is.read.only={0} is read-only.\n
0.is.not.a.legal.java.identifier=''{0}'' is not a legal java identifier
method.0.is.already.defined.in.the.1=Method {0} is already defined in the {1}
diff --git a/platform/platform-resources-en/src/messages/UIBundle.properties b/platform/platform-resources-en/src/messages/UIBundle.properties
index 5dd72ae735b7..4f67ac6dcbf8 100644
--- a/platform/platform-resources-en/src/messages/UIBundle.properties
+++ b/platform/platform-resources-en/src/messages/UIBundle.properties
@@ -24,6 +24,7 @@ replace.prompt.replace.button=&Replace
replace.prompt.skip.button=&Skip
replace.prompt.all.in.this.file.button=All in This &File
replace.prompt.all.files.action=&All Files
+replace.prompt.review.action=Re&view
replace.prompt.all.button=&All
replace.prompt.replace.occurrence.label=Do you want to replace this occurrence?
search.popup.search.for.label=Search for: