From 068f048fb63a6c3feca8f586ceecb84e235354f8 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 24 Mar 2020 22:46:56 +0100
Subject: [PATCH] i18n: java inspection display names

GitOrigin-RevId: 876dda3026362df49fcf1a51997ec27b89619353
---
 .../messages/JavaAnalysisBundle.properties    |  29 +++-
 .../src/META-INF/JavaAnalysisPlugin.xml       | 126 +++++++++-------
 java/java-impl/src/META-INF/JavaPlugin.xml    | 141 ++++++++++--------
 .../resources/messages/JavaBundle.properties  |  47 +++++-
 4 files changed, 226 insertions(+), 117 deletions(-)

diff --git a/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties b/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties
index cb2434510769..727c822cd8d7 100644
--- a/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties
+++ b/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties
@@ -363,4 +363,31 @@ unused.library.problem.descriptor=Unused library ''{0}''
 unused.library.roots.problem.descriptor=Unused roots {0} from library ''{1}''
 var.can.be.replaced.with.explicit.type='var' can be replaced with explicit type
 vararg.method.call.with.50.poly.arguments=Vararg method call with 50+ poly arguments may cause compilation and analysis slowdown
-visible.for.testing.makes.little.sense.on.test.only.code=@VisibleForTesting makes little sense on @TestOnly code
\ No newline at end of file
+visible.for.testing.makes.little.sense.on.test.only.code=@VisibleForTesting makes little sense on @TestOnly code
+inspection.inconsistent.language.level.display.name=Inconsistent language level settings
+inspection.weaker.access.display.name=Declaration access can be weaker
+inspection.can.be.final.display.name=Declaration can have final modifier
+inspection.redundant.throws.display.name=Redundant 'throws' clause
+inspection.java.9.redundant.requires.statement.display.name=Redundant 'requires' statement in module-info
+inspection.numeric.overflow.display.name=Numeric overflow
+inspection.redundant.cast.display.name=Redundant type cast
+inspection.deprecated.is.still.used.display.name=Deprecated member is still used
+inspection.deprecated.class.usage.inspection.display.name=Deprecated API usage in XML
+inspection.field.access.not.guarded.display.name=Unguarded field access or method call
+inspection.instance.guarded.by.static.display.name=Instance member guarded by static field
+inspection.non.final.field.in.immutable.display.name=Non-final field in @Immutable class
+inspection.non.final.guard.display.name=Non-final @GuardedBy field
+inspection.static.guarded.by.instance.display.name=Static member guarded by instance field or this
+inspection.unknown.guard.display.name=Unknown @GuardedBy field
+inspection.use.compare.method.display.name='compare()' method can be used to compare numbers
+inspection.convert.2.diamond.display.name=Explicit type can be replaced with &lt;&gt;
+inspection.convert.2.lambda.display.name=Anonymous type can be replaced with lambda
+inspection.invalid.comparator.method.reference.display.name=Invalid method reference used for Comparator
+inspection.code.block.2.expr.display.name=Statement lambda can be replaced with expression lambda
+inspection.safe.varargs.detector.display.name=Possible heap pollution from parameterized vararg type
+inspection.block.marker.comments.display.name=Block marker comment
+inspection.string.tokenizer.delimiter.display.name=Duplicated delimiters in java.util.StringTokenizer
+inspection.anonymous.has.lambda.alternative.display.name=Anonymous type has shorter lambda alternative
+inspection.java.8.list.sort.display.name=Collections.sort() can be replaced with List.sort()
+inspection.class.has.no.to.string.method.display.name=Class does not override 'toString()' method
+inspection.field.not.used.in.to.string.display.name=Field not used in 'toString()' method
\ No newline at end of file
diff --git a/java/java-analysis-impl/src/META-INF/JavaAnalysisPlugin.xml b/java/java-analysis-impl/src/META-INF/JavaAnalysisPlugin.xml
index f3cb9274726b..5ddbe8c3cfea 100644
--- a/java/java-analysis-impl/src/META-INF/JavaAnalysisPlugin.xml
+++ b/java/java-analysis-impl/src/META-INF/JavaAnalysisPlugin.xml
@@ -50,13 +50,15 @@
     <projectService serviceImplementation="com.intellij.codeInspection.bytecodeAnalysis.ProjectBytecodeAnalysis"/>
     <generatedSourcesFilter implementation="com.intellij.openapi.roots.JavaGeneratedSourcesFilter"/>
     <!--suppress PluginXmlCapitalization -->
-    <localInspection groupPath="Java" language="JAVA" shortName="FieldNotUsedInToString" displayName="Field not used in 'toString()' method" groupKey="group.names.toString.issues" groupBundle="messages.InspectionsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="FieldNotUsedInToString" groupKey="group.names.toString.issues" groupBundle="messages.InspectionsBundle"
                      enabledByDefault="false" level="WARNING" runForWholeFile="true"
-                     implementationClass="org.jetbrains.java.generate.inspection.FieldNotUsedInToStringInspection"/>
+                     implementationClass="org.jetbrains.java.generate.inspection.FieldNotUsedInToStringInspection"
+                     key="inspection.field.not.used.in.to.string.display.name" bundle="messages.JavaAnalysisBundle"/>
     <!--suppress PluginXmlCapitalization -->
-    <localInspection groupPath="Java" language="JAVA" shortName="ClassHasNoToStringMethod" displayName="Class does not override 'toString()' method"
+    <localInspection groupPath="Java" language="JAVA" shortName="ClassHasNoToStringMethod"
                      groupKey="group.names.toString.issues" groupBundle="messages.InspectionsBundle" enabledByDefault="false" level="WARNING"
-                     implementationClass="org.jetbrains.java.generate.inspection.ClassHasNoToStringMethodInspection"/>
+                     implementationClass="org.jetbrains.java.generate.inspection.ClassHasNoToStringMethodInspection"
+                     key="inspection.class.has.no.to.string.method.display.name" bundle="messages.JavaAnalysisBundle"/>
     <applicationService serviceImplementation="org.jetbrains.java.generate.GenerateToStringContext"/>
     <applicationService serviceInterface="org.jetbrains.java.generate.GenerateToStringActionHandler"
                         serviceImplementation="org.jetbrains.java.generate.GenerateToStringActionHandlerImpl"/>
@@ -89,20 +91,21 @@
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids8" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.java18api.Java8ListSortInspection"
-                     displayName="Collections.sort() can be replaced with List.sort()"/>
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="AnonymousHasLambdaAlternative" displayName="Anonymous type has shorter lambda alternative"
+                     key="inspection.java.8.list.sort.display.name" bundle="messages.JavaAnalysisBundle"/>
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="AnonymousHasLambdaAlternative"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids8" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.AnonymousHasLambdaAlternativeInspection" />
+                     implementationClass="com.intellij.codeInspection.AnonymousHasLambdaAlternativeInspection"
+                     key="inspection.anonymous.has.lambda.alternative.display.name" bundle="messages.JavaAnalysisBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="StringTokenizerDelimiter"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.StringTokenizerDelimiterInspection"
-                     displayName="Duplicated delimiters in java.util.StringTokenizer"/>
+                     key="inspection.string.tokenizer.delimiter.display.name" bundle="messages.JavaAnalysisBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="BlockMarkerComments"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.intellij.codeInspection.BlockMarkerCommentsInspection"
-                     displayName="Block marker comment"/>
+                     key="inspection.block.marker.comments.display.name" bundle="messages.JavaAnalysisBundle"/>
     <localInspection language="UAST" shortName="ImplicitSubclassInspection"
                      bundle="messages.JavaAnalysisBundle" key="inspection.implicit.subclass.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.inheritance.issues"
@@ -113,42 +116,54 @@
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.compiler.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.compiler.JavacQuirksInspection" />
     <localInspection groupPath="Java,Java language level migration aids" language="JAVA" suppressId="unchecked" shortName="SafeVarargsDetector"
-                     displayName="Possible heap pollution from parameterized vararg type" groupKey="group.names.language.level.specific.issues.and.migration.aids7" groupBundle="messages.InspectionsBundle"
+                     groupKey="group.names.language.level.specific.issues.and.migration.aids7" groupBundle="messages.InspectionsBundle"
                      enabledByDefault="true" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.PossibleHeapPollutionVarargsInspection" />
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="CodeBlock2Expr" displayName="Statement lambda can be replaced with expression lambda"
+                     implementationClass="com.intellij.codeInspection.PossibleHeapPollutionVarargsInspection"
+                     key="inspection.safe.varargs.detector.display.name" bundle="messages.JavaAnalysisBundle"/>
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="CodeBlock2Expr"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids8" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.RedundantLambdaCodeBlockInspection" />
-    <localInspection groupPath="Java" language="JAVA" shortName="InvalidComparatorMethodReference" displayName="Invalid method reference used for Comparator"
+                     implementationClass="com.intellij.codeInspection.RedundantLambdaCodeBlockInspection"
+                     key="inspection.code.block.2.expr.display.name" bundle="messages.JavaAnalysisBundle"/>
+    <localInspection groupPath="Java" language="JAVA" shortName="InvalidComparatorMethodReference"
                      groupKey="group.names.probable.bugs" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.InvalidComparatorMethodReferenceInspection"/>
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="Convert2Lambda" displayName="Anonymous type can be replaced with lambda"
+                     implementationClass="com.intellij.codeInspection.InvalidComparatorMethodReferenceInspection"
+                     key="inspection.invalid.comparator.method.reference.display.name" bundle="messages.JavaAnalysisBundle"/>
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="Convert2Lambda"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids8" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.AnonymousCanBeLambdaInspection" />
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="Convert2Diamond" displayName="Explicit type can be replaced with &lt;&gt;"
+                     implementationClass="com.intellij.codeInspection.AnonymousCanBeLambdaInspection"
+                     key="inspection.convert.2.lambda.display.name" bundle="messages.JavaAnalysisBundle"/>
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="Convert2Diamond"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids7" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.ExplicitTypeCanBeDiamondInspection" />
-    <localInspection groupPath="Java" language="JAVA" shortName="UseCompareMethod" displayName="'compare()' method can be used to compare numbers"
+                     implementationClass="com.intellij.codeInspection.ExplicitTypeCanBeDiamondInspection"
+                     key="inspection.convert.2.diamond.display.name" bundle="messages.JavaAnalysisBundle"/>
+    <localInspection groupPath="Java" language="JAVA" shortName="UseCompareMethod"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.UseCompareMethodInspection" />
-    <localInspection groupPath="Java" language="JAVA" shortName="UnknownGuard" displayName="Unknown @GuardedBy field" groupKey="group.names.concurrency.annotation.issues" groupBundle="messages.InspectionsBundle"
+                     implementationClass="com.intellij.codeInspection.UseCompareMethodInspection"
+                     key="inspection.use.compare.method.display.name" bundle="messages.JavaAnalysisBundle"/>
+    <localInspection groupPath="Java" language="JAVA" shortName="UnknownGuard" groupKey="group.names.concurrency.annotation.issues" groupBundle="messages.InspectionsBundle"
                      enabledByDefault="false" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.concurrencyAnnotations.UnknownGuardInspection" />
-    <localInspection groupPath="Java" language="JAVA" shortName="StaticGuardedByInstance" displayName="Static member guarded by instance field or this"
+                     implementationClass="com.intellij.codeInspection.concurrencyAnnotations.UnknownGuardInspection"
+                     key="inspection.unknown.guard.display.name" bundle="messages.JavaAnalysisBundle"/>
+    <localInspection groupPath="Java" language="JAVA" shortName="StaticGuardedByInstance"
                      groupKey="group.names.concurrency.annotation.issues" groupBundle="messages.InspectionsBundle" enabledByDefault="false" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.concurrencyAnnotations.StaticGuardedByInstanceInspection" />
-    <localInspection groupPath="Java" language="JAVA" shortName="NonFinalGuard" displayName="Non-final @GuardedBy field" groupKey="group.names.concurrency.annotation.issues" groupBundle="messages.InspectionsBundle"
+                     implementationClass="com.intellij.codeInspection.concurrencyAnnotations.StaticGuardedByInstanceInspection"
+                     key="inspection.static.guarded.by.instance.display.name" bundle="messages.JavaAnalysisBundle"/>
+    <localInspection groupPath="Java" language="JAVA" shortName="NonFinalGuard" groupKey="group.names.concurrency.annotation.issues" groupBundle="messages.InspectionsBundle"
                      enabledByDefault="false" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.concurrencyAnnotations.NonFinalGuardInspection" />
-    <localInspection groupPath="Java" language="JAVA" shortName="NonFinalFieldInImmutable" displayName="Non-final field in @Immutable class"
+                     implementationClass="com.intellij.codeInspection.concurrencyAnnotations.NonFinalGuardInspection"
+                     key="inspection.non.final.guard.display.name" bundle="messages.JavaAnalysisBundle"/>
+    <localInspection groupPath="Java" language="JAVA" shortName="NonFinalFieldInImmutable"
                      groupKey="group.names.concurrency.annotation.issues" groupBundle="messages.InspectionsBundle" enabledByDefault="false" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.concurrencyAnnotations.NonFinalFieldInImmutableInspection" />
-    <localInspection groupPath="Java" language="JAVA" shortName="InstanceGuardedByStatic" displayName="Instance member guarded by static field"
+                     implementationClass="com.intellij.codeInspection.concurrencyAnnotations.NonFinalFieldInImmutableInspection"
+                     key="inspection.non.final.field.in.immutable.display.name" bundle="messages.JavaAnalysisBundle"/>
+    <localInspection groupPath="Java" language="JAVA" shortName="InstanceGuardedByStatic"
                      groupKey="group.names.concurrency.annotation.issues" groupBundle="messages.InspectionsBundle" enabledByDefault="false" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.concurrencyAnnotations.InstanceGuardedByStaticInspection" />
-    <localInspection groupPath="Java" language="JAVA" shortName="FieldAccessNotGuarded" displayName="Unguarded field access or method call" groupKey="group.names.concurrency.annotation.issues" groupBundle="messages.InspectionsBundle"
+                     implementationClass="com.intellij.codeInspection.concurrencyAnnotations.InstanceGuardedByStaticInspection"
+                     key="inspection.instance.guarded.by.static.display.name" bundle="messages.JavaAnalysisBundle"/>
+    <localInspection groupPath="Java" language="JAVA" shortName="FieldAccessNotGuarded" groupKey="group.names.concurrency.annotation.issues" groupBundle="messages.InspectionsBundle"
                      enabledByDefault="false" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.concurrencyAnnotations.FieldAccessNotGuardedInspection" />
+                     implementationClass="com.intellij.codeInspection.concurrencyAnnotations.FieldAccessNotGuardedInspection"
+                     key="inspection.field.access.not.guarded.display.name" bundle="messages.JavaAnalysisBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="DuplicateThrows" bundle="messages.JavaAnalysisBundle" key="inspection.duplicate.throws.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.declaration.redundancy" enabledByDefault="true" level="WARNING" cleanupTool="true"
                      implementationClass="com.intellij.codeInspection.duplicateThrows.DuplicateThrowsInspection" />
@@ -159,11 +174,13 @@
     <localInspection groupPath="Java" language="JAVA" shortName="TestOnlyProblems" bundle="messages.JavaAnalysisBundle" key="inspection.test.only.problems.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="inspection.general.tools.group.name" enabledByDefault="false" level="WARNING"
                      implementationClass="com.intellij.codeInspection.testOnly.TestOnlyInspection" />
-    <localInspection language="XML" shortName="DeprecatedClassUsageInspection" displayName="Deprecated API usage in XML" groupKey="group.names.xml" groupBundle="messages.InspectionsBundle"
-                     enabledByDefault="true" level="WARNING" implementationClass="com.intellij.codeInspection.xml.DeprecatedClassUsageInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="DeprecatedIsStillUsed" displayName="Deprecated member is still used"
+    <localInspection language="XML" shortName="DeprecatedClassUsageInspection" groupKey="group.names.xml" groupBundle="messages.InspectionsBundle"
+                     enabledByDefault="true" level="WARNING" implementationClass="com.intellij.codeInspection.xml.DeprecatedClassUsageInspection"
+                     key="inspection.deprecated.class.usage.inspection.display.name" bundle="messages.JavaAnalysisBundle"/>
+    <localInspection groupPath="Java" language="JAVA" shortName="DeprecatedIsStillUsed"
                      groupKey="group.names.code.maturity.issues" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.DeprecatedIsStillUsedInspection" />
+                     implementationClass="com.intellij.codeInspection.DeprecatedIsStillUsedInspection"
+                     key="inspection.deprecated.is.still.used.display.name" bundle="messages.JavaAnalysisBundle"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="removal" shortName="MarkedForRemoval"
                      key="inspection.marked.for.removal.display.name" bundle="messages.AnalysisBundle"
                      groupKey="group.names.code.maturity.issues" groupBundle="messages.InspectionsBundle"
@@ -189,36 +206,43 @@
     <localInspection groupPath="Java" language="JAVA" shortName="RedundantTypeArguments" bundle="messages.JavaAnalysisBundle" key="inspection.redundant.type.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.verbose.or.redundant.code.constructs" enabledByDefault="true" level="WARNING" cleanupTool="true"
                      implementationClass="com.intellij.codeInspection.miscGenerics.RedundantTypeArgsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="RedundantCast" displayName="Redundant type cast" groupKey="group.names.verbose.or.redundant.code.constructs" groupBundle="messages.InspectionsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="RedundantCast" groupKey="group.names.verbose.or.redundant.code.constructs" groupBundle="messages.InspectionsBundle"
                      enabledByDefault="true" level="WARNING" cleanupTool="true"
-                     implementationClass="com.intellij.codeInspection.redundantCast.RedundantCastInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NumericOverflow" displayName="Numeric overflow" groupKey="group.names.numeric.issues" groupBundle="messages.InspectionsBundle" enabledByDefault="true"
-                     level="WARNING" implementationClass="com.intellij.codeInspection.NumericOverflowInspection"/>
+                     implementationClass="com.intellij.codeInspection.redundantCast.RedundantCastInspection"
+                     key="inspection.redundant.cast.display.name" bundle="messages.JavaAnalysisBundle"/>
+    <localInspection groupPath="Java" language="JAVA" shortName="NumericOverflow" groupKey="group.names.numeric.issues" groupBundle="messages.InspectionsBundle" enabledByDefault="true"
+                     level="WARNING" implementationClass="com.intellij.codeInspection.NumericOverflowInspection"
+                     key="inspection.numeric.overflow.display.name" bundle="messages.JavaAnalysisBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="Contract" bundle="messages.JavaAnalysisBundle" key="inspection.contract.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.dataFlow.ContractInspection"/>
     <globalInspection groupPath="Java" language="JAVA" shortName="Java9RedundantRequiresStatement"
                       groupBundle="messages.InspectionsBundle" groupKey="group.names.declaration.redundancy"
-                      enabledByDefault="true" level="WARNING" displayName="Redundant 'requires' statement in module-info"
-                      implementationClass="com.intellij.codeInspection.java19modules.Java9RedundantRequiresStatementInspection"/>
+                      enabledByDefault="true" level="WARNING"
+                      implementationClass="com.intellij.codeInspection.java19modules.Java9RedundantRequiresStatementInspection"
+                      key="inspection.java.9.redundant.requires.statement.display.name" bundle="messages.JavaAnalysisBundle"/>
     <globalInspection groupPath="Java" language="JAVA" shortName="UNUSED_IMPORT" bundle="messages.JavaAnalysisBundle" key="unused.import.display.name"
                       groupBundle="messages.InspectionsBundle" groupKey="group.names.imports" enabledByDefault="true" level="WARNING"
                       implementationClass="com.intellij.codeInspection.unusedImport.UnusedImportInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="RedundantThrows" displayName="Redundant 'throws' clause" groupKey="group.names.declaration.redundancy" groupBundle="messages.InspectionsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="RedundantThrows" groupKey="group.names.declaration.redundancy" groupBundle="messages.InspectionsBundle"
                       enabledByDefault="true" level="WARNING"
-                      implementationClass="com.intellij.codeInspection.unneededThrows.RedundantThrowsDeclarationInspection"/>
+                      implementationClass="com.intellij.codeInspection.unneededThrows.RedundantThrowsDeclarationInspection"
+                      key="inspection.redundant.throws.display.name" bundle="messages.JavaAnalysisBundle"/>
     <globalInspection groupPath="Java" language="JAVA" shortName="SameReturnValue" bundle="messages.JavaAnalysisBundle" key="inspection.same.return.value.display.name"
                       groupBundle="messages.InspectionsBundle" groupKey="group.names.declaration.redundancy" enabledByDefault="true" level="WARNING"
                       implementationClass="com.intellij.codeInspection.sameReturnValue.SameReturnValueInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="CanBeFinal" displayName="Declaration can have final modifier" groupKey="group.names.declaration.redundancy" groupBundle="messages.InspectionsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="CanBeFinal" groupKey="group.names.declaration.redundancy" groupBundle="messages.InspectionsBundle"
                       enabledByDefault="true" level="WARNING"
-                      implementationClass="com.intellij.codeInspection.canBeFinal.CanBeFinalInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="WeakerAccess" displayName="Declaration access can be weaker" groupKey="group.names.declaration.redundancy" groupBundle="messages.InspectionsBundle"
+                      implementationClass="com.intellij.codeInspection.canBeFinal.CanBeFinalInspection"
+                      key="inspection.can.be.final.display.name" bundle="messages.JavaAnalysisBundle"/>
+    <globalInspection groupPath="Java" language="JAVA" shortName="WeakerAccess" groupKey="group.names.declaration.redundancy" groupBundle="messages.InspectionsBundle"
                       enabledByDefault="false" level="WARNING"
-                      implementationClass="com.intellij.codeInspection.visibility.VisibilityInspection"/>
-    <globalInspection groupPath="Java" shortName="InconsistentLanguageLevel" displayName="Inconsistent language level settings"
+                      implementationClass="com.intellij.codeInspection.visibility.VisibilityInspection"
+                      key="inspection.weaker.access.display.name" bundle="messages.JavaAnalysisBundle"/>
+    <globalInspection groupPath="Java" shortName="InconsistentLanguageLevel"
                       groupKey="group.names.modularization.issues" groupBundle="messages.InspectionsBundle" enabledByDefault="false" level="WARNING"
-                      implementationClass="com.intellij.codeInspection.inconsistentLanguageLevel.InconsistentLanguageLevelInspection"/>
+                      implementationClass="com.intellij.codeInspection.inconsistentLanguageLevel.InconsistentLanguageLevelInspection"
+                      key="inspection.inconsistent.language.level.display.name" bundle="messages.JavaAnalysisBundle"/>
     <globalInspection groupPath="Java" shortName="UnusedLibrary" bundle="messages.JavaAnalysisBundle" key="unused.library.display.name"
                       groupBundle="messages.InspectionsBundle" groupKey="group.names.declaration.redundancy" enabledByDefault="false" level="WARNING"
                       implementationClass="com.intellij.codeInspection.unusedLibraries.UnusedLibrariesInspection"/>
diff --git a/java/java-impl/src/META-INF/JavaPlugin.xml b/java/java-impl/src/META-INF/JavaPlugin.xml
index a39e92c0054d..dc7d69b82bb5 100644
--- a/java/java-impl/src/META-INF/JavaPlugin.xml
+++ b/java/java-impl/src/META-INF/JavaPlugin.xml
@@ -600,7 +600,7 @@
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.inheritance.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.intellij.compiler.inspection.FrequentlyUsedInheritorInspection"
-                     displayName="Class may extend a commonly used base class"/>
+                     key="inspection.frequently.used.inheritor.inspection.display.name" bundle="messages.JavaBundle"/>
 
     <codeInsight.linkHandler prefix="#javaClass/" handlerClass="com.intellij.codeInsight.daemon.impl.JavaClassTooltipLinkHandler"/>
 
@@ -1286,20 +1286,20 @@
     <localInspection groupPath="Java" language="JAVA" shortName="TestFailedLine"
                      enabledByDefault="true" level="WARNING"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues"
-                     displayName="Highlight problem line in test"
-                     implementationClass="com.intellij.execution.testframework.TestFailedLineInspection"/>
+                     implementationClass="com.intellij.execution.testframework.TestFailedLineInspection"
+                     key="inspection.test.failed.line.display.name" bundle="messages.JavaBundle"/>
     <localInspection language="JAVA" shortName="MoveFieldAssignmentToInitializer" enabledByDefault="true" level="INFORMATION"
                      groupPath="Java" groupBundle="messages.InspectionsBundle" groupKey="group.names.code.style.issues"
-                     displayName="Field assignment can be moved to initializer"
-                     implementationClass="com.intellij.codeInspection.MoveFieldAssignmentToInitializerInspection"/>
+                     implementationClass="com.intellij.codeInspection.MoveFieldAssignmentToInitializerInspection"
+                     key="inspection.move.field.assignment.to.initializer.display.name" bundle="messages.JavaBundle"/>
     <localInspection language="JAVA" shortName="ConditionCoveredByFurtherCondition" enabledByDefault="true" level="WARNING"
                      groupPath="Java" groupBundle="messages.InspectionsBundle" groupKey="group.names.verbose.or.redundant.code.constructs"
-                     displayName="Condition is covered by further condition"
-                     implementationClass="com.siyeh.ig.controlflow.ConditionCoveredByFurtherConditionInspection"/>
+                     implementationClass="com.siyeh.ig.controlflow.ConditionCoveredByFurtherConditionInspection"
+                     key="inspection.condition.covered.by.further.condition.display.name" bundle="messages.JavaBundle"/>
     <localInspection language="JAVA" shortName="ExcessiveRangeCheck" enabledByDefault="true" level="WARNING"
                      groupPath="Java" groupBundle="messages.InspectionsBundle" groupKey="group.names.verbose.or.redundant.code.constructs"
-                     displayName="Excessive range check"
-                     implementationClass="com.siyeh.ig.controlflow.ExcessiveRangeCheckInspection"/>
+                     implementationClass="com.siyeh.ig.controlflow.ExcessiveRangeCheckInspection"
+                     key="inspection.excessive.range.check.display.name" bundle="messages.JavaBundle"/>
     <localInspection language="JAVA" shortName="IdempotentLoopBody" enabledByDefault="true" level="WARNING"
                      groupPath="Java" groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues"
                      bundle="messages.JavaBundle" key="inspection.idempotent.loop.body"
@@ -1332,12 +1332,12 @@
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.OptionalAssignedToNullInspection"
-                     displayName="Null value for Optional type"/>
+                     key="inspection.optional.assigned.to.null.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="ConditionalCanBeOptional"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.intellij.codeInspection.ConditionalCanBeOptionalInspection"
-                     displayName="Conditional can be replaced with Optional"/>
+                     key="inspection.conditional.can.be.optional.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="ReplaceNullCheck"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids9" enabledByDefault="true" level="WARNING"
@@ -1348,12 +1348,12 @@
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.OptionalIsPresentInspection"
-                     displayName="Optional.isPresent() can be replaced with functional-style expression"/>
+                     key="inspection.optional.is.present.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="OptionalGetWithoutIsPresent"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.java18api.OptionalGetWithoutIsPresentInspection"
-                     displayName="Optional.get() is called without isPresent() check"/>
+                     key="inspection.optional.get.without.is.present.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="RedundantExplicitClose"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.declaration.redundancy" enabledByDefault="true" level="WARNING"
@@ -1375,53 +1375,53 @@
     <localInspection groupPath="Java" language="JAVA" shortName="WrapperTypeMayBePrimitive"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.declaration.redundancy" enabledByDefault="true" level="WARNING"
-                     displayName="Wrapper type may be primitive"
-                     implementationClass="com.intellij.codeInspection.WrapperTypeMayBePrimitiveInspection"/>
+                     implementationClass="com.intellij.codeInspection.WrapperTypeMayBePrimitiveInspection"
+                     key="inspection.wrapper.type.may.be.primitive.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="RedundantLambdaParameterType"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.declaration.redundancy" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.intellij.codeInspection.lambda.RedundantLambdaParameterTypeInspection"
-                     displayName="Redundant lambda parameter types"/>
+                     key="inspection.redundant.lambda.parameter.type.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="ReplaceInefficientStreamCount"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.ReplaceInefficientStreamCountInspection"
-                     displayName="Inefficient Stream API call chains ending with count()"/>
+                     key="inspection.replace.inefficient.stream.count.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="ComparatorCombinators"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids8" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.ComparatorCombinatorsInspection"
-                     displayName="Comparator combinator can be used"/>
+                     key="inspection.comparator.combinators.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="UseBulkOperation"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.bulkOperation.UseBulkOperationInspection"
-                     displayName="Bulk operation can be used instead of iteration"/>
+                     key="inspection.use.bulk.operation.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="SimplifyCollector"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.declaration.redundancy" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.SimplifyCollectorInspection"
-                     displayName="Collector can be simplified"/>
+                     key="inspection.simplify.collector.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="SimplifyOptionalCallChains"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.declaration.redundancy" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.SimplifyOptionalCallChainsInspection"
-                     displayName="Optional call chain can be simplified"/>
+                     key="inspection.simplify.optional.call.chains.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="SimplifyStreamApiCallChains"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.declaration.redundancy" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.SimplifyStreamApiCallChainsInspection"
-                     displayName="Stream API call chain can be simplified"/>
+                     key="inspection.simplify.stream.api.call.chains.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="ObviousNullCheck"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.declaration.redundancy" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.ObviousNullCheckInspection"
-                     displayName="Null-check method is called with obviously non-null argument"/>
+                     key="inspection.obvious.null.check.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="RedundantStreamOptionalCall"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.declaration.redundancy" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.RedundantStreamOptionalCallInspection"
-                     displayName="Redundant step in Stream or Optional call chain"/>
+                     key="inspection.redundant.stream.optional.call.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="RedundantRecordConstructor" enabledByDefault="true" level="WARNING"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.declaration.redundancy"
                      bundle="messages.JavaBundle" key="inspection.redundant.record.constructor.description"
@@ -1435,27 +1435,27 @@
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.verbose.or.redundant.code.constructs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.lambdaToExplicit.ExcessiveLambdaUsageInspection"
-                     displayName="Excessive lambda usage"/>
+                     key="inspection.excessive.lambda.usage.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="ExplicitArgumentCanBeLambda"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.intellij.codeInspection.lambdaToExplicit.ExplicitArgumentCanBeLambdaInspection"
-                     displayName="Explicit argument can be lambda"/>
+                     key="inspection.explicit.argument.can.be.lambda.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="Java9CollectionFactory"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids9" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.java19api.Java9CollectionFactoryInspection"
-                     displayName="Immutable collection creation can be replaced with collection factory call"/>
+                     key="inspection.java.9.collection.factory.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="ReadWriteStringCanBeUsed"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids11" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.ReadWriteStringCanBeUsedInspection"
-                     displayName="'Files.readString()' or 'Files.writeString()' can be used"/>
+                     key="inspection.read.write.string.can.be.used.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="StringRepeatCanBeUsed"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids11" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.StringRepeatCanBeUsedInspection"
-                     displayName="String.repeat() can be used"/>
+                     key="inspection.string.repeat.can.be.used.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="Java8MapForEach"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids8" enabledByDefault="true" level="WARNING"
@@ -1465,27 +1465,27 @@
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids8" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.java18api.Java8MapApiInspection"
-                     displayName="Single Map method can be used"/>
+                     key="inspection.java.8.map.api.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="Java8CollectionRemoveIf"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids8" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.java18api.Java8CollectionRemoveIfInspection"
-                     displayName="Loop can be replaced with Collection.removeIf()"/>
+                     key="inspection.java.8.collection.remove.if.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="ExplicitArrayFilling"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.verbose.or.redundant.code.constructs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.ExplicitArrayFillingInspection"
-                     displayName="Explicit array filling"/>
+                     key="inspection.explicit.array.filling.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="ManualMinMaxCalculation"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.verbose.or.redundant.code.constructs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.ManualMinMaxCalculationInspection"
-                     displayName="Manual min/max calculation"/>
+                     key="inspection.manual.min.max.calculation.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="CollectionAddAllCanBeReplacedWithConstructor"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.CollectionAddAllCanBeReplacedWithConstructorInspection"
-                     displayName="Redundant 'Collection.addAll()' call"/>
+                     key="inspection.collection.add.all.can.be.replaced.with.constructor.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="CapturingCleaner"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
@@ -1496,42 +1496,50 @@
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.OverwrittenKeyInspection"
-                     displayName="Overwritten Map key or Set element"/>
+                     key="inspection.overwritten.key.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="StaticPseudoFunctionalStyleMethod"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids8" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.java18StreamApi.StaticPseudoFunctionalStyleMethodInspection"
-                     displayName="Pseudo functional expression using static class"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MagicConstant" displayName="Magic Constant"
+                     key="inspection.static.pseudo.functional.style.method.display.name" bundle="messages.JavaBundle"/>
+    <localInspection groupPath="Java" language="JAVA" shortName="MagicConstant"
                      groupKey="group.names.probable.bugs" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.magicConstant.MagicConstantInspection" />
-    <localInspection groupPath="Java" language="JAVA" shortName="TrivialFunctionalExpressionUsage" displayName="Trivial usage of functional expression"
+                     implementationClass="com.intellij.codeInspection.magicConstant.MagicConstantInspection"
+                     key="inspection.magic.constant.display.name" bundle="messages.JavaBundle"/>
+    <localInspection groupPath="Java" language="JAVA" shortName="TrivialFunctionalExpressionUsage"
                      groupKey="group.names.declaration.redundancy" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.TrivialFunctionalExpressionUsageInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="FunctionalExpressionCanBeFolded" displayName="Functional expression can be folded"
+                     implementationClass="com.intellij.codeInspection.TrivialFunctionalExpressionUsageInspection"
+                     key="inspection.trivial.functional.expression.usage.display.name" bundle="messages.JavaBundle"/>
+    <localInspection groupPath="Java" language="JAVA" shortName="FunctionalExpressionCanBeFolded"
                      groupKey="group.names.declaration.redundancy" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.FunctionalExpressionCanBeFoldedInspection"/>
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="LambdaCanBeMethodCall" displayName="Lambda can be replaced with method call"
+                     implementationClass="com.intellij.codeInspection.FunctionalExpressionCanBeFoldedInspection"
+                     key="inspection.functional.expression.can.be.folded.display.name" bundle="messages.JavaBundle"/>
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="LambdaCanBeMethodCall"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids8" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="INFORMATION"
-                     implementationClass="com.intellij.codeInspection.LambdaCanBeMethodCallInspection" />
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="Convert2MethodRef" displayName="Lambda can be replaced with method reference"
+                     implementationClass="com.intellij.codeInspection.LambdaCanBeMethodCallInspection"
+                     key="inspection.lambda.can.be.method.call.display.name" bundle="messages.JavaBundle"/>
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="Convert2MethodRef"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids8" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.LambdaCanBeMethodReferenceInspection" />
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="Anonymous2MethodRef" displayName="Anonymous type can be replaced with method reference"
+                     implementationClass="com.intellij.codeInspection.LambdaCanBeMethodReferenceInspection"
+                     key="inspection.convert.2.method.ref.display.name" bundle="messages.JavaBundle"/>
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="Anonymous2MethodRef"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids8" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.AnonymousCanBeMethodReferenceInspection" />
-    <localInspection groupPath="Java" language="JAVA" shortName="StreamToLoop" displayName="Stream API call chain can be replaced with loop"
+                     implementationClass="com.intellij.codeInspection.AnonymousCanBeMethodReferenceInspection"
+                     key="inspection.anonymous.2.method.ref.display.name" bundle="messages.JavaBundle"/>
+    <localInspection groupPath="Java" language="JAVA" shortName="StreamToLoop"
                      groupKey="group.names.code.style.issues" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="INFORMATION"
-                     implementationClass="com.intellij.codeInspection.streamToLoop.StreamToLoopInspection"/>
+                     implementationClass="com.intellij.codeInspection.streamToLoop.StreamToLoopInspection"
+                     key="inspection.stream.to.loop.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="OptionalToIf"
-                     displayName="Optional can be replaced with sequence of if statements"
                      groupKey="group.names.code.style.issues" groupBundle="messages.InspectionsBundle" enabledByDefault="true"
                      isInternal="true"
                      level="INFORMATION"
-                     implementationClass="com.intellij.codeInspection.optionalToIf.OptionalToIfInspection"/>
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="Convert2streamapi" displayName="Loop can be collapsed with Stream API"
+                     implementationClass="com.intellij.codeInspection.optionalToIf.OptionalToIfInspection"
+                     key="inspection.optional.to.if.display.name" bundle="messages.JavaBundle"/>
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="Convert2streamapi"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids8" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="INFORMATION"
-                     implementationClass="com.intellij.codeInspection.streamMigration.StreamApiMigrationInspection"/>
+                     implementationClass="com.intellij.codeInspection.streamMigration.StreamApiMigrationInspection"
+                     key="inspection.convert.2.streamapi.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="FuseStreamOperations"
                      bundle="messages.JavaBundle" key="inspection.fuse.stream.operations.display.name"
                      groupKey="group.names.code.style.issues" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING"
@@ -1548,9 +1556,10 @@
                      groupKey="group.names.probable.bugs" groupBundle="messages.InspectionsBundle"
                      enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.suspiciousNameCombination.SuspiciousNameCombinationInspection" />
-    <localInspection groupPath="Java" language="JAVA" suppressId="unchecked" shortName="UNCHECKED_WARNING" displayName="Unchecked warning" groupKey="group.names.compiler.issues" groupBundle="messages.InspectionsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="unchecked" shortName="UNCHECKED_WARNING" groupKey="group.names.compiler.issues" groupBundle="messages.InspectionsBundle"
                      enabledByDefault="true" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.uncheckedWarnings.UncheckedWarningLocalInspection" />
+                     implementationClass="com.intellij.codeInspection.uncheckedWarnings.UncheckedWarningLocalInspection"
+                     key="inspection.unchecked.warning.display.name" bundle="messages.JavaBundle"/>
     <localInspection shortName="DefaultFileTemplate" bundle="messages.JavaBundle" key="default.file.template.display.name"
                      groupKey="inspection.general.tools.group.name" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.defaultFileTemplateUsage.DefaultFileTemplateUsageInspection"/>
@@ -1582,8 +1591,9 @@
     <localInspection groupPath="Java" language="JAVA" shortName="FieldCanBeLocal" bundle="messages.JavaBundle" key="inspection.field.can.be.local.display.name"
                      groupKey="group.names.class.structure" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING" runForWholeFile="true"
                      implementationClass="com.intellij.codeInspection.varScopeCanBeNarrowed.FieldCanBeLocalInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="Dependency" displayName="Illegal package dependencies" groupKey="group.names.dependency.issues" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="ERROR"
-                     implementationClass="com.intellij.codeInspection.dependencyViolation.DependencyInspection"/>
+    <localInspection groupPath="Java" language="JAVA" shortName="Dependency" groupKey="group.names.dependency.issues" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="ERROR"
+                     implementationClass="com.intellij.codeInspection.dependencyViolation.DependencyInspection"
+                     key="inspection.dependency.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="Since15" bundle="messages.JavaBundle" key="inspection.1.5.display.name"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="ERROR"
                      implementationClass="com.intellij.codeInspection.java15api.Java15APIUsageInspection"/>
@@ -1620,8 +1630,9 @@
                      groupKey="group.names.code.style.issues" groupBundle="messages.InspectionsBundle"
                      enabledByDefault="true" level="WARNING" cleanupTool="true"
                      implementationClass="com.intellij.codeInspection.CharsetObjectCanBeUsedInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnusedAssignment" displayName="Unused assignment" groupKey="group.names.probable.bugs" groupBundle="messages.InspectionsBundle" enabledByDefault="true"
-                     level="WARNING" implementationClass="com.intellij.codeInspection.defUse.DefUseInspection"/>
+    <localInspection groupPath="Java" language="JAVA" shortName="UnusedAssignment" groupKey="group.names.probable.bugs" groupBundle="messages.InspectionsBundle" enabledByDefault="true"
+                     level="WARNING" implementationClass="com.intellij.codeInspection.defUse.DefUseInspection"
+                     key="inspection.unused.assignment.display.name" bundle="messages.JavaBundle"/>
     <localInspection groupPath="Java" language="JAVA" shortName="ConstantConditions" bundle="messages.JavaBundle" key="inspection.data.flow.display.name"
                      groupKey="group.names.probable.bugs" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.dataFlow.DataFlowInspection"/>
@@ -1701,18 +1712,20 @@
                      enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.redundancy.RedundantOperationOnEmptyContainerInspection" />
 
-    <globalInspection groupPath="Java" language="JAVA" shortName="EmptyMethod" displayName="Empty method" groupKey="group.names.declaration.redundancy" enabledByDefault="true" groupBundle="messages.InspectionsBundle"
-                      level="WARNING" implementationClass="com.intellij.codeInspection.emptyMethod.EmptyMethodInspection"/>
+    <globalInspection groupPath="Java" language="JAVA" shortName="EmptyMethod" groupKey="group.names.declaration.redundancy" enabledByDefault="true" groupBundle="messages.InspectionsBundle"
+                      level="WARNING" implementationClass="com.intellij.codeInspection.emptyMethod.EmptyMethodInspection"
+                      key="inspection.empty.method.display.name" bundle="messages.JavaBundle"/>
     <globalInspection groupPath="Java" language="JAVA" shortName="UnusedReturnValue" bundle="messages.JavaBundle" key="inspection.unused.return.value.display.name"
                       groupKey="group.names.declaration.redundancy" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING"
                       implementationClass="com.intellij.codeInspection.unusedReturnValue.UnusedReturnValue"/>
     <globalInspection groupPath="Java" language="UAST" shortName="SameParameterValue" bundle="messages.JavaBundle" key="inspection.same.parameter.display.name"
                       groupKey="group.names.declaration.redundancy" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING"
                       implementationClass="com.intellij.codeInspection.sameParameterValue.SameParameterValueInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="unused" displayName="Unused declaration" groupBundle="messages.InspectionsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="unused" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.declaration.redundancy" enabledByDefault="true" level="WARNING"
                       implementationClass="com.intellij.codeInspection.deadCode.UnusedDeclarationInspection"
-                      presentation="com.intellij.codeInspection.deadCode.UnusedDeclarationPresentation"/>
+                      presentation="com.intellij.codeInspection.deadCode.UnusedDeclarationPresentation" key="inspection.unused.display.name"
+                      bundle="messages.JavaBundle"/>
 
     <intentionAction>
       <className>com.intellij.codeInsight.intention.impl.SplitIfAction</className>
diff --git a/java/openapi/resources/messages/JavaBundle.properties b/java/openapi/resources/messages/JavaBundle.properties
index 1af60a579dc0..4ae75f086505 100644
--- a/java/openapi/resources/messages/JavaBundle.properties
+++ b/java/openapi/resources/messages/JavaBundle.properties
@@ -1184,4 +1184,49 @@ inspection.magic.constants.should.be.one.of.values=Should be one of: {0}{1,choic
 live.template.context.consumer.function=Consumer function
 live.template.context.statement=Statement
 live.template.context.expression=Expression
-live.template.context.declaration=Declaration
\ No newline at end of file
+live.template.context.declaration=Declaration
+inspection.unused.display.name=Unused declaration
+inspection.empty.method.display.name=Empty method
+inspection.unused.assignment.display.name=Unused assignment
+inspection.dependency.display.name=Illegal package dependencies
+inspection.unchecked.warning.display.name=Unchecked warning
+inspection.convert.2.streamapi.display.name=Loop can be collapsed with Stream API
+inspection.optional.to.if.display.name=Optional can be replaced with sequence of if statements
+inspection.stream.to.loop.display.name=Stream API call chain can be replaced with loop
+inspection.anonymous.2.method.ref.display.name=Anonymous type can be replaced with method reference
+inspection.convert.2.method.ref.display.name=Lambda can be replaced with method reference
+inspection.lambda.can.be.method.call.display.name=Lambda can be replaced with method call
+inspection.functional.expression.can.be.folded.display.name=Functional expression can be folded
+inspection.trivial.functional.expression.usage.display.name=Trivial usage of functional expression
+inspection.magic.constant.display.name=Magic Constant
+inspection.static.pseudo.functional.style.method.display.name=Pseudo functional expression using static class
+inspection.overwritten.key.display.name=Overwritten Map key or Set element
+inspection.collection.add.all.can.be.replaced.with.constructor.display.name=Redundant 'Collection.addAll()' call
+inspection.manual.min.max.calculation.display.name=Manual min/max calculation
+inspection.explicit.array.filling.display.name=Explicit array filling
+inspection.java.8.collection.remove.if.display.name=Loop can be replaced with Collection.removeIf()
+inspection.java.8.map.api.display.name=Single Map method can be used
+inspection.string.repeat.can.be.used.display.name=String.repeat() can be used
+inspection.read.write.string.can.be.used.display.name='Files.readString()' or 'Files.writeString()' can be used
+inspection.java.9.collection.factory.display.name=Immutable collection creation can be replaced with collection factory call
+inspection.explicit.argument.can.be.lambda.display.name=Explicit argument can be lambda
+inspection.excessive.lambda.usage.display.name=Excessive lambda usage
+inspection.redundant.stream.optional.call.display.name=Redundant step in Stream or Optional call chain
+inspection.obvious.null.check.display.name=Null-check method is called with obviously non-null argument
+inspection.simplify.stream.api.call.chains.display.name=Stream API call chain can be simplified
+inspection.simplify.optional.call.chains.display.name=Optional call chain can be simplified
+inspection.simplify.collector.display.name=Collector can be simplified
+inspection.use.bulk.operation.display.name=Bulk operation can be used instead of iteration
+inspection.comparator.combinators.display.name=Comparator combinator can be used
+inspection.replace.inefficient.stream.count.display.name=Inefficient Stream API call chains ending with count()
+inspection.redundant.lambda.parameter.type.display.name=Redundant lambda parameter types
+inspection.wrapper.type.may.be.primitive.display.name=Wrapper type may be primitive
+inspection.optional.get.without.is.present.display.name=Optional.get() is called without isPresent() check
+inspection.optional.is.present.display.name=Optional.isPresent() can be replaced with functional-style expression
+inspection.conditional.can.be.optional.display.name=Conditional can be replaced with Optional
+inspection.optional.assigned.to.null.display.name=Null value for Optional type
+inspection.excessive.range.check.display.name=Excessive range check
+inspection.condition.covered.by.further.condition.display.name=Condition is covered by further condition
+inspection.move.field.assignment.to.initializer.display.name=Field assignment can be moved to initializer
+inspection.test.failed.line.display.name=Highlight problem line in test
+inspection.frequently.used.inheritor.inspection.display.name=Class may extend a commonly used base class
\ No newline at end of file