diff --git a/platform/platform-resources-en/src/messages/VcsBundle.properties b/platform/platform-resources-en/src/messages/VcsBundle.properties index 3c5c354035e2..e4031d4970a6 100644 --- a/platform/platform-resources-en/src/messages/VcsBundle.properties +++ b/platform/platform-resources-en/src/messages/VcsBundle.properties @@ -252,7 +252,7 @@ changes.nodetitle.changecount={0,choice, 0#No files|1#1 file|2#{0} files} changes.nodetitle.directory.changecount={0,choice, 0#No directories|1#1 directory|2#{0} directories} changes.nodetitle.directory.file.changecount={0,choice, 0#No directories|1#1 directory|2#{0} directories} and {1,choice, 0#no files|1#1 file|2#{1} files} changes.toolwindow.name=Changes -changes.default.changelist.name=Default +changes.default.changelist.name=Default Changelist changes.update.progress.message=Updating: {0} changes.action.show.ignored.text=Show Ignored Files changes.action.show.ignored.description=Show ignored files diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/LocalChangeList.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/LocalChangeList.java index 82f482b8c7e1..b784bab7e114 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/LocalChangeList.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/LocalChangeList.java @@ -17,6 +17,7 @@ import java.util.Collection; public abstract class LocalChangeList implements Cloneable, ChangeList { @NonNls public static final String DEFAULT_NAME = VcsBundle.message("changes.default.changelist.name"); + @NonNls public static final String OLD_DEFAULT_NAME = "Default"; public static LocalChangeList createEmptyChangeList(Project project, @NotNull String name) { return VcsContextFactory.SERVICE.getInstance().createLocalChangeList(project, name); @@ -52,7 +53,7 @@ public abstract class LocalChangeList implements Cloneable, ChangeList { public abstract LocalChangeList copy(); public boolean hasDefaultName() { - return DEFAULT_NAME.equals(getName()); + return DEFAULT_NAME.equals(getName()) || OLD_DEFAULT_NAME.equals(getName()); } public boolean isBlank() {