diff --git a/build/org.eclipse.cdt.make.ui/plugin.properties b/build/org.eclipse.cdt.make.ui/plugin.properties
index 7522f31c9fc..459ea64ef8e 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.properties
+++ b/build/org.eclipse.cdt.make.ui/plugin.properties
@@ -8,6 +8,7 @@
 # Contributors:
 #     QNX Software Systems - initial API and implementation
 #     Anton Leherbauer (Wind River Systems)
+#	  IBM Corporation
 ###############################################################################
 
 pluginName=C/C++ Standard make Build UI
@@ -77,7 +78,9 @@ GCCPerFileProfile.name=GCC per file scanner info profile
 CDTPathSymbolsProperty.name=C/C++ Project paths and symbols
 
 Includes=Includes
+Includes.tooltip=Includes list
 Symbols=Symbols
+Symbols.tooltip=Macros list
 # menu label
 Make.targets.menu=Make targets
 
diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml
index 05226a7de0a..1cf3d34177f 100644
--- a/build/org.eclipse.cdt.make.ui/plugin.xml
+++ b/build/org.eclipse.cdt.make.ui/plugin.xml
@@ -433,7 +433,7 @@
            weight="001"
            helpId="cdt_u_prop_pns_inc"
            parent="org.eclipse.cdt.make.internal.ui.properties.PathAndSymbolPage"
-           tooltip=""Includes list""/>
+           tooltip="%Includes.tooltip"/>
      <tab
            class="org.eclipse.cdt.ui.newui.SymbolTab"
            name="%Symbols"
@@ -441,7 +441,7 @@
            weight="002"
            helpId="cdt_u_prop_pns_sym"
            parent="org.eclipse.cdt.make.internal.ui.properties.PathAndSymbolPage"
-           tooltip="&quot;Macros list&quot;"/>
+           tooltip="%Symbols.tooltip"/>
 	</extension>
 
      <extension
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
index a2dd4b0a287..675a7331f1b 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2007 IBM Corporation and others.
+# Copyright (c) 2003, 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -70,8 +70,11 @@ Build.artifact=Build Artifact
 Builder.settings=Builder Settings
 WBB.settings=Behaviour
 Includes=Includes
+Includes.tooltip=Includes list
 Symbols=Symbols
+Symbols.tooltip=Macros list
 Libraries=Libraries
+Libraries.tooltip=Libraries list
 Library.paths=Library Paths
 References=References
 Source.location=Source Location
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index bb3ee7b5797..d880d28fe24 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -273,7 +273,7 @@
            weight="001"
            helpId="cdt_u_prop_pns_inc"
            parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
-           tooltip="&quot;Includes list&quot;"/>
+           tooltip="%Includes.tooltip"/>
      <tab
            class="org.eclipse.cdt.ui.newui.SymbolTab"
            icon="icons/obj16/define_obj.gif"
@@ -281,7 +281,7 @@
            weight="002"
            helpId="cdt_u_prop_pns_sym"
            parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
-           tooltip="&quot;Macros list&quot;"/>
+           tooltip="%Symbols.tooltip"/>
      <tab
            class="org.eclipse.cdt.ui.newui.LibraryTab"
            icon="icons/obj16/lib_obj.gif"
@@ -289,7 +289,7 @@
            weight="003"
            helpId="cdt_u_prop_pns_lib"
            parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_PathAndSymb"
-           tooltip="&quot;Libraries list&quot;"/>
+           tooltip="%Libraries.tooltip"/>
      <tab
            class="org.eclipse.cdt.ui.newui.LibraryPathTab"
            icon="icons/obj16/opentype.gif"
@@ -354,21 +354,21 @@
            name="%Includes"
            helpId="cdt_u_prop_exp"
            parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_ExpPathAndSymb"
-           tooltip="&quot;Includes list&quot;"/>
+           tooltip="%Includes.tooltip"/>
      <tab
            class="org.eclipse.cdt.ui.newui.ExpSymbolTab"
            icon="icons/obj16/define_obj.gif"
            name="%Symbols"
            parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_ExpPathAndSymb"
            helpId="cdt_u_prop_exp"
-           tooltip="&quot;Macros list&quot;"/>
+           tooltip="%Symbols.tooltip"/>
      <tab
            class="org.eclipse.cdt.ui.newui.ExpLibraryTab"
            icon="icons/obj16/lib_obj.gif"
            name="%Libraries"
            parent="org.eclipse.cdt.managedbuilder.ui.properties.Page_ExpPathAndSymb"
            helpId="cdt_u_prop_exp"
-           tooltip="&quot;Libraries list&quot;"/>
+           tooltip="%Libraries.tooltip"/>
      <tab
            class="org.eclipse.cdt.ui.newui.ExpLibraryPathTab"
            icon="icons/obj16/opentype.gif"