Bug 474434: Cleanup externalized strings, remove invalid entries

Did some cleaning of externalized strings.
Remove some unused entries, invalid entries and stuff like filenames,
EMF feature names.

Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=474434
Change-Id: I4e8a100175645fdb64af34caaf14194689dceacd
Signed-off-by: Flavio Donzé <flavio.donze@gmx.ch>
diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/plugin.properties b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/plugin.properties
index 44a9111..77f71f9 100644
--- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/plugin.properties
+++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/plugin.properties
@@ -169,24 +169,17 @@
 category.name.20 = jBPM Constraints
 constraint.name = Process Validation
 constraint.description = Process Name, ID and Package Name validation.
-constraint.message = {0}
 constraint.name.0 = Business Rule Task Validation
 constraint.description.0 = Business Rule Task validation.
-constraint.message.0 = {0}
 constraint.name.1 = User Task Validation
 constraint.description.1 = User Task validation.
-constraint.message.1 = {0}
 constraint.name.2 = Task Validation
 constraint.description.2 = Task validation.
-constraint.message.2 = {0}
 constraint.name.3 = Gateway Validation
 constraint.description.3 = Gateway validation.
-constraint.message.3 = {0}
 constraint.name.4 = CallActivity Validation
 constraint.description.4 = CallActivity validation.
-constraint.message.4 = {0}
 constraint.name.5 = Infos
-constraint.message.5 = {0}
 constraint.description.5 = Variable Name Validation Errors
 extension.name = jBPM Process Problem
 category.name.21 = BPMN2
diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/wizards/Messages.java b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/wizards/Messages.java
index 0704681..7b343f0 100644
--- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/wizards/Messages.java
+++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/wizards/Messages.java
@@ -19,7 +19,6 @@
 	public static String NewJbpmProcessWizard_Error_Title;
 	public static String NewJbpmProcessWizard_Monitor_Title;
 	public static String NewJbpmProcessWizard_Opening_File_Message;
-	public static String NewJbpmProcessWizardPage1_BPMN_File_Extension;
 	public static String NewJbpmProcessWizardPage1_Browse;
 	public static String NewJbpmProcessWizardPage1_Browse_Title;
 	public static String NewJbpmProcessWizardPage1_Container;
diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/wizards/NewJbpmProcessWizardPage1.java b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/wizards/NewJbpmProcessWizardPage1.java
index 7d24f3b..fa459a8 100644
--- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/wizards/NewJbpmProcessWizardPage1.java
+++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/wizards/NewJbpmProcessWizardPage1.java
@@ -187,11 +187,11 @@
 			}
 		}
 		String basename = Messages.NewJbpmProcessWizardPage1_Default_File_Name;
-		String filename = basename + Messages.NewJbpmProcessWizardPage1_BPMN_File_Extension;
+		String filename = basename + ".bpmn"; //$NON-NLS-1$
 		if (container!=null) {
 			int i = 1;
 			while (container.findMember(filename)!=null) {
-				filename = basename + "_" + i + Messages.NewJbpmProcessWizardPage1_BPMN_File_Extension; //$NON-NLS-1$
+				filename = basename + "_" + i + ".bpmn"; //$NON-NLS-1$ //$NON-NLS-2$
 				++i;
 			}
 		}
diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/wizards/messages.properties b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/wizards/messages.properties
index 6ed480c..422e38f 100644
--- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/wizards/messages.properties
+++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5/src/org/eclipse/bpmn2/modeler/runtime/jboss/jbpm5/wizards/messages.properties
@@ -13,7 +13,6 @@
 NewJbpmProcessWizard_Error_Title=Error
 NewJbpmProcessWizard_Monitor_Title=Creating {0}
 NewJbpmProcessWizard_Opening_File_Message=Opening file for editing...
-NewJbpmProcessWizardPage1_BPMN_File_Extension=.bpmn
 NewJbpmProcessWizardPage1_Browse=Browse...
 NewJbpmProcessWizardPage1_Browse_Title=Select new file container
 NewJbpmProcessWizardPage1_Container=&Container:
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/Messages.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/Messages.java
index d7ea44a..5737059 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/Messages.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/Messages.java
@@ -111,16 +111,13 @@
 	public static String DefaultSchemaImportDialog_All;
 	public static String DefaultSchemaImportDialog_BPMN2_Filter_1;
 	public static String DefaultSchemaImportDialog_BPMN2_Filter_2;
-	public static String DefaultSchemaImportDialog_BPMN2_Type;
 	public static String DefaultSchemaImportDialog_Java_Filter_1;
 	public static String DefaultSchemaImportDialog_Java_Filter_2;
 	public static String DefaultSchemaImportDialog_Java_Filter_3;
 	public static String DefaultSchemaImportDialog_Missing_Namespace_Message;
 	public static String DefaultSchemaImportDialog_WSDL_Filter;
-	public static String DefaultSchemaImportDialog_WSDL_Type;
 	public static String DefaultSchemaImportDialog_XML_Filter;
 	public static String DefaultSchemaImportDialog_XSD_Filter;
-	public static String DefaultSchemaImportDialog_XSD_Type;
 	public static String UI_UnknownDiagram_description;
 	public static String UI_Process_description;
 	public static String UI_Choreography_description;
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/Messages.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/Messages.java
index 466406c..2db0620 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/Messages.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/Messages.java
@@ -38,10 +38,6 @@
 	public static String ItemDefinitionPropertiesAdapter_Structure;
 	public static String OperationPropertiesAdapter_Title;
 	public static String ParticipantPropertiesAdapter_Multiplicity;
-	public static String PropertyPropertiesAdapter_EventVar_Prefix;
-	public static String PropertyPropertiesAdapter_LocalVar_Prefix;
-	public static String PropertyPropertiesAdapter_ProcessVar_Prefix;
-	public static String PropertyPropertiesAdapter_TaskVar_Prefix;
 	public static String PropertyPropertiesAdapter_Property_Label;
 	public static String SignalPropertiesAdapter_ID;
 	public static String Interface_Operations_Label;
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/PropertyPropertiesAdapter.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/PropertyPropertiesAdapter.java
index 13c3161..46c7eba 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/PropertyPropertiesAdapter.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/PropertyPropertiesAdapter.java
@@ -110,20 +110,20 @@
 	}
 
 	public static Property createProperty(List<Property> properties) {
-		String base = Messages.PropertyPropertiesAdapter_LocalVar_Prefix;
+		String base = "localVar"; //$NON-NLS-1$
 		
 		Resource resource = null;
 		if (properties instanceof EcoreEList) {
 			EObject owner = ((EcoreEList)properties).getEObject();
 			resource = owner.eResource();
 			if (owner instanceof Event) {
-				base = Messages.PropertyPropertiesAdapter_EventVar_Prefix;
+				base = "eventVar"; //$NON-NLS-1$
 			}
 			else if (owner instanceof Process) {
-				base = Messages.PropertyPropertiesAdapter_ProcessVar_Prefix;
+				base = "processVar"; //$NON-NLS-1$
 			}
 			else if (owner instanceof Task) {
-				base = Messages.PropertyPropertiesAdapter_TaskVar_Prefix;
+				base = "taskVar"; //$NON-NLS-1$
 			}
 		}
 		
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/messages.properties b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/messages.properties
index 478bf8d..de7a35d 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/messages.properties
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/adapters/properties/messages.properties
@@ -32,10 +32,6 @@
 ItemDefinitionPropertiesAdapter_Structure=Structure
 OperationPropertiesAdapter_Title=Select an Interface for the new Operation
 ParticipantPropertiesAdapter_Multiplicity=Multiplicity
-PropertyPropertiesAdapter_EventVar_Prefix=eventVar
-PropertyPropertiesAdapter_LocalVar_Prefix=localVar
-PropertyPropertiesAdapter_ProcessVar_Prefix=processVar
-PropertyPropertiesAdapter_TaskVar_Prefix=taskVar
 PropertyPropertiesAdapter_Property_Label=Properties
 SignalPropertiesAdapter_ID=ID: 
 Interface_Operations_Label=Defined Operations
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/diagram/Bpmn2ToolBehaviorProvider.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/diagram/Bpmn2ToolBehaviorProvider.java
index 808f065..f6101cf 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/diagram/Bpmn2ToolBehaviorProvider.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/diagram/Bpmn2ToolBehaviorProvider.java
@@ -725,7 +725,7 @@
 			if (i+2 == names.size())
 				description += Messages.BPMNToolBehaviorProvider_Click_Drag_Prompt_Last_Separator;
 			else if (i+1 < names.size())
-				description += Messages.BPMNToolBehaviorProvider_Click_Drag_Prompt_Separator;
+				description += ","; //$NON-NLS-1$
 		}
 		button.setDescription(description);
 
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/diagram/Messages.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/diagram/Messages.java
index e204893..3c61a93 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/diagram/Messages.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/diagram/Messages.java
@@ -16,7 +16,6 @@
 	private static final String BUNDLE_NAME = "org.eclipse.bpmn2.modeler.ui.diagram.messages"; //$NON-NLS-1$
 	public static String BPMNToolBehaviorProvider_Click_Drag_Prompt;
 	public static String BPMNToolBehaviorProvider_Click_Drag_Prompt_Last_Separator;
-	public static String BPMNToolBehaviorProvider_Click_Drag_Prompt_Separator;
 	public static String BPMNToolBehaviorProvider_Connectors_Drawer_Label;
 	public static String BPMNToolBehaviorProvider_Custom_Tasks_Drawer_Label;
 	public static String BPMNToolBehaviorProvider_Data_Items_Drawer_Label;
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/diagram/messages.properties b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/diagram/messages.properties
index fbe89f1..fdf4439 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/diagram/messages.properties
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/diagram/messages.properties
@@ -10,7 +10,6 @@
 #-------------------------------------------------------------------------------
 BPMNToolBehaviorProvider_Click_Drag_Prompt=Click and drag to create a\n
 BPMNToolBehaviorProvider_Click_Drag_Prompt_Last_Separator=\ or 
-BPMNToolBehaviorProvider_Click_Drag_Prompt_Separator=, 
 BPMNToolBehaviorProvider_Connectors_Drawer_Label=Connectors
 BPMNToolBehaviorProvider_Custom_Tasks_Drawer_Label=Custom Tasks
 BPMNToolBehaviorProvider_Data_Items_Drawer_Label=Data Items
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/messages.properties b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/messages.properties
index 2d8a04f..f5e424f 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/messages.properties
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/messages.properties
@@ -349,11 +349,8 @@
  Defines the state of the data, for example an Order may be "Submitted", "Rejected", "Fulfilled" etc.
 
 CommonLabels_Data_Type=Data Type
-DefaultSchemaImportDialog_XSD_Type=XSD Schema
 DefaultSchemaImportDialog_XML_Filter=XML Files
 DefaultSchemaImportDialog_XSD_Filter=XML Schema Files
-DefaultSchemaImportDialog_WSDL_Type=WSDL
-DefaultSchemaImportDialog_BPMN2_Type=BPMN2
 DefaultSchemaImportDialog_Missing_Namespace_Message=This {0} does not define a target namespace
 DefaultSchemaImportDialog_All=All
 DefaultSchemaImportDialog_BPMN2_Filter_1=BPMN 2.0 Diagram Files
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/DefaultSchemaImportDialog.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/DefaultSchemaImportDialog.java
index a6f7056..2c007a1 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/DefaultSchemaImportDialog.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/dialogs/DefaultSchemaImportDialog.java
@@ -758,20 +758,20 @@
 				XSDSchema schema = (XSDSchema)fInput;
 				ns = schema.getTargetNamespace();
 				loc = schema.getSchemaLocation();
-				type = Messages.DefaultSchemaImportDialog_XSD_Type;
+				type = "XSD Schema"; //$NON-NLS-1$
 			}
 			else if (fInput instanceof Definition) {
 				Definition definition = (Definition)fInput;
 				ns = definition.getTargetNamespace();
 				loc = definition.getLocation();
-				type = Messages.DefaultSchemaImportDialog_WSDL_Type;
+				type = "WSDL"; //$NON-NLS-1$
 			}
 			else if (fInput instanceof org.eclipse.bpmn2.DocumentRoot) {
 				DocumentRoot root = (DocumentRoot)fInput;
 				org.eclipse.bpmn2.Definitions definitions = root.getDefinitions();
 				ns = definitions.getTargetNamespace();
 				loc = root.eResource().getURI().toString();
-				type = Messages.DefaultSchemaImportDialog_BPMN2_Type;
+				type = "BPMN2";//$NON-NLS-1$
 				fInput = definitions;
 			}
 			else if (fInput instanceof List) {
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoSetsListComposite.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoSetsListComposite.java
index e4b1acc..e2879d7 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoSetsListComposite.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/IoSetsListComposite.java
@@ -69,22 +69,22 @@
 		setListItemClass(listItemClass);
 		
 		EStructuralFeature f;
-		f = listItemClass.getEStructuralFeature(Messages.IoSetsListComposite_0);
+		f = listItemClass.getEStructuralFeature("name"); //$NON-NLS-1$
 		TableColumn tc;
 		tc = new IoSetNameColumn(ioSpecification,f);
 		tc.setEditable(true);
 		columnProvider.add(tc);
 
-		isInput = (Messages.IoSetsListComposite_1.equals(ioFeature.getName()));
+		isInput = ("inputSets".equals(ioFeature.getName())); //$NON-NLS-1$
 		if (isInput) {
 			ioSet = ioSpecification.getInputSets();
 
-			f = listItemClass.getEStructuralFeature(Messages.IoSetsListComposite_2);
+			f = listItemClass.getEStructuralFeature("dataInputRefs"); //$NON-NLS-1$
 			tc = new IoParameterNameColumn(ioSpecification,f);
 			tc.setHeaderText(Messages.IoSetsListComposite_Input_Data_Header);
 			columnProvider.add(tc);
 			
-			f = listItemClass.getEStructuralFeature(Messages.IoSetsListComposite_4);
+			f = listItemClass.getEStructuralFeature("optionalInputRefs"); //$NON-NLS-1$
 			tc = new IoParameterNameColumn(ioSpecification,f);
 			tc.setHeaderText(Messages.IoSetsListComposite_Optional_Inputs_Header);
 			columnProvider.add(tc);
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/Messages.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/Messages.java
index b34407f..3f4c785 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/Messages.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/Messages.java
@@ -47,11 +47,7 @@
 	public static String IoParametersDetailComposite_Output_Sets_Title;
 	public static String IoParametersListComposite_From_Header;
 	public static String IoParametersListComposite_To_Header;
-	public static String IoSetsListComposite_0;
-	public static String IoSetsListComposite_1;
-	public static String IoSetsListComposite_2;
 	public static String IoSetsListComposite_Input_Data_Header;
-	public static String IoSetsListComposite_4;
 	public static String IoSetsListComposite_Optional_Inputs_Header;
 	public static String IoSetsListComposite_Evaluated_While_Executing_Header;
 	public static String IoSetsListComposite_Input_Sets_Reqd_Header;
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/messages.properties b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/messages.properties
index 6b25175..d409101 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/messages.properties
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/property/tasks/messages.properties
@@ -41,11 +41,7 @@
 IoParametersDetailComposite_Output_Sets_Title=Output Sets
 IoParametersListComposite_From_Header=From
 IoParametersListComposite_To_Header=To
-IoSetsListComposite_0=name
-IoSetsListComposite_1=inputSets
-IoSetsListComposite_2=dataInputRefs
 IoSetsListComposite_Input_Data_Header=Input Data
-IoSetsListComposite_4=optionalInputRefs
 IoSetsListComposite_Optional_Inputs_Header=Optional Inputs
 IoSetsListComposite_Evaluated_While_Executing_Header=Evaluated While Executing
 IoSetsListComposite_Input_Sets_Reqd_Header=Input Sets Required
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/wizards/BPMN2DiagramWizardPage2.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/wizards/BPMN2DiagramWizardPage2.java
index 20293b7..825cb66 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/wizards/BPMN2DiagramWizardPage2.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/wizards/BPMN2DiagramWizardPage2.java
@@ -158,7 +158,7 @@
 	private void updateFilename() {
 		BPMN2DiagramWizardPage1 page1 = (BPMN2DiagramWizardPage1)getWizard().getPage("wizardPage1"); //$NON-NLS-1$
 		String fileType = "unknown"; //$NON-NLS-1$
-		String filename = fileType+Messages.BPMN2DiagramWizardPage2_BPMN_Extension;
+		String filename = fileType+".bpmn"; //$NON-NLS-1$
 		switch (page1.getDiagramType()) {
 		case PROCESS:
 			fileType = "process"; //$NON-NLS-1$
@@ -179,7 +179,7 @@
 			if (text!=null && !text.equals(getContainerName()))
 				containerText.setText(text);
 			for (int i=1; ; ++i) {
-				filename = fileType+"_" + i + Messages.BPMN2DiagramWizardPage2_BPMN_Extension; //$NON-NLS-1$
+				filename = fileType+"_" + i + ".bpmn"; //$NON-NLS-1$ //$NON-NLS-2$
 				IResource file = container.findMember(filename);
 				if (file==null) {
 					break;
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/wizards/Messages.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/wizards/Messages.java
index 142bb5d..4017a7e 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/wizards/Messages.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/wizards/Messages.java
@@ -21,7 +21,6 @@
 	public static String BPMN2DiagramWizardPage1_Description;
 	public static String BPMN2DiagramWizardPage1_Process_Diagram_Description;
 	public static String BPMN2DiagramWizardPage1_Title;
-	public static String BPMN2DiagramWizardPage2_BPMN_Extension;
 	public static String BPMN2DiagramWizardPage2_Browse_Button;
 	public static String BPMN2DiagramWizardPage2_Choreography_Diagram;
 	public static String BPMN2DiagramWizardPage2_Collaboration_Diagram;
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/wizards/messages.properties b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/wizards/messages.properties
index 3599f3b..de9ad9e 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/wizards/messages.properties
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/wizards/messages.properties
@@ -15,7 +15,6 @@
 BPMN2DiagramWizardPage1_Description=Select a BPMN 2.0 Diagram Type.
 BPMN2DiagramWizardPage1_Process_Diagram_Description=A Process describes a sequence or flow of Activities in an organization with the objective of carrying out work. A Process contains Activities, Events, Gateways, and Sequence Flows that define its execution semantics.
 BPMN2DiagramWizardPage1_Title=BPMN2 Diagram Type
-BPMN2DiagramWizardPage2_BPMN_Extension=.bpmn
 BPMN2DiagramWizardPage2_Browse_Button=Browse...
 BPMN2DiagramWizardPage2_Choreography_Diagram=Choreography Diagram
 BPMN2DiagramWizardPage2_Collaboration_Diagram=Collaboration Diagram