Index: applications/editors/josm/plugins/dataimport/build.xml
===================================================================
--- applications/editors/josm/plugins/dataimport/build.xml	(revision 34474)
+++ applications/editors/josm/plugins/dataimport/build.xml	(revision 34475)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Changed constructor signature, updated build.xml"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="12672"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <!-- Configure these properties (replace "..." accordingly).
@@ -16,5 +16,5 @@
     <!--<property name="plugin.link" value="..."/>-->
     <!--<property name="plugin.early" value="..."/>-->
-    <!--<property name="plugin.requires" value="..."/>-->
+    <property name="plugin.requires" value="jaxb"/>
     <!--<property name="plugin.stage" value="..."/>-->
 
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/DataImportPlugin.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/DataImportPlugin.java	(revision 34474)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/DataImportPlugin.java	(revision 34475)
@@ -18,4 +18,5 @@
      * Add new File import filter into open dialog
      * @param info plugin information
+     * @throws IOException in case of I/O error
      */
     public DataImportPlugin(PluginInformation info) throws IOException {
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java	(revision 34474)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java	(revision 34475)
@@ -10,4 +10,5 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -16,5 +17,4 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -27,4 +27,5 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -55,5 +56,5 @@
         try (
             InputStream source = new FileInputStream(file);
-            BufferedReader rd = new BufferedReader(new InputStreamReader(source));
+            BufferedReader rd = new BufferedReader(new InputStreamReader(source, StandardCharsets.UTF_8));
          ) {
             String line;
@@ -83,5 +84,5 @@
                 GpxLayer gpxLayer = new GpxLayer(data, file.getName());
                 MainApplication.getLayerManager().addLayer(gpxLayer);
-                if (Main.pref.getBoolean("marker.makeautomarkers", true)) {
+                if (Config.getPref().getBoolean("marker.makeautomarkers", true)) {
                     MarkerLayer ml = new MarkerLayer(data, tr("Markers from {0}", file.getName()), file, gpxLayer);
                     if (ml.data.size() > 0) {
@@ -107,7 +108,7 @@
         String msg = tr("Coordinates imported: ") + success + " " + tr("Format errors: ") + failure + "\n";
         if (success > 0) {
-            JOptionPane.showMessageDialog(Main.parent, msg, tr("TangoGPS import success"), JOptionPane.INFORMATION_MESSAGE);
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), msg, tr("TangoGPS import success"), JOptionPane.INFORMATION_MESSAGE);
         } else {
-            JOptionPane.showMessageDialog(Main.parent, msg, tr("TangoGPS import failure!"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), msg, tr("TangoGPS import failure!"), JOptionPane.ERROR_MESSAGE);
         }
     }
Index: applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java
===================================================================
--- applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java	(revision 34474)
+++ applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java	(revision 34475)
@@ -16,5 +16,4 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -34,4 +33,5 @@
 import org.openstreetmap.josm.plugins.dataimport.io.tcx.TrackpointT;
 import org.openstreetmap.josm.plugins.dataimport.io.tcx.TrainingCenterDatabaseT;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 
@@ -76,5 +76,5 @@
         GpxLayer gpxLayer = new GpxLayer(gpxData, tcxFile.getName());
         MainApplication.getLayerManager().addLayer(gpxLayer);
-        if (Main.pref.getBoolean("marker.makeautomarkers", true)) {
+        if (Config.getPref().getBoolean("marker.makeautomarkers", true)) {
             MarkerLayer ml = new MarkerLayer(gpxData, tr("Markers from {0}", tcxFile.getName()), tcxFile, gpxLayer);
             if (ml.data.size() > 0) {