Wizard: move core module UI texts to bundles

idea/idea-new-project-wizard/resources/messages/KotlinNewProjectWizardBundle.properties

@@ -1,5 +0,0 @@
-module.kind.android.module=Android Module
-module.kind.js.module=JS Module
-module.kind.module=Module
-module.kind.mpp.module=MPP Module
-module.kind.target=Target

idea/idea-new-project-wizard/resources/messages/KotlinNewProjectWizardUIBundle.properties

@@ -11,6 +11,7 @@ module.dependencies.module.dependencies=Module dependencies
 module.dependencies.add.module.dependency=Add module dependency
 module.dependencies.remove.module.dependency=Remove module dependency
 
+editor.modules.add=Add {0}
 editor.modules.remove.selected.module=Do you want to remove selected {0}
 editor.modules.remove.selected.submodules=This will also remove all submodules.
 editor.modules.remove.selected.no.undone=This action cannot be undone.
@@ -21,7 +22,7 @@ editor.modules.remove.tooltip=Remove {0}
 
 editor.modules.project=Project
 editor.modules.add.module=Add a module to the project
-editor.modules.no.modules=No modules created
+editor.modules.no.modules=No modules created    
 
 module.settings.name=Name
 module.settings.name.same.as.project=[The same as the project name]

idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/KotlinNewProjectWizardBundle.kt

@@ -1,18 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.tools.projectWizard.wizard
-
-import org.jetbrains.annotations.NonNls
-import org.jetbrains.annotations.PropertyKey
-import org.jetbrains.kotlin.util.AbstractKotlinBundle
-
-@NonNls
-private const val BUNDLE = "messages.KotlinNewProjectWizardBundle"
-
-object KotlinNewProjectWizardBundle : AbstractKotlinBundle(BUNDLE) {
-    @JvmStatic
-    fun message(@NonNls @PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
-}

idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/CreateModuleOrTargetPopup.kt

@@ -5,13 +5,12 @@ import com.intellij.openapi.ui.popup.ListPopup
 import com.intellij.openapi.ui.popup.PopupStep
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep
 import com.intellij.ui.popup.PopupFactoryImpl
+import org.jetbrains.kotlin.tools.projectWizard.KotlinNewProjectWizardBundle
 import org.jetbrains.kotlin.tools.projectWizard.core.buildList
 import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.*
 import org.jetbrains.kotlin.tools.projectWizard.settings.DisplayableSettingItem
 import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Module
 import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.ModuleKind
-import org.jetbrains.kotlin.tools.projectWizard.wizard.KotlinNewProjectWizardBundle
-import org.jetbrains.kotlin.tools.projectWizard.wizard.KotlinNewProjectWizardUIBundle
 import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.fullTextHtml
 import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.icon
 import javax.swing.Icon

idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/ui/secondStep/modulesEditor/ModulesEditorToolbarDecorator.kt

@@ -4,6 +4,7 @@ import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.ActionToolbarPosition
 import com.intellij.openapi.ui.Messages
 import com.intellij.ui.ToolbarDecorator
+import org.jetbrains.kotlin.tools.projectWizard.KotlinNewProjectWizardBundle
 import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.AndroidSinglePlatformModuleConfigurator
 import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.IOSSinglePlatformModuleConfigurator
 import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.JsSingleplatformModuleConfigurator
@@ -12,7 +13,6 @@ import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.withAllSubModules
 import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Module
 import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.ModuleKind
 import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Sourceset
-import org.jetbrains.kotlin.tools.projectWizard.wizard.KotlinNewProjectWizardBundle
 import org.jetbrains.kotlin.tools.projectWizard.wizard.KotlinNewProjectWizardUIBundle
 import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.createPanelWithPopupHandler
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
@@ -58,7 +58,7 @@ class ModulesEditorToolbarDecorator(
                     null -> true
                     else -> false
                 }
-                text = "Add" + " " + when (tree.selectedSettingItem?.safeAs<Module>()?.kind) {
+                val moduleKindTextToAdd = when (tree.selectedSettingItem?.safeAs<Module>()?.kind) {
                     ModuleKind.multiplatform -> KotlinNewProjectWizardBundle.message("module.kind.target")
                     ModuleKind.singleplatformJvm -> KotlinNewProjectWizardBundle.message("module.kind.module")
                     ModuleKind.singleplatformJs -> KotlinNewProjectWizardBundle.message("module.kind.js.module")
@@ -66,9 +66,12 @@ class ModulesEditorToolbarDecorator(
                     ModuleKind.target -> ""
                     null -> ""
                 }
+
+                text = KotlinNewProjectWizardUIBundle.message("editor.modules.add", moduleKindTextToAdd)
             }
             event.presentation.isEnabled
         }
+
         setRemoveAction {
             val moduleKindText = selectedModuleKindText ?: KotlinNewProjectWizardBundle.message("module.kind.module")
             if (Messages.showOkCancelDialog(