Index: src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java
===================================================================
--- src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java	(Revision 17675)
+++ src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java	(Arbeitskopie)
@@ -1,6 +1,7 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm;
 
+import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trc;
 import static org.openstreetmap.josm.tools.I18n.trcLazy;
@@ -231,16 +232,19 @@
                     n = way.get("ref");
                 }
                 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;
+                    for (String key : Arrays.asList(marktr("highway"), marktr("railway"), marktr("waterway"), marktr("landuse"))) {
+                        if (way.hasKey(key) && !way.isKeyFalse(key)) {
+                            /* I18N: first is highway, railway, waterway or landuse 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 = formatAddress(way);
                 }
-                if (n == null && way.hasKey("building")) {
-                    n = tr("building");
+                if (n == null && way.hasKey("building") && !way.isKeyFalse("building")) {
+                    n = way.isKeyTrue("building") ? tr("building") : tr("{0} (building)", trc("building", way.get("building")));
                 }
                 if (n == null || n.isEmpty()) {
                     n = String.valueOf(way.getId());