diff --git a/platform/platform-resources-en/src/messages/VcsBundle.properties b/platform/platform-resources-en/src/messages/VcsBundle.properties
index 21fbf21d5b6e..8e633aae6eeb 100644
--- a/platform/platform-resources-en/src/messages/VcsBundle.properties
+++ b/platform/platform-resources-en/src/messages/VcsBundle.properties
@@ -680,4 +680,13 @@ settings.checkbox.limit.history.to=Limit history to:
 settings.checkbox.rows=rows
 settings.checkbox.show.changed.in.last=Show changed in last
 settings.checkbox.measure.days=days
-settings.check.every.minutes=minutes
\ No newline at end of file
+settings.check.every.minutes=minutes
+settings.show.unversioned.files=Show unversioned files
+settings.commit.message.inspections=Commit message inspections
+inspection.SubjectBodySeparationInspection.display.name=Blank line between subject and body
+inspection.BodyLimitInspection.display.name=Limit body line
+inspection.CommitMessageSpellCheckingInspection.display.name=Spelling
+inspection.SubjectLimitInspection.display.name=Limit subject line
+settings.commit.without.dialog=Commit from Local Changes without showing the Commit dialog
+settings.commit.without.dialog.applies.to.git.mercurial=Applies to projects under Git and Mercurial
+settings.filter.configure.link=Configure
\ No newline at end of file
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandler.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandler.java
index 3de582bf096f..178b57941aa2 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandler.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/checkin/TodoCheckinHandler.java
@@ -81,7 +81,7 @@ public class TodoCheckinHandler extends CheckinHandler {
           myConfiguration.myTodoPanelSettings.todoFilterName = name;
           setFilterText(name);
         };
-        LinkLabel linkLabel = new LinkLabel("Configure", null);
+        LinkLabel linkLabel = new LinkLabel(VcsBundle.message("settings.filter.configure.link"), null);
         linkLabel.setListener(new LinkListener() {
           @Override
           public void linkSelected(LinkLabel aSource, Object aLinkData) {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/CommitDialogSettingsPanel.form b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/CommitDialogSettingsPanel.form
index 654258e474f7..4201a1a47349 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/CommitDialogSettingsPanel.form
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/CommitDialogSettingsPanel.form
@@ -13,7 +13,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="Show unversioned files"/>
+          <text resource-bundle="messages/VcsBundle" key="settings.show.unversioned.files"/>
         </properties>
       </component>
       <grid id="e7891" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -25,7 +25,7 @@
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithoutIndentWithoutInsets"/>
         </clientProperties>
-        <border type="none" title="Commit message inspections"/>
+        <border type="none" title-resource-bundle="messages/VcsBundle" title-key="settings.commit.message.inspections"/>
         <children>
           <component id="19cf8" class="com.intellij.vcs.commit.message.CommitMessageInspectionsPanel" binding="myInspectionsPanel" custom-create="true">
             <constraints>
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/CommitDialogSettingsPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/CommitDialogSettingsPanel.java
index b15a40a8b36f..c334819d55e5 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/CommitDialogSettingsPanel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/CommitDialogSettingsPanel.java
@@ -8,6 +8,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.ComboBox;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.vcs.VcsApplicationSettings;
+import com.intellij.openapi.vcs.VcsBundle;
 import com.intellij.openapi.vcs.VcsConfiguration;
 import com.intellij.openapi.vcs.VcsShowConfirmationOption;
 import com.intellij.ui.EnumComboBoxModel;
@@ -102,10 +103,10 @@ public class CommitDialogSettingsPanel implements ConfigurableUi<VcsConfiguratio
   }
 
   private void createUIComponents() {
-    myCommitFromLocalChanges = new JBCheckBox("Commit from Local Changes without showing the Commit dialog");
+    myCommitFromLocalChanges = new JBCheckBox(VcsBundle.message("settings.commit.without.dialog"));
     myCommitFromLocalChangesPanel =
       UI.PanelFactory.panel(myCommitFromLocalChanges).
-        withComment("Applies to projects under Git and Mercurial").
+        withComment(VcsBundle.message("settings.commit.without.dialog.applies.to.git.mercurial")).
         createPanel();
     myInspectionsPanel = new CommitMessageInspectionsPanel(myProject);
     myCommitOptions = new CommitOptionsConfigurable(myProject);
diff --git a/platform/vcs-impl/src/com/intellij/vcs/commit/message/BodyLimitInspection.java b/platform/vcs-impl/src/com/intellij/vcs/commit/message/BodyLimitInspection.java
index 6e6492e12108..0dd4dbcb9c06 100644
--- a/platform/vcs-impl/src/com/intellij/vcs/commit/message/BodyLimitInspection.java
+++ b/platform/vcs-impl/src/com/intellij/vcs/commit/message/BodyLimitInspection.java
@@ -9,6 +9,7 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.options.ConfigurableUi;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.vcs.VcsBundle;
 import com.intellij.openapi.vcs.ui.CommitMessage;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.codeStyle.CodeStyleSettings;
@@ -34,7 +35,7 @@ public class BodyLimitInspection extends BaseCommitMessageInspection {
   @NotNull
   @Override
   public String getDisplayName() {
-    return "Limit body line";
+    return VcsBundle.message("inspection.BodyLimitInspection.display.name");
   }
 
   @NotNull
diff --git a/platform/vcs-impl/src/com/intellij/vcs/commit/message/CommitMessageSpellCheckingInspection.java b/platform/vcs-impl/src/com/intellij/vcs/commit/message/CommitMessageSpellCheckingInspection.java
index 14ac26c7c9bb..e216c7eb23f8 100644
--- a/platform/vcs-impl/src/com/intellij/vcs/commit/message/CommitMessageSpellCheckingInspection.java
+++ b/platform/vcs-impl/src/com/intellij/vcs/commit/message/CommitMessageSpellCheckingInspection.java
@@ -9,6 +9,7 @@ import com.intellij.codeInspection.ex.InspectionToolWrapper;
 import com.intellij.codeInspection.ex.LocalInspectionToolWrapper;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.AtomicNullableLazyValue;
+import com.intellij.openapi.vcs.VcsBundle;
 import com.intellij.psi.PsiElementVisitor;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
@@ -53,7 +54,7 @@ public class CommitMessageSpellCheckingInspection extends BaseCommitMessageInspe
   @NotNull
   @Override
   public String getDisplayName() {
-    return "Spelling";
+    return VcsBundle.message("inspection.CommitMessageSpellCheckingInspection.display.name");
   }
 
   @NotNull
diff --git a/platform/vcs-impl/src/com/intellij/vcs/commit/message/SubjectBodySeparationInspection.java b/platform/vcs-impl/src/com/intellij/vcs/commit/message/SubjectBodySeparationInspection.java
index 10a7a7cdc6b6..805b4b6d8f62 100644
--- a/platform/vcs-impl/src/com/intellij/vcs/commit/message/SubjectBodySeparationInspection.java
+++ b/platform/vcs-impl/src/com/intellij/vcs/commit/message/SubjectBodySeparationInspection.java
@@ -6,6 +6,7 @@ import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.vcs.VcsBundle;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
@@ -19,7 +20,7 @@ public class SubjectBodySeparationInspection extends BaseCommitMessageInspection
   @NotNull
   @Override
   public String getDisplayName() {
-    return "Blank line between subject and body";
+    return VcsBundle.message("inspection.SubjectBodySeparationInspection.display.name");
   }
 
   @Override
diff --git a/platform/vcs-impl/src/com/intellij/vcs/commit/message/SubjectLimitInspection.java b/platform/vcs-impl/src/com/intellij/vcs/commit/message/SubjectLimitInspection.java
index d36360a1d0e1..30998cfc73a9 100644
--- a/platform/vcs-impl/src/com/intellij/vcs/commit/message/SubjectLimitInspection.java
+++ b/platform/vcs-impl/src/com/intellij/vcs/commit/message/SubjectLimitInspection.java
@@ -6,6 +6,7 @@ import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.options.ConfigurableUi;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vcs.VcsBundle;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
@@ -22,7 +23,7 @@ public class SubjectLimitInspection extends BaseCommitMessageInspection {
   @NotNull
   @Override
   public String getDisplayName() {
-    return "Limit subject line";
+    return VcsBundle.message("inspection.SubjectLimitInspection.display.name");
   }
 
   @NotNull