Branding - use distinct names for the distinct features

Bug: 402450

39 files changed, 285 insertions, 28 deletions

diff --git a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/feature.xml b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/feature.xml
index 462df09de..c32833e3c 100644
--- a/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.ecoretools-feature/feature.xml
@@ -4,7 +4,7 @@
       label="%featureName"
       version="2.1.0.qualifier"
       provider-name="%providerName"
-      plugin="org.eclipse.emf.compare">
+      plugin="org.eclipse.emf.compare.diagram.ide.ui.ecoretools">
 
    <description>
       %description
diff --git a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/feature.xml b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/feature.xml
index 83d5ccc92..626d97116 100644
--- a/packaging/org.eclipse.emf.compare.diagram.gmf-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.gmf-feature/feature.xml
@@ -4,7 +4,7 @@
       label="%featureName"

       version="2.1.0.qualifier"

       provider-name="%providerName"

-      plugin="org.eclipse.emf.compare">

+      plugin="org.eclipse.emf.compare.diagram">

 

    <description>

       %description

diff --git a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/feature.xml b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/feature.xml
index e1ec0854b..1c7b6055b 100644
--- a/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.diagram.papyrus-feature/feature.xml
@@ -4,7 +4,7 @@
       label="%featureName"
       version="2.1.0.qualifier"
       provider-name="%providerName"
-      plugin="org.eclipse.emf.compare">
+      plugin="org.eclipse.emf.compare.diagram.ide.ui.papyrus">
 
    <description>
       %description
diff --git a/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml b/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml
index e1a31484d..00f2c9111 100644
--- a/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.ide.ui-feature/feature.xml
@@ -4,7 +4,7 @@
       label="%featureName"

       version="2.1.0.qualifier"

       provider-name="%providerName"

-      plugin="org.eclipse.emf.compare">

+      plugin="org.eclipse.emf.compare.ide.ui">

 

    <description>

       %description

diff --git a/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml b/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml
index 538f37f33..876aa8cb4 100644
--- a/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.rcp.ui-feature/feature.xml
@@ -4,7 +4,7 @@
       label="%featureName"

       version="2.1.0.qualifier"

       provider-name="%providerName"

-      plugin="org.eclipse.emf.compare">

+      plugin="org.eclipse.emf.compare.rcp.ui">

 

    <description>

       %description

diff --git a/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml b/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml
index 9b418b71a..f60e3c7f6 100644
--- a/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml
+++ b/packaging/org.eclipse.emf.compare.uml2-feature/feature.xml
@@ -4,7 +4,7 @@
       label="%featureName"
       version="2.1.0.qualifier"
       provider-name="%providerName"
-      plugin="org.eclipse.emf.compare">
+      plugin="org.eclipse.emf.compare.uml2">
 
    <description>
       %description
diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/about.ini b/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/about.ini
new file mode 100644
index 000000000..eec22440e
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/about.ini
@@ -0,0 +1,14 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%featureText
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=modeling32.png
+
+# Property "appName" contains name of the application (translated)
+appName=%featureName
diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/about.properties b/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/about.properties
new file mode 100644
index 000000000..2e10f27e4
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/about.properties
@@ -0,0 +1,26 @@
+# /**
+#  * <copyright>
+#  *
+#  * Copyright (c) 2006, 2012 Obeo and others.
+#  * All rights reserved.   This program and the accompanying materials
+#  * are made available under the terms of the Eclipse Public License v1.0
+#  * which accompanies this distribution, and is available at
+#  * http://www.eclipse.org/legal/epl-v10.html
+#  *
+#  * Contributors:
+#  *   Obeo - Initial API and implementation
+#  *
+#  * </copyright>
+#  */
+
+# NLS_MESSAGEFORMAT_VAR
+
+featureName=EMF Compare EcoreTools Integration
+
+featureText=EMF Compare - EcoreTools Integration\n\
+Version: {featureVersion}\n\
+\n\
+(c) Copyright Obeo and others. 2006, 2012.  All rights reserved.\n\
+\n\
+EMF Compare brings comparison to the Eclipse Modeling Framework\n\
+Visit http://www.eclipse.org/emf/compare
diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/build.properties b/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/build.properties
index 63630044a..2c4329be3 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/build.properties
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/build.properties
@@ -13,5 +13,12 @@ output.. = bin/
 bin.includes = META-INF/,\

                .,\

                plugin.xml,\

-               plugin.properties

-src.includes = about.html

+               plugin.properties,\

+               modeling32.png,\

+               about.properties,\

+               about.html,\

+               about.ini

+src.includes = about.html,\

+               about.ini,\

+               about.properties,\

+               modeling32.png

diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/modeling32.png b/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/modeling32.png
new file mode 100644
index 000000000..6b08de2ad
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools/modeling32.png
diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/about.ini b/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/about.ini
new file mode 100644
index 000000000..eec22440e
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/about.ini
@@ -0,0 +1,14 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%featureText
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=modeling32.png
+
+# Property "appName" contains name of the application (translated)
+appName=%featureName
diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/about.properties b/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/about.properties
new file mode 100644
index 000000000..4c4332d9d
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/about.properties
@@ -0,0 +1,26 @@
+# /**
+#  * <copyright>
+#  *
+#  * Copyright (c) 2006, 2012 Obeo and others.
+#  * All rights reserved.   This program and the accompanying materials
+#  * are made available under the terms of the Eclipse Public License v1.0
+#  * which accompanies this distribution, and is available at
+#  * http://www.eclipse.org/legal/epl-v10.html
+#  *
+#  * Contributors:
+#  *   Obeo - Initial API and implementation
+#  *
+#  * </copyright>
+#  */
+
+# NLS_MESSAGEFORMAT_VAR
+
+featureName=EMF Compare Papyrus Integration
+
+featureText=EMF Compare - Papyrus Integration\n\
+Version: {featureVersion}\n\
+\n\
+(c) Copyright Obeo and others. 2006, 2012.  All rights reserved.\n\
+\n\
+EMF Compare brings comparison to the Eclipse Modeling Framework\n\
+Visit http://www.eclipse.org/emf/compare
diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/build.properties b/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/build.properties
index 70980bf51..2d14ba746 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/build.properties
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/build.properties
@@ -15,4 +15,7 @@ bin.includes = META-INF/,\
                plugin.xml,\
                about.html,\
                plugin.properties
-src.includes = about.html
+src.includes = about.html,\
+               about.ini,\
+               about.properties,\
+               modeling32.png
diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/modeling32.png b/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/modeling32.png
new file mode 100644
index 000000000..6b08de2ad
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/modeling32.png
diff --git a/plugins/org.eclipse.emf.compare.diagram/about.ini b/plugins/org.eclipse.emf.compare.diagram/about.ini
new file mode 100644
index 000000000..eec22440e
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram/about.ini
@@ -0,0 +1,14 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%featureText
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=modeling32.png
+
+# Property "appName" contains name of the application (translated)
+appName=%featureName
diff --git a/plugins/org.eclipse.emf.compare.diagram/about.properties b/plugins/org.eclipse.emf.compare.diagram/about.properties
new file mode 100644
index 000000000..f733cb679
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram/about.properties
@@ -0,0 +1,26 @@
+# /**
+#  * <copyright>
+#  *
+#  * Copyright (c) 2006, 2012 Obeo and others.
+#  * All rights reserved.   This program and the accompanying materials
+#  * are made available under the terms of the Eclipse Public License v1.0
+#  * which accompanies this distribution, and is available at
+#  * http://www.eclipse.org/legal/epl-v10.html
+#  *
+#  * Contributors:
+#  *   Obeo - Initial API and implementation
+#  *
+#  * </copyright>
+#  */
+
+# NLS_MESSAGEFORMAT_VAR
+
+featureName=EMF Compare GMF Integration
+
+featureText=EMF Compare - GMF Integration\n\
+Version: {featureVersion}\n\
+\n\
+(c) Copyright Obeo and others. 2006, 2012.  All rights reserved.\n\
+\n\
+EMF Compare brings comparison to the Eclipse Modeling Framework\n\
+Visit http://www.eclipse.org/emf/compare
diff --git a/plugins/org.eclipse.emf.compare.diagram/build.properties b/plugins/org.eclipse.emf.compare.diagram/build.properties
index b8de676d7..7c1e9e5d1 100644
--- a/plugins/org.eclipse.emf.compare.diagram/build.properties
+++ b/plugins/org.eclipse.emf.compare.diagram/build.properties
@@ -13,10 +13,16 @@ bin.includes = .,\
                META-INF/,\
                plugin.xml,\
                plugin.properties,\
-               about.html
+               about.html,\
+               about.ini,\
+               about.properties,\
+               modeling32.png
 jars.compile.order = .
 source.. = src-gen/,\
            src/
 output.. = bin/
 src.includes = about.html,\
-               model/
+               model/,\
+               about.ini,\
+               about.properties,\
+               modeling32.png
diff --git a/plugins/org.eclipse.emf.compare.diagram/modeling32.png b/plugins/org.eclipse.emf.compare.diagram/modeling32.png
new file mode 100644
index 000000000..6b08de2ad
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram/modeling32.png
diff --git a/plugins/org.eclipse.emf.compare.edit/plugin.properties b/plugins/org.eclipse.emf.compare.edit/plugin.properties
index 85f997260..827824a76 100644
--- a/plugins/org.eclipse.emf.compare.edit/plugin.properties
+++ b/plugins/org.eclipse.emf.compare.edit/plugin.properties
@@ -7,7 +7,7 @@
 # Contributors:
 #     Obeo - initial API and implementation
 
-pluginName = Compare Edit Support
+pluginName = EMF Compare Edit Support
 providerName = Eclipse Modeling Project
 
 _UI_CreateChild_text = {0}
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/about.ini b/plugins/org.eclipse.emf.compare.ide.ui/about.ini
new file mode 100644
index 000000000..eec22440e
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.ide.ui/about.ini
@@ -0,0 +1,14 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%featureText
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=modeling32.png
+
+# Property "appName" contains name of the application (translated)
+appName=%featureName
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/about.properties b/plugins/org.eclipse.emf.compare.ide.ui/about.properties
new file mode 100644
index 000000000..4825d266b
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.ide.ui/about.properties
@@ -0,0 +1,26 @@
+# /**
+#  * <copyright>
+#  *
+#  * Copyright (c) 2006, 2012 Obeo and others.
+#  * All rights reserved.   This program and the accompanying materials
+#  * are made available under the terms of the Eclipse Public License v1.0
+#  * which accompanies this distribution, and is available at
+#  * http://www.eclipse.org/legal/epl-v10.html
+#  *
+#  * Contributors:
+#  *   Obeo - Initial API and implementation
+#  *
+#  * </copyright>
+#  */
+
+# NLS_MESSAGEFORMAT_VAR
+
+featureName=EMF Compare IDE UI
+
+featureText=EMF Compare - IDE UI\n\
+Version: {featureVersion}\n\
+\n\
+(c) Copyright Obeo and others. 2006, 2012.  All rights reserved.\n\
+\n\
+EMF Compare brings comparison to the Eclipse Modeling Framework\n\
+Visit http://www.eclipse.org/emf/compare
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/build.properties b/plugins/org.eclipse.emf.compare.ide.ui/build.properties
index b358a03aa..c74ddd6e0 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/build.properties
+++ b/plugins/org.eclipse.emf.compare.ide.ui/build.properties
@@ -9,4 +9,7 @@ bin.includes = META-INF/,\
                schema/

 src.includes = about.html,\

                icons/,\

-               schema/

+               schema/,\

+               about.ini,\

+               about.properties,\

+               modeling32.png

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/modeling32.png b/plugins/org.eclipse.emf.compare.ide.ui/modeling32.png
new file mode 100644
index 000000000..6b08de2ad
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.ide.ui/modeling32.png
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF
index bb69f4016..a19748c5c 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-Activator: org.eclipse.emf.compare.rcp.ui.EMFCompareRCPUIPlugin
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
  org.eclipse.emf.edit.ui;bundle-version="2.5.0",
  org.eclipse.emf.compare;bundle-version="2.0.1",
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/about.ini b/plugins/org.eclipse.emf.compare.rcp.ui/about.ini
new file mode 100644
index 000000000..eec22440e
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/about.ini
@@ -0,0 +1,14 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%featureText
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=modeling32.png
+
+# Property "appName" contains name of the application (translated)
+appName=%featureName
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/about.properties b/plugins/org.eclipse.emf.compare.rcp.ui/about.properties
new file mode 100644
index 000000000..0fc1ee74a
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/about.properties
@@ -0,0 +1,26 @@
+# /**
+#  * <copyright>
+#  *
+#  * Copyright (c) 2006, 2012 Obeo and others.
+#  * All rights reserved.   This program and the accompanying materials
+#  * are made available under the terms of the Eclipse Public License v1.0
+#  * which accompanies this distribution, and is available at
+#  * http://www.eclipse.org/legal/epl-v10.html
+#  *
+#  * Contributors:
+#  *   Obeo - Initial API and implementation
+#  *
+#  * </copyright>
+#  */
+
+# NLS_MESSAGEFORMAT_VAR
+
+featureName=EMF Compare RCP UI
+
+featureText=EMF Compare - RCP UI\n\
+Version: {featureVersion}\n\
+\n\
+(c) Copyright Obeo and others. 2006, 2012.  All rights reserved.\n\
+\n\
+EMF Compare brings comparison to the Eclipse Modeling Framework\n\
+Visit http://www.eclipse.org/emf/compare
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/build.properties b/plugins/org.eclipse.emf.compare.rcp.ui/build.properties
index 06dc0bb29..bd07b7fdd 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/build.properties
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/build.properties
@@ -9,4 +9,7 @@ bin.includes = META-INF/,\
                schema/
 src.includes = about.html,\
                icons/,\
-               schema/
+               schema/,\
+               about.ini,\
+               about.properties,\
+               modeling32.png
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/modeling32.png b/plugins/org.eclipse.emf.compare.rcp.ui/modeling32.png
new file mode 100644
index 000000000..6b08de2ad
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/modeling32.png
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/plugin.properties b/plugins/org.eclipse.emf.compare.uml2.edit/plugin.properties
index e6a12fb89..9bf4daea9 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/plugin.properties
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/plugin.properties
@@ -8,7 +8,7 @@
 # Contributors:
 #     Obeo - initial API and implementation
 ################################################################################
-pluginName = UML2Diff Edit Support
+pluginName = EMF Compare UML2 Comparison Edit Support
 providerName = Eclipse Modeling Project
 
 _UI_CreateChild_text = {0}
diff --git a/plugins/org.eclipse.emf.compare.uml2.ide.ui/plugin.properties b/plugins/org.eclipse.emf.compare.uml2.ide.ui/plugin.properties
index ccf8f7d1f..7eea1c84a 100644
--- a/plugins/org.eclipse.emf.compare.uml2.ide.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.compare.uml2.ide.ui/plugin.properties
@@ -8,6 +8,6 @@
 # Contributors:
 #     Obeo - initial API and implementation
 ################################################################################
-pluginName = EMF Compare UML2 Support IDE UI Integration
+pluginName = EMF Compare UML2 Comparison Support IDE UI Integration
 providerName = Eclipse Modeling Project
 
diff --git a/plugins/org.eclipse.emf.compare.uml2.ide/plugin.properties b/plugins/org.eclipse.emf.compare.uml2.ide/plugin.properties
index 390296b33..3c1fe58f6 100644
--- a/plugins/org.eclipse.emf.compare.uml2.ide/plugin.properties
+++ b/plugins/org.eclipse.emf.compare.uml2.ide/plugin.properties
@@ -8,6 +8,6 @@
 # Contributors:
 #     Obeo - initial API and implementation
 ################################################################################
-pluginName = EMF Compare diff engine for UML2 (IDE extension)
+pluginName = EMF Compare UML2 Comparison Support IDE Integration
 providerName = Eclipse Modeling Project
 
diff --git a/plugins/org.eclipse.emf.compare.uml2/about.ini b/plugins/org.eclipse.emf.compare.uml2/about.ini
new file mode 100644
index 000000000..eec22440e
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2/about.ini
@@ -0,0 +1,14 @@
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%featureText
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=modeling32.png
+
+# Property "appName" contains name of the application (translated)
+appName=%featureName
diff --git a/plugins/org.eclipse.emf.compare.uml2/about.properties b/plugins/org.eclipse.emf.compare.uml2/about.properties
new file mode 100644
index 000000000..ff75e735f
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2/about.properties
@@ -0,0 +1,26 @@
+# /**
+#  * <copyright>
+#  *
+#  * Copyright (c) 2006, 2012 Obeo and others.
+#  * All rights reserved.   This program and the accompanying materials
+#  * are made available under the terms of the Eclipse Public License v1.0
+#  * which accompanies this distribution, and is available at
+#  * http://www.eclipse.org/legal/epl-v10.html
+#  *
+#  * Contributors:
+#  *   Obeo - Initial API and implementation
+#  *
+#  * </copyright>
+#  */
+
+# NLS_MESSAGEFORMAT_VAR
+
+featureName=EMF Compare UML2 Integration
+
+featureText=EMF Compare - UML Comparison Support\n\
+Version: {featureVersion}\n\
+\n\
+(c) Copyright Obeo and others. 2006, 2012.  All rights reserved.\n\
+\n\
+EMF Compare brings comparison to the Eclipse Modeling Framework\n\
+Visit http://www.eclipse.org/emf/compare
diff --git a/plugins/org.eclipse.emf.compare.uml2/build.properties b/plugins/org.eclipse.emf.compare.uml2/build.properties
index ec9849411..2b27624fd 100644
--- a/plugins/org.eclipse.emf.compare.uml2/build.properties
+++ b/plugins/org.eclipse.emf.compare.uml2/build.properties
@@ -19,4 +19,7 @@ source.. = src-gen/,\
            src/
 output.. = bin/
 src.includes = about.html,\
-               model/
+               model/,\
+               about.ini,\
+               about.properties,\
+               modeling32.png
diff --git a/plugins/org.eclipse.emf.compare.uml2/modeling32.png b/plugins/org.eclipse.emf.compare.uml2/modeling32.png
new file mode 100644
index 000000000..6b08de2ad
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2/modeling32.png
diff --git a/plugins/org.eclipse.emf.compare.uml2/plugin.properties b/plugins/org.eclipse.emf.compare.uml2/plugin.properties
index 4ba5481e9..644e7a6f1 100644
--- a/plugins/org.eclipse.emf.compare.uml2/plugin.properties
+++ b/plugins/org.eclipse.emf.compare.uml2/plugin.properties
@@ -8,6 +8,6 @@
 # Contributors:
 #     Obeo - initial API and implementation
 ################################################################################
-pluginName = EMF Compare diff engine for UML2
+pluginName = EMF Compare UML2 Comparison Support
 providerName = Eclipse Modeling Project
 
diff --git a/plugins/org.eclipse.emf.compare/about.mappings b/plugins/org.eclipse.emf.compare/about.mappings
deleted file mode 100644
index a28390a75..000000000
--- a/plugins/org.eclipse.emf.compare/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/plugins/org.eclipse.emf.compare/about.properties b/plugins/org.eclipse.emf.compare/about.properties
index f4451d287..76b7ed663 100644
--- a/plugins/org.eclipse.emf.compare/about.properties
+++ b/plugins/org.eclipse.emf.compare/about.properties
@@ -19,7 +19,6 @@ featureName=EMF Compare
 
 featureText=EMF Compare - Model Comparison\n\
 Version: {featureVersion}\n\
-Build id: {0}\n\
 \n\
 (c) Copyright Obeo and others. 2006, 2012.  All rights reserved.\n\
 \n\
diff --git a/plugins/org.eclipse.emf.compare/build.properties b/plugins/org.eclipse.emf.compare/build.properties
index 4708577f6..38d28d23d 100644
--- a/plugins/org.eclipse.emf.compare/build.properties
+++ b/plugins/org.eclipse.emf.compare/build.properties
@@ -13,7 +13,6 @@ bin.includes = .,\
                plugin.properties,\

                about.html,\

                about.ini,\

-               about.mappings,\

                about.properties,\

                modeling32.png

 jars.compile.order = .

@@ -22,7 +21,6 @@ source.. = src-gen/,\
 output.. = bin/

 src.includes = about.html,\

                about.ini,\

-               about.mappings,\

                about.properties,\

                modeling32.png,\

                model/