diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 4601e6af6f4..6877ce87782 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,12 @@
+2004-03-21 Tanya Wolff
+
+	Externalized stray strings.
+	* src/org/eclipse/cdt/internal/corext/template/default-templates.xml
+	* src/org/eclipse/cdt/internal/ui/editor/CEditor.java
+	* src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties
+	* src/org/eclipse/cdt/internal/ui/editor/CEditorPreferencePage.java
+	* src/org/eclipse/cdt/internal/ui/editor/PreferencesMessages.properties
+	
 2004-03-21 Alain Magloire
 
 	Show the binaries in the CView even if the parent
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/default-templates.xml b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/default-templates.xml
index 203efccc276..db14d32b907 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/default-templates.xml
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/default-templates.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!-- NOTE TO TRANSLATOR:
+* Only these ENTITY strings listed in the DOCTYPE definition
+* are to be translated. The rest of this file should remain
+* English as it produces compilable code. 
+-->
+
 <!DOCTYPE document [
 	<!ENTITY withtempvar "with temporary variable">
 	<!ENTITY statement "statement">
@@ -13,6 +20,8 @@
 	<!ENTITY printtostdout "print to standard output">
 	<!ENTITY printtostderr "print to standard error">
 	<!ENTITY authorname "author name">
+	<!ENTITY commentText "To change this generated comment edit the template variable &quot;comment&quot;:
+ * Window&gt;Preferences&gt;C&gt;Templates.">
 	
 ]>
 
@@ -56,8 +65,7 @@ private:
 }</template><template name="new" description="&createnewobject;" context="C++ Function" enabled="true">${type} ${name} = new ${type}(${arguments});</template><template name="comment" description="&defaultmultilinecomment;" context="C Global" enabled="true">/*
  * author ${user}
  *
- * To change this generated comment edit the template variable &quot;comment&quot;:
- * Window&gt;Preferences&gt;C&gt;Templates.
+ * &commentText;
  */</template>
  <template name="stdout" description="&printtostdout;" context="C Function" enabled="true">printf(${cursor});</template>
  <template name="stderr" description="&printtostderr;" context="C Function" enabled="true">fprintf(stderr, ${cursor});</template>
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
index caa149034da..5ce5fed5ce1 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
@@ -529,7 +529,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS
 		// @@@ disabled for now until we get it to do something...
 		//addAction(menu, ITextEditorActionConstants.GROUP_EDIT, "Format"); //$NON-NLS-1$
 
-		MenuManager search = new MenuManager("Search", IContextMenuConstants.GROUP_SEARCH); //$NON-NLS-1$
+		MenuManager search = new MenuManager(CEditorMessages.getString("CEditor.menu.search"), IContextMenuConstants.GROUP_SEARCH); //$NON-NLS-1$
 		menu.appendToGroup(ITextEditorActionConstants.GROUP_FIND, search);
 		
 		if (SearchDialogAction.canActionBeAdded(getSelectionProvider().getSelection())){
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties
index 1832c234da4..54cced4f1ed 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorMessages.properties
@@ -145,3 +145,4 @@ DefaultCEditorTextHover.html.description=<br><b>Description:</b><br>
 CContentOutlinePage.menu.fileSearch=File Search
 CContentOutlinePage.error.noInput=no Editor Input
 CEditor.menu.fileSearch=File Search
+CEditor.menu.search=Search
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
index aefcb757ae9..f7a50c8fa85 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
@@ -79,15 +79,15 @@ public class CEditorPreferencePage extends PreferencePage implements IWorkbenchP
             PreferencesMessages.getString("CEditorPreferencePage.cCommentTaskTags"), PreferenceConstants.EDITOR_TASK_TAG_COLOR } //$NON-NLS-1$
 	};
 
-	protected final String[][] fAppearanceColorListModel = new String[][] { { "Line number color", ExtendedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR }, //$NON-NLS-1$
+	protected final String[][] fAppearanceColorListModel = new String[][] { { PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.lineNumberColor"), ExtendedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR }, //$NON-NLS-1$
 		{
-			"Matching bracket color", CEditor.MATCHING_BRACKETS_COLOR }, //$NON-NLS-1$
+		PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.matchingBracketColor"), CEditor.MATCHING_BRACKETS_COLOR }, //$NON-NLS-1$
 		{
-			"Current line highlight color", ExtendedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR }, //$NON-NLS-1$
+			PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.currentLineHighlightColor"), ExtendedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE_COLOR }, //$NON-NLS-1$
 		{
-			"Print margin color", ExtendedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR }, //$NON-NLS-1$
+				PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.printMarginColor"), ExtendedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR }, //$NON-NLS-1$
 		{
-			"Linked position color", CEditor.LINKED_POSITION_COLOR }, //$NON-NLS-1$
+					PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.linkedPositionColor"), CEditor.LINKED_POSITION_COLOR }, //$NON-NLS-1$
 	};
 
 	protected OverlayPreferenceStore fOverlayStore;
@@ -746,13 +746,13 @@ public class CEditorPreferencePage extends PreferencePage implements IWorkbenchP
 		label = PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.matchingBrackets"); //$NON-NLS-1$
 		fBracketHighlightButton = addCheckBox(behaviorComposite, label, CEditor.MATCHING_BRACKETS, 0);
 
-		label = "Show line numbers"; //$NON-NLS-1$
+		label = PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.showLineNumbers"); //$NON-NLS-1$
 		addCheckBox(behaviorComposite, label, ExtendedTextEditorPreferenceConstants.EDITOR_LINE_NUMBER_RULER, 0);
 
 		label = PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.highlightLine"); //$NON-NLS-1$
 		fLineHighlightButton = addCheckBox(behaviorComposite, label, ExtendedTextEditorPreferenceConstants.EDITOR_CURRENT_LINE, 0);
 
-		label = "Show overview ruler"; //$NON-NLS-1$
+		label = PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.showOverviewRuler"); //$NON-NLS-1$
 		addCheckBox(behaviorComposite, label, ExtendedTextEditorPreferenceConstants.EDITOR_OVERVIEW_RULER, 0);
 
 		label = PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.printMargin"); //$NON-NLS-1$
@@ -765,7 +765,7 @@ public class CEditorPreferencePage extends PreferencePage implements IWorkbenchP
 		l.setLayoutData(gd);
 
 		l = new Label(behaviorComposite, SWT.LEFT);
-		l.setText("Appearance color options"); //$NON-NLS-1$
+		l.setText(PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.appearanceColorOptions")); //$NON-NLS-1$
 		gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
 		gd.horizontalSpan = 2;
 		l.setLayoutData(gd);
@@ -794,7 +794,7 @@ public class CEditorPreferencePage extends PreferencePage implements IWorkbenchP
 		stylesComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
 
 		l = new Label(stylesComposite, SWT.LEFT);
-		l.setText("Color:"); //$NON-NLS-1$
+		l.setText(PreferencesMessages.getString("CEditorPreferencePage.behaviorPage.Color")); //$NON-NLS-1$
 		gd = new GridData();
 		gd.horizontalAlignment = GridData.BEGINNING;
 		l.setLayoutData(gd);
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 5df63ea1826..d603e4a644f 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
@@ -109,6 +109,15 @@ CEditorPreferencePage.behaviorPage.tabSpace=Insert &space for tabs
 CEditorPreferencePage.behaviorPage.matchingBrackets=Highlight &matching brackets
 CEditorPreferencePage.behaviorPage.highlightLine=Highlight &current line
 CEditorPreferencePage.behaviorPage.printMargin=Show print &margin
+CEditorPreferencePage.behaviorPage.showLineNumbers=Show &line numbers
+CEditorPreferencePage.behaviorPage.showOverviewRuler=Show &overview ruler
+CEditorPreferencePage.behaviorPage.appearanceColorOptions=Appearance color options
+CEditorPreferencePage.behaviorPage.lineNumberColor=Line number color
+CEditorPreferencePage.behaviorPage.matchingBracketColor=Matching bracket color
+CEditorPreferencePage.behaviorPage.currentLineHighlightColor=Current line highlight color
+CEditorPreferencePage.behaviorPage.printMarginColor=Print margin color
+CEditorPreferencePage.behaviorPage.linkedPositionColor=Linked position color
+CEditorPreferencePage.behaviorPage.Color=Color:
 CEditorPreferencePage.textFont.changeButton=C&hange...
 TemplatePreferencePage.Viewer.preview=Preview:
 BuildConsolePreferencePage.fieldEditors.buildConsoleLines=&Build console lines: