Index: applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java
===================================================================
--- applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java	(revision 28192)
+++ applications/editors/josm/plugins/wikipedia/src/org/wikipedia/WikipediaToggleDialog.java	(revision 28194)
@@ -17,4 +17,5 @@
 import javax.swing.DefaultListModel;
 import javax.swing.JList;
+import javax.swing.JOptionPane;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.xpath.XPathConstants;
@@ -24,4 +25,5 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
@@ -38,6 +40,8 @@
         createLayout(list, true, Arrays.asList(
                 new SideButton(new WikipediaDownloadAction()),
-                new SideButton(new OpenWikipediaArticleAction())));
+                new SideButton(new OpenWikipediaArticleAction()),
+                new SideButton(new WikipediaSettingsAction(), false)));
     }
+    final StringProperty wikipediaLang = new StringProperty("wikipedia.lang", LanguageInfo.getWikiLanguagePrefix());
     final DefaultListModel<WikipediaEntry> model = new DefaultListModel<WikipediaEntry>();
     final JList<WikipediaEntry> list = new JList<WikipediaEntry>(model) {
@@ -106,5 +110,5 @@
                 // construct url
                 final String url = "http://toolserver.org/~kolossos/geoworld/marks.php?"
-                        + "bbox=" + bbox + "&lang=" + LanguageInfo.getWikiLanguagePrefix();
+                        + "bbox=" + bbox + "&LANG=" + wikipediaLang.get();
                 System.out.println("Wikipedia: GET " + url);
                 // parse XML document
@@ -159,3 +163,22 @@
         }
     }
+
+    class WikipediaSettingsAction extends AbstractAction {
+
+        public WikipediaSettingsAction() {
+            super(tr("Language"), ImageProvider.get("dialogs/settings"));
+            putValue(SHORT_DESCRIPTION, tr("Sets the default language for the Wikipedia articles"));
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            String lang = JOptionPane.showInputDialog(
+                    WikipediaToggleDialog.this,
+                    tr("Enter the Wikipedia language"),
+                    wikipediaLang.get());
+            if (lang != null) {
+                wikipediaLang.put(lang);
+            }
+        }
+    }
 }