--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Wed Apr 14 12:23:29 2010 +0100
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Wed Apr 14 12:31:55 2010 +0100
@@ -479,6 +479,11 @@
     type parameters of {0} cannot be determined; {1}
 compiler.err.invalid.inferred.types=\
     invalid inferred types for {0}; {1}
+compiler.err.cant.apply.diamond=\
+    cannot infer type arguments for {0}
+compiler.err.cant.apply.diamond.1=\
+    cannot infer type arguments for {0};\n\
+    reason: {1}
 compiler.err.unreachable.stmt=\
     unreachable statement
 compiler.err.initializer.must.be.able.to.complete.normally=\
@@ -1030,7 +1035,12 @@
     actual arguments do not conform to inferred formal arguments\n\
     required: {0}\n\
     found: {1}
-
+compiler.misc.diamond=\
+    {0}<>
+compiler.misc.diamond.invalid.arg=\
+    type argument {0} inferred for {1} is not allowed in this context
+compiler.misc.diamond.invalid.args=\
+    type arguments {0} inferred for {1} are not allowed in this context
 #####
 
 ## The first argument ({0}) is a "kindname".
@@ -1163,6 +1173,8 @@
     {0} in {1} implements {2} in {3}
 compiler.misc.varargs.clash.with=\
     {0} in {1} overrides {2} in {3}
+compiler.misc.non.denotable.type=\
+    Non-denotable type {0} not allowed here
 
 ########################################
 # Diagnostics for language feature changes