diff --git a/platform/platform-resources/src/idea/VcsActions.xml b/platform/platform-resources/src/idea/VcsActions.xml
index 0070165c10b3..79425a6bd13f 100644
--- a/platform/platform-resources/src/idea/VcsActions.xml
+++ b/platform/platform-resources/src/idea/VcsActions.xml
@@ -69,6 +69,9 @@
+
+
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java
index 3eb481bc28e7..b735d3e780e6 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java
@@ -82,9 +82,9 @@ public class RollbackAction extends AnAction implements DumbAware {
}
}
e.getPresentation().setEnabled(isEnabled);
+ String operationName = RollbackUtil.getRollbackOperationName(project);
+ e.getPresentation().setText(operationName);
if (isEnabled) {
- String operationName = RollbackUtil.getRollbackOperationName(project);
- e.getPresentation().setText(operationName);
e.getPresentation().setDescription(operationName + " selected changes");
}
}
diff --git a/plugins/git4idea/src/git4idea/actions/GitQuickListContentProvider.java b/plugins/git4idea/src/git4idea/actions/GitQuickListContentProvider.java
index 6771129b7fbb..b947f866e19d 100644
--- a/plugins/git4idea/src/git4idea/actions/GitQuickListContentProvider.java
+++ b/plugins/git4idea/src/git4idea/actions/GitQuickListContentProvider.java
@@ -48,7 +48,7 @@ public class GitQuickListContentProvider implements VcsQuickListContentProvider
actions.add(new Separator(activeVcs.getDisplayName()));
add("CheckinProject", manager, actions);
add("CheckinFiles", manager, actions);
- add("ChangesView.Rollback", manager, actions);
+ add("ChangesView.Revert", manager, actions);
addSeparator(actions);
add("Vcs.ShowTabbedFileHistory", manager, actions);
diff --git a/plugins/hg4idea/src/META-INF/plugin.xml b/plugins/hg4idea/src/META-INF/plugin.xml
index 46c00acb22ad..baa2474bfdfc 100644
--- a/plugins/hg4idea/src/META-INF/plugin.xml
+++ b/plugins/hg4idea/src/META-INF/plugin.xml
@@ -36,7 +36,7 @@