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;
     }