Merge branch 'master' into bugs/402206
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/feature.properties b/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/feature.properties
index 70d0051..7fbb3a4 100644
--- a/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/feature.properties
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui-feature/feature.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# Copyright (c) 2003, 2014 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -7,9 +7,9 @@
# Contributors:
# IBM - initial API and implementation
# Kenn Hussey (Embarcadero Technologies) - 204200
-# Kenn Hussey - 314388, 341158
-# Kenn Hussey - 351776
+# Kenn Hussey - 314388, 341158, 351776
# Christian W. Damus (CEA) - 227616
+# Kenn Hussey (CEA) - 227616
#
# NLS_MESSAGEFORMAT_VAR
@@ -20,7 +20,7 @@
# java.io.Properties file (ISO 8859-1 with "\" escapes)
# "feature.label" property - name of the feature
-feature.label = UML Ecore Code Generation
+feature.label = UML2 Ecore Code Generation
# "feature.provider-name" property - name of the company that provides the feature
feature.provider-name = Eclipse Modeling Project
diff --git a/plugins/org.eclipse.uml2.codegen.ecore.ui/about.properties b/plugins/org.eclipse.uml2.codegen.ecore.ui/about.properties
index 3236ff5..88f63d5 100644
--- a/plugins/org.eclipse.uml2.codegen.ecore.ui/about.properties
+++ b/plugins/org.eclipse.uml2.codegen.ecore.ui/about.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# Copyright (c) 2006, 2014 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,6 +9,7 @@
# Kenn Hussey (Embarcadero Technologies) - 219804, 204200
# Kenn Hussey - 323181
# Christian W. Damus (CEA) - 227616
+# Kenn Hussey (CEA) - 227616
#
# NLS_MESSAGEFORMAT_VAR
@@ -19,10 +20,10 @@
# fill-ins are supplied by about.mappings
# This file should be translated.
-aboutText = UML Ecore Code Generation\n\
+aboutText = UML2 Ecore Code Generation\n\
\n\
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Eclipse contributors and others 2003, 2013. All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2003, 2014. All rights reserved.\n\
Visit http://www.eclipse.org/uml2
diff --git a/plugins/org.eclipse.uml2.uml-feature/feature.properties b/plugins/org.eclipse.uml2.uml-feature/feature.properties
index be4b93c..e2f6fc6 100644
--- a/plugins/org.eclipse.uml2.uml-feature/feature.properties
+++ b/plugins/org.eclipse.uml2.uml-feature/feature.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2003, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# Copyright (c) 2003, 2014 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -7,9 +7,9 @@
# Contributors:
# IBM - initial API and implementation
# Kenn Hussey (Embarcadero Technologies) - 204200
-# Kenn Hussey - 314388, 341158
-# Kenn Hussey - 351776
+# Kenn Hussey - 314388, 341158, 351776
# Christian W. Damus (CEA) - 227616
+# Kenn Hussey (CEA) - 227616
#
# NLS_MESSAGEFORMAT_VAR
@@ -29,4 +29,4 @@
update.label = Eclipse Modeling Project Updates
# "description" property - description of the feature
-description = Implementation of the Unified Modeling Language 2.x (UML) metamodel and supporting model resources such as standard profiles and model libraries.
+description = Implementation of the Unified Modeling Language (UML) 2.x metamodel and supporting model resources such as standard profiles and model libraries.
diff --git a/plugins/org.eclipse.uml2.uml/about.properties b/plugins/org.eclipse.uml2.uml/about.properties
index 9c13172..29d9a3f 100644
--- a/plugins/org.eclipse.uml2.uml/about.properties
+++ b/plugins/org.eclipse.uml2.uml/about.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013 IBM Corporation, Embarcadero Technologies, CEA, and others.
+# Copyright (c) 2006, 2014 IBM Corporation, Embarcadero Technologies, CEA, 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
@@ -9,6 +9,7 @@
# Kenn Hussey (Embarcadero Technologies) - 219804, 204200
# Kenn Hussey - 323181
# Christian W. Damus (CEA) - 227616
+# Kenn Hussey (CEA) - 227616
#
# NLS_MESSAGEFORMAT_VAR
@@ -24,5 +25,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Eclipse contributors and others 2003, 2013. All rights reserved.\n\
+(c) Copyright Eclipse contributors and others 2003, 2014. All rights reserved.\n\
Visit http://www.eclipse.org/uml2
