Fix DelegatingConstraintProvider localized string keys
diff --git a/plugins/org.eclipse.uml2.uml/plugin.properties b/plugins/org.eclipse.uml2.uml/plugin.properties
index e0baee3..33f3007 100644
--- a/plugins/org.eclipse.uml2.uml/plugin.properties
+++ b/plugins/org.eclipse.uml2.uml/plugin.properties
@@ -8,7 +8,7 @@
 #   IBM - initial API and implementation
 #   Kenn Hussey (Embarcadero Technologies) - 156879, 215488, 213218, 204200
 #   Kenn Hussey (CEA) - 327039, 351774, 373709
-#   Christian W. Damus (CEA) - 373643
+#   Christian W. Damus (CEA) - 373643, 374012
 #
 
 # NLS_MESSAGEFORMAT_VAR
@@ -249,8 +249,8 @@
 _UI_AssociationClass_CannotBeDefined_diagnostic = Association class ''{0}'' cannot be defined between itself and something else.
 _UI_AssociationClass_DisjointAttributesEnds_diagnostic = The owned attributes and owned ends of association class ''{0}'' are not disjoint.
 
-_UI_Validation_constraintName_ = {0}: {1}
+_UI_Validation_constraintName = {0}: {1}
 _UI_Validation_constraintDesc = The modeled constraint ''{0}''.
-_UI_Validation_violation_ = The constraint ''{0}'' is not satisfied.
+_UI_Validation_violation = The constraint ''{0}'' is not satisfied.
 _UI_Validation_runtimeError = Delegated validator operation failed with a run-time error: {0}
 _UI_Validation_linkageError = Failed to invoke reflective constraint delegation: {0}
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/validation/DelegatingConstraintDescriptor.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/validation/DelegatingConstraintDescriptor.java
index 559df69..751bd5d 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/validation/DelegatingConstraintDescriptor.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/validation/DelegatingConstraintDescriptor.java
@@ -48,7 +48,7 @@
 		this.namespace = namespace;
 		this.target = target;
 		this.name = UMLPlugin.INSTANCE.getString(
-			"_UI_Validation_constraintName_", //$NON-NLS-1$
+			"_UI_Validation_constraintName", //$NON-NLS-1$
 			new Object[]{target.getName(), name});
 
 		StringBuilder buf = new StringBuilder();
@@ -72,7 +72,7 @@
 	}
 
 	public String getDescription() {
-		return UMLPlugin.INSTANCE.getString("_UI_Validation_constraintDesc_", //$NON-NLS-1$
+		return UMLPlugin.INSTANCE.getString("_UI_Validation_constraintDesc", //$NON-NLS-1$
 			new Object[]{getName()});
 	}
 
@@ -101,7 +101,7 @@
 	}
 
 	public String getMessagePattern() {
-		return UMLPlugin.INSTANCE.getString("_UI_Validation_violation_", //$NON-NLS-1$
+		return UMLPlugin.INSTANCE.getString("_UI_Validation_violation", //$NON-NLS-1$
 			new Object[]{getName()});
 	}