Index: trunk/src/org/openstreetmap/josm/gui/GettingStarted.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 3170)
+++ trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 3171)
@@ -7,9 +7,13 @@
import java.awt.BorderLayout;
import java.awt.EventQueue;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
import java.io.UnsupportedEncodingException;
+import javax.swing.JComponent;
import javax.swing.JEditorPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
+import javax.swing.KeyStroke;
import javax.swing.border.EmptyBorder;
import javax.swing.event.HyperlinkEvent;
@@ -99,4 +103,7 @@
final LinkGeneral lg = new LinkGeneral("" + styles + "" + "JOSM - " + tr("Java OpenStreetMap Editor")
+ "
" + tr("Downloading \"Message of the day\"") + "
");
+ // clear the build-in command ctrl+shift+O, because it is used as shortcut in JOSM
+ lg.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_O, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK), "none");
+
JScrollPane scroller = new JScrollPane(lg);
scroller.setViewportBorder(new EmptyBorder(10, 100, 10, 100));