Index: /trunk/src/org/openstreetmap/josm/gui/SideButton.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/SideButton.java	(revision 1102)
+++ /trunk/src/org/openstreetmap/josm/gui/SideButton.java	(revision 1103)
@@ -7,4 +7,5 @@
 import javax.swing.JButton;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -36,5 +37,9 @@
 		super(tr(name), ImageProvider.get("dialogs", imagename));
 		if(shortcut != null)
+                {
 			shortcut.setMnemonic(this);
+                        if(tooltip != null)
+				tooltip = Main.platform.makeTooltip(tooltip, shortcut);
+                }
 		setup(name, property, tooltip, actionListener);
 	}