From ceb0dedf564737cdf4e10d57948decf7c0171052 Mon Sep 17 00:00:00 2001
From: Chris Recoskie <recoskie@ca.ibm.com>
Date: Tue, 26 Sep 2006 18:51:30 +0000
Subject: [PATCH] fix for 158402 by Vivian Kong

---
 core/org.eclipse.cdt.ui/plugin.xml            |  3 +-
 .../templates/default-templates.properties    | 27 +++++++
 .../templates/default-templates.xml           | 75 ++++++++-----------
 3 files changed, 61 insertions(+), 44 deletions(-)
 create mode 100644 core/org.eclipse.cdt.ui/templates/default-templates.properties

diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index ba3afabb707..f360c8e4493 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -1341,7 +1341,8 @@
             id="org.eclipse.cdt.ui.text.templates.c">
       </contextType>
       <include
-      		file="templates/default-templates.xml">
+      		file="templates/default-templates.xml"
+      		translations="$nl$/templates/default-templates.properties">
       </include>
    </extension>
    <extension
diff --git a/core/org.eclipse.cdt.ui/templates/default-templates.properties b/core/org.eclipse.cdt.ui/templates/default-templates.properties
new file mode 100644
index 00000000000..e80b8887304
--- /dev/null
+++ b/core/org.eclipse.cdt.ui/templates/default-templates.properties
@@ -0,0 +1,27 @@
+###############################################################################
+# Copyright (c) 2000, 2006 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+
+withtempvar = with temporary variable
+statement = statement
+## block is a noun 
+block = block
+method = method
+declaration = declaration
+usinganamespace = using a namespace
+statement = statement
+createnewobject = create new object
+defaultmultilinecomment = default multiline comment
+printtostdout = print to standard output
+printtostderr = print to standard error
+authorname = author name
+commentText = To change this generated comment edit the template variable &quot;comment&quot;:
+ * Window&gt;Preferences&gt;C&gt;Editor&gt;Templates.
+	
diff --git a/core/org.eclipse.cdt.ui/templates/default-templates.xml b/core/org.eclipse.cdt.ui/templates/default-templates.xml
index 7ef7863862d..43642cfbf46 100644
--- a/core/org.eclipse.cdt.ui/templates/default-templates.xml
+++ b/core/org.eclipse.cdt.ui/templates/default-templates.xml
@@ -1,47 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-(c) Copyright IBM Corp. 2000, 2001. 2004
-All Rights Reserved.
+
+###############################################################################
+# Copyright (c) 2000, 2006 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
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+
 -->
 
 <!-- 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. 
+* This file should remain English as it produces compilable code. 
 -->
 
-<!DOCTYPE document [
-	<!ENTITY withtempvar "with temporary variable">
-	<!ENTITY statement "statement">
-	<!-- block is a noun -->
-	<!ENTITY block "block">
-	<!ENTITY method "method">
-	<!ENTITY declaration "declaration">
-	<!ENTITY usinganamespace "using a namespace">
-	<!ENTITY statement "statement">
-	<!ENTITY createnewobject "create new object">
-	<!ENTITY defaultmultilinecomment "default multiline comment">
-	<!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;Editor&gt;Templates.">
-	
-]>
-
 <templates>
 <template name="for" description="for loop" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.for" enabled="true">for (${var} = 0; ${var} &lt; ${max}; ++${var}) {
 	${cursor}
 }</template>
 
-<template name="for" description="for loop &withtempvar;" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.cpp.for" enabled="true">for (int ${var} = 0; ${var} &lt; ${max}; ++${var}) {
+<template name="for" description="for loop %withtempvar" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.cpp.for" enabled="true">for (int ${var} = 0; ${var} &lt; ${max}; ++${var}) {
 	${cursor}
 }</template>
-<template name="do" description="do while &statement;" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.do" enabled="true">do {
+<template name="do" description="do while %statement" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.do" enabled="true">do {
 	${cursor}
 } while (${condition});</template>
-<template name="switch" description="switch case &statement;" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.switch" enabled="true">switch (${key}) {
+<template name="switch" description="switch case %statement" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.switch" enabled="true">switch (${key}) {
 	case ${value}:
 		${cursor}
 		break;
@@ -49,49 +38,49 @@ All Rights Reserved.
 		break;
 }</template>
 
-<template name="if" description="if &statement;" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.if" enabled="true">if (${condition}) {
+<template name="if" description="if %statement" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.if" enabled="true">if (${condition}) {
 	${cursor}
 }</template>
-<template name="ifelse" description="if else &statement;" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.ifelse" enabled="true">if (${condition}) {
+<template name="ifelse" description="if else %statement" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.ifelse" enabled="true">if (${condition}) {
 	${cursor}
 } else {
 	
 }</template>
-<template name="elseif" description="else if &block;" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.elseif" enabled="true">else if (${condition}) {
+<template name="elseif" description="else if %block" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.elseif" enabled="true">else if (${condition}) {
 	${cursor}
 }</template>
-<template name="else" description="else &block;" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.else" enabled="true">else {
+<template name="else" description="else %block" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.else" enabled="true">else {
 	${cursor}
 }</template>
-<template name="try" description="try catch &block;" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.cpp.try" enabled="true">try {
+<template name="try" description="try catch %block" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.cpp.try" enabled="true">try {
 	${cursor}
 } catch (${Exception} e) {
 }</template>
-<template name="catch" description="catch &block;" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.cpp.catch" enabled="true">catch (${Exception} e) {
+<template name="catch" description="catch %block" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.cpp.catch" enabled="true">catch (${Exception} e) {
 	${cursor}
 }</template>
-<template name="main" description="main &method;" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.main" enabled="true">int main(int argc, char **argv) {
+<template name="main" description="main %method" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.main" enabled="true">int main(int argc, char **argv) {
 	${cursor}
 }</template>
-<template name="class" description="class &declaration;" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.cpp.class" enabled="true">class ${name} {
+<template name="class" description="class %declaration" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.cpp.class" enabled="true">class ${name} {
 	${cursor}
 private:
 };</template>
-<template name="using" description="&usinganamespace;" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.cpp.using" enabled="true">using namespace ${namespace};
+<template name="using" description="%usinganamespace" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.cpp.using" enabled="true">using namespace ${namespace};
 </template>
-<template name="namespace" description="namespace &declaration;" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.cpp.namespace" enabled="true">namespace ${namespace} {
+<template name="namespace" description="namespace %declaration" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.cpp.namespace" enabled="true">namespace ${namespace} {
 	${cursor}
 }</template>
-<template name="new" description="&createnewobject;" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.cpp.new" enabled="true">${type} ${name} = new ${type}(${arguments});</template>
-<template name="comment" description="&defaultmultilinecomment;" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.comment" enabled="true">
+<template name="new" description="%createnewobject" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.cpp.new" enabled="true">${type} ${name} = new ${type}(${arguments});</template>
+<template name="comment" description="%defaultmultilinecomment" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.comment" enabled="true">
 /*
  * author ${user}
  *
- * &commentText;
+ * %commentText
  */
 </template>
-<template name="stdout" description="&printtostdout;" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.printf" enabled="true">printf(${cursor});</template>
-<template name="stderr" description="&printtostderr;" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.fprintf" enabled="true">fprintf(stderr, ${cursor});</template>
-<template name="author" description="&authorname;" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.author" enabled="true">author ${user}</template>
+<template name="stdout" description="%printtostdout" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.printf" enabled="true">printf(${cursor});</template>
+<template name="stderr" description="%printtostderr" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.fprintf" enabled="true">fprintf(stderr, ${cursor});</template>
+<template name="author" description="%authorname" context="org.eclipse.cdt.ui.text.templates.c" id="org.eclipse.cdt.ui.text.templates.c.author" enabled="true">author ${user}</template>
 
 </templates>