--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Wed May 20 19:10:06 2009 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties	Thu May 21 10:56:36 2009 +0100
@@ -1165,3 +1165,64 @@
 compiler.err.enums.not.supported.in.source=\
     enums are not supported in -source {0}\n\
 (use -source 5 or higher to enable enums)
+
+########################################
+# Diagnostics for where clause implementation
+# used by the RichDiagnosticFormatter.
+########################################
+
+compiler.misc.type.null=\
+    <null>
+
+# X#n (where n is an int id) is disambiguated tvar name
+compiler.misc.type.var=\
+    {0}#{1}
+
+# CAP#n (where n is an int id) is an abbreviation for 'captured type'
+compiler.misc.captured.type=\
+    CAP#{0}
+
+# <INT#n> (where n is an int id) is an abbreviation for 'intersection type'
+compiler.misc.intersection.type=\
+    INT#{0}
+
+# where clause for captured type: contains upper ('extends {1}') and lower
+# ('super {2}') bound along with the wildcard that generated this captured type ({3})
+compiler.misc.where.captured=\
+    {0} extends {1} super: {2} from capture of {3}
+
+# compact where clause for captured type: contains upper ('extends {1}') along
+# with the wildcard that generated this captured type ({3})
+compiler.misc.where.captured.1=\
+    {0} extends {1} from capture of {3}
+
+# where clause for type variable: contains upper bound(s) ('extends {1}') along with
+# the kindname ({2}) and location ({3}) in which the typevar has been declared
+compiler.misc.where.typevar=\
+    {0} extends {1} declared in {2} {3}
+
+# compact where clause for type variable: contains the kindname ({2}) and location ({3})
+# in which the typevar has been declared
+compiler.misc.where.typevar.1=\
+    {0} declared in {2} {3}
+
+# where clause for type variable: contains all the upper bound(s) ('extends {1}')
+# of this intersection type
+compiler.misc.where.intersection=\
+    {0} extends {1}
+
+### Where clause headers ###
+compiler.misc.where.description.captured=\
+    where {0} is a fresh type-variable:
+compiler.misc.where.description.typevar=\
+    where {0} is a type-variable:
+compiler.misc.where.description.intersection=\
+    where {0} is an intersection type:
+compiler.misc.where.description.captured.1=\
+    where {0} are fresh type-variables:
+compiler.misc.where.description.typevar.1=\
+    where {0} are type-variables:
+compiler.misc.where.description.intersection.1=\
+    where {0} are intersection types:
+
+