diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 0fd8a9ba607..85c3cebeb03 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-19 Alain Magloire
+	Fixed PR 95943
+	* src/org/elcipse/cdt/internla/corext/template/c/TemplateMessages.properties
+	* src/org/elcipse/cdt/internla/corext/template/c/TranslationUnitContextType.java
+
 2005-05-18 David Inglis
 	Fixed bug # 95556
 	* src/org/eclipse/cdt/ui/wizards/NewCProjectWizard.java
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TemplateMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TemplateMessages.properties
index e5faa746e0f..9924cdaaa9d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TemplateMessages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TemplateMessages.properties
@@ -11,19 +11,19 @@ GlobalVariables.variable.description.date=Current date
 GlobalVariables.variable.description.time=Current time
 GlobalVariables.variable.description.user=User name
 
-JavaDocContextType.variable.description.file=Filename of compilation unit
+#JavaDocContextType.variable.description.file=Filename of translation unit
 
-CContextType.variable.description.file=Filename of compilation unit
+CContextType.variable.description.file=Filename of translation unit
 CContextType.variable.description.array=A proposal for an array
 CContextType.variable.description.array.type=A proposal for the element type of an array
 CContextType.variable.description.array.element=A proposal for the element name of an array
 CContextType.variable.description.index=A proposal for an index (int)
-CContextType.variable.description.collector=A proposal for a collector (java.util.Collector)
-CContextType.variable.description.iterator=A proposal for an iterator (java.util.Iterator)
+CContextType.variable.description.collector=A proposal for a collector
+CContextType.variable.description.iterator=A proposal for an iterator
 CContextType.variable.description.arguments=Method arguments (evaluates to empty string)
 CContextType.variable.description.enclosing.method=Enclosing method name
 CContextType.variable.description.enclosing.type=Enclosing type name
-CContextType.variable.description.enclosing.package=Enclosing package name
+#CContextType.variable.description.enclosing.package=Enclosing package name
 CContextType.variable.description.enclosing.project=Enclosing project name
 CContextType.variable.description.enclosing.method.arguments=Argument names of enclosing method
 CContextType.variable.description.return.type=Enclosing method return type
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContextType.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContextType.java
index d1dee8da90f..3029ebd4a03 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContextType.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/c/TranslationUnitContextType.java
@@ -110,7 +110,7 @@ public abstract class TranslationUnitContextType extends TemplateContextType {
 
 	protected static class Project extends TemplateVariableResolver {
 		public Project() {
-			super("enclosing_project", TemplateMessages.getString("CContextType.variable.description.project")); //$NON-NLS-1$ //$NON-NLS-2$
+			super("enclosing_project", TemplateMessages.getString("CContextType.variable.description.enclosing.project")); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 		public String resolve(TemplateContext context) {
 			ITranslationUnit unit= ((CContext) context).getTranslationUnit();