From 0df7a57cdf964b9d653fb2361d51ec1f229853e1 Mon Sep 17 00:00:00 2001
From: "kirill.safonov" <kirill.safonov@jetbrains.com>
Date: Tue, 10 Jan 2012 21:11:48 +0400
Subject: [PATCH 1/2] Remove files from shelve dialog: all capitals in title

---
 .../platform-resources-en/src/messages/VcsBundle.properties     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-resources-en/src/messages/VcsBundle.properties b/platform/platform-resources-en/src/messages/VcsBundle.properties
index f5a09057ef6b..18c5c7972d28 100644
--- a/platform/platform-resources-en/src/messages/VcsBundle.properties
+++ b/platform/platform-resources-en/src/messages/VcsBundle.properties
@@ -352,7 +352,7 @@ patch.apply.command=apply patch
 shelve.changes.delete.confirm=Are you sure you want to delete the shelved changelist named ''{0}''? You will not be able to undo this operation.
 shelve.changes.delete.multiple.confirm=Are you sure you want to delete {0} shelved changelists? You will not be able to undo this operation.
 shelve.changes.delete.files.from.list=You are going to remove {0} file(s) from shelved changelist. Are you sure?
-shelve.changes.delete.files.from.list.title=Remove files from shelved changelist
+shelve.changes.delete.files.from.list.title=Remove Files from Shelved Changelist
 shelvedChanges.delete.title=Delete Shelved Changelist
 create.patch.success.confirmation=Successfully created patch {0}
 create.patch.partial.success.confirmation=Successfully created patch {0}. {1} of the selected files {1,choice,1#is|2#are} binary and {1,choice,1#was|2#were} not included in the patch.

From 2e9027e95ec9dbd8177f733541fe92d4738f3187 Mon Sep 17 00:00:00 2001
From: "Rustam.Vishnyakov" <rustam.vishnyakov@gmail.com>
Date: Wed, 11 Jan 2012 13:59:56 +0400
Subject: [PATCH 2/2] Fixed IDEA-78556 (lost value of "Use global settings"
 flag)

---
 .../src/com/intellij/psi/codeStyle/CodeStyleSettingsManager.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsManager.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsManager.java
index 56d04a263c88..83dc90f17df1 100644
--- a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsManager.java
+++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettingsManager.java
@@ -41,7 +41,6 @@ public class CodeStyleSettingsManager implements PersistentStateComponent<Elemen
       LegacyCodeStyleSettingsManager legacySettingsManager = ServiceManager.getService(project, LegacyCodeStyleSettingsManager.class);
       if (legacySettingsManager != null && legacySettingsManager.getState() != null) {
         projectSettingsManager.loadState(legacySettingsManager.getState());
-        projectSettingsManager.USE_PER_PROJECT_SETTINGS = true;
         LOG.info("Imported old project code style settings.");
       }
     }