diff --git a/platform/platform-resources-en/src/messages/VcsBundle.properties b/platform/platform-resources-en/src/messages/VcsBundle.properties
index 018da0cf98b3..c5b2022b9902 100644
--- a/platform/platform-resources-en/src/messages/VcsBundle.properties
+++ b/platform/platform-resources-en/src/messages/VcsBundle.properties
@@ -697,4 +697,7 @@ radio.restore.workspace.on.branch.switching=Restore workspace on &branch switchi
 settings.when.files.are.deleted=When files are deleted
 checkbox.including.external.files=Including &external files
 settings.border.when.files.are.created=When files are created
-settings.border.when.empty.changelist.becomes.inactive=When empty changelist becomes inactive
\ No newline at end of file
+settings.border.when.empty.changelist.becomes.inactive=When empty changelist becomes inactive
+settings.file.status.color.modified.in.not.active.changelist=Modified in not active changelist
+settings.file.status.color.added.in.not.active.changelist=Added in not active changelist
+settings.file.status.color.changelist.conflict=Changelist conflict
\ No newline at end of file
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictFileStatusProvider.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictFileStatusProvider.java
index 14eb589a03d9..eacd3f4b2e41 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictFileStatusProvider.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictFileStatusProvider.java
@@ -5,6 +5,7 @@ import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.FileStatus;
 import com.intellij.openapi.vcs.FileStatusFactory;
+import com.intellij.openapi.vcs.VcsBundle;
 import com.intellij.openapi.vcs.changes.ChangeListManagerImpl;
 import com.intellij.openapi.vcs.impl.FileStatusProvider;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -16,12 +17,12 @@ import org.jetbrains.annotations.Nullable;
  * @author Dmitry Avdeev
  */
 public final class ChangelistConflictFileStatusProvider implements FileStatusProvider {
-  public static final FileStatus MODIFIED_OUTSIDE =
-    FileStatusFactory.getInstance().createFileStatus("modifiedOutside", "Modified in not active changelist");
-  public static final FileStatus ADDED_OUTSIDE =
-    FileStatusFactory.getInstance().createFileStatus("addedOutside", "Added in not active changelist");
-  public static final FileStatus CHANGELIST_CONFLICT =
-    FileStatusFactory.getInstance().createFileStatus("changelistConflict", "Changelist conflict");
+  public static final FileStatus MODIFIED_OUTSIDE = FileStatusFactory.getInstance()
+    .createFileStatus("modifiedOutside", VcsBundle.message("settings.file.status.color.modified.in.not.active.changelist"));
+  public static final FileStatus ADDED_OUTSIDE = FileStatusFactory.getInstance()
+    .createFileStatus("addedOutside", VcsBundle.message("settings.file.status.color.added.in.not.active.changelist"));
+  public static final FileStatus CHANGELIST_CONFLICT = FileStatusFactory.getInstance()
+    .createFileStatus("changelistConflict", VcsBundle.message("settings.file.status.color.changelist.conflict"));
 
   private final ChangeListManagerImpl myChangeListManager;