--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Wed Jul 05 18:18:18 2017 +0200
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Thu Aug 02 18:22:41 2012 +0100
@@ -1497,14 +1497,8 @@
 
 #####
 
-# 0: type, 1: type
+# 0: message segment
 compiler.err.prob.found.req=\
-    incompatible types\n\
-    required: {1}\n\
-    found: {0}
-
-# 0: message segment
-compiler.err.prob.found.req.1=\
     incompatible types: {0}
 
 # 0: message segment, 1: type, 2: type
@@ -1517,8 +1511,9 @@
 compiler.misc.inconvertible.types=\
     {0} cannot be converted to {1}
 
+# 0: type, 1: type
 compiler.misc.possible.loss.of.precision=\
-    possible loss of precision
+    possible lossy conversion from {0} to {1}
 
 compiler.misc.unchecked.assign=\
     unchecked conversion
@@ -1537,8 +1532,8 @@
 
 # 0: type
 compiler.misc.try.not.applicable.to.type=\
-    try-with-resources not applicable to variable type {0}\n\
-    (expected a variable of type java.lang.AutoCloseable)
+    try-with-resources not applicable to variable type\n\
+    ({0})
 
 #####
 
@@ -1589,16 +1584,20 @@
 compiler.misc.infer.no.conforming.instance.exists=\
     no instance(s) of type variable(s) {0} exist so that {1} conforms to {2}
 
-# 0: list of type, 1: type, 2: type
+# 0: list of type, 1: message segment
 compiler.misc.infer.no.conforming.assignment.exists=\
-    no instance(s) of type variable(s) {0} exist so that argument type {1} conforms to formal parameter type {2}
-
+    cannot infer type-variable(s) {0}\n\
+    (argument mismatch; {1})
+
+# 0: list of type
 compiler.misc.infer.arg.length.mismatch=\
-    cannot instantiate from arguments because actual and formal argument lists differ in length
-
-# 0: list of type, 1: type, 2: type
+    cannot infer type-variable(s) {0}\n\
+    (actual and formal argument lists differ in length)
+
+# 0: list of type, 1: message segment
 compiler.misc.infer.varargs.argument.mismatch=\
-    no instance(s) of type variable(s) {0} exist so that argument type {1} conforms to vararg element type {2}
+    cannot infer type-variable(s) {0}\n\
+    (varargs mismatch; {1})
 
 # 0: type, 1: list of type
 compiler.misc.inferred.do.not.conform.to.upper.bounds=\
@@ -1637,13 +1636,13 @@
 compiler.misc.arg.length.mismatch=\
     actual and formal argument lists differ in length
 
-# 0: type, 1: type
+# 0: message segment
 compiler.misc.no.conforming.assignment.exists=\
-    actual argument {0} cannot be converted to {1} by method invocation conversion
-
-# 0: type, 1: type
+    argument mismatch; {0}
+
+# 0: message segment
 compiler.misc.varargs.argument.mismatch=\
-    argument type {0} does not conform to vararg element type {1}
+    varargs mismatch; {0}
 
 #####