diff --git a/python/src/com/jetbrains/python/PyBundle.properties b/python/src/com/jetbrains/python/PyBundle.properties
index 601e86725562..9c7d2931a804 100644
--- a/python/src/com/jetbrains/python/PyBundle.properties
+++ b/python/src/com/jetbrains/python/PyBundle.properties
@@ -918,3 +918,9 @@ commandLine.commandNotFound={0}: command not found
 windowWithActions.closeWindow=Close window
 # "Stop" button title
 windowWithActions.stopProcess=Stop currently running process
+
+formatter.panel.dict.alignment.do.not.align=Do not align
+formatter.panel.dict.alignment.align.on.colon=Align on colon
+formatter.panel.dict.alignment.align.on.value=Align on value
+formatter.panel.dict.alignment.label=Dict alignment:
+formatter.panel.add.trailing.line.feed=Add line feed at the end of file
diff --git a/python/src/com/jetbrains/python/formatter/PyCodeStylePanel.form b/python/src/com/jetbrains/python/formatter/PyCodeStylePanel.form
index 9884e8a9fee5..392973f56cd5 100644
--- a/python/src/com/jetbrains/python/formatter/PyCodeStylePanel.form
+++ b/python/src/com/jetbrains/python/formatter/PyCodeStylePanel.form
@@ -42,7 +42,7 @@
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Dict alignment:"/>
+              <text resource-bundle="com/jetbrains/python/PyBundle" key="formatter.panel.dict.alignment.label"/>
             </properties>
           </component>
           <component id="b4945" class="com.intellij.ui.components.JBCheckBox" binding="myAddTrailingBlankLineCheckbox" default-binding="true">
@@ -50,7 +50,7 @@
               <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Add line feed at the end of file"/>
+              <text resource-bundle="com/jetbrains/python/PyBundle" key="formatter.panel.add.trailing.line.feed"/>
             </properties>
           </component>
         </children>
diff --git a/python/src/com/jetbrains/python/formatter/PyCodeStyleSettings.java b/python/src/com/jetbrains/python/formatter/PyCodeStyleSettings.java
index 795b8c42e987..1807d290ecdf 100644
--- a/python/src/com/jetbrains/python/formatter/PyCodeStyleSettings.java
+++ b/python/src/com/jetbrains/python/formatter/PyCodeStyleSettings.java
@@ -17,6 +17,7 @@ package com.jetbrains.python.formatter;
 
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CustomCodeStyleSettings;
+import com.jetbrains.python.PyBundle;
 
 /**
  * @author yole
@@ -24,9 +25,9 @@ import com.intellij.psi.codeStyle.CustomCodeStyleSettings;
 public class PyCodeStyleSettings extends CustomCodeStyleSettings {
 
   public enum DictAlignment {
-    NONE("Do not align"),
-    ON_VALUE("Align on value"),
-    ON_COLON("Align on colon");
+    NONE(PyBundle.message("formatter.panel.dict.alignment.do.not.align")),
+    ON_VALUE(PyBundle.message("formatter.panel.dict.alignment.align.on.value")),
+    ON_COLON(PyBundle.message("formatter.panel.dict.alignment.align.on.colon"));
 
     String description;