diff -r 4161b56e0d20 -r 3873b4aaf4a8 langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties --- a/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Mon Feb 07 18:09:46 2011 +0000 +++ b/langtools/src/share/classes/com/sun/tools/javac/resources/compiler.properties Mon Feb 07 18:10:13 2011 +0000 @@ -521,10 +521,20 @@ compiler.err.name.clash.same.erasure=\ name clash: {0} and {1} have the same erasure -# 0: symbol, 1: symbol, 2: symbol, 3: symbol +# 0: symbol, 1: symbol, 2: symbol, 3: symbol, 4: unused, 5: unused compiler.err.name.clash.same.erasure.no.override=\ name clash: {0} in {1} and {2} in {3} have the same erasure, yet neither overrides the other +# 0: symbol, 1: symbol, 2: symbol, 3: symbol, 4: symbol, 5: symbol +compiler.err.name.clash.same.erasure.no.override.1=\ + name clash: {0} in {1} overrides a method whose erasure is the same as another method, yet neither overrides the other\n\ + first method: {2} in {3}\n\ + second method: {4} in {5} + +# 0: symbol, 1: symbol, 2: symbol, 3: symbol +compiler.err.name.clash.same.erasure.no.hide=\ + name clash: {0} in {1} and {2} in {3} have the same erasure, yet neither hides the other + compiler.err.name.reserved.for.internal.use=\ {0} is reserved for internal use