bug 285480: Duplicate message IDs

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/PluginResources.properties

@@ -124,7 +124,6 @@ BuildInfoFactory.Missing_Builder=Missing Builder:
 ResourceChangeHandler.buildInfoSerializationJob=Build Info Serialization
 
 #ManagedBuilderCorePlugin messages
-ManagedBuilderCorePlugin.resourceChangeHandlingInitializationJob=Initializing Resource Change Handling
 GeneratedMakefileBuilder.buildResourcesFinished=Build of selected resources is complete.
 GeneratedMakefileBuilder.buildSelectedIncremental=Building selected file(s) incrementally
 GeneratedMakefileBuilder.buildSelectedRebuild=Rebuilding selected file(s)

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/DataProviderMessages.properties

@@ -8,7 +8,6 @@
 # Contributors:
 # Intel Corporation - Initial API and implementation
 ###############################################################################
-ProjectConverter.0=the specified project is not an CDT project
 ProjectConverter.0=failed to load the build info for the old-style project
 ProjectConverter.1=the specified project is not an old style make project, the owner ID is 
 ProjectConverter.10=project conversion failed

xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties

@@ -260,7 +260,6 @@ Option.pdf2 = Tune optimizations through Profile Directed Feedback: second run (
 Option.optimization.Prefetch = Disable generation of prefetching instructions in compiled code (-qnoprefetch)
 Option.optimization.procimported = Mark functions as imported (-qprocimported=)
 Option.optimization.proclocal = Mark functions as local (-qlocal=)
-Option.optimization.procimported = Mark functions as imported (-qprocimported=)
 Option.optimization.procunknown = Mark functions as unknown (-qprocunknown=)
 Option.optimization.showpdf = Add additional call and block count profiling information to the executable (-qshowpdf)
 Option.optimization.smallstack = Reduce the size of the stack frame (-qsmallstack)
@@ -280,8 +279,6 @@ Option.optimization.w = Specify options to pass to specific compiler components
 # Linker Options
 Option.Linking.b = Control how shared objects are processed by the editor (-b)
 Option.linking.brtl = Enable runtime linking for the output file (-brtl)
-Option.linking.bundle = 
-Option.Linking.bundle_loader
 Option.Linking.e = Set the entry name for the shared executable(-e )
 Option.Linking.f = 
 Option.linking.G = Create a shared object enabled for runtime linking (-G)
@@ -354,7 +351,6 @@ Option.tls.notls=No tls
 
 # Listings and Messages options
 Option.V = Report information on the progress of compilation (-V)
-Option.Warn.nowarn = Suppress warnings and low-level messages (-w)
 Option.Warn.Pedandic=Pedantic (-pedantic)
 Option.Warn.PedErrors=Pedantic warnings as errors (-pedantic-errors)
 Option.Warn.nowarn=Inhibit all warnings (-w)
@@ -388,7 +384,6 @@ Option.xref.noxref = Do not report identifiers in the program (-qnoxref)
 Option.xref.fullxref = Report all the identifiers in the program (-qxref = full)
 Option.xref.xref = Report only those identifiers which are used (-qxref)
 Option.warnfourcharconsts = Enable warning of four-character constants in source
-Option.report = Produce listing files that show how sections of code have been optimized (-qreport)
 
 # Error Checking and Debugging
 Option.g = Generate debugging information (-g)
@@ -408,7 +403,7 @@ Option.dbxextra = Include all typedefs, structs, unions, enums for debugging (-q
 Option.extchk = Generate bind-time type checking information and check for compile time consistency (-qextchk)
 Option.fullpath = Preserve absolute path name of source files used with -g option (-qfullpath)
 Option.genproto = Produce ANSI prototypes from K&R definitions
-Option.genproto = Generate prototypes with parameter names
+Option.genproto.general = Generate prototypes with parameter names
 Option.genproto.parmgenproto = Include parameter names in prototypes
 Option.heapdebug = Enable debug versions of memory management functions (-qheapdebug)
 Option.initauto = Initialize the automatic variables (-qinitauto=)

xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml

@@ -2908,7 +2908,7 @@
 				id="xlc.c.ecd.genproto.none">
 			</enumeratedOptionValue>
 			<enumeratedOptionValue
-				name="%Option.genproto"
+				name="%Option.genproto.general"
 				isDefault="false"
 				command="-qgenproto"
 				id="xlc.c.ecd.genproto">