Target Explorer: fix warnings for non externalized strings in plugin.xml

14 files changed, 268 insertions, 234 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/plugin.properties b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/plugin.properties
index 9a1de003c..024ea9c1c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/plugin.properties
@@ -10,3 +10,7 @@
 
 pluginName = Target Explorer, Model Runtime plug-in
 providerName = Eclipse.org - TCF
+
+# ***** Extension Points *****
+
+ExtensionPoint.factoryDelegates.name=Model Node Factory Delegates
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/plugin.xml
index 767fb75c4..afa9b6ab3 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.model/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-   <extension-point id="factoryDelegates" name="Model Node Factory Delegates" schema="schema/factoryDelegates.exsd"/>
+   <extension-point id="factoryDelegates" name="%ExtensionPoint.factoryDelegates.name" schema="schema/factoryDelegates.exsd"/>
 
 <!-- Model node factory delegate contributions -->
    <extension point="org.eclipse.tcf.te.runtime.model.factoryDelegates">
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime/plugin.properties b/target_explorer/plugins/org.eclipse.tcf.te.runtime/plugin.properties
index e02d35dc2..892aae6a7 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime/plugin.properties
@@ -10,3 +10,7 @@
 
 pluginName = Target Explorer, Runtime plug-in
 providerName = Eclipse.org - TCF
+
+# ***** Extension Points *****
+
+ExtensionPoint.eventListeners.name=Event Listener Contributions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.runtime/plugin.xml
index a438a00c9..3645bb2e7 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime/plugin.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-

-<!-- Extension points -->

-   <extension-point id="eventListeners" name="Event Listener Contributions" schema="schema/eventListeners.exsd"/>

-

-<!-- Eclipse core expressions property tester -->

-   <extension point="org.eclipse.core.expressions.propertyTesters">

-      <propertyTester

-            class="org.eclipse.tcf.te.runtime.internal.PreferencesPropertyTester"

-            id="org.eclipse.tcf.te.runtime.PreferencesPropertyTester"

-            namespace="org.eclipse.tcf.te.runtime"

-            properties="preference"

-            type="java.lang.Object">

-      </propertyTester>

-

-      <propertyTester

-            class="org.eclipse.tcf.te.runtime.internal.PropertiesContainerPropertyTester"

-            id="org.eclipse.tcf.te.runtime.PropertiesContainerPropertyTester"

-            namespace="org.eclipse.tcf.te.runtime"

-            properties="isProperty"

-            type="org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer">

-      </propertyTester>

-   </extension>

-

-<!-- Event listener contributions -->

-   <extension point="org.eclipse.tcf.te.runtime.eventListeners">

-      <eventListener class="org.eclipse.tcf.te.runtime.internal.DebugEventListener"/>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+<!-- Extension points -->
+   <extension-point id="eventListeners" name="%ExtensionPoint.eventListeners.name" schema="schema/eventListeners.exsd"/>
+
+<!-- Eclipse core expressions property tester -->
+   <extension point="org.eclipse.core.expressions.propertyTesters">
+      <propertyTester
+            class="org.eclipse.tcf.te.runtime.internal.PreferencesPropertyTester"
+            id="org.eclipse.tcf.te.runtime.PreferencesPropertyTester"
+            namespace="org.eclipse.tcf.te.runtime"
+            properties="preference"
+            type="java.lang.Object">
+      </propertyTester>
+
+      <propertyTester
+            class="org.eclipse.tcf.te.runtime.internal.PropertiesContainerPropertyTester"
+            id="org.eclipse.tcf.te.runtime.PropertiesContainerPropertyTester"
+            namespace="org.eclipse.tcf.te.runtime"
+            properties="isProperty"
+            type="org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer">
+      </propertyTester>
+   </extension>
+
+<!-- Event listener contributions -->
+   <extension point="org.eclipse.tcf.te.runtime.eventListeners">
+      <eventListener class="org.eclipse.tcf.te.runtime.internal.DebugEventListener"/>
+   </extension>
+
+</plugin>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.properties
index b92b030dd..76ab3f103 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.properties
@@ -80,12 +80,6 @@ command.label.paste = Paste
 command.label.delete = Delete
 command.label.rename = Rename
 command.label.move = Move
-command.label.cut.1 = Cut
-command.label.copy.1 = Copy
-command.label.paste.1 = Paste
-command.label.delete.1 = Delete
-command.label.rename.1 = Rename
-command.label.move.1 = Move
 
 command.newfile.label = &File
 command.newfolder.label = &Folder
@@ -115,4 +109,11 @@ propertyTab.permission.label = Permissions
 command.refresh.tooltip = Refresh the selected nodes
 command.filter.label = Filter
 command.reset.label = Reset
-command.search.label = Find...
\ No newline at end of file
+command.search.label = Find...
+
+command.cut.mnemonic = t
+command.copy.mnemonic = C
+command.paste.mnemonic = P
+command.delete.mnemonic = D
+command.rename.mnemonic = R
+command.move.mnemonic = M
\ No newline at end of file
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.xml
index e6d215b2d..bde069ffd 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem.ui/plugin.xml
@@ -231,7 +231,7 @@
                icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/cut_edit.gif"
                id="cut"
                label="%command.label.cut"
-               mnemonic="t"
+               mnemonic="%command.cut.mnemonic"
                style="push">
             <visibleWhen
                   checkEnabled="false">
@@ -254,7 +254,7 @@
                icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/copy_edit.gif"
                id="copy"
                label="%command.label.copy"
-               mnemonic="C"
+               mnemonic="%command.copy.mnemonic"
                style="push">
             <visibleWhen
                   checkEnabled="false">
@@ -277,7 +277,7 @@
                icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/paste_edit.gif"
                id="paste"
                label="%command.label.paste"
-               mnemonic="P"
+               mnemonic="%command.paste.mnemonic"
                style="push">
             <visibleWhen
                   checkEnabled="false">
@@ -304,7 +304,7 @@
                icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/delete.gif"
                id="org.eclipse.tcf.te.ui.commands.delete"
                label="%command.label.delete"
-               mnemonic="D"
+               mnemonic="%command.delete.mnemonic"
                style="push"
                tooltip="%command.delete.description">
             <visibleWhen
@@ -487,7 +487,7 @@
                helpContextId="org.eclipse.tcf.te.tcf.filesystem.command_Rename"
                id="rename"
                label="%command.label.rename"
-               mnemonic="R"
+               mnemonic="%command.rename.mnemonic"
                style="push">
             <visibleWhen
                   checkEnabled="false">
@@ -509,7 +509,7 @@
                helpContextId="org.eclipse.tcf.te.tcf.filesystem.command_Move"
                id="move"
                label="%command.label.move"
-               mnemonic="M"
+               mnemonic="%command.move.mnemonic"
                style="push">
             <visibleWhen
                   checkEnabled="false">
@@ -627,8 +627,8 @@
                helpContextId="org.eclipse.tcf.te.tcf.filesystem.command_Cut"
                icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/cut_edit.gif"
                id="cut"
-               label="%command.label.cut.1"
-               mnemonic="t"
+               label="%command.label.cut"
+               mnemonic="%command.cut.mnemonic"
                style="push">
             <visibleWhen
                   checkEnabled="false">
@@ -655,8 +655,8 @@
                helpContextId="org.eclipse.tcf.te.tcf.filesystem.command_Copy"
                icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/copy_edit.gif"
                id="copy"
-               label="%command.label.copy.1"
-               mnemonic="C"
+               label="%command.label.copy"
+               mnemonic="%command.copy.mnemonic"
                style="push">
             <visibleWhen
                   checkEnabled="false">
@@ -683,8 +683,8 @@
                helpContextId="org.eclipse.tcf.te.tcf.filesystem.command_Paste"
                icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/paste_edit.gif"
                id="paste"
-               label="%command.label.paste.1"
-               mnemonic="P"
+               label="%command.label.paste"
+               mnemonic="%command.paste.mnemonic"
                style="push">
             <visibleWhen
                   checkEnabled="false">
@@ -715,7 +715,7 @@
                icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/delete.gif"
                id="org.eclipse.tcf.te.ui.commands.delete"
                label="%command.delete.label"
-               mnemonic="D"
+               mnemonic="%command.delete.mnemonic"
                style="push"
                tooltip="%command.delete.description">
             <visibleWhen checkEnabled="false">
@@ -891,8 +891,8 @@
                commandId="org.eclipse.ui.edit.rename"
                helpContextId="org.eclipse.tcf.te.tcf.filesystem.command_Rename"
                id="rename"
-               label="%command.label.rename.1"
-               mnemonic="R"
+               label="%command.label.rename"
+               mnemonic="%command.rename.mnemonic"
                style="push">
             <visibleWhen
                   checkEnabled="false">
@@ -918,8 +918,8 @@
                commandId="org.eclipse.ui.edit.move"
                helpContextId="org.eclipse.tcf.te.tcf.filesystem.command_Move"
                id="move"
-               label="%command.label.move.1"
-               mnemonic="M"
+               label="%command.label.move"
+               mnemonic="%command.move.mnemonic"
                style="push">
             <visibleWhen
                   checkEnabled="false">
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.views/plugin.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.views/plugin.properties
index 1a5a5a4a8..23ad0e327 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.views/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.views/plugin.properties
@@ -53,3 +53,11 @@ OpenAction.tooltip=Opens a script.
 
 ClearAction.label=Clear
 ClearAction.tooltip=Clear the content and resets the opened file path.
+
+command.cut.mnemonic = t
+command.copy.mnemonic = C
+command.paste.mnemonic = P
+command.delete.mnemonic = D
+command.selectall.mnemonic = A
+command.save.mnemonic = S
+command.saveas.mnemonic = a
\ No newline at end of file
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.views/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.views/plugin.xml
index 4be06f37b..ac49f6b56 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.views/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui.views/plugin.xml
@@ -109,7 +109,7 @@
                disabledIcon="platform:/plugin/org.eclipse.ui/icons/full/dtool16/cut_edit.gif"
                icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/cut_edit.gif"
                label="%command.cut.label"
-               mnemonic="t"
+               mnemonic="%command.cut.mnemonic"
                style="push"
                tooltip="%command.cut.tooltip">
          </command>
@@ -118,7 +118,7 @@
                disabledIcon="platform:/plugin/org.eclipse.ui/icons/full/dtool16/copy_edit.gif"
                icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/copy_edit.gif"
                label="%command.copy.label"
-               mnemonic="C"
+               mnemonic="%command.copy.mnemonic"
                style="push"
                tooltip="%command.copy.tooltip">
          </command>
@@ -127,7 +127,7 @@
                disabledIcon="platform:/plugin/org.eclipse.ui/icons/full/dtool16/paste_edit.gif"
                icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/paste_edit.gif"
                label="%command.paste.label"
-               mnemonic="P"
+               mnemonic="%command.paste.mnemonic"
                style="push"
                tooltip="%command.paste.tooltip">
          </command>
@@ -137,14 +137,14 @@
                disabledIcon="platform:/plugin/org.eclipse.ui/icons/full/dtool16/delete.gif"
                icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/delete.gif"
                label="%command.delete.label"
-               mnemonic="D"
+               mnemonic="%command.delete.mnemonic"
                style="push"
                tooltip="%command.delete.tooltip">
          </command>
          <command
                commandId="org.eclipse.ui.edit.selectAll"
                label="%command.selectall.label"
-               mnemonic="A"
+               mnemonic="%command.selectall.mnemonic"
                style="push"
                tooltip="%command.selectall.tooltip">
          </command>
@@ -156,7 +156,7 @@
                disabledIcon="platform:/plugin/org.eclipse.ui/icons/full/dtool16/save_edit.gif"
                icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/save_edit.gif"
                label="%command.save.label"
-               mnemonic="S"
+               mnemonic="%command.save.mnemonic"
                style="push"
                tooltip="%command.save.tooltip">
          </command>
@@ -165,7 +165,7 @@
                disabledIcon="platform:/plugin/org.eclipse.ui/icons/full/dtool16/saveas_edit.gif"
                icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/saveas_edit.gif"
                label="%command.saveas.label"
-               mnemonic="a"
+               mnemonic="%command.saveas.mnemonic"
                style="push"
                tooltip="%command.saveas.tooltip">
          </command>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/plugin.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/plugin.properties
index 17628318a..9ea30a82b 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/plugin.properties
@@ -63,4 +63,11 @@ command.offline.label=Always Available Offline
 command.offline.tooltip=Creates an offline copy of the target attributes.
 
 command.rename.label=Rename
+command.rename.tooltip=Rename the selected target
 command.rename.description=Rename the selected target
+
+command.redirect.mnemonic = e
+command.resetredirect.mnemonic = s
+command.delete.mnemonic = D
+command.offline.mnemonic = f
+command.rename.mnemonic = R
\ No newline at end of file
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/plugin.xml
index d5b46fef7..b53e99926 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/plugin.xml
@@ -216,7 +216,7 @@
                helpContextId="org.eclipse.tcf.te.tcf.ui.command_Redirect"
                id="org.eclipse.tcf.te.tcf.ui.commands.redirect"
                label="%command.redirect.label"
-               mnemonic="e"
+               mnemonic="%command.redirect.mnemonic"
                style="push"
                tooltip="%command.redirect.tooltip">
             <visibleWhen checkEnabled="false">
@@ -237,7 +237,7 @@
                helpContextId="org.eclipse.tcf.te.tcf.ui.command_ResetRedirect"
                id="org.eclipse.tcf.te.tcf.ui.commands.resetredirect"
                label="%command.resetredirect.label"
-               mnemonic="s"
+               mnemonic="%command.resetredirect.mnemonic"
                style="push"
                tooltip="%command.resetredirect.tooltip">
             <visibleWhen checkEnabled="false">
@@ -262,7 +262,7 @@
                icon="platform:/plugin/org.eclipse.ui/icons/full/etool16/delete.gif"
                id="org.eclipse.tcf.te.ui.commands.delete"
                label="%command.delete.label"
-               mnemonic="D"
+               mnemonic="%command.delete.mnemonic"
                style="push"
                tooltip="%command.delete.description">
             <visibleWhen checkEnabled="false">
@@ -282,7 +282,7 @@
                helpContextId="org.eclipse.tcf.te.tcf.ui.command_Offline"
                id="org.eclipse.tcf.te.tcf.ui.commands.offline"
                label="%command.offline.label"
-               mnemonic="f"
+               mnemonic="%command.offline.mnemonic"
                style="push"
                tooltip="%command.offline.tooltip">
             <visibleWhen checkEnabled="true"/>
@@ -296,7 +296,7 @@
                 icon="icons/elcl16/rename.gif"
                 id="org.eclipse.tcf.te.tcf.ui.commands.rename"
                 label="%command.rename.label"
-                mnemonic="R"
+                mnemonic="%command.rename.mnemonic"
                 style="push"
                 tooltip="%command.rename.tooltip">
             <visibleWhen checkEnabled="false">
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/plugin.properties b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/plugin.properties
index 6e98e1bad..01ef59cca 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/plugin.properties
@@ -27,5 +27,11 @@ StreamsConnectorType.label=Streams Connector Type
 
 command.launch.name=Launch Terminal Command
 command.launch.label=Launch Terminal...
+command.launch.mnemonic=L
 command.launch.tooltip=Opens a terminal on the selected target.
 command.launchWithoutSelection.tooltip=Opens a terminal
+
+# ***** Extension Points *****
+
+ExtensionPoint.connectorTypes.name=Terminal Connector Types
+ExtensionPoint.launcherDelegates.name=Terminal Launcher Delegates
\ No newline at end of file
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml
index 38c8044a0..a9d44e789 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.terminals/plugin.xml
@@ -1,160 +1,160 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.4"?>

-<plugin>

-

-<!-- Extension points -->

-   <extension-point id="connectorTypes" name="Terminal Connector Types" schema="schema/connectorTypes.exsd"/>

-   <extension-point id="launcherDelegates" name="Terminal Launcher Delegates" schema="schema/launcherDelegates.exsd"/>

-

-<!-- View contributions -->

-   <extension point="org.eclipse.ui.views">

-      <view

-            allowMultiple="true"

-            category="org.eclipse.tcf.te.ui.views.category"

-            class="org.eclipse.tcf.te.ui.terminals.view.TerminalsView"

-            icon="platform:/plugin/org.eclipse.ui.console/icons/full/eview16/console_view.gif"

-            id="org.eclipse.tcf.te.ui.terminals.TerminalsView"

-            name="%TerminalsView.name">

-      </view>

-    </extension>

-    

-<!-- Perspective extension contributions -->    

-   <extension point="org.eclipse.ui.perspectiveExtensions">

-      <perspectiveExtension targetID="*">

-         <view

-               id="org.eclipse.tcf.te.ui.terminals.TerminalsView"

-               minimized="false"

-               relationship="stack"

-               relative="org.eclipse.ui.views.TaskList"

-               visible="false">

-         </view>

-      </perspectiveExtension>

-      

-      <perspectiveExtension targetID="org.eclipse.tcf.te.ui.perspective">

-		 <!-- Register the view shortcuts  -->

-         <viewShortcut id="org.eclipse.tcf.te.ui.terminals.TerminalsView"/>

-      </perspectiveExtension>

-   </extension>

-

-<!-- Terminal connector contributions -->

-   <extension point="org.eclipse.tm.terminal.terminalConnectors">

-      <connector 

-                 name="%TerminalConnector.streams"

-                 id="org.eclipse.tcf.te.ui.terminals.StreamsConnector"

-                 hidden="true"

-                 class="org.eclipse.tcf.te.ui.terminals.streams.StreamsConnector"/>

-   </extension>

-   

-<!-- Preferences contributions -->

-   <extension point="org.eclipse.core.runtime.preferences">

-      <initializer class="org.eclipse.tcf.te.ui.terminals.internal.PreferencesInitializer"/>

-   </extension>

-

-<!-- Eclipse core expressions property tester -->

-   <extension point="org.eclipse.core.expressions.propertyTesters">

-      <propertyTester

-            class="org.eclipse.tcf.te.ui.terminals.internal.PropertyTester"

-            id="org.eclipse.tcf.te.ui.terminals.PropertyTester"

-            namespace="org.eclipse.tcf.te.ui.terminals"

-            properties="hasApplicableLauncherDelegates"

-            type="java.lang.Object">

-      </propertyTester>

-   </extension>

-

-<!-- Service contributions -->

-   <extension point="org.eclipse.tcf.te.runtime.services.services">

-      <service

-            class="org.eclipse.tcf.te.ui.terminals.services.TerminalService"

-            id="org.eclipse.tcf.te.runtime.services.terminal">

-         <serviceType class="org.eclipse.tcf.te.runtime.services.interfaces.ITerminalService"/>

-      </service>

-   </extension>

-   

-<!-- Terminal connector type contributions -->

-   <extension point="org.eclipse.tcf.te.ui.terminals.connectorTypes">

-      <connectorType

-            class="org.eclipse.tcf.te.ui.terminals.types.StreamsConnectorType"

-            id="org.eclipse.tcf.te.ui.terminals.type.streams"

-            label="%StreamsConnectorType.label">

-      </connectorType>

-   </extension>

-

-<!-- Menu contributions -->

-   <extension point="org.eclipse.ui.menus">

-      <menuContribution locationURI="popup:org.eclipse.tcf.te.ui.views.View#Popup?after=group.launch">

-         <command

-               commandId="org.eclipse.tcf.te.ui.terminals.command.launch"

-               helpContextId="org.eclipse.tcf.te.ui.terminals.command_Launch"

-               icon="platform:/plugin/org.eclipse.ui.console/icons/full/eview16/console_view.gif"

-               id="org.eclipse.tcf.te.ui.terminals.commands.launch"

-               label="%command.launch.label"

-               mnemonic="L"

-               style="push"

-               tooltip="%command.launch.tooltip">

-               <visibleWhen checkEnabled="false">

-                  <with variable="selection">

-                     <test

-                           forcePluginActivation="true"

-                           property="org.eclipse.tcf.te.ui.terminals.hasApplicableLauncherDelegates"

-                           value="true"/>

-                  </with>

-               </visibleWhen>

-         </command>

-      </menuContribution>      

-      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">

-         <toolbar

-               id="org.eclipse.tcf.te.ui.terminals.toolbar">

-	         <command

-	               commandId="org.eclipse.tcf.te.ui.terminals.command.launchToolbar"

-	               helpContextId="org.eclipse.tcf.te.ui.terminals.command_Launch"

-	               icon="platform:/plugin/org.eclipse.ui.console/icons/full/eview16/console_view.gif"

-	               id="org.eclipse.tcf.te.ui.terminals.commands.launchToolbar"

-	               label="%command.launch.label"

-	               style="push"

-	               tooltip="%command.launch.tooltip">

-	         </command>

-         </toolbar>

-      </menuContribution>

-      <menuContribution locationURI="toolbar:org.eclipse.tcf.te.ui.terminals.TerminalsView">

-         <command

-               commandId="org.eclipse.tcf.te.ui.terminals.command.launchToolbar"

-               helpContextId="org.eclipse.tcf.te.ui.terminals.command_Launch"

-               icon="platform:/plugin/org.eclipse.ui.console/icons/full/eview16/console_view.gif"

-               id="org.eclipse.tcf.te.ui.terminals.commands.launchToolbarTerminalsView"

-               label="%command.launch.label"

-               style="push"

-               tooltip="%command.launchWithoutSelection.tooltip">

-         </command>

-      </menuContribution>

-      

-   </extension>

-

-<!-- Command contributions -->

-   <extension point="org.eclipse.ui.commands">

-      <command

-            categoryId="org.eclipse.tcf.te.ui.commands.category"

-            helpContextId="org.eclipse.tcf.te.ui.terminals.command_Launch"

-            id="org.eclipse.tcf.te.ui.terminals.command.launch"

-            name="%command.launch.name">

-      </command>

-      <command

-            categoryId="org.eclipse.tcf.te.ui.commands.category"

-            helpContextId="org.eclipse.tcf.te.ui.terminals.command_Launch"

-            id="org.eclipse.tcf.te.ui.terminals.command.launchToolbar"

-            name="%command.launch.name">

-      </command>

-   </extension>

-

-<!-- Handler contributions -->

-   <extension point="org.eclipse.ui.handlers">

-      <handler

-            class="org.eclipse.tcf.te.ui.terminals.internal.handler.LaunchTerminalCommandHandler"

-            commandId="org.eclipse.tcf.te.ui.terminals.command.launch">

-      </handler>

-      <handler

-            class="org.eclipse.tcf.te.ui.terminals.internal.handler.LaunchTerminalCommandHandler"

-            commandId="org.eclipse.tcf.te.ui.terminals.command.launchToolbar">

-      </handler>

-   </extension>

-

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+<!-- Extension points -->
+   <extension-point id="connectorTypes" name="%ExtensionPoint.connectorTypes.name" schema="schema/connectorTypes.exsd"/>
+   <extension-point id="launcherDelegates" name="%ExtensionPoint.launcherDelegates.name" schema="schema/launcherDelegates.exsd"/>
+
+<!-- View contributions -->
+   <extension point="org.eclipse.ui.views">
+      <view
+            allowMultiple="true"
+            category="org.eclipse.tcf.te.ui.views.category"
+            class="org.eclipse.tcf.te.ui.terminals.view.TerminalsView"
+            icon="platform:/plugin/org.eclipse.ui.console/icons/full/eview16/console_view.gif"
+            id="org.eclipse.tcf.te.ui.terminals.TerminalsView"
+            name="%TerminalsView.name">
+      </view>
+    </extension>
+    
+<!-- Perspective extension contributions -->    
+   <extension point="org.eclipse.ui.perspectiveExtensions">
+      <perspectiveExtension targetID="*">
+         <view
+               id="org.eclipse.tcf.te.ui.terminals.TerminalsView"
+               minimized="false"
+               relationship="stack"
+               relative="org.eclipse.ui.views.TaskList"
+               visible="false">
+         </view>
+      </perspectiveExtension>
+      
+      <perspectiveExtension targetID="org.eclipse.tcf.te.ui.perspective">
+		 <!-- Register the view shortcuts  -->
+         <viewShortcut id="org.eclipse.tcf.te.ui.terminals.TerminalsView"/>
+      </perspectiveExtension>
+   </extension>
+
+<!-- Terminal connector contributions -->
+   <extension point="org.eclipse.tm.terminal.terminalConnectors">
+      <connector 
+                 name="%TerminalConnector.streams"
+                 id="org.eclipse.tcf.te.ui.terminals.StreamsConnector"
+                 hidden="true"
+                 class="org.eclipse.tcf.te.ui.terminals.streams.StreamsConnector"/>
+   </extension>
+   
+<!-- Preferences contributions -->
+   <extension point="org.eclipse.core.runtime.preferences">
+      <initializer class="org.eclipse.tcf.te.ui.terminals.internal.PreferencesInitializer"/>
+   </extension>
+
+<!-- Eclipse core expressions property tester -->
+   <extension point="org.eclipse.core.expressions.propertyTesters">
+      <propertyTester
+            class="org.eclipse.tcf.te.ui.terminals.internal.PropertyTester"
+            id="org.eclipse.tcf.te.ui.terminals.PropertyTester"
+            namespace="org.eclipse.tcf.te.ui.terminals"
+            properties="hasApplicableLauncherDelegates"
+            type="java.lang.Object">
+      </propertyTester>
+   </extension>
+
+<!-- Service contributions -->
+   <extension point="org.eclipse.tcf.te.runtime.services.services">
+      <service
+            class="org.eclipse.tcf.te.ui.terminals.services.TerminalService"
+            id="org.eclipse.tcf.te.runtime.services.terminal">
+         <serviceType class="org.eclipse.tcf.te.runtime.services.interfaces.ITerminalService"/>
+      </service>
+   </extension>
+   
+<!-- Terminal connector type contributions -->
+   <extension point="org.eclipse.tcf.te.ui.terminals.connectorTypes">
+      <connectorType
+            class="org.eclipse.tcf.te.ui.terminals.types.StreamsConnectorType"
+            id="org.eclipse.tcf.te.ui.terminals.type.streams"
+            label="%StreamsConnectorType.label">
+      </connectorType>
+   </extension>
+
+<!-- Menu contributions -->
+   <extension point="org.eclipse.ui.menus">
+      <menuContribution locationURI="popup:org.eclipse.tcf.te.ui.views.View#Popup?after=group.launch">
+         <command
+               commandId="org.eclipse.tcf.te.ui.terminals.command.launch"
+               helpContextId="org.eclipse.tcf.te.ui.terminals.command_Launch"
+               icon="platform:/plugin/org.eclipse.ui.console/icons/full/eview16/console_view.gif"
+               id="org.eclipse.tcf.te.ui.terminals.commands.launch"
+               label="%command.launch.label"
+               mnemonic="%command.launch.mnemonic"
+               style="push"
+               tooltip="%command.launch.tooltip">
+               <visibleWhen checkEnabled="false">
+                  <with variable="selection">
+                     <test
+                           forcePluginActivation="true"
+                           property="org.eclipse.tcf.te.ui.terminals.hasApplicableLauncherDelegates"
+                           value="true"/>
+                  </with>
+               </visibleWhen>
+         </command>
+      </menuContribution>      
+      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
+         <toolbar
+               id="org.eclipse.tcf.te.ui.terminals.toolbar">
+	         <command
+	               commandId="org.eclipse.tcf.te.ui.terminals.command.launchToolbar"
+	               helpContextId="org.eclipse.tcf.te.ui.terminals.command_Launch"
+	               icon="platform:/plugin/org.eclipse.ui.console/icons/full/eview16/console_view.gif"
+	               id="org.eclipse.tcf.te.ui.terminals.commands.launchToolbar"
+	               label="%command.launch.label"
+	               style="push"
+	               tooltip="%command.launch.tooltip">
+	         </command>
+         </toolbar>
+      </menuContribution>
+      <menuContribution locationURI="toolbar:org.eclipse.tcf.te.ui.terminals.TerminalsView">
+         <command
+               commandId="org.eclipse.tcf.te.ui.terminals.command.launchToolbar"
+               helpContextId="org.eclipse.tcf.te.ui.terminals.command_Launch"
+               icon="platform:/plugin/org.eclipse.ui.console/icons/full/eview16/console_view.gif"
+               id="org.eclipse.tcf.te.ui.terminals.commands.launchToolbarTerminalsView"
+               label="%command.launch.label"
+               style="push"
+               tooltip="%command.launchWithoutSelection.tooltip">
+         </command>
+      </menuContribution>
+      
+   </extension>
+
+<!-- Command contributions -->
+   <extension point="org.eclipse.ui.commands">
+      <command
+            categoryId="org.eclipse.tcf.te.ui.commands.category"
+            helpContextId="org.eclipse.tcf.te.ui.terminals.command_Launch"
+            id="org.eclipse.tcf.te.ui.terminals.command.launch"
+            name="%command.launch.name">
+      </command>
+      <command
+            categoryId="org.eclipse.tcf.te.ui.commands.category"
+            helpContextId="org.eclipse.tcf.te.ui.terminals.command_Launch"
+            id="org.eclipse.tcf.te.ui.terminals.command.launchToolbar"
+            name="%command.launch.name">
+      </command>
+   </extension>
+
+<!-- Handler contributions -->
+   <extension point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.tcf.te.ui.terminals.internal.handler.LaunchTerminalCommandHandler"
+            commandId="org.eclipse.tcf.te.ui.terminals.command.launch">
+      </handler>
+      <handler
+            class="org.eclipse.tcf.te.ui.terminals.internal.handler.LaunchTerminalCommandHandler"
+            commandId="org.eclipse.tcf.te.ui.terminals.command.launchToolbar">
+      </handler>
+   </extension>
+
+</plugin>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.properties b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.properties
index 37efc24bf..86c40d8ab 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.properties
@@ -16,7 +16,7 @@ providerName = Eclipse.org - TCF
 ExtensionPoint.editorPages.name=Properties Editor Pages Extension Point
 ExtensionPoint.editorPageBindings.name=Properties Editor Page Bindings Extension Point
 ExtensionPoint.categories.name=Categories Extension Point
-
+ExtensionPoint.labelProviderDelegates.name=Label Provider Delegates Extension Point
 # ***** Perspective *****
 
 Perspective.name=Target Explorer
@@ -44,6 +44,7 @@ category.neighborhood.name=Neighborhood
 command.open.name=Open
 
 command.properties.label=Properties
+command.properties.mnemonic=r
 command.properties.tooltip=Show Properties of Selection
 
 menu.showIn.label = Show In
@@ -65,11 +66,14 @@ menu.categories.removefrom.label=Remove From
 command.showin.name = Show In Group
 
 menu.find.label = Find...
+menu.find.mnemonic = f
 
 command.find.name = Find...
 
 menu.filter.label = Filter...
+menu.filter.mnemonic = t
 menu.reset.label = Reset
+menu.reset.mnemonic = r
 
 command.find.description = Find elements in a tree viewer
 command.filter.description = Filter elements in a tree viewer
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml
index 4efa97212..e23e8317e 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/plugin.xml
@@ -235,7 +235,7 @@
                helpContextId="org.eclipse.tcf.te.ui.views.command_Properties"
                id="properties"
                label="%command.properties.label"
-               mnemonic="r"
+               mnemonic="%command.properties.mnemonic"
                tooltip="%command.properties.tooltip">
                <visibleWhen>
                   <with variable="selection">
@@ -331,13 +331,13 @@
          <command
                commandId="org.eclipse.tcf.te.ui.views.command.quickfilter"
                label="%menu.filter.label"
-               mnemonic="t"
+               mnemonic="%menu.filter.mnemonic"
                style="push">
          </command>
          <command
                commandId="org.eclipse.tcf.te.ui.views.command.resetfilter"
                label="%menu.reset.label"
-               mnemonic="r"
+               mnemonic="%menu.reset.mnemonic"
                style="push">
          </command>
       </menuContribution>
@@ -346,7 +346,7 @@
          <command
                commandId="org.eclipse.tcf.te.ui.views.command.find"
                label="%menu.find.label"
-               mnemonic="f"
+               mnemonic="%menu.find.mnemonic"
                style="push">
          </command>
       </menuContribution>