Index: trunk/netbeans/nbproject/genfiles.properties
===================================================================
--- trunk/netbeans/nbproject/genfiles.properties	(revision 12942)
+++ trunk/netbeans/nbproject/genfiles.properties	(revision 12943)
@@ -5,4 +5,4 @@
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=f36994fb
-nbproject/build-impl.xml.script.CRC32=05416174
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
+nbproject/build-impl.xml.script.CRC32=5e13918b
+nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 12942)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 12943)
@@ -987,5 +987,5 @@
         }
         String fullKey = COLOR_PREFIX + o;
-        return tr(I18n.escape(colornames.containsKey(fullKey) ? colornames.get(fullKey) : fullKey));
+        return colornames.containsKey(fullKey) ? tr(I18n.escape(colornames.get(fullKey))) : fullKey;
     }