diff --git a/idea/idea-analysis/resources/messages/KotlinIdeaAnalysisBundle.properties b/idea/idea-analysis/resources/messages/KotlinIdeaAnalysisBundle.properties index 13d0edf2bfe..e60154b20a7 100644 --- a/idea/idea-analysis/resources/messages/KotlinIdeaAnalysisBundle.properties +++ b/idea/idea-analysis/resources/messages/KotlinIdeaAnalysisBundle.properties @@ -21,7 +21,6 @@ html.types.of.inherited.var.properties.do.not.match.br.0.br.1.html=Types of inhe html.types.of.inherited.properties.are.incompatible.br.0.br.1.html=Types of inherited properties are incompatible:
{0},
{1} html.actual.class.0.has.no.corresponding.members.for.expected.class.members.1.html=Actual class ''{0}'' has no corresponding members for expected class members:{1} html.val.property.cannot.override.var.property.br.1.html=Val-property cannot override var-property
{1} -html.val.property.cannot.override.var.property.br.1.html2=Val-property cannot override var-property
{1} html.var.property.type.is.0.which.is.not.a.type.of.overridden.br.1.html=Var-property type is {0}, which is not a type of overridden
{1} required.space=required:\u0020 type.inference.failed.expected.type.mismatch=Type inference failed. Expected type mismatch:\u0020 diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java index fa16fe0fdcb..a54c5f5c48a 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java @@ -129,7 +129,7 @@ public class IdeErrorMessages { KotlinIdeaAnalysisBundle.htmlMessage("html.types.of.inherited.var.properties.do.not.match.br.0.br.1.html"), HTML, HTML); - MAP.put(VAR_OVERRIDDEN_BY_VAL, KotlinIdeaAnalysisBundle.htmlMessage("html.val.property.cannot.override.var.property.br.1.html2"), HTML, HTML); + MAP.put(VAR_OVERRIDDEN_BY_VAL, KotlinIdeaAnalysisBundle.htmlMessage("html.val.property.cannot.override.var.property.br.1.html"), HTML, HTML); MAP.put(VAR_OVERRIDDEN_BY_VAL_BY_DELEGATION, KotlinIdeaAnalysisBundle.htmlMessage("html.val.property.cannot.override.var.property.br.1.html"), HTML, HTML);