Index: /trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java	(revision 15395)
+++ /trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java	(revision 15396)
@@ -138,5 +138,5 @@
     }
 
-    /** Translated name of this system of measurement. */
+    /** Translatable name of this system of measurement. */
     private final String name;
     /** First value, in meters, used to translate unit according to above formula. */
@@ -167,5 +167,5 @@
      * x_a == x_m / aValue
      *
-     * @param name Translated name of this system of measurement
+     * @param name Translatable name of this system of measurement
      * @param aValue First value, in meters, used to translate unit according to above formula.
      * @param aName First unit used to format text.
@@ -186,5 +186,5 @@
      * x_a == x_m / aValue
      *
-     * @param name Translated name of this system of measurement
+     * @param name Translatable name of this system of measurement
      * @param aValue First value, in meters, used to translate unit according to above formula.
      * @param aName First unit used to format text.
@@ -273,6 +273,6 @@
 
     /**
-     * Returns the translated name of this system of measurement.
-     * @return the translated name of this system of measurement
+     * Returns the translatable name of this system of measurement.
+     * @return the translatable name of this system of measurement
      * @since 15395
      */
Index: /trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java	(revision 15395)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java	(revision 15396)
@@ -11,8 +11,10 @@
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.TimeZone;
 
 import javax.swing.JScrollPane;
 
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
@@ -42,4 +44,13 @@
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().main().projection().i18n();
+
+    /**
+     * Setup test
+     */
+    @BeforeClass
+    public static void beforeClass() {
+        // Make sure we don't rely on a specific country, for distance units
+        Locale.setDefault(Locale.ENGLISH);
+    }
 
     private static String getHtml(GpxLayer layer) {