diff --git a/idea/idea-jvm/resources/messages/KotlinJvmBundle.properties b/idea/idea-jvm/resources/messages/KotlinJvmBundle.properties
index 3193f283d2a..407bc7d34b2 100644
--- a/idea/idea-jvm/resources/messages/KotlinJvmBundle.properties
+++ b/idea/idea-jvm/resources/messages/KotlinJvmBundle.properties
@@ -170,4 +170,15 @@ check=\     Check...
 can.t.show.all.paths.during.index.update=Can't show all paths during index update
 unsupported.format.plugin.version.0=Unsupported format, plugin version: {0}
 no.updates.found=No updates found
-0.1.expected.2={0} ({1}) - expected: {2}
\ No newline at end of file
+0.1.expected.2={0} ({1}) - expected: {2}
+copy.to=&Copy to:
+use.library.from.plugin=&Use library from plugin
+all.modules.containing.kotlin.files=All modules containing Kotlin files: 
+all.modules=All modules
+single.module=Single module:
+kotlin.compiler.and.runtime.version=Kotlin compiler and runtime version:
+copy.into=&Copy into:
+using.compiler.bundled.into.plugin=Using compiler bundled into plugin
+reason=&Reason
+reference=Re&ference
+script.file=Script file
\ No newline at end of file
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ChooseLibraryPathPanel.form b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ChooseLibraryPathPanel.form
index dca86975aea..6bc548492ff 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ChooseLibraryPathPanel.form
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ChooseLibraryPathPanel.form
@@ -21,7 +21,7 @@
           <borderPainted value="false"/>
           <contentAreaFilled value="true"/>
           <hideActionText value="false"/>
-          <text value="&amp;Copy to:"/>
+          <text resource-bundle="messages/KotlinJvmBundle" key="copy.to"/>
         </properties>
       </component>
       <grid id="258c2" binding="copyPanelPlace" layout-manager="BorderLayout" hgap="0" vgap="0">
@@ -37,7 +37,7 @@
           <grid row="1" column="0" row-span="1" col-span="5" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="&amp;Use library from plugin"/>
+          <text resource-bundle="messages/KotlinJvmBundle" key="use.library.from.plugin"/>
         </properties>
       </component>
     </children>
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ChooseModulePanel.form b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ChooseModulePanel.form
index b034987e86e..5f5dc2252fe 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ChooseModulePanel.form
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ChooseModulePanel.form
@@ -13,7 +13,7 @@
           <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="Single module:"/>
+          <text resource-bundle="messages/KotlinJvmBundle" key="single.module"/>
         </properties>
       </component>
       <component id="8acf5" class="javax.swing.JComboBox" binding="singleModuleComboBox">
@@ -45,7 +45,7 @@
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="All modules containing Kotlin files: "/>
+          <text resource-bundle="messages/KotlinJvmBundle" key="all.modules.containing.kotlin.files"/>
         </properties>
       </component>
       <component id="5e532" class="javax.swing.JRadioButton" binding="allModulesRadioButton">
@@ -53,7 +53,7 @@
           <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="All modules"/>
+          <text resource-bundle="messages/KotlinJvmBundle" key="all.modules"/>
         </properties>
       </component>
     </children>
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.form b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.form
index 8355ab39059..76392eb72f3 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.form
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.form
@@ -26,7 +26,7 @@
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Kotlin compiler and runtime version:"/>
+              <text resource-bundle="messages/KotlinJvmBundle" key="kotlin.compiler.and.runtime.version"/>
             </properties>
           </component>
           <component id="1034b" class="javax.swing.JComboBox" binding="kotlinVersionComboBox">
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/CopyIntoPanel.form b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/CopyIntoPanel.form
index 2b2cc9ab1e1..67f57984562 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/CopyIntoPanel.form
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/CopyIntoPanel.form
@@ -24,7 +24,7 @@
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="&amp;Copy into:"/>
+          <text resource-bundle="messages/KotlinJvmBundle" key="copy.into"/>
         </properties>
       </component>
     </children>
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialogBase.form b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialogBase.form
index a923e368400..561e147de60 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialogBase.form
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialogBase.form
@@ -18,7 +18,7 @@
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="Using compiler bundled into plugin"/>
+          <text resource-bundle="messages/KotlinJvmBundle" key="using.compiler.bundled.into.plugin"/>
         </properties>
       </component>
       <grid id="f8666" binding="chooseModulesPanelPlace" layout-manager="BorderLayout" hgap="0" vgap="0">
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/inspections/api/AddToIncompatibleApiDialog.form b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/inspections/api/AddToIncompatibleApiDialog.form
index b0cc73c13bb..d513495f5f5 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/inspections/api/AddToIncompatibleApiDialog.form
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/inspections/api/AddToIncompatibleApiDialog.form
@@ -3,7 +3,7 @@
   <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="48" y="54" width="436" height="297"/>
+      <xy x="48" y="54" width="624" height="297"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -24,7 +24,7 @@
             </constraints>
             <properties>
               <labelFor value="49f89"/>
-              <text value="Re&amp;ference"/>
+              <text resource-bundle="messages/KotlinJvmBundle" key="reference"/>
             </properties>
           </component>
           <vspacer id="eac19">
@@ -44,7 +44,7 @@
             </constraints>
             <properties>
               <labelFor value="ec77c"/>
-              <text value="&amp;Reason"/>
+              <text resource-bundle="messages/KotlinJvmBundle" key="reason"/>
             </properties>
           </component>
           <component id="ec77c" class="javax.swing.JTextField" binding="reasonTextField">
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfigurationEditor.form b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfigurationEditor.form
index f280a2dac19..1fcfe4a9db6 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfigurationEditor.form
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfigurationEditor.form
@@ -31,7 +31,7 @@
         </constraints>
         <properties>
           <labelLocation value="West"/>
-          <text value="Script file"/>
+          <text resource-bundle="messages/KotlinJvmBundle" key="script.file"/>
         </properties>
       </component>
     </children>
diff --git a/idea/resources/messages/KotlinBundle.properties b/idea/resources/messages/KotlinBundle.properties
index f5565dce1fe..d2b74ebd47e 100644
--- a/idea/resources/messages/KotlinBundle.properties
+++ b/idea/resources/messages/KotlinBundle.properties
@@ -246,7 +246,7 @@ kotlin.compiler.js.option.panel.title=Kotlin to JavaScript
 kotlin.compiler.js.option.generate.sourcemaps=Generate &source maps
 kotlin.compiler.js.option.output.prefix=File to &prepend to generated code:
 kotlin.compiler.js.option.output.postfix=File to append to generated c&ode:
-kotlin.compiler.js.option.output.copy.files=&Copy library runtime fileskotlin.compiler.js.option.output.copy.dir=O&utput directory for library &runtime files:
+kotlin.compiler.js.option.output.copy.files=&Copy library runtime files
 
 # Android Lint
 android.klint.inspections.group.name=Android Lint for Kotlin
@@ -1873,4 +1873,37 @@ implement.abstract.function=Implement abstract function
 implement.abstract.property=Implement abstract property
 replace.explicit.lambda.parameter.with.it=Replace explicit lambda parameter with 'it'
 create.test=Create test
-convert.class.0.to.kotlin=Convert class ''{0}'' to Kotlin
\ No newline at end of file
+convert.class.0.to.kotlin=Convert class ''{0}'' to Kotlin
+destination.directory=&Destination directory
+language.version=&Language version
+add.prefix.to.paths.in.source.map=Add prefix to paths in source map:
+api.version=AP&I version
+compiler.coroutines=Coro&utines
+embed.source.code.into.source.map=Embed source code into source map:
+enable.incremental.compilation=Enable incremental compilation
+keep.compiler.process.alive.between.invocations=Keep compiler process alive between invocations
+script.templates.classpath=Script templates class&path:
+module.kind=Module &kind:
+script.template.classes=Script &template classes:
+target.jvm.version=Target &JVM version
+reload.script.dependencies.on.file.change=Reload script dependencies on file change
+additional.command.line.parameters=Additional command line parameters
+mnemonic.install=&Install
+status=(status)
+build.number.internal.mode=Build number (internal mode):
+check.again=Chec&k again
+current.kotlin.plugin.version=Current Kotlin plugin version:
+experimental.features=Experimental Features
+action.text.install=Install
+update.channel=Update &channel:
+version={version}
+don.t.show.this.dialog.next.time=&Don't show this dialog next time
+clipboard.content.copied.from.java.file.do.you.want.to.convert.it.to.kotlin.code=Clipboard content copied from Java file. Do you want to convert it to Kotlin code?
+name=&Name:
+return.type=&Return type:
+visibility=&Visibility:
+title.parameters=Parameters
+signature.preview=Signature Preview
+move.members.from=Move members from:
+open.moved.members.in.editor=Open moved members in editor
+to.fully.qualified.name=To (fully qualified name):
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCodeInsightWorkspaceSettingsProvider.form b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCodeInsightWorkspaceSettingsProvider.form
index 6de7a3ddba4..a8a5c7e11b3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCodeInsightWorkspaceSettingsProvider.form
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCodeInsightWorkspaceSettingsProvider.form
@@ -1,36 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form bind-to-class="org.jetbrains.kotlin.idea.codeInsight.KotlinCodeInsightWorkspaceSettingsProvider" version="1" xmlns="http://www.intellij.com/uidesigner/form/">
-  <grid column-count="1" hgap="-1" id="ccd61" layout-manager="GridLayoutManager" row-count="1" same-size-horizontally="false" same-size-vertically="false" vgap="-1">
-    <margin bottom="0" left="0" right="0" top="0"/>
-    <constraints/>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.kotlin.idea.codeInsight.KotlinCodeInsightWorkspaceSettingsProvider">
+  <grid id="ccd61" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="0" left="0" bottom="0" right="0"/>
+    <constraints>
+      <xy x="0" y="0" width="348" height="77"/>
+    </constraints>
     <properties/>
     <border type="none"/>
     <children>
-      <grid binding="myPanel" column-count="1" hgap="-1" id="ccd62" layout-manager="GridLayoutManager" row-count="2" same-size-horizontally="false" same-size-vertically="false" vgap="-1">
-        <margin bottom="0" left="0" right="0" top="0"/>
+      <grid id="ccd62" binding="myPanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid anchor="9" col-span="1" column="0" fill="0" hsize-policy="0" indent="0" row="0" row-span="1" use-parent-layout="false" vsize-policy="3"/>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent"/>
         </clientProperties>
-        <border title="Kotlin" type="etched"/>
+        <border type="etched" title-resource-bundle="messages/KotlinBundle" title-key="plugin.updater.notification.title"/>
         <children>
-          <component binding="myAddUnambiguousImportsOnTheFly" class="javax.swing.JCheckBox" default-binding="true" id="ccd64">
+          <component id="ccd64" class="javax.swing.JCheckBox" binding="myAddUnambiguousImportsOnTheFly" default-binding="true">
             <constraints>
-              <grid anchor="8" col-span="1" column="0" fill="0" hsize-policy="3" indent="0" row="0" row-span="1" use-parent-layout="false" vsize-policy="0"/>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text key="checkbox.add.unambiguous.imports.on.the.fly" resource-bundle="messages/ApplicationBundle"/>
+              <text resource-bundle="messages/ApplicationBundle" key="checkbox.add.unambiguous.imports.on.the.fly"/>
             </properties>
           </component>
-          <component binding="myOptimizeImportsOnTheFly" class="javax.swing.JCheckBox" default-binding="true" id="ccd63">
+          <component id="ccd63" class="javax.swing.JCheckBox" binding="myOptimizeImportsOnTheFly" default-binding="true">
             <constraints>
-              <grid anchor="8" col-span="1" column="0" fill="0" hsize-policy="3" indent="0" row="1" row-span="1" use-parent-layout="false" vsize-policy="0"/>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text key="checkbox.optimize.imports.on.the.fly" resource-bundle="messages/ApplicationBundle"/>
+              <text resource-bundle="messages/ApplicationBundle" key="checkbox.optimize.imports.on.the.fly"/>
             </properties>
           </component>
         </children>
diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
index 9c40101b3f3..14931f83d26 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
@@ -61,7 +61,7 @@
               <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="&amp;Destination directory"/>
+              <text resource-bundle="messages/KotlinBundle" key="destination.directory"/>
             </properties>
           </component>
           <component id="7c11a" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="outputDirectory">
@@ -89,7 +89,7 @@
             </constraints>
             <properties>
               <labelFor value="ca29c"/>
-              <text value="Module &amp;kind:"/>
+              <text resource-bundle="messages/KotlinBundle" key="module.kind"/>
             </properties>
           </component>
           <component id="ca29c" class="javax.swing.JComboBox" binding="moduleKindComboBox">
@@ -115,7 +115,7 @@
             </constraints>
             <properties>
               <labelFor value="e65e6"/>
-              <text value="Add prefix to paths in source map:"/>
+              <text resource-bundle="messages/KotlinBundle" key="add.prefix.to.paths.in.source.map"/>
             </properties>
           </component>
           <component id="e65e6" class="javax.swing.JTextField" binding="sourceMapPrefix">
@@ -131,7 +131,7 @@
               <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Embed source code into source map:"/>
+              <text resource-bundle="messages/KotlinBundle" key="embed.source.code.into.source.map"/>
             </properties>
           </component>
           <component id="48310" class="javax.swing.JComboBox" binding="sourceMapEmbedSources">
@@ -145,7 +145,7 @@
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Enable incremental compilation"/>
+              <text resource-bundle="messages/KotlinBundle" key="enable.incremental.compilation"/>
             </properties>
           </component>
         </children>
@@ -161,7 +161,7 @@
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/>
         </clientProperties>
-        <border type="etched" title="Kotlin Scripting"/>
+        <border type="etched" title-resource-bundle="messages/KotlinBundle" title-key="action.new.script.name"/>
         <children>
           <component id="71c3f" class="javax.swing.JTextField" binding="scriptTemplatesField">
             <constraints>
@@ -177,7 +177,7 @@
             </constraints>
             <properties>
               <labelFor value="644d9"/>
-              <text value="Script templates class&amp;path:"/>
+              <text resource-bundle="messages/KotlinBundle" key="script.templates.classpath"/>
             </properties>
           </component>
           <component id="644d9" class="javax.swing.JTextField" binding="scriptTemplatesClasspathField">
@@ -195,7 +195,7 @@
             <properties>
               <enabled value="true"/>
               <labelFor value="71c3f"/>
-              <text value="Script &amp;template classes:"/>
+              <text resource-bundle="messages/KotlinBundle" key="script.template.classes"/>
             </properties>
           </component>
         </children>
@@ -244,7 +244,7 @@
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Target &amp;JVM version"/>
+              <text resource-bundle="messages/KotlinBundle" key="target.jvm.version"/>
             </properties>
           </component>
           <component id="d8f92" class="javax.swing.JCheckBox" binding="enableIncrementalCompilationForJvmCheckBox">
@@ -252,7 +252,7 @@
               <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Enable incremental compilation"/>
+              <text resource-bundle="messages/KotlinBundle" key="enable.incremental.compilation"/>
             </properties>
           </component>
           <component id="769be" class="javax.swing.JComboBox" binding="jvmVersionComboBox">
@@ -296,7 +296,7 @@
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="&amp;Language version"/>
+              <text resource-bundle="messages/KotlinBundle" key="language.version"/>
             </properties>
           </component>
           <component id="d931b" class="javax.swing.JComboBox" binding="languageVersionComboBox">
@@ -320,7 +320,7 @@
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="AP&amp;I version"/>
+              <text resource-bundle="messages/KotlinBundle" key="api.version"/>
             </properties>
           </component>
           <component id="ab3e4" class="javax.swing.JComboBox" binding="apiVersionComboBox">
@@ -344,7 +344,7 @@
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Coro&amp;utines"/>
+              <text resource-bundle="messages/KotlinBundle" key="compiler.coroutines"/>
             </properties>
           </component>
           <component id="4cb8f" class="javax.swing.JComboBox" binding="coroutineSupportComboBox">
@@ -368,7 +368,7 @@
           <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <dialogCaption value="Additional command line parameters"/>
+          <dialogCaption resource-bundle="messages/KotlinBundle" key="additional.command.line.parameters"/>
         </properties>
       </component>
       <component id="dae3f" class="com.intellij.util.ui.ThreeStateCheckBox" binding="keepAliveCheckBox">
@@ -377,7 +377,7 @@
         </constraints>
         <properties>
           <state value="NOT_SELECTED"/>
-          <text value="Keep compiler process alive between invocations"/>
+          <text resource-bundle="messages/KotlinBundle" key="keep.compiler.process.alive.between.invocations"/>
         </properties>
       </component>
       <grid id="8b5c9" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinLanguageConfigurationForm.form b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinLanguageConfigurationForm.form
index 7717588c78c..d296b9b294f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinLanguageConfigurationForm.form
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinLanguageConfigurationForm.form
@@ -35,9 +35,9 @@
           <component id="65662" class="javax.swing.JButton" binding="installButton" default-binding="true">
             <constraints/>
             <properties>
-              <actionCommand value="Install"/>
-              <label value="Install"/>
-              <text value="&amp;Install"/>
+              <actionCommand resource-bundle="messages/KotlinBundle" key="action.text.install"/>
+              <label resource-bundle="messages/KotlinBundle" key="action.text.install"/>
+              <text resource-bundle="messages/KotlinBundle" key="mnemonic.install"/>
               <visible value="true"/>
             </properties>
           </component>
@@ -67,7 +67,7 @@
             <constraints/>
             <properties>
               <foreground color="-65536"/>
-              <text value="(status)"/>
+              <text resource-bundle="messages/KotlinBundle" key="status"/>
             </properties>
           </component>
         </children>
@@ -83,7 +83,7 @@
             <constraints/>
             <properties>
               <labelFor value="ca1a9"/>
-              <text value="Update &amp;channel:"/>
+              <text resource-bundle="messages/KotlinBundle" key="update.channel"/>
             </properties>
           </component>
           <component id="ca1a9" class="javax.swing.JComboBox" binding="channelCombo">
@@ -93,7 +93,7 @@
           <component id="c7546" class="javax.swing.JButton" binding="reCheckButton">
             <constraints/>
             <properties>
-              <text value="Chec&amp;k again"/>
+              <text resource-bundle="messages/KotlinBundle" key="check.again"/>
             </properties>
           </component>
           <component id="3b585" class="com.intellij.util.ui.AsyncProcessIcon" binding="updateCheckProgressIcon" custom-create="true">
@@ -114,14 +114,14 @@
           <component id="f62d1" class="javax.swing.JLabel">
             <constraints/>
             <properties>
-              <text value="Current Kotlin plugin version:"/>
+              <text resource-bundle="messages/KotlinBundle" key="current.kotlin.plugin.version"/>
             </properties>
           </component>
           <component id="e71d" class="javax.swing.JTextPane" binding="currentVersion">
             <constraints/>
             <properties>
               <editable value="false"/>
-              <text value="{version}"/>
+              <text resource-bundle="messages/KotlinBundle" key="version"/>
             </properties>
           </component>
         </children>
@@ -138,14 +138,14 @@
           <component id="a5e8c" class="javax.swing.JLabel">
             <constraints/>
             <properties>
-              <text value="Build number (internal mode):"/>
+              <text resource-bundle="messages/KotlinBundle" key="build.number.internal.mode"/>
             </properties>
           </component>
           <component id="d11da" class="javax.swing.JTextPane" binding="compilerVersion">
             <constraints/>
             <properties>
               <editable value="false"/>
-              <text value="{version}"/>
+              <text resource-bundle="messages/KotlinBundle" key="version"/>
             </properties>
           </component>
         </children>
@@ -159,7 +159,7 @@
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/>
         </clientProperties>
-        <border type="etched" title="Experimental Features"/>
+        <border type="etched" title-resource-bundle="messages/KotlinBundle" title-key="experimental.features"/>
         <children>
           <component id="31057" class="org.jetbrains.kotlin.idea.configuration.ExperimentalFeaturesPanel" binding="experimentalFeaturesPanel">
             <constraints>
diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.form b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.form
index 84b3d436102..f7ac69d0483 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.form
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.form
@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="panel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="515" height="400"/>
+      <xy x="20" y="20" width="526" height="400"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -13,7 +13,7 @@
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="Clipboard content copied from Java file. Do you want to convert it to Kotlin code?"/>
+          <text resource-bundle="messages/KotlinBundle" key="clipboard.content.copied.from.java.file.do.you.want.to.convert.it.to.kotlin.code"/>
         </properties>
       </component>
       <vspacer id="b8512">
@@ -26,7 +26,7 @@
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="&amp;Don't show this dialog next time"/>
+          <text resource-bundle="messages/KotlinBundle" key="don.t.show.this.dialog.next.time"/>
         </properties>
       </component>
     </children>
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.form b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.form
index d0928478ed9..6d7b0b4d82e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.form
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.form
@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="contentPane" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="522" height="396"/>
+      <xy x="20" y="20" width="524" height="405"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -28,7 +28,7 @@
                 <properties>
                   <text value=""/>
                 </properties>
-                <border type="none" title="Parameters"/>
+                <border type="none" title-resource-bundle="messages/KotlinBundle" title-key="title.parameters"/>
                 <children/>
               </grid>
             </children>
@@ -51,7 +51,7 @@
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
-            <border type="none" title="Signature Preview"/>
+            <border type="none" title-resource-bundle="messages/KotlinBundle" title-key="signature.preview"/>
             <children>
               <component id="7722b" class="org.jetbrains.kotlin.idea.refactoring.introduce.ui.KotlinSignatureComponent" binding="signaturePreviewField" custom-create="true">
                 <constraints>
@@ -84,7 +84,7 @@
               <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="&amp;Name:"/>
+              <text resource-bundle="messages/KotlinBundle" key="name"/>
             </properties>
           </component>
           <component id="52aa7" class="javax.swing.JLabel">
@@ -95,7 +95,7 @@
             </constraints>
             <properties>
               <labelFor value="71ee7"/>
-              <text value="&amp;Visibility:"/>
+              <text resource-bundle="messages/KotlinBundle" key="visibility"/>
               <visible value="true"/>
             </properties>
           </component>
@@ -139,7 +139,7 @@
                 </constraints>
                 <properties>
                   <labelFor value="37c42"/>
-                  <text value="&amp;Return type:"/>
+                  <text resource-bundle="messages/KotlinBundle" key="return.type"/>
                 </properties>
               </component>
               <hspacer id="b7d50">
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/ui/KotlinIntroduceTypeAliasDialog.form b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/ui/KotlinIntroduceTypeAliasDialog.form
index 4ca17db3728..711f7cfc10b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/ui/KotlinIntroduceTypeAliasDialog.form
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceTypeAlias/ui/KotlinIntroduceTypeAliasDialog.form
@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="contentPane" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="522" height="396"/>
+      <xy x="20" y="20" width="524" height="396"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -28,7 +28,7 @@
                 <properties>
                   <text value=""/>
                 </properties>
-                <border type="none" title="Parameters"/>
+                <border type="none" title-resource-bundle="messages/KotlinBundle" title-key="title.parameters"/>
                 <children/>
               </grid>
             </children>
@@ -51,7 +51,7 @@
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
-            <border type="none" title="Signature Preview"/>
+            <border type="none" title-resource-bundle="messages/KotlinBundle" title-key="signature.preview"/>
             <children>
               <component id="7722b" class="org.jetbrains.kotlin.idea.refactoring.introduce.ui.KotlinSignatureComponent" binding="signaturePreviewField" custom-create="true">
                 <constraints>
@@ -84,7 +84,7 @@
               <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="&amp;Name:"/>
+              <text resource-bundle="messages/KotlinBundle" key="name"/>
             </properties>
           </component>
           <component id="52aa7" class="javax.swing.JLabel">
@@ -95,7 +95,7 @@
             </constraints>
             <properties>
               <labelFor value="71ee7"/>
-              <text value="&amp;Visibility:"/>
+              <text resource-bundle="messages/KotlinBundle" key="visibility"/>
               <visible value="true"/>
             </properties>
           </component>
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesDialog.form b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesDialog.form
index 3ff6a397818..1a4e55d6f6d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesDialog.form
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinNestedClassesDialog.form
@@ -24,7 +24,7 @@
             </constraints>
             <properties>
               <labelFor value="50ecd"/>
-              <text value="Move members from:"/>
+              <text resource-bundle="messages/KotlinBundle" key="move.members.from"/>
             </properties>
           </component>
           <component id="50ecd" class="javax.swing.JTextField" binding="originalClassField">
@@ -57,7 +57,7 @@
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="To (fully qualified name):"/>
+              <text resource-bundle="messages/KotlinBundle" key="to.fully.qualified.name"/>
             </properties>
           </component>
           <grid id="1f1bc" binding="targetClassChooserPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
@@ -84,7 +84,7 @@
             </constraints>
             <properties>
               <selected value="true"/>
-              <text value="Open moved members in editor"/>
+              <text resource-bundle="messages/KotlinBundle" key="open.moved.members.in.editor"/>
             </properties>
           </component>
           <hspacer id="cdd1d">
diff --git a/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptingSettingsConfigurable.form b/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptingSettingsConfigurable.form
index c2c00270941..5a8dbbd84ff 100644
--- a/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptingSettingsConfigurable.form
+++ b/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptingSettingsConfigurable.form
@@ -54,7 +54,7 @@
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Reload script dependencies on file change"/>
+              <text resource-bundle="messages/KotlinBundle" key="reload.script.dependencies.on.file.change"/>
             </properties>
           </component>
         </children>