--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Thu Jul 24 11:12:41 2008 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Thu Jul 24 19:06:57 2008 +0100
@@ -81,9 +81,14 @@
 compiler.err.call.must.be.first.stmt.in.ctor=\
     call to {0} must be first statement in constructor
 compiler.err.cant.apply.symbol=\
-    {0} in {1} cannot be applied to {2}({3})
-compiler.err.cant.apply.symbol.1=\
-    {0} in {1} cannot be applied to {2}({3}); {4}
+    {0} {1} in {4} {5} cannot be applied to given types\n\
+    required: {2}\n\
+    found: {3}
+ compiler.err.cant.apply.symbol.1=\
+    {0} {1} in {4} {5} cannot be applied to given types;\n\
+    required: {2}\n\
+    found: {3}\n\
+    reason: {6}
 compiler.err.cant.assign.val.to.final.var=\
     cannot assign a value to final variable {0}
 compiler.err.cant.deref=\
@@ -940,7 +945,7 @@
 compiler.misc.type.req.exact=\
     class or interface without bounds
 compiler.misc.type.parameter=\
-    type parameter {0} 
+    type parameter {0}
 
 #####
 
@@ -980,16 +985,39 @@
 required: {0}\n\
 found   : {1}
 
-## The first argument ({0}) is a "kindname".
+## The first argument {0} is a "kindname" (e.g. 'constructor', 'field', etc.)
+## The second argument {1} is the non-resolved symbol
+## The third argument {2} is a list of type parameters (non-empty if {1} is a method)
+## The fourth argument {3} is a list of argument types (non-empty if {1} is a method)
 compiler.err.cant.resolve=\
-cannot find symbol\n\
-symbol: {0} {3}{1}{2}
+    cannot find symbol\n\
+    symbol: {0} {1}
+
+compiler.err.cant.resolve.args=\
+    cannot find symbol\n\
+    symbol: {0} {1}({3})
+
+compiler.err.cant.resolve.args.params=\
+    cannot find symbol\n\
+    symbol: {0} <{2}>{1}({3})
 
-## The first argument ({0}) and fifth argument ({4}) are "kindname"s.
+## arguments from {0} to {3} have the same meaning as above
+## The fifth argument {4} is the location "kindname" (e.g. 'constructor', 'field', etc.)
+## The sixth argument {5} is the location type
 compiler.err.cant.resolve.location=\
-cannot find symbol\n\
-symbol  : {0} {3}{1}{2}\n\
-location: {4} {5}
+    cannot find symbol\n\
+    symbol  : {0} {1}\n\
+    location: {4} {5}
+
+compiler.err.cant.resolve.location.args=\
+    cannot find symbol\n\
+    symbol  : {0} {1}({3})\n\
+    location: {4} {5}
+
+compiler.err.cant.resolve.location.args.params=\
+    cannot find symbol\n\
+    symbol  : {0} <{2}>{1}({3})\n\
+    location: {4} {5}
 
 ## The following are all possible string for "kindname".
 ## They should be called whatever the JLS calls them after it been translated
@@ -1008,55 +1036,16 @@
     type variable
 compiler.misc.kindname.type.variable.bound=\
     bound of type variable
-compiler.misc.kindname=\
-    identifier({0})
 compiler.misc.kindname.variable=\
     variable
 compiler.misc.kindname.value=\
     value
 compiler.misc.kindname.method=\
     method
-compiler.misc.kindname.variable.method=\
-    variable, method
-compiler.misc.kindname.value.method=\
-    value, method
 compiler.misc.kindname.class=\
     class
-compiler.misc.kindname.variable.class=\
-    variable, class
-compiler.misc.kindname.value.class=\
-    value, class
-compiler.misc.kindname.method.class=\
-    method, class
-compiler.misc.kindname.variable.method.class=\
-    variable, method, class
-compiler.misc.kindname.value.method.class=\
-    value, method, class
 compiler.misc.kindname.package=\
     package
-compiler.misc.kindname.variable.package=\
-    variable, package
-compiler.misc.kindname.value.package=\
-    value, package
-compiler.misc.kindname.method.package=\
-    method, package
-compiler.misc.kindname.variable.method.package=\
-    variable, method, package
-compiler.misc.kindname.value.method.package=\
-    value, method, package
-compiler.misc.kindname.class.package=\
-    class, package
-compiler.misc.kindname.variable.class.package=\
-    variable, class, package
-compiler.misc.kindname.value.class.package=\
-    value, class, package
-compiler.misc.kindname.method.class.package=\
-    method, class, package
-compiler.misc.kindname.variable.method.class.package=\
-    variable, method, class, package
-compiler.misc.kindname.value.method.class.package=\
-    value, method, class, package
-
 #####
 
 compiler.err.override.static=\