diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index d3f6e7564a3..4afed74245f 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-13 Andrew Niefer
+	fix src/org/eclipse/cdt/internal/corext/template/default-templates.xml to restore changes lost in
+	string externalization (restore for loops to use preincrement) 
+
 2004-04-12 Bogdan Gheorghe
 	Added Indexer Timeout field to Work In Progress Preference page
 	
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 db14d32b907..68eb90f1633 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,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+(c) Copyright IBM Corp. 2000, 2001. 2004
+All Rights Reserved.
+-->
+
 <!-- NOTE TO TRANSLATOR:
 * Only these ENTITY strings listed in the DOCTYPE definition
 * are to be translated. The rest of this file should remain
@@ -25,48 +30,99 @@
 	
 ]>
 
-<templates><template name="for" description="for loop" context="C Function" enabled="true">for (${var} = 0; ${var} &lt; ${max}; ${var}++) {
+<templates><template name="for" description="for loop" context="C Function" enabled="true">
+for (${var} = 0; ${var} &lt; ${max}; ++${var}) {
 	${cursor}
-}</template><template name="for" description="for loop &withtempvar;" context="C Function" enabled="true">for (int ${var} = 0; ${var} &lt; ${max}; ${var}++) {
+}
+</template>
+
+<template name="for" description="for loop &withtempvar;" context="C Function" enabled="true">
+for (int ${var} = 0; ${var} &lt; ${max}; ++${var}) {
 	${cursor}
-}</template><template name="do" description="do while &statement;" context="C Function" enabled="true">do {
+}
+</template>
+<template name="do" description="do while &statement;" context="C Function" enabled="true">
+do {
 	${cursor}
-} while (${condition});</template><template name="switch" description="switch case &statement;" context="C Function" enabled="true">switch (${key}) {
+} while (${condition});
+</template>
+<template name="switch" description="switch case &statement;" context="C Function" enabled="true">
+switch (${key}) {
 	case ${value}:
 		${cursor}
 		break;
 	default:
 		break;
-}</template><template name="if" description="if &statement;" context="C Function" enabled="true">if (${condition}) {
+}
+</template>
+
+<template name="if" description="if &statement;" context="C Function" enabled="true">
+if (${condition}) {
 	${cursor}
-}</template><template name="ifelse" description="if else &statement;" context="C Function" enabled="true">if (${condition}) {
+}
+</template>
+<template name="ifelse" description="if else &statement;" context="C Function" enabled="true">
+if (${condition}) {
 	${cursor}
 } else {
 	
-}</template><template name="elseif" description="else if &block;" context="C Function" enabled="true">else if (${condition}) {
+}
+</template>
+<template name="elseif" description="else if &block;" context="C Function" enabled="true">
+else if (${condition}) {
 	${cursor}
-}</template><template name="else" description="else &block;" context="C Function" enabled="true">else {
+}
+</template>
+<template name="else" description="else &block;" context="C Function" enabled="true">
+else {
 	${cursor}
-}</template><template name="try" description="try catch &block;" context="C++ Function" enabled="true">try {
+}
+</template>
+<template name="try" description="try catch &block;" context="C++ Function" enabled="true">
+try {
 	${cursor}
 } catch (${Exception} e) {
-}</template><template name="catch" description="catch &block;" context="C++ Function" enabled="true">catch (${Exception} e) {
+}
+</template>
+<template name="catch" description="catch &block;" context="C++ Function" enabled="true">
+catch (${Exception} e) {
 	${cursor}
-}</template><template name="main" description="main &method;" context="C Global" enabled="true">int
+}
+</template>
+<template name="main" description="main &method;" context="C Global" enabled="true">
+int 
 main(int argc, char **argv) {
 	${cursor}
-}</template><template name="class" description="class &declaration;" context="C++ Global" enabled="true">class ${name} {
+}
+</template>
+<template name="class" description="class &declaration;" context="C++ Global" enabled="true">
+class ${name} {
 	${cursor}
 private:
-};</template>
-<template name="using" description="&usinganamespace;" context="C++ Global" enabled="true">using namespace ${namespace};</template>
-<template name="namespace" description="namespace &declaration;" context="C++ Global" enabled="true">namespace ${namespace} {
+};
+</template>
+<template name="using" description="&usinganamespace;" context="C++ Global" enabled="true">
+using namespace ${namespace};
+</template>
+<template name="namespace" description="namespace &declaration;" context="C++ Global" enabled="true">
+namespace ${namespace} {
 	${cursor}
-}</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">/*
+}
+</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}
  *
  * &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>
- <template name="author" description="&authorname;" context="C Global" enabled="true">author ${user}</template></templates>
\ No newline at end of file
+ */
+</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>
+<template name="author" description="&authorname;" context="C Global" enabled="true">
+author ${user}
+</template>
+</templates>
\ No newline at end of file