From 46b6d52529ca46f0126b230889f7b2f4ad1460af Mon Sep 17 00:00:00 2001 From: Irina Chernushina Date: Mon, 22 Jun 2009 19:38:05 +0400 Subject: [PATCH] IDEA-23416 (IDEA>Settings>Editor>Colors&Fonts>File Status> "Merged with conflicts" displayed two times) --- platform-api/src/com/intellij/openapi/vcs/FileStatus.java | 2 +- platform-resources_eng/src/messages/VcsBundle.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/platform-api/src/com/intellij/openapi/vcs/FileStatus.java b/platform-api/src/com/intellij/openapi/vcs/FileStatus.java index bf75c70efd..10478aa1fd 100644 --- a/platform-api/src/com/intellij/openapi/vcs/FileStatus.java +++ b/platform-api/src/com/intellij/openapi/vcs/FileStatus.java @@ -42,7 +42,7 @@ public interface FileStatus { FileStatus MERGED_WITH_CONFLICTS = ServiceManager.getService(FileStatusFactory.class) .createFileStatus("IDEA_FILESTATUS_MERGED_WITH_CONFLICTS", VcsBundle.message("file.status.name.merged.with.conflicts"), Color.red); FileStatus MERGED_WITH_BOTH_CONFLICTS = ServiceManager.getService(FileStatusFactory.class) - .createFileStatus("IDEA_FILESTATUS_MERGED_WITH_BOTH_CONFLICTS", VcsBundle.message("file.status.name.merged.with.conflicts"), Color.red); + .createFileStatus("IDEA_FILESTATUS_MERGED_WITH_BOTH_CONFLICTS", VcsBundle.message("file.status.name.merged.with.both.conflicts"), Color.red); FileStatus MERGED_WITH_PROPERTY_CONFLICTS = ServiceManager.getService(FileStatusFactory.class) .createFileStatus("IDEA_FILESTATUS_MERGED_WITH_PROPERTY_CONFLICTS", VcsBundle.message("file.status.name.merged.with.property.conflicts"), Color.red); FileStatus DELETED_FROM_FS = ServiceManager.getService(FileStatusFactory.class) diff --git a/platform-resources_eng/src/messages/VcsBundle.properties b/platform-resources_eng/src/messages/VcsBundle.properties index feca924fca..331ca23e24 100644 --- a/platform-resources_eng/src/messages/VcsBundle.properties +++ b/platform-resources_eng/src/messages/VcsBundle.properties @@ -9,6 +9,7 @@ file.status.name.hijacked=Hijacked file.status.name.switched=Switched file.status.name.obsolete=Obsolete file.status.name.merged.with.conflicts=Merged with conflicts +file.status.name.merged.with.both.conflicts=Merged with text and property conflicts file.status.name.merged.with.property.conflicts=Merged with property conflicts file.status.name.deleted.from.file.system=Deleted from file system none.vcs.presentation= -- 2.11.4.GIT