diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 66dade16161..f92f0cc36b1 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-09 Tanya Wolff
+	Externalized strings from Work In Progress
+	Part of PR 66016
+	
+	* src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
+	
 2004-06-09 Alain Magloire
 	Disable extension Work In Progress
 	in plugin.xml. Part of PR 66016
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
index d73c4b33a5c..5b815634f95 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
@@ -165,5 +165,20 @@ CEditorHoverConfigurationBlock.insertDelimiterAndModifier= \ + {0}
 
 CEditorHoverConfigurationBlock.showAffordance= &Show affordance in hover on how to make it sticky
 
+#Search Preferences
+CSearchPreferences.ExternalSearchLinks.ExternalSearchLinksGroup=External Search Links
+CSearchPreferences.ExternalSearchLinks.EnableMarkerLinkType=Enable Marker Link Type
+CSearchPreferences.ExternalSearchLinks.Visible=Visible
+CSearchPreferences.ExternalSearchLinks.Invisible=Invisible
+CSearchPreferences.IndexerTimeout.IndexerTimeoutGroup=Indexer Timeout
+CSearchPreferences.IndexerTimeout.Timeout=Timeout (ms)
 
+#Open Type Preferences
+CEditorPreferencePage.Navigation.OpenType=Open Type
+CEditorPreferencePage.Navigation.CacheTypesInBackground=Cache types in background
+
+#Editor Preferences
+CEditorPreferencePage.behaviourPage.EditorGroup=Editor
+CEditorPreferencePage.behaviourPage.EnableEditorProblemAnnotation=Enable editor problem annotation
+CEditorPreferencePage.behaviourPage.Annotations=Annotations
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java
index aa7d15c6069..2dc34630ae8 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchResultPage.java
@@ -154,7 +154,7 @@ public class CSearchResultPage extends AbstractTextSearchViewPage {
 	 * @see org.eclipse.search.ui.text.AbstractTextSearchViewPage#configureTableViewer(org.eclipse.jface.viewers.TableViewer)
 	 */
 	protected void configureTableViewer(TableViewer viewer) {
-		viewer.setLabelProvider(new CountLabelProvider(this, new CSearchResultLabelProvider(this)));
+		viewer.setLabelProvider(new CountLabelProvider(this, new CSearchResultLabelProvider()));
 		_contentProvider=new CSearchTableContentProvider(viewer);
 		viewer.setContentProvider(_contentProvider);
 		setSortOrder(_currentSortOrder);
@@ -248,8 +248,6 @@ public class CSearchResultPage extends AbstractTextSearchViewPage {
 		if (getLayout() != FLAG_LAYOUT_FLAT)
 			addGroupActions(tbm);
 	}
-	
-	
 		
 	
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CSearchResultLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CSearchResultLabelProvider.java
index edbc220f643..58e63560721 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CSearchResultLabelProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CSearchResultLabelProvider.java
@@ -25,7 +25,6 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.search.ui.ISearchResultViewEntry;
-import org.eclipse.search.ui.text.Match;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 
@@ -44,8 +43,6 @@ public class CSearchResultLabelProvider extends LabelProvider {
 	
 	public static final String POTENTIAL_MATCH = CSearchMessages.getString("CSearchResultLabelProvider.potentialMatch"); //$NON-NLS-1$
 
-	private CSearchResultPage searchPage = null;
-	
 	public CSearchResultLabelProvider(){
 		_sortOrder = SHOW_PATH;
 	}
@@ -54,7 +51,8 @@ public class CSearchResultLabelProvider extends LabelProvider {
 	 * @param page
 	 */
 	public CSearchResultLabelProvider(CSearchResultPage page) {
-		searchPage = page;
+		
+		// TODO Auto-generated constructor stub
 	}
 
 	public Image getImage( Object element ) {
@@ -162,18 +160,6 @@ public class CSearchResultLabelProvider extends LabelProvider {
 		String result = ""; //$NON-NLS-1$
 		String path = (resource != null ) ? resource.getFullPath().toString() : ""; //$NON-NLS-1$
 		
-	//	Object key = computeGroupByKey(match);
-		
-		if (searchPage != null){
-			int matchCount = searchPage.getDisplayedMatchCount(new Match(match,match.getStartOffset(),match.getEndOffset() - match.getStartOffset()));
-			if (matchCount < 2){
-				System.out.println("Singular");
-			}else{
-			System.out.println("Plural"); //$NON-NLS-1$
-			}
-		}
-		
-		
 		switch( getOrder() ){
 			case SHOW_NAME_ONLY:
 				result = match.getName();
@@ -216,11 +202,6 @@ public class CSearchResultLabelProvider extends LabelProvider {
 		_sortOrder = orderFlag;
 	}
 	
-	public Object computeGroupByKey(IMatch match) {
-		
-		return match.getParentName() + "::" + match.getName() + " - " + match.getLocation(); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
 	private int _sortOrder;
 	private int _textFlags;
 	private int _imageFlags;