From 8aebf4d454135b46686a0fb1ccfeba39ccd58cbf Mon Sep 17 00:00:00 2001
From: Vivian Kong <vivkong@ca.ibm.com>
Date: Wed, 1 Aug 2012 11:32:23 -0400
Subject: [PATCH] Bug 384767 - Non-externalized Strings in Discovery Tab

---
 .../org.eclipse.cdt.managedbuilder.core/plugin.properties | 8 ++++++--
 build/org.eclipse.cdt.managedbuilder.core/plugin.xml      | 6 +++---
 core/org.eclipse.cdt.ui/plugin.properties                 | 4 +++-
 core/org.eclipse.cdt.ui/plugin.xml                        | 2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.properties b/build/org.eclipse.cdt.managedbuilder.core/plugin.properties
index 2f46bf52441..46b890e8956 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2010 IBM Corporation and others.
+# Copyright (c) 2003, 2012 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
@@ -75,4 +75,8 @@ extension-point.name = Managed Build Tools 2.0 (Deprecated)
 extension-point.name.0 = Managed Build Definitions
 extension-point.name.1 = Managed Build Project Converter
 extension-point.name.2 = Build Properties
-extension-point.name.3 = ToolChain Modification Info
\ No newline at end of file
+extension-point.name.3 = ToolChain Modification Info
+
+GCCBuildOutputParser.name = CDT GCC Build Output Parser
+GCCBuildinCompilerSettings.name = CDT GCC Builtin Compiler Settings
+ManagedBuildSettingEntries.name = CDT Managed Build Setting Entries
\ No newline at end of file
diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
index c0e978147fb..427e9b82fd5 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
@@ -603,12 +603,12 @@
       <provider
             class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.MBSLanguageSettingsProvider"
             id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider"
-            name="CDT Managed Build Setting Entries">
+            name="%ManagedBuildSettingEntries.name">
       </provider>
       <provider
             class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector"
             id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector"
-            name="CDT GCC Builtin Compiler Settings"
+            name="%GCCBuildinCompilerSettings.name"
             parameter="${COMMAND} -E -P -v -dD ${INPUTS}">
          <language-scope id="org.eclipse.cdt.core.gcc"/>
          <language-scope id="org.eclipse.cdt.core.g++"/>
@@ -624,7 +624,7 @@
       <provider
             class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser"
             id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"
-            name="CDT GCC Build Output Parser"
+            name="%GCCBuildOutputParser.name"
             parameter="(gcc)|([gc]\+\+)|(clang)"
             prefer-non-shared="true">
       </provider>
diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 5de290067a3..783a6f95038 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2011 IBM Corporation, QNX Software Systems, and others.
+# Copyright (c) 2003, 2012 IBM Corporation, QNX Software Systems, 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
@@ -638,3 +638,5 @@ extension-point.name = Refresh Exclusion Contributor
 # New New Project Wizard
 newProjectWizard.name = C/C++ Project (prototype)
 projectTypePages = Project Type Pages
+
+UserSettingEntries.name = CDT User Setting Entries
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index a51d26ebdca..900b5032008 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -4331,7 +4331,7 @@
 		<provider
 			class="org.eclipse.cdt.core.language.settings.providers.LanguageSettingsGenericProvider"
 			id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"
-			name="CDT User Setting Entries"
+			name="%UserSettingEntries.name"
 			prefer-non-shared="true">
 		</provider>
 	</extension>