diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplatePreferencePage.java b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplatePreferencePage.java
index e30b055f1e4..3a822c5fc8a 100644
--- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplatePreferencePage.java
+++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/TemplatePreferencePage.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  * Bala Torati (Symbian) - Initial API and implementation
+ * IBM Corporation
  *******************************************************************************/
 package org.eclipse.cdt.ui.templateengine.pages;
 
@@ -56,8 +57,8 @@ public class TemplatePreferencePage extends PreferencePage implements IWorkbench
 	 * Preference Page buttons
 	 */
 
-	private static final String EditButton = "   Edit...   "; //$NON-NLS-1$
-	private static final String DeleteButton = "   Remove     "; //$NON-NLS-1$
+	private static final String EditButton = Messages.getString("TemplatePreferencePage.8"); //$NON-NLS-1$
+	private static final String DeleteButton = Messages.getString("TemplatePreferencePage.9"); //$NON-NLS-1$
 	private static final String PageDescription = Messages.getString("TemplatePreferencePage.0");//$NON-NLS-1$
 	public static final String Blank = "";//$NON-NLS-1$
 
@@ -164,7 +165,7 @@ public class TemplatePreferencePage extends PreferencePage implements IWorkbench
 	 */
 
 	private void initializeDefaults() {
-		columnNames = new String[] { TemplateEngineHelper.ID, TemplateEngineHelper.VALUE };
+		columnNames = new String[] { Messages.getString("TemplatePreferencePage.10"), Messages.getString("TemplatePreferencePage.11") };  //$NON-NLS-1$//$NON-NLS-2$
 		// Setting InfoPop help (plugin-id+ContextID).
 		pageID = CUIPlugin.getPluginId() + "." + //$NON-NLS-1$
 				SharedContextHelpID;
diff --git a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/messages.properties b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/messages.properties
index 78d3c8dc45d..d2d0434a410 100644
--- a/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/messages.properties
+++ b/core/org.eclipse.cdt.ui/templateengine/org/eclipse/cdt/ui/templateengine/pages/messages.properties
@@ -7,6 +7,7 @@
 #
 # Contributors:
 # Symbian - Initial API and implementation
+# IBM Corporation
 ###############################################################################
 
 NewProjectCreationPage.0=\ is an invalid name on this platform.
@@ -25,3 +26,7 @@ TemplatePreferencePage.4=Delete a shared default value
 TemplatePreferencePage.5=Templates Global Values Table
 TemplatePreferencePage.6=Updates changed key-value pair
 TemplatePreferencePage.7=Deletes key-value pair
+TemplatePreferencePage.8=Edit...
+TemplatePreferencePage.9=Remove
+TemplatePreferencePage.10=ID
+TemplatePreferencePage.11=Value
\ No newline at end of file