replace 'trait' keyword with 'interface' in user-visible messages and code generation tools

idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties

@@ -136,7 +136,7 @@ livetemplate.description.void=Function returning nothing
 livetemplate.description.fun0=Function with no parameters
 livetemplate.description.fun1=Function with one parameter
 livetemplate.description.fun2=Function with two parameters
-livetemplate.description.interface=Trait
+livetemplate.description.interface=Interface
 livetemplate.description.singleton=Singleton
 livetemplate.description.closure=Closure (function without name)
 livetemplate.description.anonymous=Anonymous class
@@ -158,7 +158,6 @@ options.kotlin.attribute.descriptor.arrow=Arrow
 options.kotlin.attribute.descriptor.kdoc.comment=KDoc comment
 options.kotlin.attribute.descriptor.kdoc.tag=KDoc tag
 options.kotlin.attribute.descriptor.kdoc.value=Link in KDoc tag
-options.kotlin.attribute.descriptor.trait=Trait
 options.kotlin.attribute.descriptor.object=Object
 options.kotlin.attribute.descriptor.annotation=Annotation
 options.kotlin.attribute.descriptor.var=Var (mutable variable, parameter or property)
@@ -209,7 +208,6 @@ create.from.usage.family=Create from usage
 create.0.from.usage=Create {0}
 create.local.variable.from.usage=Create local variable ''{0}''
 create.parameter.from.usage=Create parameter ''{0}''
-choose.target.class.or.trait.title=Choose target class or trait
 surround.with=Surround with
 surround.with.string.template="${expr}"
 surround.with.when.template=when (expr) {}
@@ -368,7 +366,7 @@ usageType.packageMemberAccess = Package member access
 
 x.in.y={0} in {1}
 x.implements.y={0} in {1} implements {2} in {3}.
-x.overrides.y.in.class.list={0} in {1} overrides functions in the following classes/traits: {2} Do you want to {3} the base functions?
+x.overrides.y.in.class.list={0} in {1} overrides functions in the following classes/interfaces: {2} Do you want to {3} the base functions?
 
 unused.overriding.methods.title=Unused Overriding Members
 there.are.unused.methods.that.override.methods.you.delete=There are unused members that override methods you delete.
@@ -388,7 +386,6 @@ find.options.include.overloaded.methods.checkbox=Include o&verloaded functions a
 find.what.functions.usages.checkbox=Usages of &functions
 find.what.properties.usages.checkbox=Usages of &properties
 find.what.constructor.usages.checkbox=Usages of &constructor
-find.what.derived.traits.checkbox=&Derived traits
 find.what.derived.classes.checkbox=&Derived classes
 
 hierarchy.legend.member.is.defined.in.class=Member is defined in the class

idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt

@@ -83,7 +83,7 @@ private object DeclarationKindDetector : JetVisitor<AnnotationHostKind?, Unit?>(
 
     override fun visitDeclaration(d: JetDeclaration, _: Unit?) = null
 
-    override fun visitClass(d: JetClass, _: Unit?) = detect(d, if (d.isInterface()) "trait" else "class")
+    override fun visitClass(d: JetClass, _: Unit?) = detect(d, if (d.isInterface()) "interface" else "class")
 
     override fun visitNamedFunction(d: JetNamedFunction, _: Unit?) = detect(d, "fun")