diff options
Diffstat (limited to 'org.eclipse.egit.ui')
3 files changed, 10 insertions, 18 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 1df4287ec0..3287530e1c 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 @@ -1981,7 +1981,7 @@ public class UIText extends NLS { public static String ResetTargetSelectionDialog_ResetConfirmQuestion; /** */ - public static String ResetTargetSelectionDialog_ResetQuestion; + public static String ResetTargetSelectionDialog_ResetConfirmTitle; /** */ public static String ResetTargetSelectionDialog_ResetTitle; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommandConfirmation.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommandConfirmation.java index bceb780b69..e05b11b484 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommandConfirmation.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommandConfirmation.java @@ -55,17 +55,13 @@ public class CommandConfirmation { .getRunningLaunchConfiguration(Collections.singleton(repo), null); if (launch != null) { - question = MessageFormat.format(question, - "\n\n" + MessageFormat.format( //$NON-NLS-1$ - UIText.LaunchFinder_RunningLaunchMessage, - launch)); - } else { - question = MessageFormat.format(question, ""); //$NON-NLS-1$ + question += "\n\n" + MessageFormat.format( //$NON-NLS-1$ + UIText.LaunchFinder_RunningLaunchMessage, launch); } MessageDialog messageDialog = new MessageDialog(shell, - UIText.ResetTargetSelectionDialog_ResetQuestion, null, question, - MessageDialog.QUESTION, + UIText.ResetTargetSelectionDialog_ResetConfirmTitle, null, + question, MessageDialog.QUESTION, new String[] { UIText.CommandConfirmationHardResetDialog_resetButtonLabel, IDialogConstants.CANCEL_LABEL }, @@ -113,12 +109,8 @@ public class CommandConfirmation { String launch = LaunchFinder .getRunningLaunchConfiguration(repoAndPaths.keySet(), null); if (launch != null) { - question = MessageFormat.format(question, - "\n\n" + MessageFormat.format( //$NON-NLS-1$ - UIText.LaunchFinder_RunningLaunchMessage, - launch)); - } else { - question = MessageFormat.format(question, ""); //$NON-NLS-1$ + question += "\n\n" + MessageFormat.format( //$NON-NLS-1$ + UIText.LaunchFinder_RunningLaunchMessage, launch); } Shell parent = shell != null ? shell : PlatformUI.getWorkbench().getModalDialogShellProvider() 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 a8e7b9567a..bbc06d2fc7 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 @@ -683,8 +683,8 @@ ResetTargetSelectionDialog_DetachedHeadState=You are in the 'detached HEAD' stat ResetTargetSelectionDialog_ExpressionLabel=Reset to (&expression): ResetTargetSelectionDialog_ExpressionTooltip=Any Git expression resolving to a commit ResetTargetSelectionDialog_ResetButton=&Reset -ResetTargetSelectionDialog_ResetConfirmQuestion=Resetting will overwrite any changes in your working tree.{0}\n\nDo you want to continue? -ResetTargetSelectionDialog_ResetQuestion=Confirm Reset +ResetTargetSelectionDialog_ResetConfirmQuestion=Reset and overwrite any changes in your working tree? +ResetTargetSelectionDialog_ResetConfirmTitle=Confirm Reset ResetTargetSelectionDialog_ResetTitle=Reset: {0} ResetTargetSelectionDialog_ResetTypeGroup=Reset type ResetTargetSelectionDialog_ResetTypeHardButton=&Hard (HEAD, index, and working tree updated) @@ -1363,7 +1363,7 @@ DiffEditorPage_Title=Diff DiffEditorPage_ToggleLineNumbers=Use Old/New &Line Numbers DiffEditorPage_WarningNoDiffForMerge=Cannot compute diff for a merge commit. DiscardChangesAction_confirmActionTitle=Discard Uncommitted Changes -DiscardChangesAction_confirmActionMessage=This will discard all uncommitted changes for the selected resources. Untracked files will be ignored.{0}\n\nAre you sure you want to do this? +DiscardChangesAction_confirmActionMessage=Discard all uncommitted changes for the selected resources?\n\n Untracked files will be ignored. DiscardChangesAction_discardChanges=Discard Changes DiscardChangesAction_discardChangesButtonText=&Discard Changes Disconnect_disconnect=Disconnect |