Index: trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java	(revision 6624)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java	(revision 6625)
@@ -98,5 +98,5 @@
             final Matcher m = Pattern.compile("(" + part + ")(;\\s*" + part + ")*").matcher(value);
             if (!m.matches()) {
-                throw new ConditionalParsingException(tr("Does not match pattern ''{0}''", tr("restriction value") + " @ " + tr("condition")));
+                throw new ConditionalParsingException(tr("Does not match pattern ''restriction value @ condition''"));
             } else {
                 int i = 2;
@@ -117,5 +117,5 @@
                 // validate restriction value
                 if (isTransportationMode(key.split(":")[0]) && !isRestrictionValue(conditional.restrictionValue)) {
-                    return tr("{0} is not a valid {1}", conditional.restrictionValue, tr("restriction value"));
+                    return tr("{0} is not a valid restriction value", conditional.restrictionValue);
                 }
                 // validate opening hour if the value contains an hour (heuristic)