diff --git a/java/compiler/openapi/resources/messages/JavaCompilerBundle.properties b/java/compiler/openapi/resources/messages/JavaCompilerBundle.properties index 07206f0706f6..8194b1e7d4e0 100644 --- a/java/compiler/openapi/resources/messages/JavaCompilerBundle.properties +++ b/java/compiler/openapi/resources/messages/JavaCompilerBundle.properties @@ -317,7 +317,7 @@ artifacts.menu.item.rebuild=Rebuild artifacts.menu.item.edit=Edit\u2026 error.task.0.execution.failed=Task {0} failed, please see idea.log for details dialog.title.choose.module=Choose Module -build.process.no.javac.found=No system java compiler is provided by the JRE. Make sure tools.jar is present in IntelliJ IDEA classpath. +build.process.no.javac.found=No system java compiler is provided by the JRE. Make sure tools.jar is present in IDE classpath. build.process.no.javac.path.found=Cannot determine path to ''tools.jar'' library for {0} ({1}) build.process.no.free.debug.port=Cannot find free port to debug build process build.process.ecj.path.does.not.exist=Path to eclipse ecj compiler does not exist: {0} diff --git a/java/idea-ui/resources/messages/JavaUiBundle.properties b/java/idea-ui/resources/messages/JavaUiBundle.properties index 296679ac854a..35060bf6da0d 100644 --- a/java/idea-ui/resources/messages/JavaUiBundle.properties +++ b/java/idea-ui/resources/messages/JavaUiBundle.properties @@ -406,7 +406,7 @@ add.external.annotations.path.description=Select path in which external annotati sdk.configure.sourcepath.tab=Sourcepath error.message.please.enter.valid.library.files.path=Please enter valid library files path add.new.module.text.full=Module -project.roots.classpath.format.default.descr=IntelliJ IDEA (.iml) +project.roots.classpath.format.default.descr=IDE (.iml) module.classpath.button.edit=Ed&it\u2026 choose.modules.dialog.description=Library ''{0}'' will be added to the selected modules. dialog.message.no.suitable.modules.for.0.facet.found=No suitable modules for {0} facet found. @@ -574,7 +574,7 @@ notification.content.no.files.were.downloaded.multiple=No files have been downlo library.jars.diff.dialog.0.jars.differ.from.1.library.jars={0} JARs differ from the ''{1}'' library JARs. library.jars.change.coordinates.action.title=Change Coordinates\u2026 project.structure.dialog.title.choose.libraries=Choose Libraries -add.idea.module.label=Add Intellij IDEA module +add.idea.module.label=Add IDE module existing.sources=Existing sources label.ipr.file.based=.ipr (file-based) label.directory.based={0} (directory-based) @@ -602,7 +602,7 @@ checkbox.move.classes.to.separate.source.root=Move classes to a separate source dialog.title.specify.path.to.new.source.root=Specify Path to New Source Root dialog.message.failed.to.extract.module=Failed to extract a module: {0} select=Select -intellij.idea.module.file.iml=Intellij IDEA module file (*.iml) +intellij.idea.module.file.iml=IDE module file (*.iml) directory.with.existing.sources=directory with existing sources label.existing.library.will.be.used={0} library will be used progress.text.searching.for.libraries=Searching for libraries. Please wait. diff --git a/java/java-features-trainer/resources/messages/JavaLessonsBundle.properties b/java/java-features-trainer/resources/messages/JavaLessonsBundle.properties index 5c38eaf1fd25..e9cfd1234dda 100644 --- a/java/java-features-trainer/resources/messages/JavaLessonsBundle.properties +++ b/java/java-features-trainer/resources/messages/JavaLessonsBundle.properties @@ -11,8 +11,8 @@ java.missed.sdk.wait.installation=Please wait while the IDE installs JDK java.onboarding.module.name=Onboarding tour java.onboarding.module.description=A brief overview of the main features in {0}. -java.onboarding.lesson.name=Get Acquainted with IDEA -java.onboarding.change.ui.settings=For this lesson, IDEA changes some UI settings to the default state. \ +java.onboarding.lesson.name=Get Acquainted with OpenIDE +java.onboarding.change.ui.settings=For this lesson, IDE changes some UI settings to the default state. \ Your preferences will be restored when you complete or exit the lesson. java.onboarding.project.view.description=The Project view is one of the main tool windows. It contains the project directory, SDK-specific external libraries, and scratch files. Click the striped button to preview the demo project content. You can also open it by pressing {0}. java.onboarding.balloon.project.view=Click to open the Project view @@ -46,7 +46,7 @@ java.onboarding.choose.values.item=Now you can start typing {0} to reduce the co java.onboarding.invoke.completion.tip=Tip: shows completion options automatically as you type. \ Also, you can press {0} to show completion items in any place of the code. java.onboarding.invoke.intention.for.warning.1=You have just fixed a bug, but you can make this code look even better. \ - IDEA highlights and adds a yellow bulb to the code lines that can be improved. + IDE highlights and adds a yellow bulb to the code lines that can be improved. java.onboarding.invoke.intention.for.warning.2=Press {0} to preview the warnings and apply a quick-fix. java.onboarding.invoke.intention.for.warning.balloon=Press {0} to show available quick-fixes java.onboarding.select.fix=Apply the first item: {0}. In this case, the for-each loop will make code easier to understand. diff --git a/java/java-features-trainer/src/com/intellij/java/ift/JavaLangSupport.kt b/java/java-features-trainer/src/com/intellij/java/ift/JavaLangSupport.kt index 859ef5c44640..8548210e2b11 100644 --- a/java/java-features-trainer/src/com/intellij/java/ift/JavaLangSupport.kt +++ b/java/java-features-trainer/src/com/intellij/java/ift/JavaLangSupport.kt @@ -23,7 +23,7 @@ import javax.swing.JList const val javaLanguageId: String = "JAVA" internal class JavaLangSupport : JavaBasedLangSupport() { - override val contentRootDirectoryName: String = "IdeaLearningProject" + override val contentRootDirectoryName: String = "JavaLearningProject" override val projectResourcePath: String = "learnProjects/java/LearnProject" override val primaryLanguage: String = javaLanguageId diff --git a/java/java-features-trainer/src/com/intellij/java/ift/lesson/essential/JavaOnboardingTourLesson.kt b/java/java-features-trainer/src/com/intellij/java/ift/lesson/essential/JavaOnboardingTourLesson.kt index 0fd4c626e46f..cc61d97f9c43 100644 --- a/java/java-features-trainer/src/com/intellij/java/ift/lesson/essential/JavaOnboardingTourLesson.kt +++ b/java/java-features-trainer/src/com/intellij/java/ift/lesson/essential/JavaOnboardingTourLesson.kt @@ -103,7 +103,7 @@ internal fun LessonContext.contextActionsForJavaOnboarding(sample: LessonSample) class JavaOnboardingTourLesson : OnboardingTourLessonBase(ideaOnboardingLessonId) { override val demoFileExtension: String = "java" - override val learningProjectName: String = "IdeaLearningProject" + override val learningProjectName: String = "JavaLearningProject" override val sample = javaOnboardingTourSample override val completionStepExpectedCompletion: String = "length" diff --git a/java/openapi/resources/messages/JavaBundle.properties b/java/openapi/resources/messages/JavaBundle.properties index ea3d836f2e58..0ee8f246ee29 100644 --- a/java/openapi/resources/messages/JavaBundle.properties +++ b/java/openapi/resources/messages/JavaBundle.properties @@ -1291,8 +1291,8 @@ inlay.parameters.java.new.expr=Calls to parametrized constructors. # suppress inspection "UnusedProperty" inlay.parameters.java.clear.expression.type=Method calls that use a complex expression as an argument, for example, the ternary operator or a Java 13 switch statement. inlay.MethodChainsInlayProvider.description=Method return types in call chains. -inlay.annotation.hints.inferred.annotations=Annotations that IntelliJ IDEA generates by scanning libraries and project code. These annotations help you understand code contracts and improve the capabilities of static analysis. They include:
@Contract
@Nullable
@NotNull
@Unmodifiable
@UnmodifiableView

Documentation -inlay.annotation.hints.external.annotations=Annotations that are stored outside your source code.
These annotations are useful when you need an annotation, but adding it to the source code is not an option (for example, when working with a library code).

Documentation +inlay.annotation.hints.inferred.annotations=Annotations that IDE generates by scanning libraries and project code. These annotations help you understand code contracts and improve the capabilities of static analysis. They include:
@Contract
@Nullable
@NotNull
@Unmodifiable
@UnmodifiableView

Documentation (TODO: change link to OpenIDE) +inlay.annotation.hints.external.annotations=Annotations that are stored outside your source code.
These annotations are useful when you need an annotation, but adding it to the source code is not an option (for example, when working with a library code).

Documentation (TODO: change link to OpenIDE) show.import.popup.for.classes=&Classes show.import.popup.for.static.methods.and.fields=&Static methods and fields exclude.import.wildcard.comment=Use the * wildcard to exclude all members of a specified class or package @@ -1331,7 +1331,7 @@ title.package.not.found=Package Not Found title.packages=Packages title.packages.to.use.import.with=Packages to Use Import with '*': to.import.a.method.statically.press.0=To import a method statically, press {0} -unscramble.detect.analyze.threaddump.from.clipboard.item=Automatically detect and analyze thread dumps copied to the clipboard outside of IntelliJ IDEA +unscramble.detect.analyze.threaddump.from.clipboard.item=Automatically detect and analyze thread dumps copied to the clipboard outside of IDE unscramble.log.path.label=&Log file: unscramble.no.unscrambler.item= unscramble.normalize.button=&Normalize @@ -1719,7 +1719,7 @@ dfa.constraint.not.null=not-null dfa.constraint.0.not.null={0} (not-null) dfa.constraint.null.or.0=null or {0} label.class.pattern.syntax.explanation=Leave the method blank to represent constructors\nAny * will match against one or more characters in the qualified name (including dots) -dialog.message.modules.dont.refer.to.existing.annotations.library={0, choice, 0#Module|2#Modules} {1} {0, choice, 0#doesn''t|2#don''t} refer to the existing ''{2}'' library with IntelliJ IDEA nullity annotations. Would you like to add the {0, choice, 0#dependency|2#dependencies} now? +dialog.message.modules.dont.refer.to.existing.annotations.library={0, choice, 0#Module|2#Modules} {1} {0, choice, 0#doesn''t|2#don''t} refer to the existing ''{2}'' library with IDE nullity annotations. Would you like to add the {0, choice, 0#dependency|2#dependencies} now? tab.title.slices.grouped.by.nullness=\ (Grouped by Nullness) exclude.0.from.auto.import=Exclude ''{0}'' from auto-import column.name.method.entry.point=Method diff --git a/platform/ide-core/resources/messages/ApplicationBundle.properties b/platform/ide-core/resources/messages/ApplicationBundle.properties index 5964906034eb..da975ccd4d36 100644 --- a/platform/ide-core/resources/messages/ApplicationBundle.properties +++ b/platform/ide-core/resources/messages/ApplicationBundle.properties @@ -597,7 +597,7 @@ settings.code.style.general.autodetect.indents=Detect and use existing file inde import.scheme.chooser.source=From\: import.scheme.chooser.destination=To\: checkbox.reformat.on.typing.rbrace=Reformat block on typing '}' -settings.code.style.import.xml.error.invalid.file=The file doesn''t seem to be a valid Intellij IDEA XML scheme, it should contain ''code_scheme root'' element, found ''{0}'' instead. +settings.code.style.import.xml.error.invalid.file=The file doesn''t seem to be a valid IDE XML scheme, it should contain ''code_scheme root'' element, found ''{0}'' instead. settings.code.style.import.xml.error.missing.scheme.name=Scheme 'name' attribute not found. settings.code.style.import.xml.error.can.not.load=Can''t load code style scheme {0}. @@ -678,12 +678,12 @@ settings.editor.scheme.import.chooser.title=Choose Schemes settings.code.style.visual.guides=Visual guides settings.code.style.visual.guides.optional=Optional settings.code.style.general.visual.guides.hint=Specify one guide (80) or several (80, 120) -settings.export.target.intellij.xml=IntelliJ IDEA code style XML -settings.export.target.color.scheme=IntelliJ IDEA color scheme (.icls) +settings.export.target.intellij.xml=IDE code style XML +settings.export.target.color.scheme=IDE color scheme (.icls) settings.export.target.color.scheme.plugin=Color scheme plugin .jar -settings.import.source.color.scheme=IntelliJ IDEA color scheme (.icls) or settings (.jar) -settings.export.inspection.profile.xml=IntelliJ IDEA inspection profile XML -settings.import.inspection.profile.xml=IntelliJ IDEA inspection profile XML +settings.import.source.color.scheme=IDE color scheme (.icls) or settings (.jar) +settings.export.inspection.profile.xml=IDE inspection profile XML +settings.import.inspection.profile.xml=IDE inspection profile XML margin.columns=columns combobox.lineseparator.for.new.files.hint=Applied to new files diff --git a/platform/platform-api/resources/messages/IdeBundle.properties b/platform/platform-api/resources/messages/IdeBundle.properties index f49ad58e73fe..2f715e0f40fd 100644 --- a/platform/platform-api/resources/messages/IdeBundle.properties +++ b/platform/platform-api/resources/messages/IdeBundle.properties @@ -3045,8 +3045,8 @@ plugin.updater.not.installed.misc=Plugin update was not installed: {0} plugin.updater.not.installed.see.log.action=See the log for more information plugin.message.plugin.only.supported.in=This plugin is available only in {0}. reportProblemAction.progress.title.submitting=Submitting\u2026 -reportProblemAction.upload.logs.title=Send Logs to JetBrains? -reportProblemAction.upload.logs.message=By clicking \u201CYes\u201D you agree to send the logs of {0} to facilitate communication with JetBrains technical support. \ +reportProblemAction.upload.logs.title=Send Logs? +reportProblemAction.upload.logs.message=By clicking \u201CYes\u201D you agree to send the logs of {0} to facilitate communication with technical support. \ Logs may contain private info such as system info and info about the projects opened in the IDE. \ If it is not possible to upload logs automatically, you can still send a separate, editable log as an attachment. \ If you do not send a log, we may be unable to help you with your issue. @@ -3120,8 +3120,8 @@ title.language.and.region=Language and Region combobox.language.option=Language combobox.language=Language: combobox.region=Region: -combobox.region.comment=Select a region to ensure that licensing, JetBrains Marketplace, and
other region-specific features and links work correctly. Requires
restart. See the documentation for details. -combobox.region.hint=Select a region to ensure that
licensing, JetBrains Marketplace,
and other region-specific features
and links work correctly. Requires
restart. +combobox.region.comment=Select a region to ensure that licensing, marketplace, and other
region-specific features and links work correctly. Requires
restart. See the documentation for details. +combobox.region.hint=Select a region to ensure that
licensing, marketplace, and
other region-specific features
and links work correctly. Requires
restart. combobox.region.hint.link=Documentation item.get.more.languages=Get More Languages\u2026 diff --git a/platform/platform-api/resources/messages/LanguageAndRegionBundle.properties b/platform/platform-api/resources/messages/LanguageAndRegionBundle.properties index 9fbeff838c17..704500f39f8a 100644 --- a/platform/platform-api/resources/messages/LanguageAndRegionBundle.properties +++ b/platform/platform-api/resources/messages/LanguageAndRegionBundle.properties @@ -1,5 +1,5 @@ title.language.and.region=Language and Region -description.language.and.region=

Select a region to ensure that licensing, JetBrains Marketplace, and other region-specific features and links work correctly. See the documentation for details

+description.language.and.region=

Select a region to ensure that licensing, marketplace, and other region-specific features and links work correctly. See the documentation (TODO: change link to OpenIDE) for details

language.en=English language.zhCN=Chinese (Simplified) \u4E2D\u6587\u8BED\u8A00\u5305 diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties index b21a63cc0854..02c37d420417 100644 --- a/platform/platform-resources-en/src/messages/ActionsBundle.properties +++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties @@ -456,7 +456,7 @@ action.FindPrevWordAtCaret.text=Previous Occurrence of the Word at Caret action.FindPrevWordAtCaret.description=Find previous occurrence of the word at caret action.ToggleFindInSelection.text=Search in Selection Only action.IncrementalSearch.text=Incrementa_l Search -action.IncrementalSearch.description=Start incremental search (searches string as you type), IntelliJ IDEA 6.0 implementation. +action.IncrementalSearch.description=Start incremental search (searches string as you type). action.FindUsages.text=Find _Usages action.FindUsages.description=Find usages of the symbol at caret action.ShowUsages.text=_Show Usages @@ -1290,7 +1290,7 @@ action.Help.KeymapReference.text=_Keyboard Shortcuts PDF action.Help.KeymapReference.description=Open PDF file with the default keymap reference card. action.Help.JetBrainsTV.text=Product on YouTube action.Help.JetBrainsTV.templateText={0} on YouTube -action.Help.JetBrainsTV.description=View short live demos introducing features of JetBrains products. +action.Help.JetBrainsTV.description=View short live demos introducing features of OpenIDE. action.CheckForUpdate.text=_Check for Updates\u2026 action.CheckForUpdate.description=Checks for available IDE and plugin updates action.CheckForUpdate.description.plugins=Checks for available plugin updates (IDE updates are managed externally) @@ -1569,9 +1569,9 @@ action.EditCustomVmOptions.description=Opens an editor tab with a custom VM opti action.LogDebugConfigure.text=D_ebug Log Settings\u2026 action.LogDebugConfigure.description=Enable or disable additional log categories. Allows to provide more information to the support team by request. action.TechnicalSupport.text=Contact _Support\u2026 -action.TechnicalSupport.description=Contact technical support on JetBrains website +action.TechnicalSupport.description=Contact technical support on OpenIDE website action.ReportProblem.text=Submit a Bug Report\u2026 -action.ReportProblem.description=Submit a bug report in JetBrains issue tracker +action.ReportProblem.description=Submit a bug report in OpenIDE issue tracker action.TextComponent.ClearAction.text=Clear text action.TextComponent.ClearAction.description=Clear text in text components diff --git a/platform/projectModel-api/resources/messages/ProjectModelBundle.properties b/platform/projectModel-api/resources/messages/ProjectModelBundle.properties index 060905dec8be..b52055df7735 100644 --- a/platform/projectModel-api/resources/messages/ProjectModelBundle.properties +++ b/platform/projectModel-api/resources/messages/ProjectModelBundle.properties @@ -5,7 +5,7 @@ filetype.idea.project.display.name=IDEA project global.library.display.name=Global {0, choice, 1#Library|2#Libraries} libraries.node.text.ide=Libraries contain classes that add up various functionality to your applications. \ Libraries also include source files and JavaDocs that can help you develop your projects.

\ - IntelliJ IDEA uses libraries to assist you with code completion, validation, error highlighting, etc.

\ + IDE uses libraries to assist you with code completion, validation, error highlighting, etc.

\ Global libraries are referenced through the entire project and can be used from all modules. \ Also they are available to all projects create locally on your computer.

\ Note that Global libraries are not available to anybody you share your project with. \ @@ -14,12 +14,12 @@ libraries.node.text.ide=Libraries contain classes that add up various functional To attach a library to a module, select that module, click the Dependencies tab, click Add and specify the library location. libraries.node.text.module=Libraries contain classes that add up various functionality to your applications. \ Libraries also include source files and JavaDocs that can help you develop your projects.

\ - IntelliJ IDEA uses libraries to assist you with code completion, validation, error highlighting, etc.

\ + IDE uses libraries to assist you with code completion, validation, error highlighting, etc.

\ Module libraries are referenced only from the module they are attached to. Expand the node and select child items to manage Module libraries.

\ To attach a library to a module, select that module, click the Dependencies tab, click Add and specify the library location. libraries.node.text.project=Libraries contain classes that add up various functionality to your applications. \ Libraries also include source files and JavaDocs that can help you develop your projects.

\ - IntelliJ IDEA uses libraries to assist you with code completion, validation, error highlighting, etc.

\ + IDE uses libraries to assist you with code completion, validation, error highlighting, etc.

\ Project libraries are referenced through the entire project and can be used from all modules. \ Also they are available to everybody you share the project with.

Expand the node and select child items to manage Project libraries.

\ To attach a library to a module, select that module, click the Dependencies tab, click Add and specify the library location. diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index a51c7787f2ce..6a449022829e 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -1311,7 +1311,7 @@ ide.open.file.in.temp.project.dir=true ide.open.file.in.temp.project.dir.description=Enables opening file in temp project directory embed.scene.builder=true -embed.scene.builder.description=Show SceneBuilder embedded into IntelliJ IDEA frame +embed.scene.builder.description=Show SceneBuilder embedded into IDE frame new.retina.detection=false new.retina.detection.description=New implementation to detect retina devices diff --git a/plugins/devkit/devkit-core/resources/messages/DevKitBundle.properties b/plugins/devkit/devkit-core/resources/messages/DevKitBundle.properties index a8c45b5fcbc7..9f3b16e5944a 100644 --- a/plugins/devkit/devkit-core/resources/messages/DevKitBundle.properties +++ b/plugins/devkit/devkit-core/resources/messages/DevKitBundle.properties @@ -407,7 +407,7 @@ testdata.related.navigation.title=Test data # UpdateFromSources action.UpdateIdeFromSourcesSettings.text=Update IDE from Sources Settings\u2026 action.UpdateIdeFromSources.text=Update IDE from Sources\u2026 -action.UpdateIdeFromSources.description=Builds an installation of IntelliJ IDEA from the currently opened sources \ +action.UpdateIdeFromSources.description=Builds an installation of IDE from the currently opened sources \ and updates the current (or another) installation with the result. action.UpdateIdeFromSourcesAction.task.title=Updating from Sources action.UpdateIdeFromSourcesAction.task.failed.title=Update from sources failed diff --git a/plugins/eclipse/resources/META-INF/plugin.xml b/plugins/eclipse/resources/META-INF/plugin.xml index 803735463c48..a09fc90f40a3 100644 --- a/plugins/eclipse/resources/META-INF/plugin.xml +++ b/plugins/eclipse/resources/META-INF/plugin.xml @@ -6,10 +6,10 @@ -
  • Open Eclipse project in IntelliJ IDEA
    • -
  • Import Eclipse project into IntelliJ IDEA
    • -
  • Export IntelliJ IDEA project into Eclipse
    • -
  • Convert IntelliJ IDEA module to Eclipse-compatible format
    • +
  • Open Eclipse project in OpenIDE
    • +
  • Import Eclipse project into OpenIDE
    • +
  • Export OpenIDE project into Eclipse
    • +
  • Convert OpenIDE module to Eclipse-compatible format
  • Synchronize Eclipse project files

    • diff --git a/plugins/eclipse/resources/messages/EclipseBundle.properties b/plugins/eclipse/resources/messages/EclipseBundle.properties index 7558d67b9313..79e9c5dfdf27 100644 --- a/plugins/eclipse/resources/messages/EclipseBundle.properties +++ b/plugins/eclipse/resources/messages/EclipseBundle.properties @@ -1,7 +1,7 @@ eclipse.name=Eclipse eclipse.import.label.select.workspace=&Select Eclipse projects directory: eclipse.import.title.select.workspace=Select Eclipse projects directory -eclipse.import.title.module.dir=Select directory for IntelliJ IDEA project and module files +eclipse.import.title.module.dir=Select directory for IDE project and module files eclipse.import.warning.undefinded.libraries=Imported project refers to unknown global libraries eclipse.import.converting=Converting Eclipse Projects eclipse.import.scanning=Scanning Eclipse projects @@ -15,12 +15,12 @@ filetype.eclipse.description=Eclipse project filetype.eclipse.display.name=Eclipse Project eclipse.create.library.title=Locate Eclipse Installation eclipse.create.library.description=Some of the projects you are importing depend on Eclipse platform.
    \ -IntelliJ IDEA will create a global library named {0} containing Eclipse libraries. +IDE will create a global library named {0} containing Eclipse libraries. eclipse.import.code.style.default.option=Use default project code style eclipse.import.code.style.import.option=Import code style from Eclipse project eclipse.import.code.style.default.hint=Settings | Editor | Code Style eclipse.import.code.style.import.hint=One code style per project is supported. Not all Eclipse code style settings can be mapped to\ - Intellij IDEA settings,
    so the best possible approximation will be used. + IDE settings,
    so the best possible approximation will be used. eclipse.import.code.style.organize.imports.box=Import "Organize Imports" settings list.empty.text.code.styles.not.found=Code styles not found border.text.choose.project.code.style=Choose project code style @@ -53,10 +53,10 @@ label.path.to.resulting.userlibraries=&Path to resulting .userlibraries checkbox.export.non.module.libraries=E&xport non-module libraries border.title.modules.to.export=Modules to export checkbox.switch.selected.modules.to.eclipse.compatible.format=Convert selected modules into &Eclipse-compatible format -checkbox.link.created.intellij.idea.modules.to.eclipse.project.files=&Link created IntelliJ IDEA modules to Eclipse project files +checkbox.link.created.intellij.idea.modules.to.eclipse.project.files=&Link created IDE modules to Eclipse project files radio.button.create.module.files.near.classpath.files=Create module files near .classpath files label.detect.test.sources.comma.separated.path.masks.and.wildcards.allowed=Detect &test sources (comma-separated path masks, '*' and '?' wildcards allowed): -border.title.intellij.idea.project.and.module.files.location=IntelliJ IDEA project and module files location +border.title.intellij.idea.project.and.module.files.location=IDE project and module files location radio.button.keep.project.and.module.files.in=Keep project and module files in border.title.choose.project.code.style=Choose project code style eclipse.color.theme.name=Eclipse color theme (XML) diff --git a/plugins/editorconfig/resources/META-INF/plugin.xml b/plugins/editorconfig/resources/META-INF/plugin.xml index 0b7b28fe7100..fd7d7c2f7b46 100644 --- a/plugins/editorconfig/resources/META-INF/plugin.xml +++ b/plugins/editorconfig/resources/META-INF/plugin.xml @@ -6,7 +6,7 @@ JetBrains Handles properties in .editorconfig files and applies them to all supported languages in all JetBrains IDEs. +

    Handles properties in .editorconfig files and applies them to all supported languages.

    Features

    Getting started

    For more information, -check the documentation for EditorConfig files and your IDE. +check the documentation for EditorConfig files and your IDE. ]]> com.intellij.modules.lang diff --git a/plugins/kotlin/features-trainer/resources/messages/KotlinLessonsBundle.properties b/plugins/kotlin/features-trainer/resources/messages/KotlinLessonsBundle.properties index 8db50c90fb45..b59d6d83e4ae 100644 --- a/plugins/kotlin/features-trainer/resources/messages/KotlinLessonsBundle.properties +++ b/plugins/kotlin/features-trainer/resources/messages/KotlinLessonsBundle.properties @@ -4,7 +4,7 @@ welcome.promo.start.tour.java=Start Tour in Java welcome.promo.start.tour.kotlin=Start Tour in Kotlin kotlin.onboarding.invoke.intention.for.warning.1=You have just fixed a bug, but you can make this code look even better. \ - IntelliJ IDEA highlights and adds a yellow bulb to the code lines that can be improved. + IDE highlights and adds a yellow bulb to the code lines that can be improved. kotlin.onboarding.invoke.intention.for.warning.2=Press {0} to preview the warnings and apply a quick-fix. kotlin.onboarding.invoke.intention.for.warning.balloon=Press {0} to show available quick-fixes kotlin.onboarding.select.fix=Apply the first item: {0}. In this case, the for-each loop will make code easier to understand. diff --git a/plugins/kotlin/formatter/minimal/resources-en/messages/KotlinFormatterMinimalBundle.properties b/plugins/kotlin/formatter/minimal/resources-en/messages/KotlinFormatterMinimalBundle.properties index f4bb4e6ef391..bc81060343d6 100644 --- a/plugins/kotlin/formatter/minimal/resources-en/messages/KotlinFormatterMinimalBundle.properties +++ b/plugins/kotlin/formatter/minimal/resources-en/messages/KotlinFormatterMinimalBundle.properties @@ -1,2 +1,2 @@ kotlin.coding.conventions.title=Kotlin Coding Conventions -kotlin.obsolete.coding.conventions.title=Kotlin obsolete IntelliJ IDEA codestyle \ No newline at end of file +kotlin.obsolete.coding.conventions.title=Kotlin obsolete IDE codestyle \ No newline at end of file diff --git a/plugins/kotlin/onboarding-gradle/resources/messages/GradleFeedbackBundle.properties b/plugins/kotlin/onboarding-gradle/resources/messages/GradleFeedbackBundle.properties index 6908fa5e3d6e..eea29ebfb518 100644 --- a/plugins/kotlin/onboarding-gradle/resources/messages/GradleFeedbackBundle.properties +++ b/plugins/kotlin/onboarding-gradle/resources/messages/GradleFeedbackBundle.properties @@ -23,6 +23,6 @@ build.process.info.kotlin.version=Kotlin version: build.process.info.groovy.build.file.count=Number of Gradle Groovy build files: build.process.info.kts.build.file.count=Number of Gradle Kts build files: build.process.info.months.of.kotlin.usage=Months of Kotlin usage: -build.process.info.months.of.idea.usage=Months of IntelliJ IDEA usage: +build.process.info.months.of.idea.usage=Months of IDE usage: action.org.jetbrains.kotlin.onboarding.gradle.ShowBuildProcessSatisfactionDialogAction.text=Show Kotlin Gradle Build Process Satisfaction Survey \ No newline at end of file diff --git a/plugins/maven/src/main/resources/messages/MavenConfigurableBundle.properties b/plugins/maven/src/main/resources/messages/MavenConfigurableBundle.properties index 7f9aab39171f..be4872544ef2 100644 --- a/plugins/maven/src/main/resources/messages/MavenConfigurableBundle.properties +++ b/plugins/maven/src/main/resources/messages/MavenConfigurableBundle.properties @@ -36,7 +36,7 @@ maven.settings.importing.use.output.directories=Use Maven &output directories maven.settings.importing.use.output.directories.tooltip=IDEA compiler will use output directory defined in maven model (target/classes by default) maven.settings.importing.generated.source.folders=Generated sources folders: maven.settings.importing.phase.for.source.updates=Phase to be used for folders &update: -maven.settings.importing.phase.for.source.updates.notes=IntelliJ IDEA needs to execute one of the listed phases in order to \ +maven.settings.importing.phase.for.source.updates.notes=IDE needs to execute one of the listed phases in order to \ discover all source folders that are configured via Maven plugins.\
    Note that all test-* phases firstly generate and compile production sources. diff --git a/plugins/maven/src/main/resources/messages/MavenSyncBundle.properties b/plugins/maven/src/main/resources/messages/MavenSyncBundle.properties index 526b039678b1..69e16aa3ba11 100644 --- a/plugins/maven/src/main/resources/messages/MavenSyncBundle.properties +++ b/plugins/maven/src/main/resources/messages/MavenSyncBundle.properties @@ -86,7 +86,7 @@ progress.title.starting.maven.server=Starting Maven server maven.sync.not.trusted.title=Untrusted project #leave link html markup - i.e. Translation goes here maven.sync.not.trusted.description=The opened untrusted project is not fully loaded. \n\ - IntelliJ IDEA will not resolve any plugins in the project, download artifacts, or execute any goals + IDE will not resolve any plugins in the project, download artifacts, or execute any goals maven.sync.trust.project=Trust project maven.sync.wsl.maven.is.not.wsl=Maven distribution looks incorrect maven.sync.wsl.maven.is.not.wsl.description=Maven home resolved to {0}.\n For performance reason better to use maven installed in wsl distribution. Open settings diff --git a/plugins/ui-designer/resources/messages/UIDesignerBundle.properties b/plugins/ui-designer/resources/messages/UIDesignerBundle.properties index aea9d32e2d5c..d02e1287e932 100644 --- a/plugins/ui-designer/resources/messages/UIDesignerBundle.properties +++ b/plugins/ui-designer/resources/messages/UIDesignerBundle.properties @@ -398,7 +398,7 @@ delete.component.title=Delete Component insert.feedback.fill=fill insert.feedback.add.tab=Add tab: {0} ({1}) generate.main.title=Generate main() -generate.main.not.valid.form=The form bound to the class is not a valid IntelliJ IDEA form +generate.main.not.valid.form=The form bound to the class is not a valid IDE form generate.main.no.default.constructor=The class does not have a default constructor generate.main.empty.form=The form bound to the class is empty generate.main.no.root.binding=The form bound to the class does not have a valid binding for the root component diff --git a/resources-en/resources/search/searchableOptions.xml b/resources-en/resources/search/searchableOptions.xml index ffc67c222144..cc1758b0bbfa 100644 --- a/resources-en/resources/search/searchableOptions.xml +++ b/resources-en/resources/search/searchableOptions.xml @@ -12594,15 +12594,15 @@