[472057] Externalize translatable strings from org.eclipse.sirius.common

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

30 files changed, 283 insertions, 83 deletions

diff --git a/plugins/org.eclipse.sirius.common/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.sirius.common/.settings/org.eclipse.jdt.core.prefs
index fc8c7f3ddc..39e1d0d4d4 100644
--- a/plugins/org.eclipse.sirius.common/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.sirius.common/.settings/org.eclipse.jdt.core.prefs
@@ -32,7 +32,7 @@ org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
diff --git a/plugins/org.eclipse.sirius.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.common/META-INF/MANIFEST.MF
index 8d290cbfac..0635ed8162 100644
--- a/plugins/org.eclipse.sirius.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.common/META-INF/MANIFEST.MF
@@ -27,6 +27,6 @@ Bundle-Activator: org.eclipse.sirius.common.tools.DslCommonPlugin$Implementation
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Localization: plugin
-Import-Package: org.eclipse.sirius.ext.base;version="2.0.0",
+Import-Package: org.eclipse.sirius.ext.base;version="2.1.0",
  org.eclipse.sirius.ext.base.cache;version="2.0.0",
  org.eclipse.sirius.ext.base.collect;version="2.0.0"
diff --git a/plugins/org.eclipse.sirius.common/plugin.properties b/plugins/org.eclipse.sirius.common/plugin.properties
index 092209dad9..b78311dd60 100644
--- a/plugins/org.eclipse.sirius.common/plugin.properties
+++ b/plugins/org.eclipse.sirius.common/plugin.properties
@@ -18,4 +18,42 @@ extension-point.editingDomainFactory.name = org.eclipse.sirius.common.editingDom
 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
+extension-point.resourceSetFactory.name = org.eclipse.sirius.common.resourceSetFactory
+
+BundleClassLoading_ignoredEPackageDeclaration = An EPackage declaration in project {0} has been ignored because of missing informations.
+ClassLoadingService_multipleOverridesDetected = Several overrides are contributed for the class loading override, {0} will be ignored
+CompoundInterpreter_impossibleToCreateInterpreter = Impossible to create the interpreter {0}
+DefaultExpressionProposal_nullProposal = The proposal must not be null
+DynamicEPackageService_missingLocationAttribute = No location attribute was specified.
+DynamicPackageRegistryReader_packageConflict = Both '{0}' and '{1}' register a package for '{2}'
+EObjectCouple_firstNull = the first eObject is null
+EObjectCouple_secondNull = the second eObject is null
+EclipseEditingDomainFactoryDescriptor_errorLoadingExtension = Error while loading the extension {0}
+EclipseUtil_extensionLoadError = Impossible to load the extension {0}
+EditingSessionWorkspaceListener_resourceRefreshError = Error while refreshing resource
+FeatureInterpreter_invalidFeature = The current element {0} does not have the feature named: {1}
+FeatureInterpreter_unknownFeature = Unknown feature name {0}
+FileModificationValidatorDescriptor_creationError = Impossible to create the validator {0}
+FileStatusPrecommitListener_fileModificationValidationStatus = File modification validation status 
+MonomorphicService_serviceError = Exception while calling service {0}.
+PolymorphicService_noCompatibleImplem = No compatible implementation of service {0} found for {1}
+PolymorphicService_toString = Polymorphic service {0} ({1} implementations).
+ProfilerTask_nullCategory = the category is null
+ProfilerTask_nullName = the name is null
+ProfilerTaskRegistry_keyConflict = ProfilerTaskRegistry key already in use: {0}
+ProfilerTaskRegistry_valueConflict = ProfilerTaskRegistry already contains value : {0}
+ResourceSetFactory_creationError = Impossible to create the resource factory {0}
+ResourceSetFactory_ignoredOverrides = Several overrides are contributed for the resource factory,  {0} will be ignored
+ResourceSyncClientNotifier_actionName = ResourceSyncClient notification
+ResourceUtil_backupFileAlreadyExists = the file already exists
+ResourceUtil_backupFileTask = Backup and refresh workspace
+ServiceInterpreter_invalidReceiver = The receiver of the service call {0} is not an EObject (it is a {1})
+ServiceInterpreter_javaClassNotFound = Could not find Java extension class {0}
+ServiceInterpreter_unknownService = Unknown service "{0}"
+TimeProfiler_nullListener = listener is null
+TimeProfiler2_emptyStackError = Empty stack in stopWork. Stopped task: {0}
+TimeProfiler2_otherCategory = Other
+TimeProfiler2_otherTaskName = Other
+VariableInterpreter_unknownVariable = Unknown variable "{0}".
+VariableInterpreter_unkownVariable = The current context does not contains variable named: {0}
+
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/Messages.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/Messages.java
new file mode 100644
index 0000000000..08db83ebf6
--- /dev/null
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/Messages.java
@@ -0,0 +1,142 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.common.tools;
+
+import org.eclipse.sirius.ext.base.I18N;
+import org.eclipse.sirius.ext.base.I18N.TranslatableMessage;
+
+/**
+ * Helper class to obtains translated strings.
+ * 
+ * @author pcdavid
+ */
+public final class Messages {
+
+    static {
+        I18N.initializeMessages(Messages.class, DslCommonPlugin.INSTANCE);
+    }
+
+    // CHECKSTYLE:OFF
+
+    @TranslatableMessage
+    public static String BundleClassLoading_ignoredEPackageDeclaration;
+
+    @TranslatableMessage
+    public static String ClassLoadingService_multipleOverridesDetected;
+
+    @TranslatableMessage
+    public static String CompoundInterpreter_impossibleToCreateInterpreter;
+
+    @TranslatableMessage
+    public static String DefaultExpressionProposal_nullProposal;
+
+    @TranslatableMessage
+    public static String DynamicEPackageService_missingLocationAttribute;
+
+    @TranslatableMessage
+    public static String DynamicPackageRegistryReader_packageConflict;
+
+    @TranslatableMessage
+    public static String EObjectCouple_firstNull;
+
+    @TranslatableMessage
+    public static String EObjectCouple_secondNull;
+
+    @TranslatableMessage
+    public static String EclipseEditingDomainFactoryDescriptor_errorLoadingExtension;
+
+    @TranslatableMessage
+    public static String EclipseUtil_extensionLoadError;
+
+    @TranslatableMessage
+    public static String EditingSessionWorkspaceListener_resourceRefreshError;
+
+    @TranslatableMessage
+    public static String FeatureInterpreter_invalidFeature;
+
+    @TranslatableMessage
+    public static String FeatureInterpreter_unknownFeature;
+
+    @TranslatableMessage
+    public static String FileModificationValidatorDescriptor_creationError;
+
+    @TranslatableMessage
+    public static String FileStatusPrecommitListener_fileModificationValidationStatus;
+
+    @TranslatableMessage
+    public static String MonomorphicService_serviceError;
+
+    @TranslatableMessage
+    public static String PolymorphicService_noCompatibleImplem;
+
+    @TranslatableMessage
+    public static String PolymorphicService_toString;
+
+    @TranslatableMessage
+    public static String ProfilerTask_nullCategory;
+
+    @TranslatableMessage
+    public static String ProfilerTask_nullName;
+
+    @TranslatableMessage
+    public static String ProfilerTaskRegistry_keyConflict;
+    
+    @TranslatableMessage
+    public static String ProfilerTaskRegistry_valueConflict;
+
+    @TranslatableMessage
+    public static String ResourceSetFactory_creationError;
+
+    @TranslatableMessage
+    public static String ResourceSetFactory_ignoredOverrides;
+
+    @TranslatableMessage
+    public static String ResourceSyncClientNotifier_actionName;
+
+    @TranslatableMessage
+    public static String ResourceUtil_backupFileAlreadyExists;
+
+    @TranslatableMessage
+    public static String ResourceUtil_backupFileTask;
+
+    @TranslatableMessage
+    public static String ServiceInterpreter_invalidReceiver;
+
+    @TranslatableMessage
+    public static String ServiceInterpreter_javaClassNotFound;
+
+    @TranslatableMessage
+    public static String ServiceInterpreter_unknownService;
+
+    @TranslatableMessage
+    public static String TimeProfiler_nullListener;
+
+    @TranslatableMessage
+    public static String TimeProfiler2_emptyStackError;
+
+    @TranslatableMessage
+    public static String TimeProfiler2_otherCategory;
+
+    @TranslatableMessage
+    public static String TimeProfiler2_otherTaskName;
+
+    @TranslatableMessage
+    public static String VariableInterpreter_unknownVariable;
+
+    @TranslatableMessage
+    public static String VariableInterpreter_unkownVariable;
+
+    // CHECKSTYLE:ON
+
+    private Messages() {
+        // Prevents instanciation.
+    }
+}
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/editing/FileStatusPrecommitListener.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/editing/FileStatusPrecommitListener.java
index d0b6f27bac..9e22cb4dc0 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/editing/FileStatusPrecommitListener.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/editing/FileStatusPrecommitListener.java
@@ -29,18 +29,18 @@ import org.eclipse.emf.transaction.ResourceSetChangeEvent;
 import org.eclipse.emf.transaction.ResourceSetListenerImpl;
 import org.eclipse.emf.transaction.RollbackException;
 import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-
 import org.eclipse.sirius.common.tools.DslCommonPlugin;
+import org.eclipse.sirius.common.tools.Messages;
 import org.eclipse.sirius.common.tools.api.constant.CommonPreferencesConstants;
 import org.eclipse.sirius.common.tools.api.query.NotificationQuery;
 import org.eclipse.sirius.common.tools.api.resource.FileModificationValidatorProvider;
 import org.eclipse.sirius.common.tools.api.resource.IFileModificationValidator;
 
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Sets;
+
 /**
  * ResourceSetListener responsible for asking for file edit validation before
  * commits.
@@ -51,8 +51,6 @@ import org.eclipse.sirius.common.tools.api.resource.IFileModificationValidator;
  */
 public class FileStatusPrecommitListener extends ResourceSetListenerImpl {
 
-    private static final String FILE_MODIFICATION_VALIDATION_STATUS = "File modification validation status"; //$NON-NLS-1$
-
     private final ArrayList<IFileModificationValidator> fileModificationValidators;
 
     /**
@@ -104,8 +102,8 @@ public class FileStatusPrecommitListener extends ResourceSetListenerImpl {
             }
 
             if (!files2Validate.isEmpty()) {
-                final RollbackException cancelException = new RollbackException(new Status(IStatus.CANCEL, DslCommonPlugin.PLUGIN_ID, FILE_MODIFICATION_VALIDATION_STATUS));
-                final MultiStatus status = new MultiStatus(DslCommonPlugin.PLUGIN_ID, IStatus.ERROR, FILE_MODIFICATION_VALIDATION_STATUS, cancelException);
+                final RollbackException cancelException = new RollbackException(new Status(IStatus.CANCEL, DslCommonPlugin.PLUGIN_ID, Messages.FileStatusPrecommitListener_fileModificationValidationStatus));
+                final MultiStatus status = new MultiStatus(DslCommonPlugin.PLUGIN_ID, IStatus.ERROR, Messages.FileStatusPrecommitListener_fileModificationValidationStatus, cancelException);
                 if (fileModificationValidators.isEmpty()) {
                     // No extension found, use the default process.
                     status.add(ResourcesPlugin.getWorkspace().validateEdit(files2Validate.keySet().toArray(new IFile[files2Validate.size()]), IWorkspace.VALIDATE_PROMPT));
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/CompoundInterpreter.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/CompoundInterpreter.java
index f12a01130d..718f3d8951 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/CompoundInterpreter.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/CompoundInterpreter.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.tools.api.interpreter;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -30,6 +31,7 @@ import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
 import org.eclipse.sirius.common.tools.DslCommonPlugin;
+import org.eclipse.sirius.common.tools.Messages;
 import org.eclipse.sirius.common.tools.api.contentassist.ContentContext;
 import org.eclipse.sirius.common.tools.api.contentassist.ContentInstanceContext;
 import org.eclipse.sirius.common.tools.api.contentassist.ContentProposal;
@@ -411,7 +413,7 @@ public final class CompoundInterpreter implements IInterpreter, IProposalProvide
         try {
             desc = (IInterpreterProvider) configElement.createExecutableExtension(ENGINE_ATTRIBUTE_CLASS);
         } catch (final CoreException e) {
-            DslCommonPlugin.getDefault().error("Impossible to create the interpreter " + configElement.getAttribute(ENGINE_ATTRIBUTE_CLASS), e);
+            DslCommonPlugin.getDefault().error(MessageFormat.format(Messages.CompoundInterpreter_impossibleToCreateInterpreter, configElement.getAttribute(ENGINE_ATTRIBUTE_CLASS)), e);
         }
         return desc;
     }
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/DefaultExpressionProposal.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/DefaultExpressionProposal.java
index d224a1c353..a662462e34 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/DefaultExpressionProposal.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/interpreter/DefaultExpressionProposal.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.tools.api.interpreter;
 
+import org.eclipse.sirius.common.tools.Messages;
+
 /**
  * Default implementation of {@link IExpressionProposal}.
  * 
@@ -44,7 +46,7 @@ public class DefaultExpressionProposal implements IExpressionProposal {
      */
     public DefaultExpressionProposal(final String proposal, final String description) {
         if (proposal == null) {
-            throw new IllegalArgumentException("The proposal must not be null");
+            throw new IllegalArgumentException(Messages.DefaultExpressionProposal_nullProposal);
         }
         this.proposal = proposal;
         this.description = description;
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/ProfilerTask.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/ProfilerTask.java
index 3b4ab83172..9a4fd932a5 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/ProfilerTask.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/ProfilerTask.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.tools.api.profiler;
 
+import org.eclipse.sirius.common.tools.Messages;
+
 /**
  * Represents a task.
  * 
@@ -17,9 +19,9 @@ package org.eclipse.sirius.common.tools.api.profiler;
  */
 public class ProfilerTask {
 
-    private static final String THE_NAME_IS_NULL = "the name is null";
+    private static final String THE_NAME_IS_NULL = Messages.ProfilerTask_nullName;
 
-    private static final String THE_CATEGORY_IS_NULL = "the category is null";
+    private static final String THE_CATEGORY_IS_NULL = Messages.ProfilerTask_nullCategory;
 
     /** The category. */
     private String category;
@@ -126,21 +128,11 @@ public class ProfilerTask {
         return name;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see java.lang.Object#toString()
-     */
     @Override
     public String toString() {
         return new StringBuffer(category.length() + name.length() + 2).append('[').append(category).append(']').append(name).toString();
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see java.lang.Object#hashCode()
-     */
     @Override
     public int hashCode() {
         return category.hashCode() ^ name.hashCode();
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/ProfilerTaskRegistry.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/ProfilerTaskRegistry.java
index f4e60d1742..0177d5afe0 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/ProfilerTaskRegistry.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/ProfilerTaskRegistry.java
@@ -10,9 +10,11 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.tools.api.profiler;
 
+import java.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.sirius.common.tools.Messages;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.ext.base.Options;
 
@@ -65,9 +67,9 @@ public class ProfilerTaskRegistry {
      */
     public void put(String key, ProfilerTask value) throws IllegalArgumentException {
         if (getTable().get(key) != null) {
-            throw new IllegalArgumentException("ProfilerTaskRegistry key already in use: " + key); //$NON-NLS-1$            
+            throw new IllegalArgumentException(MessageFormat.format(Messages.ProfilerTaskRegistry_keyConflict, key));            
         } else if (getTable().values().contains(value)) {
-            throw new IllegalArgumentException("ProfilerTaskRegistry already contains value : " + key); //$NON-NLS-1$
+            throw new IllegalArgumentException(MessageFormat.format(Messages.ProfilerTaskRegistry_valueConflict, value));
         } else {
             getTable().put(key, value);
         }
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/TimeProfiler.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/TimeProfiler.java
index b83bb30fff..240574fe16 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/TimeProfiler.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/TimeProfiler.java
@@ -18,6 +18,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.eclipse.sirius.common.tools.Messages;
 import org.eclipse.sirius.ext.base.Option;
 
 /**
@@ -319,7 +320,7 @@ public class TimeProfiler {
      */
     public void addProfilerListener(final ProfilerListener listener) throws IllegalArgumentException {
         if (listener == null) {
-            throw new IllegalArgumentException("listener is null");
+            throw new IllegalArgumentException(Messages.TimeProfiler_nullListener);
         }
         this.listeners.add(listener);
     }
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/TimeProfiler2.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/TimeProfiler2.java
index 77e2c5832c..a5ee29da29 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/TimeProfiler2.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/profiler/TimeProfiler2.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.tools.api.profiler;
 
+import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.Date;
 import java.util.EmptyStackException;
@@ -22,6 +23,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import org.eclipse.sirius.common.tools.DslCommonPlugin;
+import org.eclipse.sirius.common.tools.Messages;
 import org.eclipse.sirius.ext.base.collect.StackEx;
 
 /**
@@ -32,7 +34,7 @@ import org.eclipse.sirius.ext.base.collect.StackEx;
 public class TimeProfiler2 extends TimeProfiler {
 
     /** The Other task. */
-    public static final ProfilerTask OTHER_TASK = new ProfilerTask("Other", "Other");
+    public static final ProfilerTask OTHER_TASK = new ProfilerTask(Messages.TimeProfiler2_otherCategory, Messages.TimeProfiler2_otherTaskName);
 
     /** The roots tasks. */
     private List<CompositeTask> roots;
@@ -261,7 +263,7 @@ public class TimeProfiler2 extends TimeProfiler {
                 runningTask.stopTask();
             }
         } catch (final EmptyStackException e) {
-            DslCommonPlugin.getDefault().error("Empty stack in stopWork. Stopped task : " + task.toString(), e);
+            DslCommonPlugin.getDefault().error(MessageFormat.format(Messages.TimeProfiler2_emptyStackError, task.toString()), e);
         }
     }
 
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/resource/ResourceSetFactory.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/resource/ResourceSetFactory.java
index 78dfcf6b40..5e09402a13 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/resource/ResourceSetFactory.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/resource/ResourceSetFactory.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.tools.api.resource;
 
+import java.text.MessageFormat;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
@@ -20,8 +22,8 @@ import org.eclipse.emf.common.EMFPlugin;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
 import org.eclipse.sirius.common.tools.DslCommonPlugin;
+import org.eclipse.sirius.common.tools.Messages;
 
 /**
  * 
@@ -64,16 +66,14 @@ public class ResourceSetFactory {
                         if (result == null) {
                             result = contributed;
                         } else {
-                            final IStatus status = new Status(IStatus.WARNING, DslCommonPlugin.PLUGIN_ID, "Several overrides are contributed for the resource factory,  "
-                                    + configElement.getAttribute(CLASS_ATTRIBUTE) + " will be ignored");
+                            final IStatus status = new Status(IStatus.WARNING, DslCommonPlugin.PLUGIN_ID, MessageFormat.format(Messages.ResourceSetFactory_ignoredOverrides, configElement.getAttribute(CLASS_ATTRIBUTE)));
                             DslCommonPlugin.getDefault().getLog().log(status);
                         }
                     } catch (final CoreException e) {
-                        DslCommonPlugin.getDefault().error("Impossible to create the resource factory " + configElement.getAttribute(CLASS_ATTRIBUTE), e);
+                        DslCommonPlugin.getDefault().error(MessageFormat.format(Messages.ResourceSetFactory_creationError, configElement.getAttribute(CLASS_ATTRIBUTE)), e);
                     } catch (final ClassCastException e) {
-                        DslCommonPlugin.getDefault().error("Impossible to create the resource factory " + configElement.getAttribute(CLASS_ATTRIBUTE), e);
+                        DslCommonPlugin.getDefault().error(MessageFormat.format(Messages.ResourceSetFactory_creationError, configElement.getAttribute(CLASS_ATTRIBUTE)), e);
                     }
-
                 }
             }
         }
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EObjectCouple.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EObjectCouple.java
index 760ca296c6..d7aa472dff 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EObjectCouple.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EObjectCouple.java
@@ -11,6 +11,7 @@
 package org.eclipse.sirius.common.tools.api.util;
 
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.common.tools.Messages;
 
 /**
  * Class useful to use as a key for a cache needing two objects.
@@ -45,10 +46,10 @@ public class EObjectCouple {
      */
     public EObjectCouple(final EObject obj1, final EObject obj2, RefreshIdsHolder ids) {
         if (obj1 == null) {
-            throw new IllegalArgumentException("the first eObject is null");
+            throw new IllegalArgumentException(Messages.EObjectCouple_firstNull);
         }
         if (obj2 == null) {
-            throw new IllegalArgumentException("the second eObject is null");
+            throw new IllegalArgumentException(Messages.EObjectCouple_secondNull);
         }
         this.obj1 = obj1;
         this.obj2 = obj2;
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EclipseUtil.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EclipseUtil.java
index 55be2aab15..f839633215 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EclipseUtil.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/EclipseUtil.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.tools.api.util;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -28,6 +29,7 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.common.EMFPlugin;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
 import org.eclipse.sirius.common.tools.DslCommonPlugin;
+import org.eclipse.sirius.common.tools.Messages;
 
 import com.google.common.base.Objects;
 import com.google.common.base.Predicate;
@@ -138,7 +140,7 @@ public final class EclipseUtil {
                                 contributors.add(clazz.cast(obj));
                             }
                         } catch (final CoreException e) {
-                            DslCommonPlugin.getDefault().error("Impossible to load the extension " + ext.getLabel(), e);
+                            DslCommonPlugin.getDefault().error(MessageFormat.format(Messages.EclipseUtil_extensionLoadError, ext.getLabel()), e);
                             DslCommonPlugin.getDefault().getLog().log(e.getStatus());
                         }
                     }
@@ -196,7 +198,7 @@ public final class EclipseUtil {
                                 val.add(clazz.cast(obj));
                             }
                         } catch (final CoreException e) {
-                            DslCommonPlugin.getDefault().error("Impossible to load the extension " + ext.getLabel(), e);
+                            DslCommonPlugin.getDefault().error(MessageFormat.format(Messages.EclipseUtil_extensionLoadError, ext.getLabel()), e);
                             DslCommonPlugin.getDefault().getLog().log(e.getStatus());
                         }
                     }
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/ResourceUtil.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/ResourceUtil.java
index 5f7d61ded0..548ad51d26 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/ResourceUtil.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/api/util/ResourceUtil.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.sirius.common.tools.Messages;
 
 /**
  * Useful operations for the type {@link IResource}.
@@ -48,7 +49,7 @@ public final class ResourceUtil {
      *             in case of while saving file error.
      */
     public static IFile createBackupFile(final IFile file, final IProgressMonitor monitor) throws CoreException {
-        monitor.beginTask("Backup and refresh workspace", 2);
+        monitor.beginTask(Messages.ResourceUtil_backupFileTask, 2);
         // computes a timestamp.
         final String timestamp = new SimpleDateFormat("yyyyMMdd_HHmm").format(new Date()); //$NON-NLS-1$
 
@@ -72,7 +73,7 @@ public final class ResourceUtil {
             }
             backup = file.getParent().getFile(new Path(FILE_SEPARATOR + name + i));
         }
-        assert !backup.exists() : "the file already exists";
+        assert !backup.exists() : Messages.ResourceUtil_backupFileAlreadyExists;
 
         // creates the backup
         file.copy(backup.getFullPath(), IResource.FORCE, new SubProgressMonitor(monitor, 1));
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/ecore/DynamicEPackageService.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/ecore/DynamicEPackageService.java
index 3e04ff09fb..5a03cd3471 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/ecore/DynamicEPackageService.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/ecore/DynamicEPackageService.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.plugin.RegistryReader.PluginClassDescriptor;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.sirius.common.tools.Messages;
 
 /**
  * A class to fork EMF for dynamic registry.
@@ -68,7 +69,7 @@ public class DynamicEPackageService {
                         }
                         return (EPackage) resourceSet.getEObject(locationURI, true);
                     } else {
-                        throw new RuntimeException("No location attribute was specified.");
+                        throw new RuntimeException(Messages.DynamicEPackageService_missingLocationAttribute);
                     }
                 } catch (Exception e) {
                     throw new WrappedException(e);
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/ecore/DynamicPackageRegistryReader.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/ecore/DynamicPackageRegistryReader.java
index b6d49dfa83..17d0ad3fa7 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/ecore/DynamicPackageRegistryReader.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/ecore/DynamicPackageRegistryReader.java
@@ -16,15 +16,16 @@
  */
 package org.eclipse.sirius.common.tools.internal.ecore;
 
+import java.text.MessageFormat;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.common.util.WrappedException;
 import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
 import org.eclipse.emf.ecore.plugin.RegistryReader;
-
 import org.eclipse.sirius.common.tools.DslCommonPlugin;
+import org.eclipse.sirius.common.tools.Messages;
 import org.eclipse.sirius.common.tools.internal.ecore.DynamicEPackageService.EPackageDescriptor;
 
 //CHECKSTYLE:OFF
@@ -78,10 +79,8 @@ public class DynamicPackageRegistryReader extends RegistryReader {
                 Object previous = EPackage.Registry.INSTANCE.put(packageURI, new EPackageDescriptor.Dynamic(element, ATT_LOCATION));
                 if (previous instanceof PluginClassDescriptor) {
                     PluginClassDescriptor descriptor = (PluginClassDescriptor) previous;
-                    EcorePlugin.INSTANCE.log("Both '" + descriptor.element.getContributor().getName() + "' and '" + element.getContributor().getName() + "' register a package for '" + packageURI
-                            + "'");
+                    DslCommonPlugin.INSTANCE.log(MessageFormat.format(Messages.DynamicPackageRegistryReader_packageConflict, descriptor.element.getContributor().getName(), element.getContributor().getName(), packageURI));
                 }
-
                 return true;
             } else {
                 EPackage.Registry.INSTANCE.remove(packageURI);
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/editing/EclipseEditingDomainFactoryDescriptor.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/editing/EclipseEditingDomainFactoryDescriptor.java
index 9fc82c79ef..27ca73c245 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/editing/EclipseEditingDomainFactoryDescriptor.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/editing/EclipseEditingDomainFactoryDescriptor.java
@@ -10,13 +10,15 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.tools.internal.editing;
 
+import java.text.MessageFormat;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
-
 import org.eclipse.sirius.common.tools.DslCommonPlugin;
+import org.eclipse.sirius.common.tools.Messages;
 import org.eclipse.sirius.common.tools.api.editing.EditingDomainFactoryDescriptor;
 import org.eclipse.sirius.common.tools.api.editing.IEditingDomainFactory;
 
@@ -86,8 +88,11 @@ public class EclipseEditingDomainFactoryDescriptor implements EditingDomainFacto
                 try {
                     extension = (IEditingDomainFactory) element.createExecutableExtension(EDITING_DOMAIN_FACTORY_CLASS_ATTRIBUTE);
                 } catch (CoreException e) {
-                    DslCommonPlugin.getDefault().getLog()
-                            .log(new Status(IStatus.ERROR, DslCommonPlugin.PLUGIN_ID, "Error while loading the extension " + element.getDeclaringExtension().getUniqueIdentifier(), e));
+                    DslCommonPlugin
+                            .getDefault()
+                            .getLog()
+                            .log(new Status(IStatus.ERROR, DslCommonPlugin.PLUGIN_ID, MessageFormat.format(Messages.EclipseEditingDomainFactoryDescriptor_errorLoadingExtension, element
+                                    .getDeclaringExtension().getUniqueIdentifier()), e));
                 }
             }
         }
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/BundleClassLoading.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/BundleClassLoading.java
index 66d764d583..473bd92248 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/BundleClassLoading.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/BundleClassLoading.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.tools.internal.interpreter;
 
+import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Set;
@@ -21,6 +22,7 @@ import org.eclipse.core.runtime.IExtensionRegistry;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.common.EMFPlugin;
 import org.eclipse.sirius.common.tools.DslCommonPlugin;
+import org.eclipse.sirius.common.tools.Messages;
 import org.eclipse.sirius.common.tools.api.interpreter.ClassLoading;
 import org.eclipse.sirius.common.tools.api.interpreter.ClasspathChangeCallback;
 import org.eclipse.sirius.common.tools.api.interpreter.EPackageLoadingCallback;
@@ -144,8 +146,7 @@ public class BundleClassLoading implements ClassLoading {
                         if (nsURI != null && className != null) {
                             contributions.put(contributorName, new EPackageDeclaration(nsURI, className, genModel));
                         } else {
-                            DslCommonPlugin.getDefault().warning("An EPackage declaration in project " + contributorName + " has been ignored because of missing informations.",
-                                    new IllegalArgumentException());
+                            DslCommonPlugin.getDefault().warning(MessageFormat.format(Messages.BundleClassLoading_ignoredEPackageDeclaration, contributorName), new IllegalArgumentException());
                         }
                     }
 
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/ClassLoadingService.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/ClassLoadingService.java
index d1bb75c3a9..e163980065 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/ClassLoadingService.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/ClassLoadingService.java
@@ -10,12 +10,14 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.tools.internal.interpreter;
 
+import java.text.MessageFormat;
 import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.sirius.common.tools.DslCommonPlugin;
+import org.eclipse.sirius.common.tools.Messages;
 import org.eclipse.sirius.common.tools.api.interpreter.ClassLoading;
 import org.eclipse.sirius.common.tools.api.util.EclipseUtil;
 
@@ -60,8 +62,7 @@ public final class ClassLoadingService {
             if (picked == null) {
                 picked = it.next();
             } else {
-                final IStatus status = new Status(IStatus.WARNING, DslCommonPlugin.PLUGIN_ID, "Several overrides are contributed for the class loading override,  " + it.next().getClass().getName()
-                        + " will be ignored");
+                final IStatus status = new Status(IStatus.WARNING, DslCommonPlugin.PLUGIN_ID, MessageFormat.format(Messages.ClassLoadingService_multipleOverridesDetected, it.next().getClass().getName()));
                 DslCommonPlugin.getDefault().getLog().log(status);
             }
         }
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/FeatureInterpreter.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/FeatureInterpreter.java
index cfdd1dbc84..714dea8ab5 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/FeatureInterpreter.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/FeatureInterpreter.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.tools.internal.interpreter;
 
+import java.text.MessageFormat;
 import java.util.Iterator;
 import java.util.Set;
 
@@ -18,6 +19,7 @@ import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.sirius.common.tools.Messages;
 import org.eclipse.sirius.common.tools.api.interpreter.EvaluationException;
 import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
 import org.eclipse.sirius.common.tools.api.interpreter.IInterpreterContext;
@@ -90,7 +92,7 @@ public class FeatureInterpreter extends AbstractInterpreter implements org.eclip
             } else if (E_CROSS_REFERENCES_FEATURE_NAME.equals(featureName)) {
                 result = target.eCrossReferences();
             } else {
-                throw new EvaluationException("Unknown feature name " + featureName + ".");
+                throw new EvaluationException(MessageFormat.format(Messages.FeatureInterpreter_unknownFeature, featureName));
             }
         }
         return result;
@@ -117,8 +119,8 @@ public class FeatureInterpreter extends AbstractInterpreter implements org.eclip
                         foundAtLeastOneValid = hasFeatureNameAndCollectReturnTypes(cur, featureName, possibleReturnTypes);
                     }
                     if (!foundAtLeastOneValid) {
-                        interpreterStatus.addStatus(InterpreterStatusFactory.createInterpreterStatus(context, IInterpreterStatus.ERROR, "The current element " + typeName.getCompleteName("::")
-                                + " does not have the feature named : " + featureName));
+                        interpreterStatus.addStatus(InterpreterStatusFactory.createInterpreterStatus(context, IInterpreterStatus.ERROR,
+                                MessageFormat.format(Messages.FeatureInterpreter_invalidFeature, typeName.getCompleteName("::"), featureName))); //$NON-NLS-1$
                     }
                 }
                 if (possibleReturnTypes.size() > 0) {
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/MonomorphicService.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/MonomorphicService.java
index f005d6f686..34fbd960cd 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/MonomorphicService.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/MonomorphicService.java
@@ -12,9 +12,11 @@ package org.eclipse.sirius.common.tools.internal.interpreter;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.sirius.common.tools.Messages;
 import org.eclipse.sirius.common.tools.api.interpreter.EvaluationException;
 
 import com.google.common.base.Preconditions;
@@ -78,12 +80,12 @@ class MonomorphicService implements IMonomorphicService {
     }
 
     private void fail(Exception e) throws EvaluationException {
-        throw new EvaluationException("Exception while calling service " + this + ".", e);
+        throw new EvaluationException(MessageFormat.format(Messages.MonomorphicService_serviceError, this), e);
     }
 
     @Override
     public String toString() {
-        return serviceInstance.getClass().getCanonicalName() + "." + serviceMethod.getName() + "(" + serviceMethod.getParameterTypes()[0].getCanonicalName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        return MessageFormat.format("{0}.{1}({2})", serviceInstance.getClass().getCanonicalName(), serviceMethod.getName(), serviceMethod.getParameterTypes()[0].getCanonicalName()); //$NON-NLS-1$
     }
 
     @Override
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/PolymorphicService.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/PolymorphicService.java
index 2715c7b7ef..23b623a058 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/PolymorphicService.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/PolymorphicService.java
@@ -10,9 +10,11 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.tools.internal.interpreter;
 
+import java.text.MessageFormat;
 import java.util.List;
 import java.util.Set;
 
+import org.eclipse.sirius.common.tools.Messages;
 import org.eclipse.sirius.common.tools.api.interpreter.EvaluationException;
 
 import com.google.common.base.Preconditions;
@@ -55,7 +57,7 @@ class PolymorphicService implements IPolymorphicService {
         if (!candidates.isEmpty()) {
             return candidates.get(0).call(target);
         } else {
-            throw new EvaluationException("No compatible implementation of service " + getName() + " found for " + target);
+            throw new EvaluationException(MessageFormat.format(Messages.PolymorphicService_noCompatibleImplem, getName(), target));
         }
     }
 
@@ -70,7 +72,7 @@ class PolymorphicService implements IPolymorphicService {
 
     @Override
     public String toString() {
-        return "Polymorphic service " + getName() + " (" + implementers.size() + " implementations).";
+        return MessageFormat.format(Messages.PolymorphicService_toString, getName(), implementers.size());
     }
 
     public Set<IMonomorphicService> getImplementers() {
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/ServiceInterpreter.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/ServiceInterpreter.java
index a43ee9a68e..a064d06ed6 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/ServiceInterpreter.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/ServiceInterpreter.java
@@ -12,6 +12,7 @@ package org.eclipse.sirius.common.tools.internal.interpreter;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -19,6 +20,7 @@ import java.util.regex.Pattern;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.sirius.common.tools.DslCommonPlugin;
+import org.eclipse.sirius.common.tools.Messages;
 import org.eclipse.sirius.common.tools.api.interpreter.ClassLoadingCallback;
 import org.eclipse.sirius.common.tools.api.interpreter.EvaluationException;
 import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
@@ -77,7 +79,7 @@ public class ServiceInterpreter extends VariableInterpreter implements org.eclip
 
         @Override
         public void notFound(String qualifiedName) {
-            DslCommonPlugin.getDefault().warning("Could not find Java extension class " + qualifiedName, new RuntimeException());
+            DslCommonPlugin.getDefault().warning(MessageFormat.format(Messages.ServiceInterpreter_javaClassNotFound, qualifiedName), new RuntimeException());
         }
 
         @Override
@@ -134,7 +136,7 @@ public class ServiceInterpreter extends VariableInterpreter implements org.eclip
                 if (objectReceiver instanceof EObject) {
                     receiver = (EObject) objectReceiver;
                 } else {
-                    throw new EvaluationException("The receiver of the service call " + serviceCall + " is not an EObject.");
+                    throw new EvaluationException(MessageFormat.format(Messages.ServiceInterpreter_invalidReceiver, serviceCall, objectReceiver != null ? objectReceiver.getClass().getName() : "null")); //$NON-NLS-1$
                 }
             }
             int indexOfParenthesis = serviceCall.indexOf("("); //$NON-NLS-1$
@@ -160,7 +162,7 @@ public class ServiceInterpreter extends VariableInterpreter implements org.eclip
             IService service = services.get(serviceName);
             return service.call(target);
         } else {
-            throw new EvaluationException("Unknown service \"" + serviceName + "\"");
+            throw new EvaluationException(MessageFormat.format(Messages.ServiceInterpreter_unknownService, serviceName));
         }
     }
 
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/VariableInterpreter.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/VariableInterpreter.java
index f84bb28310..3c404d72b6 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/VariableInterpreter.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/interpreter/VariableInterpreter.java
@@ -10,9 +10,11 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.tools.internal.interpreter;
 
+import java.text.MessageFormat;
 import java.util.Map;
 
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.sirius.common.tools.Messages;
 import org.eclipse.sirius.common.tools.api.interpreter.EvaluationException;
 import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
 import org.eclipse.sirius.common.tools.api.interpreter.IInterpreterContext;
@@ -104,37 +106,29 @@ public class VariableInterpreter extends AbstractInterpreter implements org.ecli
             } else if (variablesManager.getVariables().containsKey(variableName)) {
                 result = variablesManager.getVariable(variableName);
             } else {
-                throw new EvaluationException("Unknown variable \"" + variableName + "\".");
+                throw new EvaluationException(MessageFormat.format(Messages.VariableInterpreter_unknownVariable, variableName));
             }
         }
         return result;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     public IInterpreter createInterpreter() {
         return new VariableInterpreter();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public boolean supportsValidation() {
         return true;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public ValidationResult analyzeExpression(IInterpreterContext context, String expression) {
         ValidationResult result = new ValidationResult();
         if (expression != null && context != null && expression.startsWith(PREFIX)) {
             String variableName = expression.substring(PREFIX.length());
             if (!context.getVariables().containsKey(variableName) && !SELF_VARIABLE_NAME.equals(variableName)) {
-                result.addStatus(InterpreterStatusFactory.createInterpreterStatus(context, IInterpreterStatus.ERROR, "The current context does not contains variable named : " + variableName));
+                result.addStatus(InterpreterStatusFactory.createInterpreterStatus(context, IInterpreterStatus.ERROR, MessageFormat.format(Messages.VariableInterpreter_unkownVariable, variableName)));
             }
 
             if (SELF_VARIABLE_NAME.equals(variableName)) {
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/EditingSessionWorkspaceListener.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/EditingSessionWorkspaceListener.java
index fb0673c9fd..e9017e2df8 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/EditingSessionWorkspaceListener.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/EditingSessionWorkspaceListener.java
@@ -20,6 +20,7 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.sirius.common.tools.DslCommonPlugin;
+import org.eclipse.sirius.common.tools.Messages;
 import org.eclipse.sirius.common.tools.api.resource.ResourceSetSync;
 import org.eclipse.sirius.common.tools.api.resource.ResourceSetSync.ResourceStatus;
 import org.eclipse.sirius.common.tools.api.resource.ResourceSyncClient;
@@ -59,7 +60,7 @@ public class EditingSessionWorkspaceListener implements IResourceChangeListener
                 }
             }
         } catch (final CoreException exception) {
-            DslCommonPlugin.getDefault().error("Error while refreshing resource", exception);
+            DslCommonPlugin.getDefault().error(Messages.EditingSessionWorkspaceListener_resourceRefreshError, exception);
         }
     }
 
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/FileModificationValidatorDescriptor.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/FileModificationValidatorDescriptor.java
index d7c830ddfa..ab1b622199 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/FileModificationValidatorDescriptor.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/FileModificationValidatorDescriptor.java
@@ -10,10 +10,12 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.tools.internal.resource;
 
+import java.text.MessageFormat;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
-
 import org.eclipse.sirius.common.tools.DslCommonPlugin;
+import org.eclipse.sirius.common.tools.Messages;
 import org.eclipse.sirius.common.tools.api.resource.IFileModificationValidator;
 
 /**
@@ -45,9 +47,9 @@ public class FileModificationValidatorDescriptor {
         try {
             return (IFileModificationValidator) element.createExecutableExtension(CLASS_ATTRIBUTE);
         } catch (final CoreException e) {
-            DslCommonPlugin.getDefault().error("Impossible to create the validator " + element.getAttribute(CLASS_ATTRIBUTE), e);
+            DslCommonPlugin.getDefault().error(MessageFormat.format(Messages.FileModificationValidatorDescriptor_creationError, element.getAttribute(CLASS_ATTRIBUTE)), e);
         } catch (final ClassCastException e) {
-            DslCommonPlugin.getDefault().error("Impossible to create the validator " + element.getAttribute(CLASS_ATTRIBUTE), e);
+            DslCommonPlugin.getDefault().error(MessageFormat.format(Messages.FileModificationValidatorDescriptor_creationError, element.getAttribute(CLASS_ATTRIBUTE)), e);
         }
         return null;
     }
diff --git a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/ResourceSyncClientNotifier.java b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/ResourceSyncClientNotifier.java
index 86444d3522..b58a97950d 100644
--- a/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/ResourceSyncClientNotifier.java
+++ b/plugins/org.eclipse.sirius.common/src/org/eclipse/sirius/common/tools/internal/resource/ResourceSyncClientNotifier.java
@@ -18,6 +18,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.sirius.common.tools.DslCommonPlugin;
+import org.eclipse.sirius.common.tools.Messages;
 import org.eclipse.sirius.common.tools.api.resource.ResourceSyncClient;
 
 /**
@@ -30,7 +31,7 @@ public class ResourceSyncClientNotifier extends Job {
     /** The family id for this kind of job. */
     public static final String FAMILY = DslCommonPlugin.PLUGIN_ID + ".ResourceSyncClientNotification"; //$NON-NLS-1$
 
-    private static final String ACTION_NAME = "ResourceSyncClient notification";
+    private static final String ACTION_NAME = Messages.ResourceSyncClientNotifier_actionName;
 
     /**
      * Scheduling rule to prevent concurrent ResourceSyncClientNotifier
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index 33c1d918f1..0f6bb85487 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -275,6 +275,9 @@
 						<code>org.eclipse.sirius.synchronizer</code>
 					</li>
 					<li>
+						<code>org.eclipse.sirius.common</code>
+					</li>
+					<li>
 						<code>org.eclipse.sirius.common.acceleo.aql</code>
 					</li>
 					<li>
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
index fd72972c27..3c7ed8ddb7 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
@@ -63,6 +63,7 @@ Additional non-breaking changes:
 ** @org.eclipse.sirius.ext.base@
 ** @org.eclipse.sirius.ecore.extender@
 ** @org.eclipse.sirius.synchronizer@
+** @org.eclipse.sirius.common@
 ** @org.eclipse.sirius.common.acceleo.aql@
 ** @org.eclipse.sirius.common.acceleo.aql.ide@
 ** @org.eclipse.sirius.common.acceleo.mtl@