bug 321160: Confusing message about redefined macro from xlc error parser

1 files changed, 4 insertions, 2 deletions

diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc/plugin.properties b/xlc/org.eclipse.cdt.errorparsers.xlc/plugin.properties
index 89c0bddd88c..916d7f31777 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc/plugin.properties
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc/plugin.properties
@@ -20,12 +20,14 @@ CDTXLCErrorParser.name=CDT xlC Error Parser
 
 # Translators:  do not translate patterns below. We currently do not support NL versions of the XL C/C++ compilers.
 # Following are patterns of xlC compiler messages. While translating the patterns should be replaced
-# with corresponding patterns matchind localized compiler messages
+# with corresponding patterns matching localized compiler messages
 
 # START NON-TRANSLATABLE
 # "hello.c", line 5.9: 1506-358 (I) "MACRO" is defined on line 3 of hello.h.
 CDTXLCErrorParser.pattern.macro=["]?(.*?)["]?, line ([0-9]+)\\.[0-9]+:( [0-9]*-[0-9]*)? \\(I\\)\\s*["]?(\\w*)["]? is defined on line ([0-9]+) of (.*)\\.
-CDTXLCErrorParser.pattern.macro.replacement=Macro name $4 originally defined in file $6
+CDTXLCErrorParser.pattern.macro.replacement=Macro name $4 has been redefined on line $2 of $1
+CDTXLCErrorParser.pattern.macro.crossreference=Macro name $4 redefines macro originally defined on line $5 of $6
+CDTXLCErrorParser.pattern.macro.ignore=["]?(.*?)["]?, line ([0-9]+)\\.[0-9]+:( [0-9]*-[0-9]*)? \\(W\\)\\s*Macro name .* has been redefined\\.
 # "main.cpp", line 10.6: 1540-0064 (S) Syntax error:  "name" was expected but "char" was found.
 CDTXLCErrorParser.pattern.error=["]?(.*?)["]?, line ([0-9]+)\\.[0-9]+:( [0-9]*-[0-9]*)? \\([USE]\\)\\s*(.*)
 CDTXLCErrorParser.pattern.warning=["]?(.*?)["]?, line ([0-9]+)\\.[0-9]+:( [0-9]*-[0-9]*)? \\(W\\)\\s*(.*)