diff -r 96072ad00783 -r 396b117c1743 src/share/classes/com/sun/tools/javac/resources/compiler.properties
--- a/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Fri Apr 09 15:39:39 2010 -0700
+++ b/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Wed Apr 14 12:23:29 2010 +0100
@@ -1082,10 +1082,6 @@
     symbol:   {0} <{2}>{1}({3})\n\
     location: {4} {5}
 
-compiler.err.cant.apply.diamond=\
-    diamond operator cannot infer types for {0};\n\
-    reason: {1}
-
 ## The following are all possible string for "kindname".
 ## They should be called whatever the JLS calls them after it been translated
 ## to the appropriate language.
@@ -1227,10 +1223,6 @@
     enums are not supported in -source {0}\n\
 (use -source 5 or higher to enable enums)
 
-compiler.err.diamond.not.supported.in.source=\
-    diamond operator is not supported in -source {0}\n\
-(use -source 7 or higher to enable diamond operator)
-
 compiler.err.string.switch.not.supported.in.source=\
     strings in switch are not supported in -source {0}\n\
 (use -source 7 or higher to enable strings in switch)