Index: applications/editors/josm/plugins/tcxplugin/build.xml
===================================================================
--- applications/editors/josm/plugins/tcxplugin/build.xml	(revision 11976)
+++ applications/editors/josm/plugins/tcxplugin/build.xml	(revision 12588)
@@ -20,6 +20,4 @@
   <property name="livegpsplugin.jar" value="../../dist/livegps.jar"/>
   
-  <!-- plugin meta data (enter new version number if anything changed!) -->
-  <property name="plugin.version" value="1.1"/>
   <property name="plugin.description" value="Adds support for TCX files."/>
   <property name="plugin.stage" value="100"/>
@@ -51,4 +49,12 @@
   	
     
+    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+      <env key="LANG" value="C"/>
+      <arg value="info"/>
+      <arg value="--xml"/>
+      <arg value="."/>
+    </exec>
+    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+    <delete file="REVISION"/>
     <!-- create jar file -->
     <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
@@ -56,6 +62,8 @@
         <attribute name="Plugin-Class" value="${plugin.class}" />
         <attribute name="Plugin-Description" value="${plugin.description}" />
-        <attribute name="Plugin-Version" value="${plugin.version}" />
         <attribute name="Plugin-Stage" value="${plugin.stage}" />
+        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
+        <attribute name="Plugin-Mainversion" value="1180" />
 <!--        <attribute name="Class-Path" value="lib/jaxb-api.jar;lib/jaxb-impl.jar" />-->
       </manifest>
Index: applications/editors/josm/plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java
===================================================================
--- applications/editors/josm/plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java	(revision 11976)
+++ applications/editors/josm/plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java	(revision 12588)
@@ -19,4 +19,5 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.actions.DiskAccessAction;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -25,4 +26,5 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.io.TcxReader;
+import org.openstreetmap.josm.tools.Shortcut;
 /**
  * @author adrian
@@ -35,5 +37,7 @@
         public OpenAction()
         {
-            super("Import TCX File...", "tcxicon", "", KeyEvent.VK_T, KeyEvent.CTRL_MASK);
+            super(tr("Import TCX File..."), "tcxicon", tr("Import TCX file as GPS track"),
+            Shortcut.registerShortcut("menu:importtcx", tr("Menu: {0}", tr("Import TCX File...")),
+            KeyEvent.VK_T, Shortcut.GROUP_MENU));
         }
         
@@ -98,11 +102,5 @@
     public TcxPlugin()
     {
-        JMenu menu = Main.main.menu.getMenu(0);
-
-        JosmAction openAction = new OpenAction();
-        JMenuItem actionItem = new JMenuItem(openAction);
-        menu.insert(actionItem, 2);
-        actionItem.setAccelerator(openAction.shortcut);
-        
+        MainMenu.add(Main.main.menu.fileMenu, new OpenAction());
     }
 }