From f8d8ad68434c7c0f86cde8c218668104d2684e71 Mon Sep 17 00:00:00 2001
From: Andrew Niefer <aniefer@ca.ibm.com>
Date: Thu, 18 Mar 2004 23:34:30 +0000
Subject: [PATCH] externalizing strings from Tanya Wolff

---
 core/org.eclipse.cdt.ui/ChangeLog             |   9 ++
 core/org.eclipse.cdt.ui/plugin.properties     |   1 +
 core/org.eclipse.cdt.ui/plugin.xml            |   2 +-
 .../corext/template/default-templates.xml     | 135 +++++-------------
 .../ui/cview/CViewMessages.properties         |   2 +-
 .../internal/ui/cview/MainActionGroup.java    |   2 +-
 6 files changed, 50 insertions(+), 101 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index c1aca9319b5..2d6c55333db 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -4,6 +4,15 @@
 	* src/org/eclipse/cdt/internal/ui/BaseCElementContentProvider.java
 	* src/org/eclipse/cdt/internal/ui/CElementImageProvider.java
 
+2004-03-18 Tanya Wolff
+	Externalized template descriptions,
+	Externalized name in plugin.xml,
+	Fixed missing resource "Link With Editor".
+	* src/org/eclipse/cdt/internal/corext/template/default-templates.xml
+	* plugin.xml
+	* plugin.properties
+	* src/org/eclipse/cdt/internal/ui/cview/CViewMessages.properties
+	
 2004-03-18 Alain Magloire
 	Change in the hierarchy of the core Model:
 	ICModel
diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 2c4f18b39b6..f7890dc82ca 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -2,6 +2,7 @@ pluginName=C/C++ Development Tools UI
 providerName=Eclipse.org
 
 elementFiltersName=CElement Filters
+binaryParserPage=Binary Parser Page
 textHoversName=Text Hovers
 editorActionsName=Editor Actions
 editorRulerActionsName=Editor Ruler Actions
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index e62b1c67226..f4226fa6b93 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -33,7 +33,7 @@
 
    <extension-point id="CCompletionContributor" name="%completionContributorName"/>
    <extension-point id="CElementFilters" name="%elementFiltersName"/>
-   <extension-point id="BinaryParserPage" name="Binary Parser Page"/>
+   <extension-point id="BinaryParserPage" name="%binaryParserPage"/>
 <!-- =========================================================================== -->
 <!-- Extension point: org.eclipse.cdt.ui.textHovers                        -->
 <!-- Extension Implementation: must implement org.eclipse.jface.text.ITextHover  -->
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 fe66840f0b9..203efccc276 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,125 +1,64 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!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">
+	
+]>
 
-<!--
-(c) Copyright IBM Corp. 2000, 2001.
-All Rights Reserved.
--->
-
-<templates>
-
-<!-- C++ -->
-
-<template description="for loop" name="for" context="C Function">
-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 description="for loop with temporary variable" name="for" context="C Function">
-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 description="do while statement" name="do" context="C Function">
-do {
+}</template><template name="do" description="do while &statement;" context="C Function" enabled="true">do {
 	${cursor}
-} while (${condition});
-</template>
-
-<template description="switch case statement" name="switch" context="C Function">
-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 description="if statement" name="if" context="C Function">
-if (${condition}) {
+}</template><template name="if" description="if &statement;" context="C Function" enabled="true">if (${condition}) {
 	${cursor}
-}
-</template>
-
-<template description="if else statement" name="ifelse" context="C Function">
-if (${condition}) {
+}</template><template name="ifelse" description="if else &statement;" context="C Function" enabled="true">if (${condition}) {
 	${cursor}
 } else {
 	
-}
-</template>
-
-<template description="else if block" name="elseif" context="C Function">
-else if (${condition}) {
+}</template><template name="elseif" description="else if &block;" context="C Function" enabled="true">else if (${condition}) {
 	${cursor}
-}
-</template>
-
-<template description="else block" name="else" context="C Function">
-else {
+}</template><template name="else" description="else &block;" context="C Function" enabled="true">else {
 	${cursor}
-}
-</template>
-
-<template description="try catch block" name="try" context="C++ Function">
-try {
+}</template><template name="try" description="try catch &block;" context="C++ Function" enabled="true">try {
 	${cursor}
 } catch (${Exception} e) {
-}
-</template>
-
-<template description="catch block" name="catch" context="C++ Function">
-catch (${Exception} e) {
+}</template><template name="catch" description="catch &block;" context="C++ Function" enabled="true">catch (${Exception} e) {
 	${cursor}
-}
-</template>
-
-<template description="main method" name="main" context="C Global">
-int
+}</template><template name="main" description="main &method;" context="C Global" enabled="true">int
 main(int argc, char **argv) {
 	${cursor}
-}
-</template>
-
-<template description="class declaration" name="class" context="C++ Global">
-class ${name} {
+}</template><template name="class" description="class &declaration;" context="C++ Global" enabled="true">class ${name} {
 	${cursor}
 private:
-};
-</template>
-
-<template description="using a namespace" name="using" context="C++ Global">
-using namespace ${namespace};
-</template>
-
-  <template description="namespace declaration" name="namespace" context="C++ Global"
- >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 description="create new object" name="new" context="C++ Function"
->${type} ${name} = new ${type}(${arguments});
-</template>
-
-
-<template name="comment" description="default multiline comment" 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}
  *
  * To change this generated comment edit the template variable &quot;comment&quot;:
  * Window&gt;Preferences&gt;C&gt;Templates.
- */</template> 
-
-  <template description="print to standard out" name="stdout" context="C Function"
-  >printf(${cursor});</template>
-
-  <template description="print to standard error" name="stderr" context="C Function"
-  >fprintf(stderr, ${cursor});</template>
-
-  <!-- javadoc -->
-
-  <template description="author name" name="author" context="C Global"
-  >author ${user}</template>
-
-</templates>
+ */</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
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMessages.properties
index 6d6f5a74eb0..3f981f1e791 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMessages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewMessages.properties
@@ -40,7 +40,7 @@ RefreshAction.locationDeleted.title= Project location has been deleted
 RefreshAction.locationDeleted.message= The location for project {0} ({1}) has been deleted.\n Delete {0} from the workspace?
  
 ToggleLinkingAction.label=Lin&k With Editor
-ToggleLinkingAction.tooltip=Link with Editor
+ToggleLinkingAction.toolTip=Link with Editor
 ToggleLinkingAction.description=Link with active editor
 
 SearchAction.label=Search
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java
index b8f8da17651..debef116b81 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/MainActionGroup.java
@@ -156,7 +156,7 @@ public class MainActionGroup extends CViewActionGroup {
 
 		collapseAllAction = new CollapseAllAction(getCView());
 
-		toggleLinkingAction = new ToggleLinkingAction(getCView(), CViewMessages.getString("ToggleLinkingAction.text")); //$NON-NLS-1$
+		toggleLinkingAction = new ToggleLinkingAction(getCView(), CViewMessages.getString("ToggleLinkingAction.label")); //$NON-NLS-1$
 		toggleLinkingAction.setToolTipText(CViewMessages.getString("ToggleLinkingAction.toolTip")); //$NON-NLS-1$
 		toggleLinkingAction.setImageDescriptor(getImageDescriptor("elcl16/synced.gif"));//$NON-NLS-1$
 		toggleLinkingAction.setHoverImageDescriptor(getImageDescriptor("clcl16/synced.gif"));//$NON-NLS-1$