[472057] Externalize translatable strings from plugin.xml files

Also Configure PDE Tooling to consider non-externalized strings in
plugin.xml as errors from now on.

I've reviewed all our own extension point definitions (*.exsd) for
possibly translatable strings which were not marked as such (and thus
for which we would not get the benefit of PDE's check), but the only
candidates are for attributes we do not actually use anywhere (e.g. we
allow an extender to provide labels for
org.eclipse.sirius.common.acceleo.mtl.importhandler, but even if it is
supplied we do nothing with it). To avoid changes which would have no
actual benefit, the *.exsd files have not been modified.

Bug: 472057
Change-Id: I51f932c8ae5ee8bfea268213649fc3448d0bd827
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

81 files changed, 544 insertions, 307 deletions

diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql.ide/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.aql.ide/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql.ide/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.common.acceleo.aql/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.common.acceleo.aql/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.aql/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.common.acceleo.aql/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.properties b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.properties
index bbafb7950a..d31f92f31e 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.properties
@@ -11,3 +11,6 @@
 
 pluginName = Sirius IDE Support for Acceleo 3 Expressions
 providerName = Eclipse Modeling Project
+
+command.toggleAcceleoNature.name = Convert to Acceleo project
+wksJavaImportHandler.label = Java services from workspace
\ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.xml b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.xml
index 1010d19fcf..6fff8bcb8e 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.xml
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.xml
@@ -16,7 +16,7 @@
          point="org.eclipse.sirius.common.acceleo.mtl.importhandler">
       <importHandler
             class="org.eclipse.sirius.common.acceleo.mtl.ide.WorkspaceJavaImportHandler"
-            label="Java services from workspace">
+            label="%wksJavaImportHandler.label">
       </importHandler>
    </extension>
    <extension
@@ -31,7 +31,7 @@
       <command
             defaultHandler="org.eclipse.acceleo.internal.ide.ui.natures.AcceleoToggleNatureAction"
             id="org.eclipse.sirius.common.acceleo.mtl.ide.internal.convert"
-            name="Convert to Acceleo project">
+            name="%command.toggleAcceleoNature.name">
       </command>
    </extension>
 </plugin>
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.common.acceleo.mtl/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl/plugin.properties b/plugins/org.eclipse.sirius.common.acceleo.mtl/plugin.properties
index e6c772a939..f98c9df2a1 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl/plugin.properties
@@ -11,3 +11,6 @@
 
 pluginName = Sirius Support for Acceleo 3 Expressions
 providerName = Eclipse Modeling Project
+
+extension-point.importHandler.name = Import Handler
+javaImportHandler.label = Java services from classpath
\ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl/plugin.xml b/plugins/org.eclipse.sirius.common.acceleo.mtl/plugin.xml
index 5c682e6abd..0084036d97 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl/plugin.xml
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl/plugin.xml
@@ -12,7 +12,7 @@
 -->
 
 <plugin>
-   <extension-point id="org.eclipse.sirius.common.acceleo.mtl.importhandler" name="Import Handler" schema="schema/importhandler.exsd"/>
+   <extension-point id="org.eclipse.sirius.common.acceleo.mtl.importhandler" name="%extension-point.importHandler.name" schema="schema/importhandler.exsd"/>
    <extension
          id="org.eclipse.sirius.common.acceleo.mtl.AcceleoMTLInterpreter"
          point="org.eclipse.sirius.common.expressionInterpreter">
@@ -25,7 +25,7 @@
          point="org.eclipse.sirius.common.acceleo.mtl.importhandler">
       <importHandler
             class="org.eclipse.sirius.common.acceleo.mtl.business.api.extension.JavaImportHandler"
-            label="Java services from classpath">
+            label="%javaImportHandler.label">
       </importHandler>
    </extension>
 
diff --git a/plugins/org.eclipse.sirius.common.ocl/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.common.ocl/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.common.ocl/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.common.ocl/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.common.ui.ext/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.common.ui.ext/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.common.ui.ext/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.common.ui.ext/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.common.ui.ext/plugin.properties b/plugins/org.eclipse.sirius.common.ui.ext/plugin.properties
index 0054ab74eb..2bc5176c38 100644
--- a/plugins/org.eclipse.sirius.common.ui.ext/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.ui.ext/plugin.properties
@@ -11,3 +11,6 @@
 
 pluginName = Sirius Common UI Extensions
 providerName = Eclipse Modeling Project
+
+category.profiling.name = Sirius Profiler
+view.profiler.name = Time Profiler View
diff --git a/plugins/org.eclipse.sirius.common.ui.ext/plugin.xml b/plugins/org.eclipse.sirius.common.ui.ext/plugin.xml
index 9586bc458d..44447bf1a5 100644
--- a/plugins/org.eclipse.sirius.common.ui.ext/plugin.xml
+++ b/plugins/org.eclipse.sirius.common.ui.ext/plugin.xml
@@ -17,13 +17,13 @@
          point="org.eclipse.ui.views">
       <category
             id="org.eclipse.sirius.common.ui.profiling"
-            name="Sirius Profiler">
+            name="%category.profiling.name">
       </category>
       <view
             category="org.eclipse.sirius.common.ui.profiling"
             class="org.eclipse.sirius.common.ui.tools.api.profiler.view.TimeProfilerView"
             id="org.eclipse.sirius.common.ui.view.timeProfiler"
-            name="Time Profiler View">
+            name="%view.profiler.name">
       </view>
    </extension>
 </plugin>
diff --git a/plugins/org.eclipse.sirius.common.ui/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.common.ui/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.common.ui/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.common.ui/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.common.ui/plugin.properties b/plugins/org.eclipse.sirius.common.ui/plugin.properties
index 32ef71a098..5a79f3e4cf 100644
--- a/plugins/org.eclipse.sirius.common.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.ui/plugin.properties
@@ -11,3 +11,6 @@
 
 pluginName = Sirius UI Commons
 providerName = Eclipse Modeling Project
+
+extension-point.propertyContributorLabelProviderDelegate.name = org.eclipse.sirius.common.ui.views.properties.tabbed.propertyContributorLabelProviderDelegate
+extension-point.savedialogextension.name = org.eclipse.sirius.common.ui.savedialogextension
diff --git a/plugins/org.eclipse.sirius.common.ui/plugin.xml b/plugins/org.eclipse.sirius.common.ui/plugin.xml
index d389712b9c..a6f1cbcafc 100644
--- a/plugins/org.eclipse.sirius.common.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.common.ui/plugin.xml
@@ -12,8 +12,8 @@
 -->
 
 <plugin>
-   <extension-point id="savedialogextension" name="org.eclipse.sirius.common.ui.savedialogextension" schema="schema/savedialogextension.exsd"/>
-   <extension-point id="propertyContributorLabelProviderDelegate" name="org.eclipse.sirius.common.ui.views.properties.tabbed.propertyContributorLabelProviderDelegate" schema="schema/propertyContributorLabelProviderDelegate.exsd"/>
+   <extension-point id="savedialogextension" name="%extension-point.savedialogextension.name" schema="schema/savedialogextension.exsd"/>
+   <extension-point id="propertyContributorLabelProviderDelegate" name="%extension-point.propertyContributorLabelProviderDelegate.name" schema="schema/propertyContributorLabelProviderDelegate.exsd"/>
    
    <extension
        point="org.eclipse.sirius.common.fileModificationValidator">
diff --git a/plugins/org.eclipse.sirius.common.xtext/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.common.xtext/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.common.xtext/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.common.xtext/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.common/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.common/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.common/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.common/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.common/plugin.properties b/plugins/org.eclipse.sirius.common/plugin.properties
index c079e3f5d0..092209dad9 100644
--- a/plugins/org.eclipse.sirius.common/plugin.properties
+++ b/plugins/org.eclipse.sirius.common/plugin.properties
@@ -11,3 +11,11 @@
 
 pluginName = Sirius Commons
 providerName = Eclipse Modeling Project
+
+extension-point.classloading_override.name = org.eclipse.sirius.common.classloading_override
+extension-point.dynamicPackages.name = Forked Ecore Package Registry for Dynamic Packages
+extension-point.editingDomainFactory.name = org.eclipse.sirius.common.editingDomainFactory
+extension-point.expressionInterpreter.name = org.eclipse.sirius.common.expressionInterpreter
+extension-point.fileModificationValidator.name = File Modification Validator
+extension-point.proposalProvider.name = org.eclipse.sirius.common.proposalProvider
+extension-point.resourceSetFactory.name = org.eclipse.sirius.common.resourceSetFactory
\ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.common/plugin.xml b/plugins/org.eclipse.sirius.common/plugin.xml
index 13e67de89a..ea325b0acf 100644
--- a/plugins/org.eclipse.sirius.common/plugin.xml
+++ b/plugins/org.eclipse.sirius.common/plugin.xml
@@ -13,13 +13,13 @@
 
 <plugin>
 
-  <extension-point id="editingDomainFactory" name="org.eclipse.sirius.common.editingDomainFactory" schema="schema/editingDomainFactory.exsd"/>
-  <extension-point id="expressionInterpreter" name="org.eclipse.sirius.common.expressionInterpreter" schema="schema/expressionInterpreter.exsd"/>
-  <extension-point id="proposalProvider" name="org.eclipse.sirius.common.proposalProvider" schema="schema/proposalProvider.exsd"/>
-  <extension-point id="dynamic_package" name="Forked Ecore Package Registry for Dynamic Packages" schema="schema/dynamic_package.exsd"/>
-  <extension-point id="fileModificationValidator" name="File Modification Validator" schema="schema/fileModificationValidator.exsd"/>
-  <extension-point id="resourceSetFactory" name="org.eclipse.sirius.common.resourceSetFactory" schema="schema/resourceSetFactory.exsd"/>
-  <extension-point id="classloading_override" name="org.eclipse.sirius.common.classloading_override" schema="schema/classloading_override.exsd"/>
+  <extension-point id="editingDomainFactory" name="%extension-point.editingDomainFactory.name" schema="schema/editingDomainFactory.exsd"/>
+  <extension-point id="expressionInterpreter" name="%extension-point.expressionInterpreter.name" schema="schema/expressionInterpreter.exsd"/>
+  <extension-point id="proposalProvider" name="%extension-point.proposalProvider.name" schema="schema/proposalProvider.exsd"/>
+  <extension-point id="dynamic_package" name="%extension-point.dynamicPackages.name" schema="schema/dynamic_package.exsd"/>
+  <extension-point id="fileModificationValidator" name="%extension-point.fileModificationValidator.name" schema="schema/fileModificationValidator.exsd"/>
+  <extension-point id="resourceSetFactory" name="%extension-point.resourceSetFactory.name" schema="schema/resourceSetFactory.exsd"/>
+  <extension-point id="classloading_override" name="%extension-point.classloading_override.name" schema="schema/classloading_override.exsd"/>
   
   <extension id="org.eclipse.sirius.common.variableInterpreter" point="org.eclipse.sirius.common.expressionInterpreter">
     <expressionInterpreterProvider interpreterProviderClass="org.eclipse.sirius.common.tools.internal.interpreter.VariableInterpreter" />
diff --git a/plugins/org.eclipse.sirius.diagram.layoutdata/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.diagram.layoutdata/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.diagram.layoutdata/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.diagram.layoutdata/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.edit/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.diagram.sequence.edit/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.edit/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.diagram.sequence.edit/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.diagram.sequence.ui/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/plugin.properties b/plugins/org.eclipse.sirius.diagram.sequence.ui/plugin.properties
index ef570c3446..49c6d43d0f 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/plugin.properties
@@ -23,3 +23,6 @@
 
 pluginName = Sirius Sequence Diagrams UI
 providerName = Eclipse Modeling Project
+
+extension.editPartProvider.name = Sequence Diagram Edit Parts Provider
+diagramTypeProvider.label = Sequence Diagram
\ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/plugin.xml b/plugins/org.eclipse.sirius.diagram.sequence.ui/plugin.xml
index d118ae90dc..e387c84a41 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/plugin.xml
@@ -15,7 +15,7 @@
 
   <extension id="org.eclipse.sirius.diagram.sequence.ui.editPartProvider"
              point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders"
-             name="Sequence Diagram Edit Parts Provider">
+             name="%extension.editPartProvider.name">
     <editpartProvider class="org.eclipse.sirius.diagram.sequence.ui.tool.internal.provider.SequenceDiagramEditPartProvider">
       <Priority name="High" />
     </editpartProvider>
@@ -39,7 +39,7 @@
         point="org.eclipse.sirius.diagram.diagramTypeProvider">
      <provider
            descriptionProvider="org.eclipse.sirius.diagram.sequence.ui.business.api.diagramtype.SequenceDiagramTypeProvider"
-           label="Sequence Diagram">
+           label="%diagramTypeProvider.label">
      </provider>
   </extension>
    <extension
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.diagram.sequence/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.diagram.sequence/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.diagram.ui.ext/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.diagram.ui.ext/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.diagram.ui.ext/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.diagram.ui.ext/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.diagram.ui.ext/plugin.properties b/plugins/org.eclipse.sirius.diagram.ui.ext/plugin.properties
index 2ea3cdd718..204f7160b0 100644
--- a/plugins/org.eclipse.sirius.diagram.ui.ext/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.ui.ext/plugin.properties
@@ -16,9 +16,9 @@ providerName = Eclipse Modeling Project
 editorName=Sirius Diagram Editing
 
 # Preferences
-preference.page.title.org.eclipse.sirius.diagram.ui.general=Sirius Diagram
 preference.page.title.org.eclipse.sirius.diagram.ui.appearance=Appearance
 preference.page.title.org.eclipse.sirius.diagram.ui.connections=Connections
+preference.page.title.org.eclipse.sirius.diagram.ui.general=Sirius Diagram
+preference.page.title.org.eclipse.sirius.diagram.ui.pathmaps=Pathmaps
 preference.page.title.org.eclipse.sirius.diagram.ui.printing=Printing
 preference.page.title.org.eclipse.sirius.diagram.ui.rulersAndGrid=Rulers And Grid
-preference.page.title.org.eclipse.sirius.diagram.ui.pathmaps=Pathmaps
diff --git a/plugins/org.eclipse.sirius.diagram.ui/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.diagram.ui/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.diagram.ui/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
index c7a95a2ed5..f14f802f14 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
@@ -12,7 +12,6 @@
 pluginName = Sirius Diagram Specification Editor
 providerName = Eclipse Modeling Project
 
-
 # Property Sheet
 tab.appearance=Appearance
 tab.diagram=Rulers & Grid
@@ -49,6 +48,47 @@ update.diagram.description=Perform Sirius diagram update
 #For size max for diagram image export
 _Pref_DiagramExportSizeMax = 50000000
 
+action.deleteFromDiagram.label = Delete from Diagram
+action.find.label = Find
+action.quickSearch.label = Quick search
+category.sirius.name = Sirius
+command.deleteFromDiagram.name = Delete From Diagram
+command.deselectAll.name = Deselect all
+command.findInModel.description = Find in model
+command.findInModel.name = Find Element
+command.hideElement.description = Hide the element
+command.hideElement.name = Hide element
+command.hideLabel.description = Hide the label of the element
+command.hideLabel.name = Hide label
+command.launchRules.description = Launch all rules
+command.launchRules.name = Launch Rules
+command.pinElements.description = Mark diagram elements as pinned
+command.pinElements.name = Pin elements
+command.quickOutline.name = Quick outline
+command.refresh.description = Refresh the element
+command.refresh.name = Refresh
+command.removeBendpoints.label = Remove Bend-points
+command.resetOrigin.label = Reset Origin
+command.revealAllElements.name = Reveal all elements
+command.revealHiddenElements.description = Reveal all the elements
+command.revealHiddenElements.name = Reveal hidden elements
+command.showLabel.description = Show the label of the element
+command.showLabel.name = Show label
+command.synchronizedDiagram.name = Synchronized Diagram
+command.unpinElements.description = Mark diagram elements as unpinned
+command.unpinElements.name = Unpin elements
+command.validateDiagram.label = Validate diagram
+command.validateDiagram.name = Validate Diagram
+extension-point.diagramIdentifierProvider.name = org.eclipse.sirius.diagram.ui.diagramIdentifierProvider
+extension-point.imageSelector.name = org.eclipse.sirius.diagram.ui.imageSelector
+extension-point.layoutDataManager.name = org.eclipse.sirius.diagram.ui.layoutDataManager
+extension-point.layoutProvider.name = org.eclipse.sirius.diagram.ui.layoutProvider
+extension-point.styleConfigurationProvider..name = org.eclipse.sirius.diagram.ui.styleConfigurationProvider
+extension-point.viewOrderingProvider.name = org.eclipse.sirius.diagram.ui.viewOrderingProvider
+extension.diagramProblems.name = Sirius diagram editor Plugin problems
+menu.find.label = Find
+menu.showHide.label = Show/Hide
+
 ## GENERATED ##
 
 _UI_CreateChild_text = {0}
@@ -187,9 +227,7 @@ _UI_FilterVariable_type = Variable
 _UI_ConcernSet_type = Concerns
 _UI_ConcernDescription_type = Concern
 _UI_Unknown_type = Object
-
 _UI_Unknown_datatype= Value
-
 _UI_DDiagram_ownedDiagramElements_feature = Owned Diagram Elements
 _UI_DDiagram_diagramElements_feature = Diagram Elements
 _UI_DDiagram_description_feature = Description
diff --git a/plugins/org.eclipse.sirius.diagram.ui/plugin.xml b/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
index 6df13349aa..a7a26db3de 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.xml
@@ -12,12 +12,12 @@
 -->
 
 <plugin>
-   <extension-point id="styleConfigurationProvider" name="org.eclipse.sirius.diagram.ui.styleConfigurationProvider" schema="schema/styleConfigurationProvider.exsd"/>
-   <extension-point id="viewOrderingProvider" name="org.eclipse.sirius.diagram.ui.viewOrderingProvider" schema="schema/viewOrderingProvider.exsd"/>
-   <extension-point id="diagramIdentifierProvider" name="org.eclipse.sirius.diagram.ui.diagramIdentifierProvider" schema="schema/diagramIdentifierProvider.exsd"/>
-   <extension-point id="layoutProvider" name="org.eclipse.sirius.diagram.ui.layoutProvider" schema="schema/layoutProvider.exsd"/>
-   <extension-point id="layoutDataManager" name="org.eclipse.sirius.diagram.ui.layoutDataManager" schema="schema/layoutDataManager.exsd"/>
-   <extension-point id="imageSelector" name="org.eclipse.sirius.diagram.ui.imageSelector" schema="schema/imageSelector.exsd"/>
+   <extension-point id="styleConfigurationProvider" name="%extension-point.styleConfigurationProvider..name" schema="schema/styleConfigurationProvider.exsd"/>
+   <extension-point id="viewOrderingProvider" name="%extension-point.viewOrderingProvider.name" schema="schema/viewOrderingProvider.exsd"/>
+   <extension-point id="diagramIdentifierProvider" name="%extension-point.diagramIdentifierProvider.name" schema="schema/diagramIdentifierProvider.exsd"/>
+   <extension-point id="layoutProvider" name="%extension-point.layoutProvider.name" schema="schema/layoutProvider.exsd"/>
+   <extension-point id="layoutDataManager" name="%extension-point.layoutDataManager.name" schema="schema/layoutDataManager.exsd"/>
+   <extension-point id="imageSelector" name="%extension-point.imageSelector.name" schema="schema/imageSelector.exsd"/>
 
    <extension point="org.eclipse.ui.elementFactories">
      <factory
@@ -809,98 +809,98 @@
       <?gmfgen generated="false"?>
       <command
          categoryId="org.eclipse.ui.category.edit"
-         description="Refresh the element"
+         description="%command.refresh.description"
          id="org.eclipse.sirius.diagram.ui.refreshSirius"
-         name="Refresh Sirius"/>
+         name="%command.refresh.name"/>
        <command
          categoryId="org.eclipse.ui.category.edit"
-         description="Hide the element"
+         description="%command.hideElement.description"
          id="org.eclipse.sirius.diagram.ui.hideElement"
-         name="Hide element"/>
+         name="%command.hideElement.name"/>
        <command
          categoryId="org.eclipse.ui.category.edit"
-         description="Hide the label of the element"
+         description="%command.hideLabel.description"
          id="org.eclipse.sirius.diagram.ui.hideLabel"
-         name="Hide label"/>
+         name="%command.hideLabel.name"/>
        <command
          categoryId="org.eclipse.ui.category.edit"
-         description="Reveal all the elements"
+         description="%command.revealHiddenElements.description"
          id="org.eclipse.sirius.diagram.ui.revealElements"
-         name="Reveal hidden elements"/>
+         name="%command.revealHiddenElements.name"/>
      <command
          categoryId="org.eclipse.ui.category.edit"
-         description="Show the label of the element"
+         description="%command.showLabel.description"
          id="org.eclipse.sirius.diagram.ui.revealLabel"
-         name="Show label"/>
+         name="%command.showLabel.name"/>
        <command
              categoryId="org.eclipse.ui.category.edit"
-             description="Launch all rules"
+             description="%command.launchRules.description"
              id="org.eclipse.sirius.diagram.ui.launchRules"
-             name="Launch Rules">
+             name="%command.launchRules.name">
        </command>
        <command
              categoryId="org.eclipse.sirius.ui.tools.commands"
              defaultHandler="org.eclipse.sirius.diagram.ui.tools.internal.commands.PinElementsHandler"
-             description="Mark diagram elements as pinned"
+             description="%command.pinElements.description"
              id="org.eclipse.sirius.diagram.ui.pinElementsCommand"
-             name="Pin elements">
+             name="%command.pinElements.name">
        </command>
        <command
              categoryId="org.eclipse.sirius.ui.tools.commands"
              defaultHandler="org.eclipse.sirius.diagram.ui.tools.internal.commands.UnpinElementsHandler"
-             description="Mark diagram elements as unpinned"
+             description="%command.unpinElements.description"
              id="org.eclipse.sirius.diagram.ui.unpinElementsCommand"
-             name="Unpin elements">
+             name="%command.unpinElements.name">
        </command>
        <command
            id="org.eclipse.sirius.diagram.ui.command.revealAllElements"
-           name="Reveal all elements">
+           name="%command.revealAllElements.name">
      </command>
      <command
            id="org.eclipse.sirius.diagram.ui.command.hideElement"
-           name="Hide element">
+           name="%command.hideElement.name">
      </command>
    <command
            id="org.eclipse.sirius.diagram.ui.command.hideLabel"
-           name="Hide label">
+           name="%command.hideLabel.name">
      </command>
      <command
            id="org.eclipse.sirius.diagram.ui.command.showLabel"
-           name="Show label">
+           name="%command.showLabel.name">
      </command>
      <command
            id="org.eclipse.sirius.diagram.ui.command.refreshElement"
-           name="Refresh element">
+           name="%command.refresh.name">
      </command>
      <command
            id="org.eclipse.sirius.diagram.ui.command.synchronizedDiagram"
-           name="Synchronized Diagram">
+           name="%command.synchronizedDiagram.name">
      </command>
      <command
            id="org.eclipse.sirius.diagram.ui.command.validateDiagram"
-           name="Validate Diagram">
+           name="%command.validateDiagram.name">
      </command>
      <command
            id="org.eclipse.sirius.diagram.ui.command.deleteFromDiagram"
-           name="Delete From Diagram">
+           name="%command.deleteFromDiagram.name">
      </command>
      <command
            id="org.eclipse.sirius.diagram.ui.command.show.outline"
-           name="Quick outline">
+           name="%command.quickOutline.name">
      </command>
      <command
            id="org.eclipse.sirius.diagram.ui.command.deselectAll"
-           name="Deselect all">
+           name="%command.deselectAll.name">
      </command>
-     <category name="Sirius" id="org.eclipse.sirius.common.ui.category"/>
-     <command categoryId="org.eclipse.sirius.common.ui.category" description="Find in model" id="org.eclipse.sirius.diagram.ui.find.binding.FindElementAction" name="Find Element"/>
+     <category name="%category.sirius.name" id="org.eclipse.sirius.common.ui.category"/>
+     <command categoryId="org.eclipse.sirius.common.ui.category" description="%command.findInModel.description" id="org.eclipse.sirius.diagram.ui.find.binding.FindElementAction" name="%command.findInModel.name"/>
      <command
            id="org.eclipse.sirius.diagram.ui.removeBendpoints"
-           name="Remove Bend-points">
+           name="%command.removeBendpoints.label">
      </command>
      <command
            id="org.eclipse.sirius.diagram.ui.resetOrigin"
-           name="Reset Origin">
+           name="%command.resetOrigin.label">
      </command>
    </extension>
 
@@ -979,7 +979,7 @@
          <Priority name="Lowest"/>
       </MarkerNavigationProvider>
    </extension>
-<extension id="diagnostic" name="Sirius diagram editor Plugin problems" point="org.eclipse.core.resources.markers">
+<extension id="diagnostic" name="%extension.diagramProblems.name" point="org.eclipse.core.resources.markers">
       <?gmfgen generated="true"?>
       <super type="org.eclipse.core.resources.problemmarker"/>
       <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
@@ -1155,7 +1155,7 @@
       <command
             commandId="org.eclipse.sirius.diagram.ui.command.hideElement"
             icon="icons/categoryHidden.gif"
-            label="Hide element"
+            label="%command.hideElement.name"
             style="push">
          <visibleWhen
                checkEnabled="false">
@@ -1176,7 +1176,7 @@
       <command
             commandId="org.eclipse.sirius.diagram.ui.command.hideLabel"
             icon="icons/categoryLabelHidden.gif"
-            label="Hide label"
+            label="%command.hideLabel.name"
             style="push">
          <visibleWhen
                checkEnabled="false">
@@ -1197,7 +1197,7 @@
       <command
             commandId="org.eclipse.sirius.diagram.ui.command.showLabel"
             icon="icons/categoryLabelVisible.gif"
-            label="Show label"
+            label="%command.showLabel.name"
             style="push">
          <visibleWhen
                checkEnabled="false">
@@ -1221,7 +1221,7 @@
       <command
             commandId="org.eclipse.sirius.diagram.ui.command.refreshElement"
             icon="images/refresh.gif"
-            label="Refresh"
+            label="%command.refresh.name"
             style="push">
          <visibleWhen
                checkEnabled="false">
@@ -1237,7 +1237,7 @@
       </command>
       <command
             commandId="org.eclipse.sirius.diagram.ui.command.synchronizedDiagram"
-            label="Synchronized"
+            label="%command.synchronizedDiagram.name"
             style="toggle">
          <visibleWhen
                checkEnabled="false">
@@ -1253,7 +1253,7 @@
       </command>
       <menu
             id="org.eclipse.sirius.diagram.ui.popup.hideReveal"
-            label="Show/Hide">
+            label="%menu.showHide.label">
          <visibleWhen
                checkEnabled="false">
             <with
@@ -1283,7 +1283,7 @@
          locationURI="popup:org.eclipse.ui.popup.any?after=org.eclipse.sirius.diagram.ui.popup.otherActions">
       <command
             commandId="org.eclipse.sirius.diagram.ui.command.validateDiagram"
-            label="Validate diagram"
+            label="%command.validateDiagram.label"
             style="push">
          <visibleWhen
                checkEnabled="false">
@@ -1307,7 +1307,7 @@
          locationURI="popup:org.eclipse.ui.popup.any?after=formatMenu">
       <command
             commandId="org.eclipse.sirius.diagram.ui.removeBendpoints"
-            label="Remove Bend-points"
+            label="%command.removeBendpoints.label"
             style="push">
          <visibleWhen
                checkEnabled="false">
@@ -1337,7 +1337,7 @@
          locationURI="popup:org.eclipse.ui.popup.any?after=arrangeMenu">
       <command
             commandId="org.eclipse.sirius.diagram.ui.resetOrigin"
-            label="Reset Origin"
+            label="%command.resetOrigin.label"
             style="push">
             <visibleWhen
                checkEnabled="false">
@@ -1415,7 +1415,7 @@
                enablesFor="+"
                icon="icons/delete.gif"
                id="org.eclipse.sirius.diagram.ui.actions.DeleteFromDiagramActionID"
-               label="Delete from Diagram"
+               label="%action.deleteFromDiagram.label"
                menubarPath="editMenu/deleteFromGroup">
          </action>
       </objectContribution>
@@ -1428,7 +1428,7 @@
                definitionId="org.eclipse.sirius.diagram.ui.command.show.outline"
                enablesFor="*"
                id="org.eclipse.sirius.diagram.ui.action.show.outline"
-               label="Quick search">
+               label="%action.quickSearch.label">
          </action>
       </objectContribution>
       <objectContribution
@@ -1437,7 +1437,7 @@
             objectClass="org.eclipse.sirius.diagram.ui.edit.api.part.IDDiagramEditPart">
          <menu
                id="org.eclipse.sirius.common.ui.menu.findelement"
-               label="Find"
+               label="%menu.find.label"
                path="additions">
             <separator
                   name="group1">
@@ -1447,7 +1447,7 @@
                class="org.eclipse.sirius.diagram.ui.tools.api.action.FindElementAction"
                definitionId="org.eclipse.sirius.diagram.ui.find.binding.FindElementAction"
                id="org.eclipse.sirius.diagram.ui.find.binding.FindElementAction"
-               label="Find"
+               label="%action.find.label"
                style="push">
          </action>
       </objectContribution>
diff --git a/plugins/org.eclipse.sirius.diagram/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.diagram/.settings/org.eclipse.pde.prefs
index 2ab9e66d43..6fe142fc97 100644
--- a/plugins/org.eclipse.sirius.diagram/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.diagram/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.diagram/plugin.properties b/plugins/org.eclipse.sirius.diagram/plugin.properties
index 28f02dbc22..ac1e4a276f 100644
--- a/plugins/org.eclipse.sirius.diagram/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram/plugin.properties
@@ -19,7 +19,6 @@ metatype.name.Sirius_79=Undefined
 metatype.name.ViewNode_1001=DNode
 metatype.name.ViewEdge_3001=DEdge
 metatype.name.BracketEdge_4002=BracketEdge
-
 metatype.name.ViewNode_2001=DNode
 metatype.name.Dot_2002=Dot
 metatype.name.Square_2003=Square
@@ -82,8 +81,77 @@ metatype.name.DNode_3015=DNode
 metatype.name.DEdge_4001=DEdge
 metatype.name.Ellipse_3016=Ellipse
 metatype.name.Lozenge_3017=Lozenge
-
-## NOT GENERATED ##
-
-#added by mch for #1213
 metatype.name.DDiagram_3001=DDiagram
+
+category.siriusDiagramConstraints.name = Sirius Diagram Constraints
+category.siriusValidation.name = Sirius Diagram Validation Rules
+constraint.candidateExpressionExistsForRecursiveMapping.description = Validates that there is no blank SemanticCandidatesExpression for a recursive ContainerMapping
+constraint.candidateExpressionExistsForRecursiveMapping.message = The SemanticCandidatesExpression field of {0} does not accept a blank value because it is recursively imported by another ContainerMapping ({1}). This can cause infinite loop, StackOverflowError (except in case of not synchronized mapping).
+constraint.candidateExpressionExistsForRecursiveMapping.name = Blank Candidates Expression With Recursive Mapping
+constraint.compartmentRecusrion.description = Validates that Region Container Mapping should not be a Region (contained by another RegionContainer)
+constraint.compartmentRecusrion.message = The Mapping {0} should not be defined as a Region Container (ie children presentation set to horizontal stack or vertical stack) as it is itself defined as a Region (ie contained in a Region Container).
+constraint.compartmentRecusrion.name = Compartment recursivity constraint
+constraint.containersInContainerList.description = Validates that Container mapping should not be contained by a List mapping.
+constraint.containersInContainerList.message = The Mapping {0} should not be defined as a container mapping as it is contained in a Container List.
+constraint.containersInContainerList.name = Containers in Container List constraint
+constraint.defaultLayerExists.description = Validate that each diagram has a default layer.
+constraint.defaultLayerExists.message = The default layer is missing for the diagram {0}.
+constraint.defaultLayerExists.name = Diagram Has Default Layer
+constraint.edgeMappingCycle.description = Check that EdgeMappings with an EdgeMapping as source or target does not cause cycles.
+constraint.edgeMappingCycle.message = EdgeMappings {0} causes a cycle. You should modify the source or target mapping with an EdgeMapping that causes this cycle.
+constraint.edgeMappingCycle.name = Check that EdgeMappings with an EdgeMapping as source or target does not cause cycles.
+constraint.mandatoryDomainClass.description = Validates DomainClass features.
+constraint.mandatoryDomainClass.message = The Domain Class is mandatory for this element
+constraint.mandatoryDomainClass.name = Diagram Mandatory Domain Class
+constraint.missingRequiredEdgeSizeExpression.description = Validates that the size computation expression of an EdgeStyleDecription is set
+constraint.missingRequiredEdgeSizeExpression.message = The SizeComputationExpression field of {0} does not accept a blank value.
+constraint.missingRequiredEdgeSizeExpression.name = Missing Required Size Expression On Edge Style Description
+constraint.noBorderedNodesInRegion.description = Validates that BorderNode mapping are not contained in a Region mapping.
+constraint.noBorderedNodesInRegion.message = BorderedNodes are not supported for Regions. However, they can be placed in the parent RegionContainer.
+constraint.noBorderedNodesInRegion.name = No bordered nodes in region constraint
+constraint.noMappingFilterOnRegions.description = Validates that filtering nodes is not supported on Region mapping.
+constraint.noMappingFilterOnRegions.message = The Filter {0} is not supported on Region mapping.
+constraint.noMappingFilterOnRegions.name = No mapping filter on regions constraint
+constraint.noReusedBorderedNodesInRegion.description = Validates that a Region does not reuse Bordered Nodes.
+constraint.noReusedBorderedNodesInRegion.message = The Region mapping {0} should not reuse Bordered Node mappings. However, they can be placed as bordered node mappings of the parent RegionContainer mapping.
+constraint.noReusedBorderedNodesInRegion.name = No reused bordered nodes in region constraint
+constraint.noReusedNodesInRegionContainer.description = Validates that a Region Container mapping does not reuse children node mapping.
+constraint.noReusedNodesInRegionContainer.message = The Region Container mapping {0} should not reuse nodes as sub node mappings.
+constraint.noReusedNodesInRegionContainer.name = No reused nodes in region container constraint
+constraint.noSubNodesInRegionContainer.description = Validates that Node mappings are not contained in a RegionContainer mapping.
+constraint.noSubNodesInRegionContainer.message = The Node mapping {0} should not be placed in a RegionContainer mapping as a sub node mapping. However, they can be placed in one of the Region mapping.
+constraint.noSubNodesInRegionContainer.name = No sub nodes in region container constraint
+constraint.preconditionForDndTools.description = Drag and drop tools which accept Model or Both as source should have an explicit precondition.
+constraint.preconditionForDndTools.message = The Drop tool {0} accepts arbitrary elements from the Model Content view as drag source. You should specify a precondition to validate the nature of the dragged element.
+constraint.preconditionForDndTools.name = Check that drag and drop tools which accept the model as source have an explicit precondition.
+constraint.regionMappingCardinality.description = Validates that Region Container Mapping should not be a Region (contained by another RegionContainer)
+constraint.regionMappingCardinality.message = The Mapping {0} is defined as a Region Container, it should have at least one Container mapping as child or reused mapping.
+constraint.regionMappingCardinality.name = Region mapping cardinality constraint
+constraint.regionStyle.description = Validates that only Gradient is used as style of RegionContainer and Region mappings.
+constraint.regionStyle.message = The style {0} is not valid for its parent mapping {1}. Only the gradient style is supported for RegionContainer and Region mappings.
+constraint.regionStyle.name = RegionContainer and Region style constraint
+constraint.representationExtensionDescriptionRepresentationName.message = {0}
+constraint.representationExtensionDescriptionRepresentationName.name = Representation extension description representation name validation
+constraint.reuseContainersInContainerList.description = Validates that List mappings does not reuse container mappings.
+constraint.reuseContainersInContainerList.message = The Container List Mapping {0} should not reuse a container mappings.
+constraint.reuseContainersInContainerList.name = Reused Containers in Container List constraint
+constraint.siriusValidationError.description = Validation Error
+constraint.siriusValidationError.message = {0}
+constraint.siriusValidationError.name = Sirius Error
+constraint.siriusValidationInfo.description = Validation info
+constraint.siriusValidationInfo.message = {0}
+constraint.siriusValidationInfo.name = Sirius Info
+constraint.siriusValidationWarning.description = Validation warning
+constraint.siriusValidationWarning.message = {0}
+constraint.siriusValidationWarningname = Sirius Warning
+constraint.validDomainClass.description = Invalid Class
+constraint.validDomainClass.message = The Class {0} does not exist.
+constraint.validDomainClass.name = Valid Domain Classes
+constraint.validStyle.description = Validates that the style is set
+constraint.validStyle.message = A style is missing for {0}
+constraint.validStyle.name = Valid Style
+constraint.validVariable.description = Invalid variable
+constraint.validVariable.message = The expression {0} of {1} does not accept the {2} variable.
+constraint.validVariable.name = Valid Variables
+extension-point.canonicalSynchronizerFactoryOverride.name = org.eclipse.sirius.diagram.canonicalSynchronizerFactoryOverride
+extension-point.diagramTypeProvider.name = org.eclipse.sirius.diagram.diagramTypeProvider
diff --git a/plugins/org.eclipse.sirius.diagram/plugin.xml b/plugins/org.eclipse.sirius.diagram/plugin.xml
index b5119c8f1a..97fe94ee5e 100644
--- a/plugins/org.eclipse.sirius.diagram/plugin.xml
+++ b/plugins/org.eclipse.sirius.diagram/plugin.xml
@@ -12,8 +12,8 @@
 -->
 
 <plugin>
-   <extension-point id="diagramTypeProvider" name="org.eclipse.sirius.diagram.diagramTypeProvider" schema="schema/diagramTypeProvider.exsd"/>
-   <extension-point id="canonicalSynchronizerFactoryOverride" name="org.eclipse.sirius.diagram.canonicalSynchronizerFactoryOverride" schema="schema/canonicalSynchronizerFactoryOverride.exsd"/>
+   <extension-point id="diagramTypeProvider" name="%extension-point.diagramTypeProvider.name" schema="schema/diagramTypeProvider.exsd"/>
+   <extension-point id="canonicalSynchronizerFactoryOverride" name="%extension-point.canonicalSynchronizerFactoryOverride.name" schema="schema/canonicalSynchronizerFactoryOverride.exsd"/>
 
    <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes">
       <?gmfgen generated="false"?>
@@ -297,7 +297,7 @@
       <category
 		id="org.eclipse.sirius.diagram.category"
 		mandatory="false"
-		name="Sirius Diagram Validation Rules">   
+		name="%category.siriusValidation.name">   
 			<![CDATA[Sirius]]>
       </category>	
       <constraintProvider
@@ -310,13 +310,13 @@
                   class="org.eclipse.sirius.diagram.tools.internal.validation.constraints.ErrorConstraint"
                   severity="ERROR"
                   mode="Batch"
-                  name="Sirius Error"
+                  name="%constraint.siriusValidationError.name"
                   id="org.eclipse.sirius.diagram.category.validation.error"
                   statusCode="1">
-               <description><![CDATA[Validation Error]]>
+               <description>%constraint.siriusValidationError.description
                </description>
                <message>
-                  <![CDATA[{0}]]>
+                  %constraint.siriusValidationError.message
                </message>               
                <target class="DDiagramElement"/>
                <target class="DDiagram"/>
@@ -326,13 +326,13 @@
                   class="org.eclipse.sirius.diagram.tools.internal.validation.constraints.WarningConstraint"
                   severity="WARNING"
                   mode="Batch"
-                  name="Sirius Warning"
+                  name="%constraint.siriusValidationWarningname"
                   id="org.eclipse.sirius.diagram.category.validation.warning"
                   statusCode="1">
-               <description><![CDATA[Validation warning]]>
+               <description>%constraint.siriusValidationWarning.description
                </description>
                <message>
-                  <![CDATA[{0}]]>
+                  %constraint.siriusValidationWarning.message
                </message>               
                <target class="DDiagramElement"/>
                <target class="DDiagram"/>
@@ -342,13 +342,13 @@
                   class="org.eclipse.sirius.diagram.tools.internal.validation.constraints.InfoConstraint"
                   severity="INFO"
                   mode="Batch"
-                  name="Sirius Info"
+                  name="%constraint.siriusValidationInfo.name"
                   id="org.eclipse.sirius.diagram.category.validation.info"
                   statusCode="1">
-               <description><![CDATA[Validation info]]>
+               <description>%constraint.siriusValidationInfo.description
                </description>
                <message>
-                  <![CDATA[{0}]]>
+                  %constraint.siriusValidationInfo.message
                </message>               
                <target class="DDiagramElement"/>
                <target class="DDiagram"/>
@@ -359,7 +359,7 @@
   <extension
          point="org.eclipse.emf.validation.constraintProviders">
       <category
-            name="Sirius Diagram Constraints"
+            name="%category.siriusDiagramConstraints.name"
             id="org.eclipse.sirius.diagram.constraints"/>
       <constraintProvider
             cache="true"
@@ -376,14 +376,14 @@
                   id="org.eclipse.sirius.diagram.constraints.MandatoryDomainClass"
                   lang="Java"
                   mode="Batch"
-                  name="Diagram Mandatory Domain Class"
+                  name="%constraint.mandatoryDomainClass.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  The Domain Class is mandatory for this element
+                  %constraint.mandatoryDomainClass.message
                </message>
                <description>
-                  Validates DomainClass features.
+                  %constraint.mandatoryDomainClass.description
                </description>
             </constraint>
             <constraint
@@ -391,14 +391,14 @@
                   class="org.eclipse.sirius.diagram.tools.internal.validation.description.constraints.ExistingDomainClassConstraint"
                   severity="ERROR"
                   mode="Batch"
-                  name="Valid Domain Classes"
+                  name="%constraint.validDomainClass.name"
                   id="org.eclipse.sirius.diagram.constraints.ValidDomainClass"
                   statusCode="1">
                <description>
-                  Invalid Class
+                  %constraint.validDomainClass.description
                </description>
                <message>
-                  The Class {0} does not exist.
+                  %constraint.validDomainClass.message
                </message>
             </constraint>
             <constraint
@@ -406,14 +406,14 @@
                   class="org.eclipse.sirius.diagram.tools.internal.validation.description.constraints.ExistingDefaultLayerConstraint"
                   severity="ERROR"
                   mode="Batch"
-                  name="Diagram Has Default Layer"
+                  name="%constraint.defaultLayerExists.name"
                   id="org.eclipse.sirius.diagram.constraints.DiagramHasDefaultLayer"
                   statusCode="1">
                <description>
-                  Validate that each diagram has a default layer.
+                  %constraint.defaultLayerExists.description
                </description>
                <message>
-                  The default layer is missing for the diagram {0}.
+                  %constraint.defaultLayerExists.message
                </message>
             </constraint>
             <constraint
@@ -421,14 +421,14 @@
                   id="org.eclipse.sirius.diagram.constraints.BlankCandidatesExpressionWithRecursiveMapping"
                   lang="Java"
                   mode="Batch"
-                  name="Blank Candidates Expression With Recursive Mapping"
+                  name="%constraint.candidateExpressionExistsForRecursiveMapping.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  The SemanticCandidatesExpression field of {0} does not accept a blank value because it is recursively imported by another ContainerMapping ({1}). This can cause infinite loop, StackOverflowError (except in case of not synchronized mapping).
+                  %constraint.candidateExpressionExistsForRecursiveMapping.message
                </message>
                <description>
-                  Validates that there is no blank SemanticCandidatesExpression for a recursive ContainerMapping
+                  %constraint.candidateExpressionExistsForRecursiveMapping.description
                </description>
             </constraint>
             <constraint
@@ -436,14 +436,14 @@
                   id="org.eclipse.sirius.diagram.constraints.RegionMappingCardinalityConstraint"
                   lang="Java"
                   mode="Batch"
-                  name="Region mapping cardinality constraint"
+                  name="%constraint.regionMappingCardinality.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  The Mapping {0} is defined as a Region Container, it should have at least one Container mapping as child or reused mapping.
+                  %constraint.regionMappingCardinality.message
                </message>
                <description>
-                  Validates that Region Container Mapping should not be a Region (contained by another RegionContainer)
+                  %constraint.regionMappingCardinality.description
                </description>
             </constraint>
             <constraint
@@ -451,14 +451,14 @@
                   id="org.eclipse.sirius.diagram.constraints.CompartmentContainmentConstraint"
                   lang="Java"
                   mode="Batch"
-                  name="Compartment recursivity constraint"
+                  name="%constraint.compartmentRecusrion.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  The Mapping {0} should not be defined as a Region Container (ie children presentation set to horizontal stack or vertical stack) as it is itself defined as a Region (ie contained in a Region Container).
+                  %constraint.compartmentRecusrion.message
                </message>
                <description>
-                  Validates that Region Container Mapping should not be a Region (contained by another RegionContainer)
+                  %constraint.compartmentRecusrion.description
                </description>
             </constraint>
             <constraint
@@ -466,14 +466,14 @@
                   id="org.eclipse.sirius.diagram.constraints.ReuseContainersInContainerListConstraint"
                   lang="Java"
                   mode="Batch"
-                  name="Reused Containers in Container List constraint"
+                  name="%constraint.reuseContainersInContainerList.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  The Container List Mapping {0} should not reuse a container mappings.
+                  %constraint.reuseContainersInContainerList.message
                </message>
                <description>
-                  Validates that List mappings does not reuse container mappings.
+                  %constraint.reuseContainersInContainerList.description
                </description>
             </constraint>
             <constraint
@@ -481,14 +481,14 @@
                   id="org.eclipse.sirius.diagram.constraints.ContainersInContainerListConstraint"
                   lang="Java"
                   mode="Batch"
-                  name="Containers in Container List constraint"
+                  name="%constraint.containersInContainerList.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  The Mapping {0} should not be defined as a container mapping as it is contained in a Container List.
+                  %constraint.containersInContainerList.message
                </message>
                <description>
-                  Validates that Container mapping should not be contained by a List mapping.
+                  %constraint.containersInContainerList.description
                </description>
             </constraint>
             <constraint
@@ -496,14 +496,14 @@
                   id="org.eclipse.sirius.diagram.constraints.NoReusedNodesInRegionContainerConstraint"
                   lang="Java"
                   mode="Batch"
-                  name="No reused nodes in region container constraint"
+                  name="%constraint.noReusedNodesInRegionContainer.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  The Region Container mapping {0} should not reuse nodes as sub node mappings.
+                  %constraint.noReusedNodesInRegionContainer.message
                </message>
                <description>
-                  Validates that a Region Container mapping does not reuse children node mapping.
+                  %constraint.noReusedNodesInRegionContainer.description
                </description>
             </constraint>
             <constraint
@@ -511,14 +511,14 @@
                   id="org.eclipse.sirius.diagram.constraints.NoReusedBorderedNodesInRegion"
                   lang="Java"
                   mode="Batch"
-                  name="No reused bordered nodes in region constraint"
+                  name="%constraint.noReusedBorderedNodesInRegion.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  The Region mapping {0} should not reuse Bordered Node mappings. However, they can be placed as bordered node mappings of the parent RegionContainer mapping.
+                  %constraint.noReusedBorderedNodesInRegion.message
                </message>
                <description>
-                  Validates that a Region does not reuse Bordered Nodes.
+                  %constraint.noReusedBorderedNodesInRegion.description
                </description>
             </constraint>
             <constraint
@@ -526,14 +526,14 @@
                   id="org.eclipse.sirius.diagram.constraints.NoMappingFilterOnRegionsConstraint"
                   lang="Java"
                   mode="Batch"
-                  name="No mapping filter on regions constraint"
+                  name="%constraint.noMappingFilterOnRegions.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  The Filter {0} is not supported on Region mapping.
+                  %constraint.noMappingFilterOnRegions.message
                </message>
                <description>
-                  Validates that filtering nodes is not supported on Region mapping.
+                  %constraint.noMappingFilterOnRegions.description
                </description>
             </constraint>
             <constraint
@@ -541,14 +541,14 @@
                   id="org.eclipse.sirius.diagram.constraints.RegionStyleConstraint"
                   lang="Java"
                   mode="Batch"
-                  name="RegionContainer and Region style constraint"
+                  name="%constraint.regionStyle.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-            The style {0} is not valid for its parent mapping {1}. Only the gradient style is supported for RegionContainer and Region mappings.
+            %constraint.regionStyle.message
                </message>
                <description>
-            Validates that only Gradient is used as style of RegionContainer and Region mappings.
+            %constraint.regionStyle.description
                </description>
             </constraint>
             <constraint
@@ -556,14 +556,14 @@
                   id="org.eclipse.sirius.diagram.constraints.NoSubNodesInRegionContainerConstraint"
                   lang="Java"
                   mode="Batch"
-                  name="No sub nodes in region container constraint"
+                  name="%constraint.noSubNodesInRegionContainer.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  The Node mapping {0} should not be placed in a RegionContainer mapping as a sub node mapping. However, they can be placed in one of the Region mapping.
+                  %constraint.noSubNodesInRegionContainer.message
                </message>
                <description>
-                  Validates that Node mappings are not contained in a RegionContainer mapping.
+                  %constraint.noSubNodesInRegionContainer.description
                </description>
             </constraint>
             <constraint
@@ -571,14 +571,14 @@
                   id="org.eclipse.sirius.diagram.constraints.NoBorderedNodesInRegion"
                   lang="Java"
                   mode="Batch"
-                  name="No bordered nodes in region constraint"
+                  name="%constraint.noBorderedNodesInRegion.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  BorderedNodes are not supported for Regions. However, they can be placed in the parent RegionContainer.
+                  %constraint.noBorderedNodesInRegion.message
                </message>
                <description>
-                  Validates that BorderNode mapping are not contained in a Region mapping.
+                  %constraint.noBorderedNodesInRegion.description
                </description>
             </constraint>
             <constraint
@@ -586,14 +586,14 @@
                   id="org.eclipse.sirius.diagram.constraints.MissingRequiredEdgeSizeExpressionConstraint"
                   lang="Java"
                   mode="Batch"
-                  name="Missing Required Size Expression On Edge Style Description"
+                  name="%constraint.missingRequiredEdgeSizeExpression.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  The SizeComputationExpression field of {0} does not accept a blank value.
+                  %constraint.missingRequiredEdgeSizeExpression.message
                </message>
                <description>
-                  Validates that the size computation expression of an EdgeStyleDecription is set
+                  %constraint.missingRequiredEdgeSizeExpression.description
                </description>
             </constraint>
             <constraint
@@ -601,14 +601,14 @@
                   class="org.eclipse.sirius.diagram.tools.internal.validation.description.constraints.EdgeMappingCycleConstraint"
                   severity="ERROR"
                   mode="Batch"
-                  name="Check that EdgeMappings with an EdgeMapping as source or target does not cause cycles."
+                  name="%constraint.edgeMappingCycle.name"
                   id="org.eclipse.sirius.diagram.constraints.EdgeMappingCycle"
                   statusCode="1">
                <description>
-                  Check that EdgeMappings with an EdgeMapping as source or target does not cause cycles.
+                  %constraint.edgeMappingCycle.description
                </description>
                <message>
-                  EdgeMappings {0} causes a cycle. You should modify the source or target mapping with an EdgeMapping that causes this cycle.
+                  %constraint.edgeMappingCycle.message
                </message>
             </constraint>
             <constraint
@@ -616,14 +616,14 @@
                   class="org.eclipse.sirius.diagram.tools.internal.validation.description.constraints.DiagramExistingExpressionVariablesConstraint"
                   severity="ERROR"
                   mode="Batch"
-                  name="Valid Variables"
+                  name="%constraint.validVariable.name"
                   id="org.eclipse.sirius.constraints.ValidAcceleoVariable"
                   statusCode="1">
                <description>
-                  Invalid variable
+                  %constraint.validVariable.description
                </description>
                <message>
-                  The expression {0} of {1} does not accept the {2} variable.
+                  %constraint.validVariable.message
                </message>
             </constraint>
             <constraint
@@ -632,11 +632,11 @@
                   isEnabledByDefault="true"
                   lang="Java"
                   mode="Batch"
-                  name="Representation extension description representation name validation"
+                  name="%constraint.representationExtensionDescriptionRepresentationName.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  {0}
+                  %constraint.representationExtensionDescriptionRepresentationName.message
                </message>
             </constraint>
             <constraint
@@ -644,14 +644,14 @@
                   id="org.eclipse.sirius.constraints.ValidStyleConstraint"
                   lang="Java"
                   mode="Batch"
-                  name="Valid Style"
+                  name="%constraint.validStyle.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  A style is missing for {0}
+                  %constraint.validStyle.message
                </message>
                <description>
-                  Validates that the style is set
+                  %constraint.validStyle.description
                </description>
             </constraint>
          </constraints>
@@ -660,7 +660,7 @@
    <extension
          point="org.eclipse.emf.validation.constraintProviders">
       <category
-            name="Sirius Diagram Constraints"
+            name="%category.siriusDiagramConstraints.name"
             id="org.eclipse.sirius.diagram.constraints"/>
       <constraintProvider
             cache="true"
@@ -673,14 +673,14 @@
                   class="org.eclipse.sirius.diagram.tools.internal.validation.description.constraints.PreconditionForDndToolsConstraint"
                   severity="WARNING"
                   mode="Batch"
-                  name="Check that drag and drop tools which accept the model as source have an explicit precondition."
+                  name="%constraint.preconditionForDndTools.name"
                   id="org.eclipse.sirius.diagram.constraints.PreconditionForDndTools"
                   statusCode="1">
                <description>
-                  Drag and drop tools which accept Model or Both as source should have an explicit precondition.
+                  %constraint.preconditionForDndTools.description
                </description>
                <message>
-                  The Drop tool {0} accepts arbitrary elements from the Model Content view as drag source. You should specify a precondition to validate the nature of the dragged element.
+                  %constraint.preconditionForDndTools.message
                </message>
             </constraint>            
          </constraints>
diff --git a/plugins/org.eclipse.sirius.ecore.extender/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.ecore.extender/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.ecore.extender/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.ecore.extender/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.ecore.extender/plugin.properties b/plugins/org.eclipse.sirius.ecore.extender/plugin.properties
index e39e012634..e55f009eff 100644
--- a/plugins/org.eclipse.sirius.ecore.extender/plugin.properties
+++ b/plugins/org.eclipse.sirius.ecore.extender/plugin.properties
@@ -11,3 +11,6 @@
 
 pluginName = Sirius Metamodel Extender Support
 providerName = Eclipse Modeling Project
+
+extension-point.extenderProvider.name = org.eclipse.sirius.ecore.extender.ExtenderProvider
+extension-point.permissionProvider.name = org.eclipse.sirius.ecore.extender.PermissionProvider
diff --git a/plugins/org.eclipse.sirius.ecore.extender/plugin.xml b/plugins/org.eclipse.sirius.ecore.extender/plugin.xml
index d467a3d730..9f82a7bb56 100644
--- a/plugins/org.eclipse.sirius.ecore.extender/plugin.xml
+++ b/plugins/org.eclipse.sirius.ecore.extender/plugin.xml
@@ -12,8 +12,8 @@
 -->
 
 <plugin>
-   <extension-point id="org.eclipse.sirius.ecore.extender.ExtenderProvider" name="org.eclipse.sirius.ecore.extender.ExtenderProvider" schema="schema/extenderProvider.exsd"/>
-   <extension-point id="org.eclipse.sirius.ecore.extender.PermissionProvider" name="org.eclipse.sirius.ecore.extender.PermissionProvider" schema="schema/permissionProvider.exsd"/>
+   <extension-point id="org.eclipse.sirius.ecore.extender.ExtenderProvider" name="%extension-point.extenderProvider.name" schema="schema/extenderProvider.exsd"/>
+   <extension-point id="org.eclipse.sirius.ecore.extender.PermissionProvider" name="%extension-point.permissionProvider.name" schema="schema/permissionProvider.exsd"/>
 
    <extension point="org.eclipse.sirius.ecore.extender.ExtenderProvider">
       <extenderprovider priority="normal" providerClass="org.eclipse.sirius.ecore.extender.business.internal.accessor.ecore.EcoreExtenderProvider"/>
diff --git a/plugins/org.eclipse.sirius.eef.adapters/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.eef.adapters/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.eef.adapters/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.eef.adapters/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.eef.adapters/plugin.properties b/plugins/org.eclipse.sirius.eef.adapters/plugin.properties
index f67faed1ca..d186929101 100644
--- a/plugins/org.eclipse.sirius.eef.adapters/plugin.properties
+++ b/plugins/org.eclipse.sirius.eef.adapters/plugin.properties
@@ -11,3 +11,5 @@
 
 pluginName = Sirius Integration for EEF
 providerName = Eclipse Modeling Project
+
+extension-point.sectionFilters.name = sectionfilters
\ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.eef.adapters/plugin.xml b/plugins/org.eclipse.sirius.eef.adapters/plugin.xml
index 81c35d0c48..e902f74f4b 100644
--- a/plugins/org.eclipse.sirius.eef.adapters/plugin.xml
+++ b/plugins/org.eclipse.sirius.eef.adapters/plugin.xml
@@ -14,7 +14,7 @@
 <plugin>
 
    <extension-point id="org.eclipse.sirius.eef.adapters.sectionFilters" 
-   		            name="sectionfilters" 
+   		            name="%extension-point.sectionFilters.name" 
             		schema="schema/sectionFilters.exsd"/>
 
    <extension point="org.eclipse.sirius.externalJavaAction">
diff --git a/plugins/org.eclipse.sirius.ext.base/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.ext.base/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.ext.base/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.ext.base/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.ext.draw2d/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.ext.draw2d/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.ext.draw2d/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.ext.draw2d/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.ext.e3.ui/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.ext.e3.ui/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.ext.e3.ui/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.ext.e3.ui/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.ext.e3/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.ext.e3/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.ext.e3/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.ext.e3/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.ext.emf.edit/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.ext.emf.edit/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.ext.emf.edit/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.ext.emf.edit/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.ext.emf.tx/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.ext.emf.tx/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.ext.emf.tx/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.ext.emf.tx/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.ext.emf.ui/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.ext.emf.ui/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.ext.emf.ui/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.ext.emf.ui/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.ext.emf/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.ext.emf/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.ext.emf/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.ext.emf/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.ext.gef/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.ext.gef/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.ext.gef/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.ext.gef/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.ext.gmf.notation/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.ext.gmf.notation/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.ext.gmf.notation/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.ext.gmf.notation/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.ext.gmf.runtime/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.ext.gmf.runtime/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.ext.gmf.runtime/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.ext.gmf.runtime/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.ext.jface/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.ext.jface/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.ext.jface/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.ext.jface/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.ext.swt/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.ext.swt/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.ext.swt/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.ext.swt/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.interpreter/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.interpreter/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.interpreter/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.interpreter/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.interpreter/plugin.properties b/plugins/org.eclipse.sirius.interpreter/plugin.properties
index 48a9afd314..ae0078784d 100644
--- a/plugins/org.eclipse.sirius.interpreter/plugin.properties
+++ b/plugins/org.eclipse.sirius.interpreter/plugin.properties
@@ -11,3 +11,5 @@
 
 pluginName = Sirius Integration for Interpreter View
 providerName = Eclipse Modeling Project
+
+siriusInterpreter.label = Sirius
diff --git a/plugins/org.eclipse.sirius.interpreter/plugin.xml b/plugins/org.eclipse.sirius.interpreter/plugin.xml
index 8a6809f3c7..c4eadd22d1 100644
--- a/plugins/org.eclipse.sirius.interpreter/plugin.xml
+++ b/plugins/org.eclipse.sirius.interpreter/plugin.xml
@@ -16,7 +16,7 @@
          point="org.eclipse.acceleo.ui.language.interpreter">
       <languageInterpreter
             class="org.eclipse.sirius.common.acceleo.interpreter.SiriusInterpreter"
-            label="Sirius">
+            label="%siriusInterpreter.label">
       </languageInterpreter>
    </extension>
 </plugin>
diff --git a/plugins/org.eclipse.sirius.synchronizer/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.synchronizer/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.synchronizer/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.synchronizer/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.table.ui.ext/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.table.ui.ext/.settings/org.eclipse.pde.prefs
index a1c0f1e991..7ea6c949c3 100644
--- a/plugins/org.eclipse.sirius.table.ui.ext/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.table.ui.ext/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.table.ui.ext/plugin.properties b/plugins/org.eclipse.sirius.table.ui.ext/plugin.properties
index 0442f79226..e0c0d8c851 100644
--- a/plugins/org.eclipse.sirius.table.ui.ext/plugin.properties
+++ b/plugins/org.eclipse.sirius.table.ui.ext/plugin.properties
@@ -11,3 +11,6 @@
 
 pluginName = Sirius Tables UI Extensions
 providerName = Eclipse Modeling Project
+
+editor.crossTable.name = CrossTable editor
+editor.editionTable.name = EditionTable editor
diff --git a/plugins/org.eclipse.sirius.table.ui.ext/plugin.xml b/plugins/org.eclipse.sirius.table.ui.ext/plugin.xml
index 13f458ca9b..2e6d52a633 100644
--- a/plugins/org.eclipse.sirius.table.ui.ext/plugin.xml
+++ b/plugins/org.eclipse.sirius.table.ui.ext/plugin.xml
@@ -24,7 +24,7 @@
             extensions="dtable"
             icon="icons/full/obj16/EditionTableDescription.gif"
             id="org.eclipse.sirius.table.ui.EditionTableEditorID"
-            name="EditionTable editor">
+            name="%editor.editionTable.name">
       </editor>
       <editor
             class="org.eclipse.sirius.table.ui.tools.internal.editor.DTableCrossEditor"
@@ -33,7 +33,7 @@
             extensions="dtable"
             icon="icons/full/obj16/CrossTableDescription.gif"
             id="org.eclipse.sirius.table.ui.CrossTableEditorID"
-            name="CrossTable editor">
+            name="%editor.crossTable.name">
       </editor>
    </extension>
    
diff --git a/plugins/org.eclipse.sirius.table.ui/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.table.ui/.settings/org.eclipse.pde.prefs
index a1c0f1e991..7ea6c949c3 100644
--- a/plugins/org.eclipse.sirius.table.ui/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.table.ui/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.table.ui/plugin.properties b/plugins/org.eclipse.sirius.table.ui/plugin.properties
index 50b43992cb..8f3ce0ce28 100644
--- a/plugins/org.eclipse.sirius.table.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.table.ui/plugin.properties
@@ -12,7 +12,17 @@
 pluginName = Sirius Tables UI
 providerName = Eclipse Modeling Project
 
+DTableContext.description = Sirius DTable Editing
+DTableContext.name = DTable Editing
 TableEditorQuickOutlineCommand = Table Editor Quick Outline Command
+action.tableRefresh.label = Refresh
+action.tableRefresh.tooltip = Force a refresh of the table
+command.exportToCSV.name = Export to CSV
+command.tableElementRefresh.name = Refresh element
+menu.table.label = DTable
+propertyTab.default.label = default
+propertyTab.semantic.label = Semantic
+propertyTab.style.label = Style
 
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
@@ -176,8 +186,6 @@ _UI_DeleteColumnTool_mapping_feature = Mapping
 _UI_DeleteLineTool_mapping_feature = Mapping
 _UI_TableTool_firstModelOperation_feature = First Model Operation
 
-DTableContext.name = DTable Editing
-DTableContext.description = Sirius DTable Editing
 _UI_DColumn_visible_feature = Visible
 _UI_CellUpdater_canEdit_feature = Can Edit
 _UI_TableCreationDescription_type = Table Creation
diff --git a/plugins/org.eclipse.sirius.table.ui/plugin.xml b/plugins/org.eclipse.sirius.table.ui/plugin.xml
index 093a3dd309..23b89880b5 100644
--- a/plugins/org.eclipse.sirius.table.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.table.ui/plugin.xml
@@ -53,7 +53,7 @@
             targetID="org.eclipse.sirius.table.ui.EditionTableEditorID">
          <menu
                id="org.eclipse.sirius.table.ui.EditorID.actions.DTable"
-               label="DTable"
+               label="%menu.table.label"
                path="additions">
             <separator
                   name="column">
@@ -75,10 +75,10 @@
                class="org.eclipse.sirius.table.ui.tools.internal.editor.action.EditorRefreshAction"
                icon="icons/table/refresh.gif"
                id="org.eclipse.sirius.table.ui.refresh"
-               label="Refresh"
+               label="%action.tableRefresh.label"
                menubarPath="org.eclipse.sirius.table.ui.EditorID.actions.DTable/refresh"
                toolbarPath="Normal/additions"
-               tooltip="Force a refresh of the table">
+               tooltip="%action.tableRefresh.tooltip">
          </action>
       </editorContribution>
       <editorContribution
@@ -86,7 +86,7 @@
             targetID="org.eclipse.sirius.table.ui.CrossTableEditorID">
          <menu
                id="org.eclipse.sirius.table.ui.EditorID.actions.DTable"
-               label="DTable"
+               label="%menu.table.label"
                path="additions">
             <separator
                   name="column">
@@ -108,10 +108,10 @@
                class="org.eclipse.sirius.table.ui.tools.internal.editor.action.EditorRefreshAction"
                icon="icons/table/refresh.gif"
                id="org.eclipse.sirius.table.ui.refresh"
-               label="Refresh"
+               label="%action.tableRefresh.label"
                menubarPath="org.eclipse.sirius.table.ui.EditorID.actions.DTable/refresh"
                toolbarPath="Normal/additions"
-               tooltip="Force a refresh of the table">
+               tooltip="%action.tableRefresh.tooltip">
          </action>
       </editorContribution>
    </extension>
@@ -132,7 +132,7 @@
          <propertyTab
                category="default"
                id="org.eclipse.sirius.table.ui.tab.default"
-               label="default">
+               label="%propertyTab.default.label">
          </propertyTab>
       </propertyTabs>
    </extension>
@@ -144,7 +144,7 @@
                afterTab="org.eclipse.sirius.table.ui.tab.default"
                category="default"
                id="org.eclipse.sirius.table.ui.tab.semantic"
-               label="Semantic">
+               label="%propertyTab.semantic.label">
          </propertyTab>
       </propertyTabs>
    </extension>
@@ -156,7 +156,7 @@
                afterTab="org.eclipse.sirius.table.ui.tab.semantic"
                category="default"
                id="org.eclipse.sirius.table.ui.tab.style"
-               label="Style">
+               label="%propertyTab.style.label">
          </propertyTab>
       </propertyTabs>
    </extension>
@@ -202,7 +202,7 @@
       <command
             defaultHandler="org.eclipse.sirius.table.ui.tools.internal.export.ExportToCsvHandler"
             id="org.eclipse.sirius.table.ui.exportToCsv"
-            name="Export to CSV">
+            name="%command.exportToCSV.name">
       </command>
    </extension>
    
@@ -225,7 +225,7 @@
    <extension point="org.eclipse.ui.commands">
      <command
            id="org.eclipse.sirius.table.ui.command.refreshElement"
-           name="Refresh element">
+           name="%command.tableElementRefresh.name">
      </command>
    </extension>
    
diff --git a/plugins/org.eclipse.sirius.table/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.table/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.table/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.table/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.tree.ui.ext/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.tree.ui.ext/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.tree.ui.ext/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.tree.ui.ext/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.tree.ui.ext/plugin.properties b/plugins/org.eclipse.sirius.tree.ui.ext/plugin.properties
index 34c293ad07..f676f6e9bc 100644
--- a/plugins/org.eclipse.sirius.tree.ui.ext/plugin.properties
+++ b/plugins/org.eclipse.sirius.tree.ui.ext/plugin.properties
@@ -11,3 +11,5 @@
 
 pluginName = Sirius Tree UI Extensions
 providerName = Eclipse Modeling Project
+
+editor.treeEditor.name = DTree editor
\ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.tree.ui.ext/plugin.xml b/plugins/org.eclipse.sirius.tree.ui.ext/plugin.xml
index 1f49c5ce0a..dffdad9850 100644
--- a/plugins/org.eclipse.sirius.tree.ui.ext/plugin.xml
+++ b/plugins/org.eclipse.sirius.tree.ui.ext/plugin.xml
@@ -21,7 +21,7 @@
             extensions="dtree"
             icon="icons/full/obj16/TreeDescription.gif"
             id="org.eclipse.sirius.tree.ui.EditorID"
-            name="DTree editor">
+            name="%editor.treeEditor.name">
       </editor>
    </extension>
    
diff --git a/plugins/org.eclipse.sirius.tree.ui/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.tree.ui/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.tree.ui/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.tree.ui/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.tree.ui/plugin.properties b/plugins/org.eclipse.sirius.tree.ui/plugin.properties
index 997b0f5ee0..97af395f39 100644
--- a/plugins/org.eclipse.sirius.tree.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.tree.ui/plugin.properties
@@ -12,9 +12,15 @@
 pluginName = Sirius Tree Specification Editor
 providerName = Eclipse Modeling Project
 
-DTreeContext.name = DTree Editing
 DTreeContext.description = Sirius DTree Editing
+DTreeContext.name = DTree Editing
 TreeEditorQuickOutlineCommand = Tree Editor Quick Outline Command
+action.treeRefresh.label = Refresh
+action.treeRefresh.tooltip = Force a refresh of the tree
+command.treeRefresh.name = Refresh element
+menu.dtree.label = DTree
+propertyTab.default.label = default
+propertyTab.semantic.label = Semantic
 
 _UI_CreateChild_text = {0}
 _UI_CreateChild_text2 = {1} {0}
diff --git a/plugins/org.eclipse.sirius.tree.ui/plugin.xml b/plugins/org.eclipse.sirius.tree.ui/plugin.xml
index 70cc4aae15..38b7506f0e 100644
--- a/plugins/org.eclipse.sirius.tree.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.tree.ui/plugin.xml
@@ -73,7 +73,7 @@
          <propertyTab
                category="default"
                id="org.eclipse.sirius.tree.ui.tab.default"
-               label="default">
+               label="%propertyTab.default.label">
          </propertyTab>
       </propertyTabs>
    </extension>
@@ -85,7 +85,7 @@
                afterTab="org.eclipse.sirius.tree.ui.tab.default"
                category="default"
                id="org.eclipse.sirius.tree.ui.tab.semantic"
-               label="Semantic">
+               label="%propertyTab.semantic.label">
          </propertyTab>
       </propertyTabs>
    </extension>
@@ -151,7 +151,7 @@
             targetID="org.eclipse.sirius.tree.ui.EditorID">
          <menu
                id="org.eclipse.sirius.tree.ui.EditorID.actions.DTree"
-               label="DTree"
+               label="%menu.dtree.label"
                path="additions">
             <separator
                   name="line">
@@ -167,10 +167,10 @@
                class="org.eclipse.sirius.tree.ui.tools.internal.editor.actions.EditorRefreshAction"
                icon="icons/tree/refresh.gif"
                id="org.eclipse.sirius.tree.ui.refresh"
-               label="Refresh"
+               label="%action.treeRefresh.label"
                menubarPath="org.eclipse.sirius.tree.ui.EditorID.actions.DTree/refresh"
                toolbarPath="Normal/additions"
-               tooltip="Force a refresh of the tree">
+               tooltip="%action.treeRefresh.tooltip">
          </action>
       </editorContribution>
      </extension>
@@ -194,7 +194,7 @@
    <extension point="org.eclipse.ui.commands">
      <command
            id="org.eclipse.sirius.tree.ui.command.refreshElement"
-           name="Refresh element">
+           name="%command.treeRefresh.name">
      </command>
    </extension>
    
diff --git a/plugins/org.eclipse.sirius.tree/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.tree/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.tree/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.tree/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.ui.debug/plugin.properties b/plugins/org.eclipse.sirius.ui.debug/plugin.properties
index 6a4a56f060..a9c51853f7 100644
--- a/plugins/org.eclipse.sirius.ui.debug/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui.debug/plugin.properties
@@ -10,3 +10,6 @@
 # ====================================================================
 pluginName = Sirius Debugging View
 providerName = Eclipse Modeling Project
+
+propertyTab.debug.label = Debug
+view.siriusDebug.name = Sirius Debugging View
\ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.ui.debug/plugin.xml b/plugins/org.eclipse.sirius.ui.debug/plugin.xml
index 37050973a6..3f63503d24 100644
--- a/plugins/org.eclipse.sirius.ui.debug/plugin.xml
+++ b/plugins/org.eclipse.sirius.ui.debug/plugin.xml
@@ -7,7 +7,7 @@
           <propertyTab
                 category="misc"
                 id="property.tab.misc"
-                label="Debug">
+                label="%propertyTab.debug.label">
           </propertyTab>
       </propertyTabs>
          
@@ -59,7 +59,7 @@
    </extension>
    <extension point="org.eclipse.ui.views">
       <view
-            name="Sirius Debugging View"
+            name="%view.siriusDebug.name"
             icon="icons/sample.gif"
             category="org.eclipse.sirius.category"
             class="org.eclipse.sirius.ui.debug.SiriusDebugView"
diff --git a/plugins/org.eclipse.sirius.ui.ext/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.ui.ext/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.ui.ext/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.ui.ext/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.ui.ext/plugin.properties b/plugins/org.eclipse.sirius.ui.ext/plugin.properties
index a897dfc4ca..647ac01737 100644
--- a/plugins/org.eclipse.sirius.ui.ext/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui.ext/plugin.properties
@@ -12,8 +12,18 @@
 pluginName = Sirius UI Extensions
 providerName = Eclipse Modeling Project
 
+category.sirius.name = Sirius
+command.addModelingNature.label = Convert to Modeling Project
+command.removeModelingNature.label = Remove Modeling Project Nature
+editor.textEditor.name = Text editor
 exportRepresentationsAsImagesActionLabel=Export representations as images
+page.sirius.name = Sirius
+perspective.modeling.name = Modeling
 repairActionLabel=Repair
+view.legacyInterpreter.name = Model requests interpreter
+view.modelExplorer.name = Model Explorer
+wizard.modelingProject.name = Modeling Project
+wizard.representationFile.name = Representations File
 
 _UI_ModelingProjectWizard_label = Create a Modeling project
 _UI_RepresentationsFileWizard_description = Create a new representations file resource
diff --git a/plugins/org.eclipse.sirius.ui.ext/plugin.xml b/plugins/org.eclipse.sirius.ui.ext/plugin.xml
index 4de05fbc3b..898ba8edec 100644
--- a/plugins/org.eclipse.sirius.ui.ext/plugin.xml
+++ b/plugins/org.eclipse.sirius.ui.ext/plugin.xml
@@ -16,19 +16,19 @@
          point="org.eclipse.ui.views">
       <category
             id="org.eclipse.sirius.category"
-            name="Sirius"/>
+            name="%category.sirius.name"/>
       <view
             category="org.eclipse.sirius.category"
             class="org.eclipse.sirius.ui.tools.internal.views.interpreterview.DesignerInterpreterView"
             icon="icons/full/others/information.gif"
             id="org.eclipse.sirius.ui.tools.views.interpreterview"
-            name="Model requests interpreter"/>
+            name="%view.legacyInterpreter.name"/>
       <view
             category="org.eclipse.sirius.category"
             class="org.eclipse.sirius.ui.tools.internal.views.modelexplorer.ModelExplorerView"
             icon="icons/full/others/ModelExplorer.gif"
             id="org.eclipse.sirius.ui.tools.views.model.explorer"
-            name="Model Explorer">
+            name="%view.modelExplorer.name">
       </view>
    </extension>
    
@@ -38,7 +38,7 @@
              class="org.eclipse.sirius.ui.tools.internal.perspectives.DesignerModelingPerspective"
              icon="icons/full/others/ModelingPerspective.gif"
              id="org.eclipse.sirius.ui.tools.perspective.modeling"
-             name="Modeling">
+             name="%perspective.modeling.name">
        </perspective>
     </extension>
 
@@ -47,7 +47,7 @@
      <page
            class="org.eclipse.sirius.ui.tools.internal.preference.SiriusPreferencePage"
            id="org.eclipse.sirius.ui.page"
-           name="Sirius">
+           name="%page.sirius.name">
      </page>
   </extension>
 
@@ -69,14 +69,14 @@
   </extension>
 
    <extension point="org.eclipse.ui.newWizards">
-	   <category id="org.eclipse.sirius.category" name="Sirius"/>
+	   <category id="org.eclipse.sirius.category" name="%category.sirius.name"/>
 		<wizard
         category="org.eclipse.sirius.category"
         class="org.eclipse.sirius.ui.tools.internal.wizards.ModelingProjectWizard"
         finalPerspective="org.eclipse.sirius.ui.tools.perspective.modeling"
         icon="icons/obj16/ModelingProject.gif"
         id="org.eclipse.sirius.ui.modelingproject.wizard"
-        name="Modeling Project"
+        name="%wizard.modelingProject.name"
         preferredPerspectives="org.eclipse.sirius.ui.tools.perspective.design"
         project="true">
      <description>
@@ -90,7 +90,7 @@
           finalPerspective="org.eclipse.sirius.ui.tools.perspective.modeling"
           icon="icons/obj16/SiriusFile.gif"
           id="org.eclipse.sirius.ui.session.creation"
-          name="Representations File"
+          name="%wizard.representationFile.name"
           preferredPerspectives="org.eclipse.sirius.ui.tools.perspective.design"
           project="false">
         <description>
@@ -112,7 +112,7 @@
             extensions="aird"
             icon="icons/obj16/SiriusFile.gif"
             id="org.eclipse.sirius.ui.fakeeditoronlyforicon"
-            name="Text editor">
+            name="%editor.textEditor.name">
       </editor>
    </extension>
   
@@ -158,7 +158,7 @@
 		<command
 	    	commandId="org.eclipse.sirius.ui.tools.internal.actions.nature.addRemoveNatureCommand"
 	        icon="icons/obj16/ModelingProject.gif"
-	        label="Convert to Modeling Project"
+	        label="%command.addModelingNature.label"
 	        style="push">
 	        <visibleWhen
             	checkEnabled="false">
@@ -186,7 +186,7 @@
 		<command
 	    	commandId="org.eclipse.sirius.ui.tools.internal.actions.nature.addRemoveNatureCommand"
 	    	icon="icons/obj16/ModelingProject.gif"
-	        label="Remove Modeling Project Nature"
+	        label="%command.removeModelingNature.label"
 	        style="push">
 	        <visibleWhen
             	checkEnabled="false">
diff --git a/plugins/org.eclipse.sirius.ui/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius.ui/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius.ui/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius.ui/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius.ui/plugin.properties b/plugins/org.eclipse.sirius.ui/plugin.properties
index b1566233bd..b3678d90b6 100644
--- a/plugins/org.eclipse.sirius.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui/plugin.properties
@@ -12,7 +12,39 @@
 pluginName = Sirius UI
 providerName = Eclipse Modeling Project
 
+ModelingModelProvider.name=Sirius Modeling Workspace
+category.siriusCommands.name = Sirius Commands
+command.control.name = Control
+command.uncontrol.name = Uncontrol
+commonFilter.danglingRepresentations.description = Hides the dangling representations, ie. whitout represented element or whose element has been detached or deleted.
+commonFilter.danglingRepresentations.name = Representations known as dangling
+commonFilter.emptyRepresentationType.description = Hides Representation descriptions without instances
+commonFilter.emptyRepresentationType.name = Representation descriptions without instance
+commonFilter.patternFilter.description = Filter used in in the filter text area of Model Explorer view
+commonFilter.patternFilter.name = Pattern filter
+commonFilter.representationPerCategory.description = Hides "Representations per category" item in viewpoint legacy mode. This item displays activated Viewpoints and their available representations.
+commonFilter.representationPerCategory.name = Representations per category
+commonFilter.representationPerResource.description = Hides "Representations per resource" item in viewpoint legacy mode. This item displays linked aird files with their activated viewpoints and their available representations.
+commonFilter.representationPerResource.name = Representations per resource
+commonFilter.representations.description = Hides the representations in the model tree
+commonFilter.representations.name = Representations as child of the represented element
 exportRepresentationsAsImagesActionLabel=Export representations as images
+extension-point.assistContentProvider.name = org.eclipse.sirius.ui.assistContentProvider
+extension-point.dialectUI.name = org.eclipse.sirius.dialect.ui
+extension-point.exporteAsImages.name = org.eclipse.sirius.ui.exportRepresentationsAsImages
+extension-point.featureExtensionUI.name = org.eclipse.sirius.ui.featureExtensions.ui
+extension-point.modelExplorerTabExtension.name = org.eclipse.sirius.ui.modelExplorerTabExtension
+extension-point.modelingProjectResourceListener.name = org.eclipse.sirius.ui.resourcelistener
+extension-point.newmodeldependencywizard.name = newmodeldependencywizard
+extension-point.representationTemplateEdit.name = org.eclipse.sirius.ui.representationTemplateEdit
+extension-point.resourceLocator.name = org.eclipse.sirius.ui.resourcelocator
+extension-point.siriusPropertiesCellEditor.name = org.eclipse.sirius.ui.siriuspropertiescelleditor
+extension-point.uiSessionFactory.name = UI Session Factory
+migrateODActionLabel=Migrate Description File
+migrateODesignToODesignActionLabel=Migrate Description File
+navigatorContent.siriusContent.name = Sirius Content Management
+propertyTab.default.label = Default
+repairActionLabel=Repair
 
 _Pref_RefreshOnRepresentationOpening = true
 _Pref_AutoRefresh = true
@@ -418,9 +450,6 @@ _UI_ContainerDropDescription_moveEdges_feature = Move Edges
 
 # not generated
 
-migrateODActionLabel=Migrate Description File
-migrateODesignToODesignActionLabel=Migrate Description File
-repairActionLabel=Repair
 _UI_LabelStyle_showIcon_feature = Show Icon
 _UI_LabelStyleDescription_showIcon_feature = Show Icon
 _UI_RepresentationDescription_titleExpression_feature = Title Expression
@@ -932,7 +961,6 @@ _UI_Contribution_description_feature = Description
 _UI_FontFormat_bold_italic_literal = Bold Italic
 _UI_MetamodelsPropertyCategory = Metamodels
 
-ModelingModelProvider.name=Sirius Modeling Workspace
 _UI_AbstractNodeMapping_borderedNodeMappings_feature_prefix = Bordered
 _UI_ContainerMapping_subNodeMappings_feature_prefix = Sub
 _UI_BracketEdgeStyle_type = Bracket Edge Style
diff --git a/plugins/org.eclipse.sirius.ui/plugin.xml b/plugins/org.eclipse.sirius.ui/plugin.xml
index 421ab9f4fb..523315ead4 100644
--- a/plugins/org.eclipse.sirius.ui/plugin.xml
+++ b/plugins/org.eclipse.sirius.ui/plugin.xml
@@ -12,17 +12,17 @@
 -->
 
 <plugin>
-   <extension-point id="dialectui" name="org.eclipse.sirius.dialect.ui" schema="schema/dialect.ui.exsd"/>
-   <extension-point id="featureExtensionsui" name="org.eclipse.sirius.ui.featureExtensions.ui" schema="schema/featureExtensions.ui.exsd"/>
-   <extension-point id="exportRepresentationsAsImagesExtension" name="org.eclipse.sirius.ui.exportRepresentationsAsImages" schema="schema/exportRepresentationsAsImagesExtension.exsd"/>
-   <extension-point id="assistContentProvider" name="org.eclipse.sirius.ui.assistContentProvider" schema="schema/IAssistContentProvider.exsd"/>
-   <extension-point id="resourcelocator" name="org.eclipse.sirius.ui.resourcelocator" schema="schema/resourcelocator.exsd"/>
-   <extension-point id="representationTemplateEdit" name="org.eclipse.sirius.ui.representationTemplateEdit" schema="schema/representationTemplateEdit.exsd"/>
-   <extension-point id="modelExplorerTabExtension" name="org.eclipse.sirius.ui.modelExplorerTabExtension" schema="schema/modelExplorerTabExtension.exsd"/>
-   <extension-point id="uiSessionFactory" name="UI Session Factory" schema="schema/uiSessionFactory.exsd"/>
-   <extension-point id="newmodeldependencywizard" name="newmodeldependencywizard" schema="schema/newmodeldependencywizard.exsd"/>
-   <extension-point id="modelingprojectresourcelistener" name="org.eclipse.sirius.ui.resourcelistener" schema="schema/modelingprojectresourcelistener.exsd"/>
-   <extension-point id="siriuspropertiescelleditor" name="org.eclipse.sirius.ui.siriuspropertiescelleditor" schema="schema/siriuspropertiescelleditor.exsd"/>
+   <extension-point id="dialectui" name="%extension-point.dialectUI.name" schema="schema/dialect.ui.exsd"/>
+   <extension-point id="featureExtensionsui" name="%extension-point.featureExtensionUI.name" schema="schema/featureExtensions.ui.exsd"/>
+   <extension-point id="exportRepresentationsAsImagesExtension" name="%extension-point.exporteAsImages.name" schema="schema/exportRepresentationsAsImagesExtension.exsd"/>
+   <extension-point id="assistContentProvider" name="%extension-point.assistContentProvider.name" schema="schema/IAssistContentProvider.exsd"/>
+   <extension-point id="resourcelocator" name="%extension-point.resourceLocator.name" schema="schema/resourcelocator.exsd"/>
+   <extension-point id="representationTemplateEdit" name="%extension-point.representationTemplateEdit.name" schema="schema/representationTemplateEdit.exsd"/>
+   <extension-point id="modelExplorerTabExtension" name="%extension-point.modelExplorerTabExtension.name" schema="schema/modelExplorerTabExtension.exsd"/>
+   <extension-point id="uiSessionFactory" name="%extension-point.uiSessionFactory.name" schema="schema/uiSessionFactory.exsd"/>
+   <extension-point id="newmodeldependencywizard" name="%extension-point.newmodeldependencywizard.name" schema="schema/newmodeldependencywizard.exsd"/>
+   <extension-point id="modelingprojectresourcelistener" name="%extension-point.modelingProjectResourceListener.name" schema="schema/modelingprojectresourcelistener.exsd"/>
+   <extension-point id="siriuspropertiescelleditor" name="%extension-point.siriusPropertiesCellEditor.name" schema="schema/siriuspropertiescelleditor.exsd"/>
 
    
    <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
@@ -42,7 +42,7 @@
          <propertyTab
                category="default"
                id="org.eclipse.sirius.ui.tools.views.model.explorer.tab"
-               label="Default">
+               label="%propertyTab.default.label">
          </propertyTab>
       </propertyTabs>
    </extension>
@@ -168,19 +168,19 @@
         point="org.eclipse.ui.commands">
      <category
            id="org.eclipse.sirius.ui.tools.commands"
-           name="Sirius Commands">
+           name="%category.siriusCommands.name">
      </category>
      <command
            categoryId="org.eclipse.sirius.ui.tools.commands"
            defaultHandler="org.eclipse.sirius.ui.tools.api.control.SiriusControlHandler"
            id="org.eclipse.sirius.ui.tools.controlCommand"
-           name="Control">
+           name="%command.control.name">
      </command>
      <command
            categoryId="org.eclipse.sirius.ui.tools.commands"
            defaultHandler="org.eclipse.sirius.ui.tools.api.control.SiriusUncontrolHandler"
            id="org.eclipse.sirius.ui.tools.uncontrolCommand"
-           name="Uncontrol">
+           name="%command.uncontrol.name">
      </command>
   </extension>
     <!-- Standard External Java Actions usable from VSMs. --> 
@@ -293,7 +293,7 @@
            icon="icons/obj16/SessionResourceFile.gif"
            id="org.eclipse.sirius.ui.resource.content.session"
            labelProvider="org.eclipse.sirius.ui.tools.internal.views.common.navigator.SiriusCommonLabelProvider"
-           name="Sirius Content Management"
+           name="%navigatorContent.siriusContent.name"
            priority="high"
            providesSaveables="false">
         <commonSorter
@@ -474,9 +474,9 @@
         </enablement>
      </commonWizard> 
     <commonFilter
-           description="Hides &quot;Representations per resource&quot; item in viewpoint legacy mode. This item displays linked aird files with their activated viewpoints and their available representations."
+           description="%commonFilter.representationPerResource.description"
            id="org.eclipse.sirius.ui.commonFilter.resourceFolderItem"
-           name="Representations per resource">
+           name="%commonFilter.representationPerResource.name">
         <filterExpression>
            <instanceof
                  value="org.eclipse.sirius.ui.tools.api.views.common.item.ResourcesFolderItem">
@@ -484,9 +484,9 @@
         </filterExpression>
      </commonFilter>
      <commonFilter
-           description="Hides &quot;Representations per category&quot; item in viewpoint legacy mode. This item displays activated Viewpoints and their available representations."
+           description="%commonFilter.representationPerCategory.description"
            id="org.eclipse.sirius.ui.commonFilter.viewpointFolderItem"
-           name="Representations per category">
+           name="%commonFilter.representationPerCategory.name">
         <filterExpression>
            <instanceof
                  value="org.eclipse.sirius.ui.tools.api.views.common.item.ViewpointsFolderItem">
@@ -495,31 +495,31 @@
      </commonFilter>
      <commonFilter
            class="org.eclipse.sirius.ui.tools.internal.views.common.navigator.filter.RepresentationInSemanticNodeCommonFilter"
-           description="Hides the representations in the model tree"
+           description="%commonFilter.representations.description"
            id="org.eclipse.sirius.ui.commonFilter.representation"
-           name="Representations as child of the represented element">
+           name="%commonFilter.representations.name">
      </commonFilter>
      <commonFilter
            activeByDefault="true"
            class="org.eclipse.sirius.ui.tools.internal.views.common.navigator.filter.RepresentationDescriptionWithoutRepresentationCommonFilter"
-           description="Hides Representation descriptions without instances"
+           description="%commonFilter.emptyRepresentationType.description"
            id="org.eclipse.sirius.ui.commonFilter.representation.description"
-           name="Representation descriptions without instance">
+           name="%commonFilter.emptyRepresentationType.name">
      </commonFilter>
      <commonFilter
            activeByDefault="true"
            class="org.eclipse.sirius.ui.tools.internal.views.common.navigator.filter.PatternFilter"
-           description="Filter used in in the filter text area of Model Explorer view"
+           description="%commonFilter.patternFilter.description"
            id="org.eclipse.sirius.ui.commonFilter.pattern"
-           name="Pattern filter"
+           name="%commonFilter.patternFilter.name"
            visibleInUI="false">
      </commonFilter>
      <commonFilter
            activeByDefault="false"
            class="org.eclipse.sirius.ui.tools.internal.views.common.navigator.filter.DanglingRepresentationCommonFilter"
-           description="Hides the dangling representations, ie. whitout represented element or whose element has been detached or deleted."
+           description="%commonFilter.danglingRepresentations.description"
            id="org.eclipse.sirius.ui.commonFilter.dangling.representation"
-           name="Representations known as dangling">
+           name="%commonFilter.danglingRepresentations.name">
      </commonFilter>
   </extension>
   <extension
diff --git a/plugins/org.eclipse.sirius/.settings/org.eclipse.pde.prefs b/plugins/org.eclipse.sirius/.settings/org.eclipse.pde.prefs
index 740eeeb99a..c307a7b58e 100644
--- a/plugins/org.eclipse.sirius/.settings/org.eclipse.pde.prefs
+++ b/plugins/org.eclipse.sirius/.settings/org.eclipse.pde.prefs
@@ -18,7 +18,7 @@ compilers.p.missing-version-export-package=1
 compilers.p.missing-version-import-package=1
 compilers.p.missing-version-require-bundle=0
 compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
+compilers.p.not-externalized-att=0
 compilers.p.unknown-attribute=1
 compilers.p.unknown-class=1
 compilers.p.unknown-element=1
diff --git a/plugins/org.eclipse.sirius/plugin.properties b/plugins/org.eclipse.sirius/plugin.properties
index 7848305bed..c7a74b05de 100644
--- a/plugins/org.eclipse.sirius/plugin.properties
+++ b/plugins/org.eclipse.sirius/plugin.properties
@@ -24,4 +24,45 @@
 pluginName = Sirius Core Runtime
 providerName = Eclipse Modeling Project
 
-ExtPoint.externalJavaAction = External Java Actions
+constraint.category.name = Sirius Constraints
+constraint.validAppliedOn.message = {0}
+constraint.validAppliedOn.name = Empty appliedOn list validation
+constraint.validAttributeCustomization.description = Check the constraint that EAttributeCustomization.attributeName is the name of a common EAttribute to all referenced style description or a description element owned by a style description through EAttributeCustomization.appliedOn.
+constraint.validAttributeCustomization.message = {0}
+constraint.validAttributeCustomization.name = EAttributeCustomization referenced style descriptions elements conforms to attributeName 
+constraint.validExpression.description = Validates that the typed Interpreter Expression is valid
+constraint.validExpression.message = Invalid Interpreter Expression
+constraint.validExpression.name = Invalid Interpreted Expression
+constraint.validImagePath.description = Validates that image paths are valid
+constraint.validImagePath.message = {0}
+constraint.validImagePath.name = Invalid Image Path
+constraint.validReferenceCustomization.description = Check the constraint that EReferenceCustomization.referenceName is the name of a common EReference to all referenced style description or a description element owned by a style description through EAttributeCustomization.appliedOn or different EReference with the same name and a common type.
+constraint.validReferenceCustomization.message = {0}
+constraint.validReferenceCustomization.name = EReferenceCustomization referenced style descriptions elements conforms to referenceName 
+constraint.validVSMElementCustomization.description = Check the constraint that a VSMElementCustomizationReuse is valid.
+constraint.validVSMElementCustomization.message = {0}
+constraint.validVSMElementCustomization.name = VSMElementCustomizationReuse validity checking 
+constraint.validVSMElementName.description = Check the constraint that the name of vsm element is not empty or null.
+constraint.validVSMElementName.message = {0}
+constraint.validVSMElementName.name = Empty or null element name validation
+constraint.validVariables.description = Invalid variable
+constraint.validVariables.message = The expression {0} of {1} does not accept the {2} variable.
+constraint.validVariables.name = Valid Variables
+extension-point.analysisSelectorProvider.name = org.eclipse.sirius.analysisSelectorProvider
+extension-point.componentization.name = org.eclipse.sirius.componentization
+extension-point.deleteHook.name = org.eclipse.sirius.deleteHook
+extension-point.dialect.name = org.eclipse.sirius.dialect
+extension-point.externalJavaAction = External Java Actions
+extension-point.featureExtensions.name = org.eclipse.sirius.featureExtensions
+extension-point.migration.name = org.eclipse.sirius.migration
+extension-point.mmdescriptor.name = org.eclipse.sirius.mmdescriptor
+extension-point.refreshExtensionProvider.name = viewpoint.semantic.refresh.refreshExtensionProvider
+extension-point.repairParticipant.name = viewpoint.repair.repairParticipant
+extension-point.runtimeLogger.name = org.eclipse.sirius.runtimeLogger
+extension-point.sessionFactory.name = org.eclipse.sirius.sessionFactory
+extension-point.sessionManagerListener.name = org.eclipse.sirius.sessionManagerListener
+extension-point.viewpointResourceType.name = org.eclipse.sirius.viewpointResourceType
+extension-point.viewpointSpecificationModel.name = org.eclipse.sirius.viewpointSpecificationModel
+extension.modelingMarker.name = Modeling Marker
+extension.sessionEditingDomainFactory.name = Local Session EditingDomain Factory
+extension.siriusMarker.name = Sirius Marker
diff --git a/plugins/org.eclipse.sirius/plugin.xml b/plugins/org.eclipse.sirius/plugin.xml
index d0a30a7b01..de9ad4a99b 100644
--- a/plugins/org.eclipse.sirius/plugin.xml
+++ b/plugins/org.eclipse.sirius/plugin.xml
@@ -12,21 +12,21 @@
 -->
 
 <plugin>
-   <extension-point id="refreshExtensionProvider" name="viewpoint.semantic.refresh.refreshExtensionProvider" schema="schema/refreshExtensionProvider.exsd"/>
-   <extension-point id="dialect" name="org.eclipse.sirius.dialect" schema="schema/dialect.exsd"/>
-   <extension-point id="mmdescriptor" name="org.eclipse.sirius.mmdescriptor" schema="schema/mmdescriptor.exsd"/>
-   <extension-point id="featureExtensions" name="org.eclipse.sirius.featureExtensions" schema="schema/featureExtensions.exsd"/>
-   <extension-point id="componentization" name="org.eclipse.sirius.componentization" schema="schema/componentization.exsd"/>
-   <extension-point id="externalJavaAction" name="%ExtPoint.externalJavaAction" schema="schema/externalJavaAction.exsd"/>
-   <extension-point id="sessionManagerListener" name="org.eclipse.sirius.sessionManagerListener" schema="schema/sessionManagerListener.exsd"/>
-   <extension-point id="analysisSelectorProvider" name="org.eclipse.sirius.analysisSelectorProvider" schema="schema/analysisSelectorProvider.exsd"/>
-   <extension-point id="runtimeLogger" name="org.eclipse.sirius.runtimeLogger" schema="schema/runtimeLogger.exsd"/>
-   <extension-point id="deleteHook" name="org.eclipse.sirius.deleteHook" schema="schema/deleteHook.exsd"/>
-   <extension-point id="sessionFactory" name="org.eclipse.sirius.sessionFactory" schema="schema/sessionFactory.exsd"/>
-   <extension-point id="viewpointSpecificationModel" name="org.eclipse.sirius.viewpointSpecificationModel" schema="schema/viewpointSpecificationModel.exsd"/>
-   <extension-point id="viewpointResourceType" name="org.eclipse.sirius.viewpointResourceType" schema="schema/viewpointResourceType.exsd"/>
-   <extension-point id="migrationParticipant" name="org.eclipse.sirius.migration" schema="schema/migrationParticipant.exsd"/>
-   <extension-point id="repairParticipant" name="viewpoint.repair.repairParticipant" schema="schema/repairParticipant.exsd"/>
+   <extension-point id="refreshExtensionProvider" name="%extension-point.refreshExtensionProvider.name" schema="schema/refreshExtensionProvider.exsd"/>
+   <extension-point id="dialect" name="%extension-point.dialect.name" schema="schema/dialect.exsd"/>
+   <extension-point id="mmdescriptor" name="%extension-point.mmdescriptor.name" schema="schema/mmdescriptor.exsd"/>
+   <extension-point id="featureExtensions" name="%extension-point.featureExtensions.name" schema="schema/featureExtensions.exsd"/>
+   <extension-point id="componentization" name="%extension-point.componentization.name" schema="schema/componentization.exsd"/>
+   <extension-point id="externalJavaAction" name="%extension-point.externalJavaAction" schema="schema/externalJavaAction.exsd"/>
+   <extension-point id="sessionManagerListener" name="%extension-point.sessionManagerListener.name" schema="schema/sessionManagerListener.exsd"/>
+   <extension-point id="analysisSelectorProvider" name="%extension-point.analysisSelectorProvider.name" schema="schema/analysisSelectorProvider.exsd"/>
+   <extension-point id="runtimeLogger" name="%extension-point.runtimeLogger.name" schema="schema/runtimeLogger.exsd"/>
+   <extension-point id="deleteHook" name="%extension-point.deleteHook.name" schema="schema/deleteHook.exsd"/>
+   <extension-point id="sessionFactory" name="%extension-point.sessionFactory.name" schema="schema/sessionFactory.exsd"/>
+   <extension-point id="viewpointSpecificationModel" name="%extension-point.viewpointSpecificationModel.name" schema="schema/viewpointSpecificationModel.exsd"/>
+   <extension-point id="viewpointResourceType" name="%extension-point.viewpointResourceType.name" schema="schema/viewpointResourceType.exsd"/>
+   <extension-point id="migrationParticipant" name="%extension-point.migration.name" schema="schema/migrationParticipant.exsd"/>
+   <extension-point id="repairParticipant" name="%extension-point.repairParticipant.name" schema="schema/repairParticipant.exsd"/>
 
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated viewpoint -->
@@ -113,7 +113,7 @@
   <extension
          point="org.eclipse.emf.validation.constraintProviders"> 
       <category
-            name="Sirius Constraints"
+            name="%constraint.category.name"
             id="org.eclipse.sirius.constraints"/>
       <constraintProvider
             cache="true"
@@ -129,14 +129,14 @@
                   class="org.eclipse.sirius.tools.internal.validation.description.constraints.ExistingExpressionVariablesConstraint"
                   severity="ERROR"
                   mode="Batch"
-                  name="Valid Variables"
+                  name="%constraint.validVariables.name"
                   id="org.eclipse.sirius.constraints.ValidAcceleoVariable"
                   statusCode="1">
                <description>
-                  Invalid variable
+                  %constraint.validVariables.description
                </description>
                <message>
-                  The expression {0} of {1} does not accept the {2} variable.
+                  %constraint.validVariables.message
                </message>
             </constraint>
             <constraint
@@ -144,14 +144,14 @@
                   id="org.eclipse.sirius.constraints.ValidImagePathConstraint"
                   lang="Java"
                   mode="Batch"
-                  name="Invalid Image Path"
+                  name="%constraint.validImagePath.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  {0}
+                  %constraint.validImagePath.message
                </message>
                <description>
-                  Validates that image paths are valid
+                  %constraint.validImagePath.description
                </description>
             </constraint>
             <constraint
@@ -159,14 +159,14 @@
                   id="org.eclipse.sirius.constraints.ValidInterpretedExpressionConstraint"
                   lang="Java"
                   mode="Batch"
-                  name="Invalid Interpreted Expression"
+                  name="%constraint.validExpression.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  Invalid Interpreter Expression
+                  %constraint.validExpression.message
                </message>
                <description>
-                  Validates that the typed Interpreter Expression is valid
+                  %constraint.validExpression.description
                </description>
             </constraint>
              <constraint
@@ -174,14 +174,14 @@
                   id="org.eclipse.sirius.tools.internal.validation.description.constraints.EAttributeCustomizationAttributeNameCommonToAppliedOnConstraint"
                   lang="Java"
                   mode="Batch"
-                  name="EAttributeCustomization referenced style descriptions elements conforms to attributeName "
+                  name="%constraint.validAttributeCustomization.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  {0}
+                  %constraint.validAttributeCustomization.message
                </message>
                <description>
-                  Check the constraint that EAttributeCustomization.attributeName is the name of a common EAttribute to all referenced style description or a description element owned by a style description through EAttributeCustomization.appliedOn.
+                  %constraint.validAttributeCustomization.description
                </description>
                <target
                      class="EAttributeCustomization">
@@ -192,14 +192,14 @@
                   id="org.eclipse.sirius.tools.internal.validation.description.constraints.EReferenceCustomizationReferenceNameCommonToAppliedOnConstraint"
                   lang="Java"
                   mode="Batch"
-                  name="EReferenceCustomization referenced style descriptions elements conforms to referenceName "
+                  name="%constraint.validReferenceCustomization.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  {0}
+                  %constraint.validReferenceCustomization.message
                </message>
                <description>
-                  Check the constraint that EReferenceCustomization.referenceName is the name of a common EReference to all referenced style description or a description element owned by a style description through EAttributeCustomization.appliedOn or different EReference with the same name and a common type.
+                  %constraint.validReferenceCustomization.description
                </description>
                <target
                      class="EReferenceCustomization">
@@ -210,14 +210,14 @@
                   id="org.eclipse.sirius.tools.internal.validation.description.constraints.VSMElementCustomizationReuseValidConstraint"
                   lang="Java"
                   mode="Batch"
-                  name="VSMElementCustomizationReuse validity checking "
+                  name="%constraint.validVSMElementCustomization.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  {0}
+                  %constraint.validVSMElementCustomization.message
                </message>
                <description>
-                  Check the constraint that a VSMElementCustomizationReuse is valid.
+                  %constraint.validVSMElementCustomization.description
                </description>
                <target
                      class="VSMElementCustomizationReuse">
@@ -229,11 +229,11 @@
                   isEnabledByDefault="true"
                   lang="Java"
                   mode="Batch"
-                  name="Empty appliedOn list validation"
+                  name="%constraint.validAppliedOn.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  {0}
+                  %constraint.validAppliedOn.message
                </message>
             </constraint>
             <constraint
@@ -242,14 +242,14 @@
                   isEnabledByDefault="true"
                   lang="Java"
                   mode="Batch"
-                  name="Empty or null element name validation"
+                  name="%constraint.validVSMElementName.name"
                   severity="ERROR"
                   statusCode="1">
                <message>
-                  {0}
+                  %constraint.validVSMElementName.message
                </message>
                <description>
-                  Check the constraint that the name of vsm element is not empty or null.
+                  %constraint.validVSMElementName.description
                </description>    
                <target
                      class="IdentifiedElement">
@@ -291,7 +291,7 @@
   </extension>
   <extension
         id="LocalSessionEditingDomainFactory"
-        name="Local Session EditingDomain Factory"
+        name="%extension.sessionEditingDomainFactory.name"
         point="org.eclipse.sirius.common.editingDomainFactory">
      <editingDomainFactory
            class="org.eclipse.sirius.business.internal.session.LocalSessionEditingDomainFactory">
@@ -314,7 +314,7 @@
 
    <extension
          id="viewpointMarker"
-         name="Sirius Marker"
+         name="%extension.siriusMarker.name"
          point="org.eclipse.core.resources.markers">
       <super type="org.eclipse.core.resources.problemmarker"/>
       <attribute
@@ -324,7 +324,7 @@
    </extension>
    <extension
          id="modelingMarker"
-         name="Modeling Marker"
+         name="%extension.modelingMarker.name"
          point="org.eclipse.core.resources.markers">
       <super type="org.eclipse.sirius.viewpointMarker"/>
       <persistent value="true"/>