Index: /trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/Main.java	(revision 1162)
+++ /trunk/src/org/openstreetmap/josm/Main.java	(revision 1163)
@@ -19,4 +19,5 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.SortedMap;
@@ -523,3 +524,12 @@
     }
 
+    static public String getLanguageCodeU()
+    {
+        String languageCode = Locale.getDefault().getLanguage();
+        return languageCode.substring(0,1).toUpperCase() + languageCode.substring(1) + ":";
+    }
+    static public String getLanguageCode()
+    {
+        return Locale.getDefault().getLanguage() + ":";
+    }
 }
Index: /trunk/src/org/openstreetmap/josm/actions/HelpAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/HelpAction.java	(revision 1162)
+++ /trunk/src/org/openstreetmap/josm/actions/HelpAction.java	(revision 1163)
@@ -46,5 +46,5 @@
     }
 
-	private String languageCode = tr("En:");
+        private String languageCode = Main.getLanguageCodeU();
 	private JFrame helpBrowser = new JFrame(tr("JOSM Online Help"));
 	private String baseurl = Main.pref.get("help.baseurl", "http://josm.openstreetmap.de");
Index: /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java	(revision 1162)
+++ /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java	(revision 1163)
@@ -68,4 +68,5 @@
             Matcher matcher = versionPattern.matcher(motdcontent);
             matcher.reset();
+            String languageCode = Main.getLanguageCodeU();
             while (matcher.find()) {
                 int targetVersion = Integer.parseInt(matcher.group(4));
@@ -94,7 +95,4 @@
                 start = matcher.end();
                 if (included) {
-                    // translators: set this to a suitable language code to
-                    // be able to provide translations in the Wiki.
-                    String languageCode = tr("En:");
                     String url = matcher.group(1) + languageCode + matcher.group(2);
                     try {
Index: /trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java	(revision 1162)
+++ /trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java	(revision 1163)
@@ -1,6 +1,4 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.tools;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.Reader;
@@ -23,4 +21,6 @@
 import org.xml.sax.helpers.DefaultHandler;
 
+import org.openstreetmap.josm.Main;
+
 /**
  * An helper class that reads from a XML stream into specific objects.
@@ -30,5 +30,5 @@
 public class XmlObjectParser implements Iterable<Object> {
 
-	public static final String lang = tr("En:").toLowerCase();
+        public static final String lang = Main.getLanguageCode();
 	public static class Uniform<T> implements Iterable<T>{
 		private Iterator<Object> iterator;