From 8526dae7783456d6375a5b67d4d72e49738f4f34 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Mon, 9 Jul 2012 12:12:20 +0400
Subject: [PATCH] IDEA-88465 Remove mnemonics for "Rollback/Revert", where
 needed (in dialog title, in progress indicator text).

---
 .../openapi/vcs/changes/actions/RollbackAction.java    |  2 +-
 .../openapi/vcs/changes/ui/RollbackChangesDialog.java  | 10 +++-------
 plugins/git4idea/src/git4idea/actions/GitRevert.java   |  3 ++-
 3 files changed, 6 insertions(+), 9 deletions(-)

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 fa2bb9a7d077..3eb481bc28e7 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
@@ -222,7 +222,7 @@ public class RollbackAction extends AnAction implements DumbAware {
               if (rollbackEnvironment != null) {
                 if (indicator != null) {
                   indicator.setText(vcs.getDisplayName() +
-                                    ": performing " + rollbackEnvironment.getRollbackOperationName().toLowerCase() + "...");
+                                    ": performing " + UIUtil.removeMnemonic(rollbackEnvironment.getRollbackOperationName()).toLowerCase() + "...");
                   indicator.setIndeterminate(false);
                 }
                 rollbackEnvironment
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/RollbackChangesDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/RollbackChangesDialog.java
index ec5c93c44271..eeea92f6da3a 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/RollbackChangesDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/RollbackChangesDialog.java
@@ -110,14 +110,10 @@ public class RollbackChangesDialog extends DialogWrapper {
     }
 
     String operationName = RollbackUtil.getRollbackOperationName(affectedVcs);
-    int pos = operationName.indexOf(UIUtil.MNEMONIC);
-    if (pos >= 0) {
-      setOKButtonMnemonic(Character.toUpperCase(operationName.charAt(pos + 1)));
-      operationName = operationName.replace(Character.toString(UIUtil.MNEMONIC), "");
-    }
-
-    setTitle(VcsBundle.message("changes.action.rollback.custom.title", operationName).replace("_", ""));
     setOKButtonText(operationName);
+
+    operationName = UIUtil.removeMnemonic(operationName);
+    setTitle(VcsBundle.message("changes.action.rollback.custom.title", operationName));
     setCancelButtonText(CommonBundle.getCloseButtonText());
     myBrowser.setToggleActionTitle("Include in " + operationName.toLowerCase());
 
diff --git a/plugins/git4idea/src/git4idea/actions/GitRevert.java b/plugins/git4idea/src/git4idea/actions/GitRevert.java
index 29fbb90a3b52..ca5659da549a 100644
--- a/plugins/git4idea/src/git4idea/actions/GitRevert.java
+++ b/plugins/git4idea/src/git4idea/actions/GitRevert.java
@@ -23,6 +23,7 @@ import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.changes.ui.RollbackChangesDialog;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.ui.UIUtil;
 import git4idea.GitUtil;
 import git4idea.GitVcs;
 import git4idea.i18n.GitBundle;
@@ -65,7 +66,7 @@ public class GitRevert extends BasicAction {
   @Override
   @NotNull
   protected String getActionName() {
-    return GitBundle.getString("revert.action.name");
+    return UIUtil.removeMnemonic(GitBundle.getString("revert.action.name"));
   }
 
   @Override