Index: trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java	(revision 17809)
+++ trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java	(revision 17810)
@@ -232,14 +232,14 @@
                 }
                 if (n == null) {
-                    n = way.hasKey("highway") ? tr("highway") :
-                        way.hasKey("railway") ? tr("railway") :
-                        way.hasKey("waterway") ? tr("waterway") :
-                        way.hasKey("landuse") ? tr("landuse") : null;
+                    n = formatAddress(way);
                 }
                 if (n == null) {
-                    n = formatAddress(way);
-                }
-                if (n == null && way.hasKey("building")) {
-                    n = tr("building");
+                    for (String key : Arrays.asList(marktr("highway"), marktr("railway"), marktr("waterway"), marktr("landuse"), marktr("building"))) {
+                        if (way.hasKey(key) && !way.isKeyFalse(key)) {
+                            /* I18N: first is highway, railway, waterway, landuse or building type, second is the type itself */
+                            n = way.isKeyTrue(key) ? tr(key) : tr("{0} ({1})", trcLazy(key, way.get(key)), tr(key));
+                            break;
+                        }
+                    }
                 }
                 if (n == null || n.isEmpty()) {