--- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Mon Sep 12 11:40:07 2011 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Tue Sep 13 14:14:57 2011 +0100
@@ -68,9 +68,13 @@
compiler.err.already.annotated=\
{0} {1} has already been annotated
-# 0: symbol, 1: symbol
+# 0: symbol kind, 1: symbol, 2: symbol kind, 3: symbol
compiler.err.already.defined=\
- {0} is already defined in {1}
+ {0} {1} is already defined in {2} {3}
+
+# 0: symbol kind, 1: symbol, 2: symbol kind, 3: symbol kind, 4: symbol
+compiler.err.already.defined.in.clinit=\
+ {0} {1} is already defined in {2} of {3} {4}
# 0: string
compiler.err.already.defined.single.import=\
@@ -1753,6 +1757,12 @@
compiler.misc.kindname.package=\
package
+compiler.misc.kindname.static.init=\
+ static initializer
+
+compiler.misc.kindname.instance.init=\
+ instance initializer
+
#####
compiler.misc.no.args=\