--- old/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties	2018-08-03 14:07:28.342792489 +0200
+++ new/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties	2018-08-03 14:07:27.866792511 +0200
@@ -49,6 +49,7 @@
 # kind name         an informative description of the kind of a declaration; see compiler.misc.kindname.*
 # target            a target version number, such as 1.5, 1.6, 1.7, taken from a com.sun.tools.javac.jvm.Target
 # token             the name of a non-terminal in source code; see compiler.misc.token.*
+# tree tag          the name of a non-terminal in source code; see compiler.misc.token.*
 # type              a Java type; e.g. int, X, X<T>
 # url               a URL
 # object            a Java object (unspecified)
@@ -188,26 +189,28 @@
     break outside switch or loop
 
 compiler.err.break.missing.value=\
-    break is missing a value to return from switch expression
+    missing break value
 
 compiler.err.break.outside.switch.expression=\
-    break is jumping outside of the enclosing switch expression
+    break outside of enclosing switch expression
 
 compiler.err.continue.outside.switch.expression=\
-    continue is jumping outside of the enclosing switch expression
+    continue outside of enclosing switch expression
 
 compiler.err.return.outside.switch.expression=\
-    return is returning outside of the enclosing switch expression
+    return outside of enclosing switch expression
 
 # 0: name
 compiler.err.break.ambiguous.target=\
-    {0} is ambiguously both a valid expression and a valid label
+    ambiguous reference to ''{0}''\n\
+    (''{0}'' is both a label and an expression)
 
+# 0: tree tag
 compiler.err.break.expr.not.immediate=\
-    expression break not immediately enclosed by a switch expression
+    value break not supported in ''{0}''
 
 compiler.err.break.complex.value.no.switch.expression=\
-    value break outside of switch expression
+    unexpected value break
 
 compiler.err.switch.expression.empty=\
     switch expression does not have any case clauses
@@ -2609,6 +2612,22 @@
 compiler.misc.kindname.instance.init=\
     instance initializer
 
+# the following are names of tree kinds:
+compiler.misc.tree.tag.forloop=\
+    for
+
+compiler.misc.tree.tag.foreachloop=\
+    enhanced for
+
+compiler.misc.tree.tag.whileloop=\
+    while
+
+compiler.misc.tree.tag.doloop=\
+    do
+
+compiler.misc.tree.tag.switch=\
+    switch
+
 #####
 
 compiler.misc.no.args=\