Bug 71083

3 files changed, 21 insertions, 6 deletions

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java
index ba6249258..99d737836 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java
@@ -328,9 +328,17 @@ public class Utils {
 	}
 
 	public static void initAction(IAction a, String prefix) {
-		Utils.initAction(a, prefix, Policy.bundle);
+		Utils.initAction(a, prefix, Policy.bundle, null);
+	}
+	
+	public static void initAction(IAction a, String prefix, ResourceBundle bundle) {
+		Utils.initAction(a, prefix, bundle, null);
 	}
 
+	public static void initAction(IAction a, String prefix, String[] bindings) {
+		Utils.initAction(a, prefix, Policy.bundle, bindings);
+	}
+	
 	public static void updateLabels(SyncInfo sync, CompareConfiguration config) {
 		final IResourceVariant remote = sync.getRemote();
 		final IResourceVariant base = sync.getBase();
@@ -355,7 +363,7 @@ public class Utils {
 	/**
 	 * Initialize the given Action from a ResourceBundle.
 	 */
-	public static void initAction(IAction a, String prefix, ResourceBundle bundle) {
+	public static void initAction(IAction a, String prefix, ResourceBundle bundle, String[] bindings) {
 		String labelKey = "label"; //$NON-NLS-1$
 		String tooltipKey = "tooltip"; //$NON-NLS-1$
 		String imageKey = "image"; //$NON-NLS-1$
@@ -366,7 +374,12 @@ public class Utils {
 			imageKey = prefix + imageKey;
 			descriptionKey = prefix + descriptionKey;
 		}
-		String s = Policy.bind(labelKey, bundle);
+		String s = null;
+		if(bindings != null) {
+			s = Policy.bind(Policy.bind(labelKey, bundle), bindings);
+		} else {
+			s = Policy.bind(labelKey, bundle);
+		}
 		if (s != null)
 			a.setText(s);
 		s = Policy.bind(tooltipKey, bundle);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
index 23c0b817e..fb9e70bad 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
@@ -185,8 +185,8 @@ action.collapseAll.tooltip=Collapse All
 action.collapseAll.description=Collapse All
 action.collapseAll.image=collapseall.gif
 
-action.configureSchedulel.label=&Schedule...
-action.configureSchedulel.tooltip=Configure the Synchronize Schedule...
+action.configureSchedulel.label=&Schedule {0}...
+action.configureSchedulel.tooltip=Configure the Synchronization Schedule...
 
 action.refreshWithRemote.label=&Synchronize
 action.refreshWithRemote.tooltip=Synchronize
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SubscriberActionContribution.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SubscriberActionContribution.java
index 4c8b3e93b..2d9a06a38 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SubscriberActionContribution.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SubscriberActionContribution.java
@@ -17,6 +17,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.team.internal.ui.Policy;
 import org.eclipse.team.internal.ui.Utils;
 import org.eclipse.team.internal.ui.synchronize.ConfigureRefreshScheduleDialog;
+import org.eclipse.team.internal.ui.synchronize.SynchronizeView;
 import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
 import org.eclipse.team.ui.synchronize.ISynchronizePageSite;
 import org.eclipse.team.ui.synchronize.SubscriberParticipant;
@@ -65,7 +66,8 @@ public final class SubscriberActionContribution extends SynchronizePageActionGro
 					d.open();
 				}
 			};
-			Utils.initAction(configureSchedule, "action.configureSchedulel."); //$NON-NLS-1$
+			String participantName = Utils.shortenText(SynchronizeView.MAX_NAME_LENGTH, configuration.getParticipant().getName());
+			Utils.initAction(configureSchedule, "action.configureSchedulel.", new String[] {participantName}); //$NON-NLS-1$
 		}
 		
 		showPreferences = new SyncViewerShowPreferencesAction(configuration);