diff --git a/debug/org.eclipse.cdt.debug.mi.ui/plugin.properties b/debug/org.eclipse.cdt.debug.mi.ui/plugin.properties
index 00d91b7edcf..55bd62cbcfd 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.mi.ui/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2009 QNX Software Systems and others.
+# Copyright (c) 2000, 2010 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
@@ -21,3 +21,8 @@ TargetOptionsPage.label=GDB/MI Options
 
 VerboseMode.label=Verbose Mode
 VerboseMode.tooltip=Verbose Mode For gdb Console
+
+category.description = C/C++ debugging with the CDI (legacy) GDB debugger
+category.name = CDT CDI-GDB - GDB Debugging (Legacy)
+activity.description = C/C++ debugging with the CDI (legacy) GDB debugger
+activity.name = CDT CDI-GDB - GDB Debugging (Legacy)
\ No newline at end of file
diff --git a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
index 4d41d97d58d..f8a1a277081 100644
--- a/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.mi.ui/plugin.xml
@@ -88,8 +88,8 @@
          point="org.eclipse.ui.activities">
  
       <category
-            name="CDT CDI-GDB - GDB Debugging (Legacy)"
-            description="C/C++ debugging with the CDI (legacy) GDB debugger"
+            name="%category.name"
+            description="%category.description"
             id="org.eclipse.cdt.debug.cdigdbCategory">
       </category>
   
@@ -99,8 +99,8 @@
       </categoryActivityBinding>
   
       <activity
-            name="CDT CDI-GDB - GDB Debugging (Legacy)"
-            description="C/C++ debugging with the CDI (legacy) GDB debugger"
+            name="%activity.name"
+            description="%activity.description"
             id="org.eclipse.cdt.debug.cdigdbActivity">
        </activity>
 
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.properties b/debug/org.eclipse.cdt.debug.ui/plugin.properties
index 5fba69e1041..ae575feb60a 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2009 QNX Software Systems and others.
+# Copyright (c) 2000, 2010 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
@@ -246,3 +246,8 @@ sourceNotFoundEditor.name = C/C++ Source Not Found Editor
 displayMode.name = displayMode
 CastingCategory.description = Set of commands for displaying variables and expressions as other types or arrays.
 CastingCategory.name = Cast to Type or Array
+
+category.description = Commands for C/C++ debugging
+category.name = CDT Debug - C/C++ Development Tools
+activity.description = Commands for C/C++ debugging
+activity.name = CDT Debug - C/C++ Development Tools
\ No newline at end of file
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index 1ee1f7d9635..31c00afc9e8 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -2388,8 +2388,8 @@
          point="org.eclipse.ui.activities">
  
       <category
-            name="CDT Debug - C/C++ Development Tools"
-            description="Commands for C/C++ debugging"
+            name="%category.name"
+            description="%category.description"
             id="org.eclipse.cdt.debug.ui.cdtCategory">
       </category>
   
@@ -2399,8 +2399,8 @@
       </categoryActivityBinding>
   
       <activity
-            name="CDT Debug - C/C++ Development Tools"
-            description="Commands for C/C++ debugging"
+            name="%activity.name"
+            description="%activity.description"
             id="org.eclipse.cdt.debug.ui.cdtActivity">
        </activity>
 
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties
index 3da35534847..a8b37e93630 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.properties
@@ -46,3 +46,8 @@ command.nextTraceRecord.name=Next Trace Record
 command.prevTraceRecord.name=Previous Trace Record
 command.nextTraceRecord.description=Select Next Trace Record
 command.prevTraceRecord.description=Select Previous Trace Record
+
+category.description = C/C++ debugging with the DSF GDB debugger
+category.name = CDT DSF-GDB - GDB Debugging
+activity.description = C/C++ debugging with the DSF GDB debugger
+activity.name = CDT DSF-GDB - GDB Debugging)
\ No newline at end of file
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml
index b823868451c..b742f19349c 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/plugin.xml
@@ -542,8 +542,8 @@
          point="org.eclipse.ui.activities">
  
       <category
-            name="CDT DSF-GDB - GDB Debugging"
-            description="C/C++ debugging with the DSF GDB debugger"
+            name="%category.name"
+            description="%category.description"
             id="org.eclipse.cdt.debug.dsfgdbCategory">
       </category>
   
@@ -553,8 +553,8 @@
       </categoryActivityBinding>
   
       <activity
-            name="CDT DSF-GDB - GDB Debugging)"
-            description="C/C++ debugging with the DSF GDB debugger"
+            name="%activity.name"
+            description="%activity.description"
             id="org.eclipse.cdt.debug.dsfgdbActivity">
        </activity>
 
diff --git a/dsf/org.eclipse.cdt.dsf.ui/plugin.properties b/dsf/org.eclipse.cdt.dsf.ui/plugin.properties
index 1d9d2332ef1..9fe899554b8 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/plugin.properties
+++ b/dsf/org.eclipse.cdt.dsf.ui/plugin.properties
@@ -59,3 +59,9 @@ StaleData.background.label=Stale data background color
 StaleData.background.description=This color is used to indicate that a given element of data in a view is stale.  User should refresh the view to see current data.  The background color is used only when the view is in no-columns mode. 
 
 debugUpdateModes.label = Debug Update Modes
+
+activity.name = Debug Update Modes
+category.description = Debug Services Framework
+category.name = CDT-DSF Debug Services Framework
+activity.description = Debug Services Framework
+activity.name.0 = CDT-DSF Debug Services Framework
\ No newline at end of file
diff --git a/dsf/org.eclipse.cdt.dsf.ui/plugin.xml b/dsf/org.eclipse.cdt.dsf.ui/plugin.xml
index c97180f093a..6183613adab 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/plugin.xml
+++ b/dsf/org.eclipse.cdt.dsf.ui/plugin.xml
@@ -675,7 +675,7 @@
          point="org.eclipse.ui.activities">
       <activity
             id="org.eclipse.cdt.dsf.ui.activity.updateModes"
-            name="Debug Update Modes">
+            name="%activity.name">
          <enabledWhen>
 	        <reference definitionId="org.eclipse.cdt.dsf.debug.ui.testIsUpdateModesActionSetActive"/>
          </enabledWhen>
@@ -690,8 +690,8 @@
          point="org.eclipse.ui.activities">
  
       <category
-            name="CDT-DSF Debug Services Framework"
-            description="Debug Services Framework"
+            name="%category.name"
+            description="%category.description"
             id="org.eclipse.cdt.dsf.ui.dsfCategory">
       </category>
   
@@ -701,8 +701,8 @@
       </categoryActivityBinding>
   
       <activity
-            name="CDT-DSF Debug Services Framework"
-            description="Debug Services Framework"
+            name="%activity.name.0"
+            description="%activity.description"
             id="org.eclipse.cdt.dsf.ui.dsfActivity">
        </activity>