Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java	(revision 6157)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java	(revision 6159)
@@ -5,4 +5,5 @@
 package at.dallermassl.josm.plugin.surveyor;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -103,11 +104,6 @@
 
     public void addButton(ButtonDescription description) {
-        if(hotKeys.contains(description.getHotkey())) {
-            // <FIXXME date="23.06.2007" author="cdaller">
-            // TODO if i18n is done
-            //JOptionPane.showMessageDialog(Main.parent, tr("Duplicate hotkey for button '{0}' - button will be ignored!",description.getLabel()));
-            JOptionPane.showMessageDialog(Main.parent, "Duplicate hotkey for button '" + description.getLabel() 
-                + "' - button will be ignored!");
-            // </FIXXME> 
+        if(description.getHotkey() != "" &&  hotKeys.contains(description.getHotkey())) {
+            JOptionPane.showMessageDialog(Main.parent, tr("Duplicate hotkey for button '{0}' - button will be ignored!",description.getLabel()));
         } else {
             if(rows == 0 && columns == 0) {