Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java3
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/CommitMessageEditorDialog.java10
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties1
3 files changed, 14 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
index 2e9099554..a40c35f8a 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
@@ -805,6 +805,9 @@ public class UIText extends NLS {
public static String RebaseInteractiveHandler_EditMessageDialogTitle;
/** */
+ public static String RebaseInteractiveHandler_EditMessageDialogOkButton;
+
+ /** */
public static String RebaseInteractiveStepActionToolBarProvider_SkipText;
/** */
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/CommitMessageEditorDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/CommitMessageEditorDialog.java
index efac3f628..1393dfbc8 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/CommitMessageEditorDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/CommitMessageEditorDialog.java
@@ -16,6 +16,7 @@ package org.eclipse.egit.ui.internal.rebase;
import org.eclipse.egit.ui.Activator;
import org.eclipse.egit.ui.internal.UIText;
import org.eclipse.egit.ui.internal.dialogs.SpellcheckableMessageArea;
+import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.TitleAreaDialog;
import org.eclipse.jface.layout.GridDataFactory;
@@ -131,4 +132,13 @@ public class CommitMessageEditorDialog extends TitleAreaDialog {
super.configureShell(newShell);
newShell.setText(title);
}
+
+ @Override
+ protected void createButtonsForButtonBar(Composite parent) {
+ createButton(parent, IDialogConstants.OK_ID,
+ UIText.RebaseInteractiveHandler_EditMessageDialogOkButton,
+ true);
+ createButton(parent, IDialogConstants.CANCEL_ID,
+ IDialogConstants.CANCEL_LABEL, false);
+ }
}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
index b276f8e63..f2bd449b3 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
@@ -343,6 +343,7 @@ RebaseCurrentRefCommand_RebasingCurrentJobName=Rebasing Branch {0} on {1}
RebaseCurrentRefCommand_ErrorGettingCurrentBranchMessage=Error getting the branch to rebase
RebaseInteractiveHandler_EditMessageDialogText=Edit the commit message. Lines starting with a \# are comments and will be ignored.
RebaseInteractiveHandler_EditMessageDialogTitle=Edit Commit Message
+RebaseInteractiveHandler_EditMessageDialogOkButton=&Reword
RebaseInteractiveStepActionToolBarProvider_SkipText=Skip
RebaseInteractiveStepActionToolBarProvider_SkipDesc=Remove the commit from the history
RebaseInteractiveStepActionToolBarProvider_EditText=Edit

Back to the top