diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.properties b/debug/org.eclipse.cdt.debug.ui/plugin.properties
index 62fc2880b05..575c8f5aaf6 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.properties
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.properties
@@ -88,10 +88,12 @@ DisableVariablesAction.tooltip=Disable Selected Variables
 DefaultSourceLocator.name=Default C/C++ Source Locator
 OldDefaultSourceLocator.name=Default C/C++ Source Locator (old)
 
-DisassemblyFontDefinition.label=Disassembly View Text Font
 DisassemblyView.name=Disassembly
 DisassemblyCurrentInstructionPointer=Disassembly Current Instruction Pointer
 DisassemblySecondaryInstructionPointer=Disassembly Secondary Instruction Pointer
 
 DebugPresentation.label=C/C++ Debug Appearance
-DisassemblySourceLineColor=Disassembly Source Line text color
+DisassemblySourceLineColor.label=Disassembly Source Line text color
+DisassemblySourceLineColor.description=The color used in the Disassembly view for source lines.
+DisassemblyFontDefinition.label=Disassembly View text font
+DisassemblyFontDefinition.description=The font used in the Disassembly view.
diff --git a/debug/org.eclipse.cdt.debug.ui/plugin.xml b/debug/org.eclipse.cdt.debug.ui/plugin.xml
index fe4c3a2ae09..3ec9f4e2d5c 100644
--- a/debug/org.eclipse.cdt.debug.ui/plugin.xml
+++ b/debug/org.eclipse.cdt.debug.ui/plugin.xml
@@ -76,8 +76,8 @@
          <view
                relative="org.eclipse.debug.ui.VariableView"
                visible="false"
-               id="org.eclipse.cdt.debug.ui.MemoryView"
-               relationship="stack">
+               relationship="stack"
+               id="org.eclipse.cdt.debug.ui.MemoryView">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.debug.ui.MemoryView">
@@ -85,8 +85,8 @@
          <view
                relative="org.eclipse.debug.ui.VariableView"
                visible="false"
-               id="org.eclipse.cdt.debug.ui.SharedLibrariesView"
-               relationship="stack">
+               relationship="stack"
+               id="org.eclipse.cdt.debug.ui.SharedLibrariesView">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.debug.ui.SharedLibrariesView">
@@ -94,8 +94,8 @@
          <view
                relative="org.eclipse.debug.ui.VariableView"
                visible="false"
-               id="org.eclipse.cdt.debug.ui.SignalsView"
-               relationship="stack">
+               relationship="stack"
+               id="org.eclipse.cdt.debug.ui.SignalsView">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.debug.ui.SignalsView">
@@ -106,8 +106,8 @@
          <view
                relative="org.eclipse.ui.views.ContentOutline"
                visible="false"
-               id="org.eclipse.cdt.debug.ui.DisassemblyView"
-               relationship="stack">
+               relationship="stack"
+               id="org.eclipse.cdt.debug.ui.DisassemblyView">
          </view>
          <viewShortcut
                id="org.eclipse.cdt.debug.ui.DisassemblyView">
@@ -279,8 +279,8 @@
          </action>
          <action
                label="%SwitchToDisassemblyAction.label"
-               icon="icons/full/clcl16/disassembly.gif"
                style="toggle"
+               icon="icons/full/clcl16/disassembly.gif"
                helpContextId="switch_to_disassembly_action_context"
                class="org.eclipse.cdt.debug.internal.ui.actions.SwitchToDisassemblyActionDelegate"
                menubarPath="renderGroup"
@@ -675,8 +675,8 @@
                label="%LoadSymbolsAction.label"
                icon="icons/full/clcl16/load_symbols_co.gif"
                helpContextId="load_symbols_action_context"
-               tooltip="%LoadSymbolsAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.LoadSymbolsActionDelegate"
+               tooltip="%LoadSymbolsAction.tooltip"
                menubarPath="sharedLibrariesGroup"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.LoadSymbolsActionDelegate">
@@ -695,8 +695,8 @@
                label="%SignalAction.label"
                icon="icons/full/clcl16/signal_co.gif"
                helpContextId="signal_action_context"
-               tooltip="%SignalAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.SignalActionDelegate"
+               tooltip="%SignalAction.tooltip"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.SignalActionDelegate">
@@ -711,8 +711,8 @@
                label="%SignalPropertiesAction.label"
                style="pulldown"
                helpContextId="signal_properties_action_context"
-               tooltip="%SignalPropertiesAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.SignalPropertiesActionDelegate"
+               tooltip="%SignalPropertiesAction.tooltip"
                enablesFor="1"
                id="org.eclipse.cdt.debug.ui.SignalPropertiesAction">
             <enablement>
@@ -748,8 +748,8 @@
          <action
                label="%RestoreDefaultTypeAction.label"
                helpContextId="restore_default_type_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.RestoreDefaultTypeActionDelegate"
                tooltip="%RestoreDefaultTypeAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.RestoreDefaultTypeActionDelegate"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.RestoreDefaultTypeActionDelegate">
@@ -764,8 +764,8 @@
                label="%CastToTypeAction.label"
                icon="icons/full/clcl16/casttotype_co.gif"
                helpContextId="cast_to_type_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.CastToTypeActionDelegate"
                tooltip="%CastToTypeAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.CastToTypeActionDelegate"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.CastToTypeActionDelegate">
@@ -780,8 +780,8 @@
                label="%CastToArrayAction.label"
                icon="icons/full/clcl16/showasarray_co.gif"
                helpContextId="cast_to_array_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.CastToArrayActionDelegate"
                tooltip="%CastToArrayAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.CastToArrayActionDelegate"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.CastToArrayActionDelegate">
@@ -800,8 +800,8 @@
                label="%ManageFunctionBreakpointAction.label"
                icon="icons/full/obj16/funbrkp_obj.gif"
                helpContextId="manage_function_breakpoint_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.ManageFunctionBreakpointActionDelegate"
                tooltip="%ManageFunctionBreakpointAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.ManageFunctionBreakpointActionDelegate"
                menubarPath="additions"
                enablesFor="1"
                id="org.eclipse.cdt.debug.internal.ui.actions.ManageFunctionBreakpointActionDelegate">
@@ -820,8 +820,8 @@
                label="%DisableVariablesAction.label"
                icon="icons/full/clcl16/disabled_co.gif"
                helpContextId="disable_variables_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.DisableVariablesActionDelegate"
                tooltip="%DisableVariablesAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.DisableVariablesActionDelegate"
                menubarPath="variableGroup"
                enablesFor="2+"
                id="org.eclipse.cdt.debug.internal.ui.actions.DisableVariablesActionDelegate">
@@ -833,8 +833,8 @@
                label="%EnableVariablesAction.label"
                icon="icons/full/clcl16/enabled_co.gif"
                helpContextId="enable_variables_action_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.EnableVariablesActionDelegate"
                tooltip="%EnableVariablesAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.EnableVariablesActionDelegate"
                menubarPath="variableGroup"
                enablesFor="2+"
                id="org.eclipse.cdt.debug.internal.ui.actions.EnableVariablesActionDelegate">
@@ -857,8 +857,8 @@
                disabledIcon="icons/full/dlcl16/restart.gif"
                enablesFor="1"
                icon="icons/full/elcl16/restart.gif"
-               label="%RestartAction.label"
                helpContextId="restart_action_context"
+               label="%RestartAction.label"
                tooltip="%RestartAction.tooltip">
             <enablement>
                <pluginState
@@ -876,8 +876,8 @@
                disabledIcon="icons/full/dlcl16/disassembly.gif"
                enablesFor="1"
                icon="icons/full/elcl16/disassembly.gif"
-               label="%SwitchToDisassemblyAction.label"
                helpContextId="switch_to_disassembly_action_context"
+               label="%SwitchToDisassemblyAction.label"
                tooltip="%SwitchToDisassemblyAction.tooltip">
             <enablement>
                <pluginState
@@ -892,11 +892,11 @@
             id="org.eclipse.cdt.debug.ui.debugView.menu">
          <action
                label="%ShowFullPathsAction.label"
-               style="toggle"
                icon="icons/full/clcl16/show_paths.gif"
+               style="toggle"
                helpContextId="show_full_paths_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                tooltip="%ShowFullPathsAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                menubarPath="cDebugActions"
                id="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction">
             <enablement>
@@ -916,11 +916,11 @@
             id="org.eclipse.cdt.debug.ui.breakpointView.menu">
          <action
                label="%ShowFullPathsAction.label"
-               style="toggle"
                icon="icons/full/clcl16/show_paths.gif"
+               style="toggle"
                helpContextId="show_full_paths_context"
-               class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                tooltip="%ShowFullPathsAction.tooltip"
+               class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
                menubarPath="cDebugActions"
                id="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction">
             <enablement>
@@ -942,8 +942,8 @@
                disabledIcon="icons/full/dlcl16/watch_globals.gif"
                enablesFor="1"
                icon="icons/full/elcl16/watch_globals.gif"
-               label="%AddGlobalsAction.label"
                helpContextId="add_globals_action_context"
+               label="%AddGlobalsAction.label"
                tooltip="%AddGlobalsAction.tooltip">
             <enablement>
                <pluginState
@@ -958,11 +958,11 @@
             id="org.eclipse.debug.ui.sharedLibrariesView.menu">
          <action
                label="%ShowFullPathsAction.label"
-               icon="icons/full/clcl16/show_paths.gif"
                style="toggle"
+               icon="icons/full/clcl16/show_paths.gif"
                helpContextId="show_full_paths_context"
-               tooltip="%ShowFullPathsAction.tooltip"
                class="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction"
+               tooltip="%ShowFullPathsAction.tooltip"
                menubarPath="cDebugActions"
                id="org.eclipse.cdt.debug.internal.ui.actions.ShowFullPathsAction">
             <enablement>
@@ -1053,20 +1053,20 @@
    <extension
          point="org.eclipse.debug.core.statusHandlers">
       <statusHandler
-            code="10000"
             plugin="org.eclipse.cdt.debug.core"
+            code="10000"
             class="org.eclipse.cdt.debug.internal.ui.QuestionStatusHandler"
             id="org.eclipse.cdt.debug.internal.ui.QuestionStatusHandler">
       </statusHandler>
       <statusHandler
-            code="10001"
             plugin="org.eclipse.cdt.debug.core"
+            code="10001"
             class="org.eclipse.cdt.debug.internal.ui.InfoStatusHandler"
             id="org.eclipse.cdt.debug.internal.ui.InfoStatusHandler">
       </statusHandler>
       <statusHandler
-            code="10002"
             plugin="org.eclipse.cdt.debug.core"
+            code="10002"
             class="org.eclipse.cdt.debug.internal.ui.ErrorStatusHandler"
             id="org.eclipse.cdt.debug.internal.ui.ErrorStatusHandler">
       </statusHandler>
@@ -1123,16 +1123,16 @@
          point="org.eclipse.ui.editors">
       <editor
             name="%DisassemblyEditor.name"
-            extensions="dasm"
             icon="icons/full/obj16/disassembly_obj.gif"
+            extensions="dasm"
             class="org.eclipse.cdt.debug.internal.ui.editors.DisassemblyEditor"
             id="org.eclipse.cdt.debug.ui.DisassemblyEditor">
       </editor>
       <editor
             name="%CDebugEditor.name"
             icon="icons/full/obj16/filenotfound_obj.gif"
-            class="org.eclipse.cdt.debug.internal.ui.editors.CDebugEditor"
             contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
+            class="org.eclipse.cdt.debug.internal.ui.editors.CDebugEditor"
             id="org.eclipse.cdt.debug.ui.editor.CDebugEditor">
       </editor>
    </extension>
@@ -1154,8 +1154,8 @@
       <context
             name="Debugging C/C++"
             description="Debugging C/C++ Programs"
-            id="org.eclipse.cdt.debug.ui.debugging"
-            parentId="org.eclipse.debug.ui.debugging">
+            parentId="org.eclipse.debug.ui.debugging"
+            id="org.eclipse.cdt.debug.ui.debugging">
       </context>
    </extension>
    <extension
@@ -1187,8 +1187,8 @@
    <extension
          point="org.eclipse.ui.editors.annotationTypes">
       <type
-            super="org.eclipse.debug.core.breakpoint"
             markerType="org.eclipse.cdt.debug.core.cBreakpointMarker"
+            super="org.eclipse.debug.core.breakpoint"
             name="org.eclipse.cdt.debug.core.breakpoint">
       </type>
       <type
@@ -1217,8 +1217,8 @@
             highlightPreferenceValue="true"
             presentationLayer="6"
             icon="icons/full/obj16/inst_ptr_top.gif"
-            textPreferenceValue="false"
             label="%DisassemblyCurrentInstructionPointer"
+            textPreferenceValue="false"
             textPreferenceKey="currentDisassemblyIPIndication"
             verticalRulerPreferenceKey="currentDisassemblyIPVerticalRuler"
             overviewRulerPreferenceKey="currentDisassemblyIPOverviewRuler">
@@ -1233,8 +1233,8 @@
             highlightPreferenceValue="true"
             presentationLayer="6"
             icon="icons/full/obj16/inst_ptr.gif"
-            textPreferenceValue="false"
             label="%DisassemblySecondaryInstructionPointer"
+            textPreferenceValue="false"
             textPreferenceKey="secondaryDisassemblyIPIndication"
             verticalRulerPreferenceKey="secondaryDisassemblyIPVerticalRuler"
             overviewRulerPreferenceKey="secondaryDisassemblyIPOverviewRuler">
@@ -1280,19 +1280,18 @@
             id="org.eclipse.cdt.debug.ui.presentation">
       </themeElementCategory>
       <colorDefinition
-            label="%DisassemblySourceLineColor"
-            value="COLOR_BLUE"
+            label="%DisassemblySourceLineColor.label"
             categoryId="org.eclipse.cdt.debug.ui.presentation"
+            value="COLOR_BLUE"
             id="org.eclipse.cdt.debug.ui.disassembly.sourceLineColor">
-         <description>
-         </description>
+         <description>%DisassemblySourceLineColor.description</description>
       </colorDefinition>
       <fontDefinition
             label="%DisassemblyFontDefinition.label"
+            categoryId="org.eclipse.cdt.debug.ui.presentation"
             defaultsTo="org.eclipse.jface.textfont"
             id="org.eclipse.cdt.debug.ui.disassemblyFont">
-         <description>
-         </description>
+         <description>%DisassemblyFontDefinition.description</description>
       </fontDefinition>
    </extension>