diff options
3 files changed, 9 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java index 675e76944b..35ce58958b 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java @@ -4,6 +4,7 @@ * Copyright (C) 2010, Matthias Sohn <matthias.sohn@sap.com> * Copyright (C) 2011, Daniel Megert <daniel_megert@ch.ibm.com> * Copyright (C) 2012, Mathias Kinzler <mathias.kinzler@sap.com> + * Copyright (C) 2012, Daniel Megert <daniel_megert@ch.ibm.com> * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -3425,6 +3426,9 @@ public class UIText extends NLS { public static String MultiPullResultDialog_UpdatedMessage; /** */ + public static String MultiPullResultDialog_UpdatedOneMessage; + + /** */ public static String MultiPullResultDialog_UpdateStatusColumnHeader; /** */ diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/MultiPullResultDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/MultiPullResultDialog.java index 37fc90f439..0b95cd7201 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/MultiPullResultDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/MultiPullResultDialog.java @@ -9,6 +9,7 @@ * Mathias Kinzler (SAP AG) - initial implementation * Daniel Megert <daniel_megert@ch.ibm.com> - remove unnecessary @SuppressWarnings * Markus Keller <markus_keller@ch.ibm.com> - Open multiple detail dialogs from MultiPullResultDialog at once + * Daniel Megert <daniel_megert@ch.ibm.com> - Use correct syntax when a single ref was updated *******************************************************************************/ package org.eclipse.egit.ui.internal.pull; @@ -110,6 +111,8 @@ public class MultiPullResultDialog extends Dialog { else { int updated = pullRes.getFetchResult() .getTrackingRefUpdates().size(); + if ( updated == 1) + return UIText.MultiPullResultDialog_UpdatedOneMessage; return NLS.bind( UIText.MultiPullResultDialog_UpdatedMessage, Integer.valueOf(updated)); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties index 96bb4d56a2..92ae3fe91b 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties @@ -11,6 +11,7 @@ # - Removed unused entry # - Added context menu to the Commit Editor's header text # Markus Keller <markus_keller@ch.ibm.com> - Show the repository name in the title of the Pull Result dialog +# Daniel Megert <daniel_megert@ch.ibm.com> - Use correct syntax when a single ref was updated ############################################################################### AbortRebaseCommand_CancelDialogMessage=The abort operation was canceled AbortRebaseCommand_JobName=Aborting Rebase @@ -1273,6 +1274,7 @@ MultiPullResultDialog_RebaseResultMessage=Rebase result: {0} MultiPullResultDialog_RepositoryColumnHeader=Repository MultiPullResultDialog_UnknownStatus=Unknown MultiPullResultDialog_UpdatedMessage={0} refs were updated +MultiPullResultDialog_UpdatedOneRefMessage=1 ref was updated MultiPullResultDialog_UpdateStatusColumnHeader=Update Status MultiPullResultDialog_WindowTitle=Pull Result for Multiple Repositories |