diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 43ff98a0e15..b2996c7a377 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-16 Tanya Wolff
+
+	Fix for 70221: unexternalized strings
+	* org.eclipse.cdt.internal.ui/search/CountLabelProvider.java
+	* org.eclipse.cdt.internal.ui/search/CSearchMessages.properties
+
 2004-07-15 Tanya Wolff
 
 	Fix for 70124: unexternalized strings
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties
index b317607881a..606c3de7d6d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties
@@ -17,8 +17,9 @@ group.references= All Re&ferences
 Search.Error.search.title=Search Error
 Search.Error.search.message=An error occurred during the search operation
 
-CSearchResultCollector.match= 1 match
-CSearchResultCollector.matches= {0} matches
+# Examples of the display for the following value are 
+# "(1 match)", where {0} is 1 and "(5 matches)", where {0} is 2 or more.
+CSearchResultCollector.matches= ({0} {0, choice, 1\#match|2\#matches})
 CSearchResultCollector.done= Search done: {0}.
 CSearchResultCollector.searching= Searching...
 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java
index a2ac79625bc..1455f1d36cc 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CountLabelProvider.java
@@ -46,13 +46,13 @@ public class CountLabelProvider extends LabelProvider {
 	}
 
 	public String getText(Object element) {
-		int matchCount= fPage.getInput().getMatchCount(element);
+		int c = fPage.getInput().getMatchCount(element);
+		
 		String text= fLabelProvider.getText(element);
-		if (matchCount == 0)
+		if (c == 0)
 			return text;
-		if (matchCount == 1)
-			return fLabelProvider.getText(element)+ " (" + 1 + " match)"; //$NON-NLS-1$ //$NON-NLS-2$
-		return text + " (" + matchCount + " matches)"; //$NON-NLS-1$ //$NON-NLS-2$
+		Integer matchCount= new Integer(c);
+		return fLabelProvider.getText(element) + " "+ CSearchMessages.getFormattedString("CSearchResultCollector.matches", matchCount); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	public void dispose() {