Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java	(revision 6406)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/Highways.java	(revision 6407)
@@ -31,6 +31,16 @@
     protected static final int MISSING_PEDESTRIAN_CROSSING = 2702;
     
+    /**
+     * Classified highways in order of importance
+     */
     protected static final List<String> CLASSIFIED_HIGHWAYS = Arrays.asList(
-            "motorway", "trunk", "primary", "secondary", "tertiary", "living_street", "residential", "unclassified");
+            "motorway",  "motorway_link", 
+            "trunk",     "trunk_link", 
+            "primary",   "primary_link", 
+            "secondary", "secondary_link",
+            "tertiary",  "tertiary_link",
+            "living_street",
+            "residential",
+            "unclassified");
 
     boolean leftByPedestrians = false;
@@ -99,5 +109,5 @@
                     // Error when the highway tags do not match
                     if (!w.get("highway").equals(s)) {
-                        errors.add(new WrongRoundaboutHighway(w, tr("Incorrect roundabout (highway: {0} instead of {1})", w.get("highway"), s)));
+                        errors.add(new WrongRoundaboutHighway(w, s));
                     }
                     break;