diff --git a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
index ce976cadba5..2fde255e00f 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
+++ b/idea/src/org/jetbrains/jet/plugin/JetBundle.properties
@@ -284,4 +284,18 @@ replace.by.reconstructed.type.family.name=Replace by Reconstructed Type
 replace.by.reconstructed.type=Replace by ''{0}''
 
 suppress.warnings.family=Suppress Warnings
-suppress.warning.for=Suppress ''{0}'' for {1} {2}
\ No newline at end of file
+suppress.warning.for=Suppress ''{0}'' for {1} {2}
+
+# Kotlin Compiler Settings Tab
+
+#Common
+kotlin.compiler.option.generate.no.warnings=Generate no &warnings
+kotlin.compiler.option.additional.command.line.parameters=&Additional command line parameters:
+kotlin.compiler.option.additional.command.line.parameters.dialog.title=Additional command line parameters
+
+# Kotlin to JVM
+kotlin.compiler.jvm.option.panel.title=Kotlin to JVM
+
+# Kotlin to JavaScript
+kotlin.compiler.js.option.panel.title=Kotlin to JavaScript
+kotlin.compiler.js.option.generate.sourcemaps=Generate &source maps
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.form b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.form
index 96bc788be6b..b80b902eb2e 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.form
+++ b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.form
@@ -27,7 +27,7 @@
             </constraints>
             <properties>
               <selected value="false"/>
-              <text value="Generate no warnings"/>
+              <text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.option.generate.no.warnings"/>
             </properties>
           </component>
           <component id="ba279" class="javax.swing.JLabel" binding="additionalArgsLabel">
@@ -35,7 +35,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="Additional command line parameters:"/>
+              <text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.option.additional.command.line.parameters"/>
             </properties>
           </component>
           <component id="7a827" class="com.intellij.ui.RawCommandLineEditor" binding="additionalArgsOptionsField">
@@ -59,7 +59,7 @@
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/>
         </clientProperties>
-        <border type="etched" title="Kotlin to JVM"/>
+        <border type="etched" title-resource-bundle="org/jetbrains/jet/plugin/JetBundle" title-key="kotlin.compiler.jvm.option.panel.title"/>
         <children/>
       </grid>
       <grid id="98e8a" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -73,14 +73,14 @@
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndent"/>
         </clientProperties>
-        <border type="etched" title="Kotlin to JavaScript"/>
+        <border type="etched" title-resource-bundle="org/jetbrains/jet/plugin/JetBundle" title-key="kotlin.compiler.js.option.panel.title"/>
         <children>
           <component id="1fbe0" class="javax.swing.JCheckBox" binding="generateSourceMapsCheckBox" default-binding="true">
             <constraints>
               <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="Generate source maps"/>
+              <text resource-bundle="org/jetbrains/jet/plugin/JetBundle" key="kotlin.compiler.js.option.generate.sourcemaps"/>
             </properties>
           </component>
         </children>
diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java
index f6a63ac1ac4..a7cb7fd3f38 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java
+++ b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java
@@ -28,6 +28,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments;
 import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments;
 import org.jetbrains.jet.compiler.AdditionalCompilerSettings;
+import org.jetbrains.jet.plugin.JetBundle;
 
 import javax.swing.*;
 
@@ -51,7 +52,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
         this.additionalCompilerSettings = KotlinAdditionalCompilerSettings.getInstance(ep.getProject()).getSettings();
 
         additionalArgsOptionsField.attachLabel(additionalArgsLabel);
-        additionalArgsOptionsField.setDialogCaption(null);
+        additionalArgsOptionsField.setDialogCaption(JetBundle.message("kotlin.compiler.option.additional.command.line.parameters.dialog.title"));
     }
 
     @NotNull