From c10c22198c830cdc68e18ab93e3fcc5c6c78239e Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Mon, 3 Dec 2012 14:53:05 +0400 Subject: [PATCH] IDEA-96392 Git "Unstash Changes" window: "Close" instead of "Cancel" button --- plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java index 504dadf8a730..d52371263a32 100644 --- a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java +++ b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java @@ -15,6 +15,7 @@ */ package git4idea.ui; +import com.intellij.CommonBundle; import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; import com.intellij.notification.NotificationType; @@ -130,6 +131,7 @@ public class GitUnstashDialog extends DialogWrapper { myVcs = GitVcs.getInstance(project); setTitle(GitBundle.getString("unstash.title")); setOKButtonText(GitBundle.getString("unstash.button.apply")); + setCancelButtonText(CommonBundle.getCloseButtonText()); GitUIUtil.setupRootChooser(project, roots, defaultRoot, myGitRootComboBox, myCurrentBranch); myStashList.setModel(new DefaultListModel()); refreshStashList();