bug 342628: Avoid acronym "Vex"; in "New.." wizards add the keyword "Vex"
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/plugin.properties b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/plugin.properties
index 3a89439..f6ed707 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/plugin.properties
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/plugin.properties
@@ -12,28 +12,29 @@
 pluginName= Vex UI
 providerName= Eclipse.org
 
-BuildProblemDecorator.name=Vex Plug-in Build Problem Decorator
-ConfigurationView.name=Vex Configuration
-DebugView.name=Vex Debug
-DoctypePropertyPage.name=Vex Document Type
+BuildProblemDecorator.name=Visual XML Plug-in Build Problem Decorator
+ConfigurationView.name=Visual XML Configuration
+DebugView.name=Visual XML Debug
 DocumentPerspective.name=Document
 NewDocumentWizard.name=Document
-NewDocumentWizard.desc=Create an XML document using the Vex editor.
-NewPluginProjectWizard.name=Vex Plug-in Project
-NewPluginProjectWizard.desc=Create a new Vex Plug-in project.
+NewDocumentWizard.desc=Create an XML document using the Visual Editor for XML.
+NewPluginProjectWizard.name=Visual XML Plug-in Project
+NewPluginProjectWizard.desc=Create a Visual XML Plug-in project to register XML types and to associate styles to edit these types of files with the Visual XML Editor.
 NewWizardCategory.name=XML Authoring
-PluginProjectBuilder.name=Vex Plug-in Builder
-PluginProjectDecorator.name=Vex Plug-in Project Decorator
-PluginProjectNature.name=Vex Plugin Project Nature
-StylePropertyPage.name=Vex Style
-VexCommandCategory.name=Vex XML Editor
+PluginProjectBuilder.name=Visual XML Plug-in Builder
+PluginProjectDecorator.name=Visual XML Plug-in Project Decorator
+PluginProjectNature.name=Visual XML Plug-in Project Nature
+DoctypePropertyPage.name=Visual XML Document Type
+StylePropertyPage.name=Visual XML Style
+VexCommandCategory.name=Visual XML Editor
 VexEditor.name=Visual XML Editor
 VexEditor.multipage.name=Visual/Source XML Editor (Experimental)
 VexEditorContext.name=Editing XML Documents
-VexViewCategory.name=Vex
+VexViewCategory.name=XML Authoring
+Keyword.Vex=Vex
 
-extensionPoint.doctypes=Vex Document Types
-extensionPoint.styles=Vex Styles
+extensionPoint.doctypes=Visual XML Document Types
+extensionPoint.styles=Visual XML Styles
 
 command.category.name= Vex - Visual Editor for XML
 command.addElement.name= Add Element...
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/plugin.xml b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/plugin.xml
index ff66ad2..998fa90 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/plugin.xml
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/plugin.xml
@@ -44,6 +44,9 @@
             class="org.eclipse.wst.xml.vex.ui.internal.wizards.NewDocumentWizard"
             id="org.eclipse.wst.xml.vex.ui.NewDocumentWizard">
          <description>%NewDocumentWizard.desc</description>
+         <keywordReference
+               id="org.eclipse.wst.xml.vex.ui.KeywordVex">
+         </keywordReference>
       </wizard>
    </extension>
    <extension
@@ -482,6 +485,9 @@
             project="true"
             id="org.eclipse.wst.xml.vex.ui.config.NewPluginProjectWizard">
          <description>%NewPluginProjectWizard.desc</description>
+         <keywordReference
+               id="org.eclipse.wst.xml.vex.ui.KeywordVex">
+         </keywordReference>
       </wizard>
    </extension>
    <extension
@@ -838,5 +844,12 @@
          </separator>
       </menuContribution>
    </extension>
+   <extension
+         point="org.eclipse.ui.keywords">
+      <keyword
+            id="org.eclipse.wst.xml.vex.ui.KeywordVex"
+            label="%Keyword.Vex">
+      </keyword>
+   </extension>
 
 </plugin>
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages.properties b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages.properties
index 8269c49..72f2004 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages.properties
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages.properties
@@ -4,7 +4,7 @@
 # * 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:
 # *     John Krasnay - initial API and implementation
 # *******************************************************************************
@@ -12,26 +12,26 @@
 Messages.cantFindResource=Can''t find resource string {0}
 
 StyleFactory.pluralName=Styles
-StylePropertyPage.loading=The Configuration is being loaded ... 
+StylePropertyPage.loading=The Configuration is being loaded ...
 StylePropertyPage.name=Name:
 StylePropertyPage.doctypes=Document Types:
 ConfigLoaderJob.loadingConfig=Loading Vex configuration
-ConfigLoaderJob.loading=Loading 
+ConfigLoaderJob.loading=Loading
 ConfigPlugin.loadError=Unable to load {0} from project {1}
 ConfigLoaderJob.loadingError=Error loading {0}. Rebuilding from scratch.
-ConfigSource.errorParsingUri=Error parsing 
+ConfigSource.errorParsingUri=Error parsing
 ConfigLoaderJob.cacheError=Unable to cache configuration in {0}
 ConfigurationView.loading=Loading...
 ConfigLoaderJob.loadingProject=Loading project {0}
 ConfigLoaderJob.natureError=Error determining nature of project {0}
 DoctypeFactory.pluralName=Document Types
 DoctypePropertyPage.errorWritingConfig=Error writing {0}
-DoctypePropertyPage.loading=The Configuration is being loaded ... 
+DoctypePropertyPage.loading=The Configuration is being loaded ...
 DoctypePropertyPage.name=Name:
 DoctypePropertyPage.publicId=Public ID:
 DoctypePropertyPage.systemId=System ID:
 DoctypePropertyPage.rootElements=Root Elements:
-NewPluginProjectWizard.title=New Vex Plug-in Project
+NewPluginProjectWizard.title=New Visual XML Plug-in Project
 NewPluginProjectWizard.createError=Error creating plug-in project
 PluginProject.malformedUrl=Project base URL is malformed.
 PluginProject.notPluginProject=Project {0}  is not a Vex plugin project.
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages_fr.properties b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages_fr.properties
index e16b092..d2afe19 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages_fr.properties
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/config/messages_fr.properties
@@ -4,33 +4,32 @@
 # * 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:

 # *     John Krasnay - initial API and implementation

 # *******************************************************************************

 Messages.cantFindResource=Ne peut pas trouver la ressource : {0}

 

 StyleFactory.pluralName=Styles

-StylePropertyPage.loading=La configuration a été chargée ... 

+StylePropertyPage.loading=La configuration a été chargée ...

 StylePropertyPage.name=Nom:

 StylePropertyPage.doctypes=Types de Document:

 ConfigLoaderJob.loadingConfig=Chargement de la configuration de Vex

-ConfigLoaderJob.loading=Chargement 

+ConfigLoaderJob.loading=Chargement

 ConfigPlugin.loadError=Impossible de charger {0} du projet {1}

 ConfigLoaderJob.loadingError=Erreur au chargement {0}. Reconstuction.

-ConfigSource.errorParsingUri=Erreur d'analyse 

+ConfigSource.errorParsingUri=Erreur d'analyse

 ConfigLoaderJob.cacheError=Impossible de mettre en cache la configuration pour {0}

 ConfigurationView.loading=Chargement...

 ConfigLoaderJob.loadingProject=Chargement du projet {0}

 ConfigLoaderJob.natureError=Erreur lors de la détermination du projet {0}

 DoctypeFactory.pluralName=Types de Document

 DoctypePropertyPage.errorWritingConfig=Erreur à l'écriture {0}

-DoctypePropertyPage.loading=La configuration est chargée ... 

+DoctypePropertyPage.loading=La configuration est chargée ...

 DoctypePropertyPage.name=Nom:

 DoctypePropertyPage.publicId=Public ID:

 DoctypePropertyPage.systemId=System ID:

 DoctypePropertyPage.rootElements=Elements Racines:

-NewPluginProjectWizard.title=Nouveau projet Vex

 NewPluginProjectWizard.createError=Erreur à la création du projet Vex

 PluginProject.malformedUrl=L'URL de base du projet est incorrecte

 PluginProject.notPluginProject=Le projet {0} n'est pas un projet Vex.

diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages.properties b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages.properties
index 72db90f..9ce15bb 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages.properties
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages.properties
@@ -18,7 +18,7 @@
 command.convertElement.dynamicName= &Convert ''{0}'' To...
 command.convertElement.dynamicCommandName= Convert ''{0}'' to ''{1}''
 
-DebugView.noActiveEditor=No Vex editor is currently active.
+DebugView.noActiveEditor=No Visual XML Editor is currently active.
 
 DocumentFileCreationPage.title=File
 DocumentFileCreationPage.desc=Enter a file name for the new document.
@@ -31,9 +31,9 @@
 
 DocumentTypeSelectionDialog.ok=OK
 DocumentTypeSelectionDialog.cancel=Cancel
-DocumentTypeSelectionDialog.unknownDoctype=Vex does not recognize the document type ''{0}''. To open the document with a different document type, select one of the registered document types below.
+DocumentTypeSelectionDialog.unknownDoctype=Unknown document type: ''{0}''. To open the document with a different document type, select one of the registered document types below:
 DocumentTypeSelectionDialog.selectDoctype=Select Document Type
-DocumentTypeSelectionDialog.noDoctype=Vex cannot determine a document type from the selected document. Please select a document type from the following list.
+DocumentTypeSelectionDialog.noDoctype=The document does not contain a document type specification. Please select a document type from the list below:
 DocumentTypeSelectionDialog.alwaysUse=Always use this document type for the selected document.
 
 DocumentTypeSelectionPage.title=Document Type
@@ -44,7 +44,7 @@
 
 ElementPropertySource.multiple=(multiple)
 
-NewDocumentWizard.title=New Vex Document
+NewDocumentWizard.title=New Document
 NewDocumentWizard.noStyles.title=Error
 NewDocumentWizard.noStyles.message=No styles for the given document type.
 NewDocumentWizard.errorLoading.message=Error loading {0}: {1}
diff --git a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages_fr.properties b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages_fr.properties
index b406309..494f7ab 100644
--- a/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages_fr.properties
+++ b/sourceediting/plugins/org.eclipse.wst.xml.vex.ui/src/org/eclipse/wst/xml/vex/ui/internal/editor/messages_fr.properties
@@ -26,9 +26,7 @@
 
 DocumentTypeSelectionDialog.ok=Accepter
 DocumentTypeSelectionDialog.cancel=Abandonner
-DocumentTypeSelectionDialog.unknownDoctype=Vex ne connait pas le type de document '{0}'. Pour ouvrir le document avec un autre type de document, sélectionner un des types enregistrés ci-dessous.
 DocumentTypeSelectionDialog.selectDoctype=Sélectionner un type de document
-DocumentTypeSelectionDialog.noDoctype=Vex ne peut pas déterminer le type de document pour le document sélectionné. Sélectionner un des types de document dans la liste suivante.
 DocumentTypeSelectionDialog.alwaysUse=Toujours utiliser ce type de document pour le document sélectionné.
 Always use this document type for the selected document.
 
@@ -40,7 +38,7 @@
 
 ElementPropertySource.multiple=(multiple)
 
-NewDocumentWizard.title=Nouveau Document Vex
+NewDocumentWizard.title=Nouveau Document
 NewDocumentWizard.noStyles.title=Erreur
 NewDocumentWizard.noStyles.message=Pas de styles pour le type de document donné
 NewDocumentWizard.errorLoading.message=Erreur de chargement {0}: {1}