diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 2539a4226b3..88487783edc 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-04 Alain Magloire
+	Move to Eclipse-31M6
+	* src/org/eclipse/cdt/internal/ui/cview/CopyAction.java
+	* src/org/eclipse/cdt/internal/ui/cview/CViewMessages.properties
+
 2005-03-30 Alain Magloire
 	Fix PR 87334
 	* src/org/eclipse/cdt/internal/ui/compare/CMergeViewer.java
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMessages.properties
index bea679631d2..78c05f6b60e 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMessages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMessages.properties
@@ -57,4 +57,7 @@ ShowLibrariesAction.showReferenced.tooltip=Show Referenced Libs
 LibraryRefContainer.Libraries=Libraries
 IncludeRefContainer.Includes=Includes
 
-CView.statusLine = {0} items selected
\ No newline at end of file
+CView.statusLine = {0} items selected
+
+CopyToClipboardProblemDialog_title=Problem Copying to Clipboard
+CopyToClipboardProblemDialog_message=There was a problem when accessing the system clipboard. Retry?
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CopyAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CopyAction.java
index 975fc8f79c1..df925349862 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CopyAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CopyAction.java
@@ -29,8 +29,6 @@ import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.SelectionListenerAction;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.ui.internal.WorkbenchMessages;
 import org.eclipse.ui.part.ResourceTransfer;
 
 /**
@@ -77,7 +75,8 @@ public class CopyAction extends SelectionListenerAction {
 		this.clipboard = clipboard;
 		setToolTipText(CViewMessages.getString("CopyAction.toolTip")); //$NON-NLS-1$
 		setId(CopyAction.ID);
-		WorkbenchHelp.setHelp(this, ICHelpContextIds.COPY_ACTION);
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, ICHelpContextIds.COPY_ACTION);
+
 	}
 	/**
 	 * Creates a new action.
@@ -151,7 +150,7 @@ public class CopyAction extends SelectionListenerAction {
 		} catch (SWTError e) {
 			if (e.code != DND.ERROR_CANNOT_SET_CLIPBOARD)
 				throw e;
-			if (MessageDialog.openQuestion(shell, WorkbenchMessages.getString("CopyToClipboardProblemDialog.title"), WorkbenchMessages.getString("CopyToClipboardProblemDialog.message"))) //$NON-NLS-1$ //$NON-NLS-2$
+			if (MessageDialog.openQuestion(shell, CViewMessages.getString("CopyToClipboardProblemDialog.title"), CViewMessages.getString("CopyToClipboardProblemDialog.message"))) //$NON-NLS-1$ //$NON-NLS-2$
 				setClipboard(resources, fileNames, names);
 		}
 	}