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

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

30 files changed, 342 insertions, 265 deletions

diff --git a/plugins/org.eclipse.sirius.common.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.sirius.common.ui/.settings/org.eclipse.jdt.core.prefs
index fc8c7f3ddc..39e1d0d4d4 100644
--- a/plugins/org.eclipse.sirius.common.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.sirius.common.ui/.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.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.common.ui/META-INF/MANIFEST.MF
index 68ecebd166..83f6125eb9 100644
--- a/plugins/org.eclipse.sirius.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.common.ui/META-INF/MANIFEST.MF
@@ -41,6 +41,6 @@ Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 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.e3.ui.dialogs;version="3.0.0"
diff --git a/plugins/org.eclipse.sirius.common.ui/plugin.properties b/plugins/org.eclipse.sirius.common.ui/plugin.properties
index 5a79f3e4cf..c1d8bef6d5 100644
--- a/plugins/org.eclipse.sirius.common.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.ui/plugin.properties
@@ -14,3 +14,49 @@ 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
+
+AbstractFolderSelectionDialog_newFolder = New Folder
+AbstractSelectionWizardPage_label = Enter prefix or pattern (? = any character, * = any String): 
+AbstractSelectionWizardPage_message = Filter elements
+DynamicConfigurationHelper_unknownField = No field named {0} could be found in class {1}
+EObjectPaneBasedSelectionWizard_askSelect = Please select an element
+EObjectPaneBasedSelectionWizard_choiceMessage = Choice of values
+EObjectPaneBasedSelectionWizard_selectedMessage = Selected values
+EObjectPaneBasedSelectionWizard_title = Selection Wizard
+EObjectSelectionWizard_message = Please select an element
+EObjectSelectionWizard_title = Selection Wizard
+EclipseLabelProviderProviderDescriptor_errorLoadingExtension = Error while loading the extension {0}
+EclipseUIUtil_showView_error = The view with id {0} could not be initialized
+FeatureProposalProvider_newFeatureExpression = New feature access expression.
+FolderSelectionDialog_title = Select a folder
+ModelElementChooserDialog_title = Select a model element
+NewFileDialog_fileLabel = File
+NewFileDialog_message = Select the folder
+NewFileDialog_selectFileStatus = Select a file
+NewFileDialog_title = File Name
+QuickOutlineAdapterFactoryLabelProvider_foundIn = found in
+QuickOutlineControl_errorNoPage = The descriptor has no page
+RenameDialog_askNewName_caseInsensitive = Enter new name (case insensitive):
+RenameDialog_askNewName_caseSensitive = Enter new name (case sensitive):
+RenameDialog_errorNameClash = New name must be different
+RenameDialog_title = Rename representation
+SWTUtil_askToSaveChanges = {0} have been modified{1}. Save changes{2}?
+SWTUtil_askToSaveChanges_openElseWhere = {0} have been modified, but are still open elsewhere with identical changes. Closing this will not lose those changes. Save changes now anyway?
+SWTUtil_saveDialog_title = Save
+SelectFilesWizardPage_notEnoughFiles = Not enough files were selected.
+SelectFilesWizardPage_title = This page is used to select file(s) in the workspace.
+SelectFilesWizardPage_tooManyFiles = Too many files were selected.
+SelectModelElementWizardPage_invalidFile = The following file is not valid: {0}
+ServiceProposalProvider_invalidContext = The context parameter should be a ContentContext or a ContentInstanceContext
+ServiceProposalProvider_newVariableExpression = New service calls expression.
+TimeProfiler_action_print = Print to console
+TimeProfiler_action_refresh = Refresh view
+TimeProfiler_action_reinit = Reinit profiler
+TimeProfiler_column_avg = Average
+TimeProfiler_column_category = Task Category
+TimeProfiler_column_max = Maximum
+TimeProfiler_column_min = Minimum
+TimeProfiler_column_occ = Occurences
+TimeProfiler_column_task = Task Name
+TimeProfiler_column_time = Time (ms)
+VariableProposalProvider_newVariableExpression = New variable access expression.
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/Messages.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/Messages.java
new file mode 100644
index 0000000000..a4a7e3efd6
--- /dev/null
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/Messages.java
@@ -0,0 +1,168 @@
+/*******************************************************************************
+ * 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.ui;
+
+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, SiriusTransPlugin.INSTANCE);
+    }
+
+    // CHECKSTYLE:OFF
+    @TranslatableMessage
+    public static String AbstractFolderSelectionDialog_newFolder;
+
+    @TranslatableMessage
+    public static String AbstractSelectionWizardPage_label;
+
+    @TranslatableMessage
+    public static String AbstractSelectionWizardPage_message;
+
+    @TranslatableMessage
+    public static String DynamicConfigurationHelper_unknownField;
+
+    @TranslatableMessage
+    public static String EObjectPaneBasedSelectionWizard_askSelect;
+
+    @TranslatableMessage
+    public static String EObjectPaneBasedSelectionWizard_choiceMessage;
+
+    @TranslatableMessage
+    public static String EObjectPaneBasedSelectionWizard_selectedMessage;
+
+    @TranslatableMessage
+    public static String EObjectPaneBasedSelectionWizard_title;
+
+    @TranslatableMessage
+    public static String EObjectSelectionWizard_message;
+
+    @TranslatableMessage
+    public static String EObjectSelectionWizard_title;
+    
+    @TranslatableMessage
+    public static String FolderSelectionDialog_title;
+
+    @TranslatableMessage
+    public static String EclipseLabelProviderProviderDescriptor_errorLoadingExtension;
+
+    @TranslatableMessage
+    public static String EclipseUIUtil_showView_error;
+
+    @TranslatableMessage
+    public static String FeatureProposalProvider_newFeatureExpression;
+
+    @TranslatableMessage
+    public static String ModelElementChooserDialog_title;
+    
+    @TranslatableMessage
+    public static String NewFileDialog_message;
+
+    @TranslatableMessage
+    public static String NewFileDialog_title;
+
+    @TranslatableMessage
+    public static String NewFileDialog_fileLabel;
+
+    @TranslatableMessage
+    public static String NewFileDialog_selectFileStatus;
+
+    @TranslatableMessage
+    public static String QuickOutlineAdapterFactoryLabelProvider_foundIn;
+
+    @TranslatableMessage
+    public static String QuickOutlineControl_errorNoPage;
+
+    @TranslatableMessage
+    public static String RenameDialog_askNewName_caseInsensitive;
+
+    @TranslatableMessage
+    public static String RenameDialog_askNewName_caseSensitive;
+
+    @TranslatableMessage
+    public static String RenameDialog_errorNameClash;
+
+    @TranslatableMessage
+    public static String RenameDialog_title;
+
+    @TranslatableMessage
+    public static String SWTUtil_askToSaveChanges;
+
+    @TranslatableMessage
+    public static String SWTUtil_askToSaveChanges_openElseWhere;
+
+    @TranslatableMessage
+    public static String SWTUtil_saveDialog_title;
+    
+    @TranslatableMessage
+    public static String SelectFilesWizardPage_title;
+    
+    @TranslatableMessage
+    public static String SelectFilesWizardPage_notEnoughFiles;
+
+    @TranslatableMessage
+    public static String SelectFilesWizardPage_tooManyFiles;
+
+    @TranslatableMessage
+    public static String SelectModelElementWizardPage_invalidFile;
+
+    @TranslatableMessage
+    public static String ServiceProposalProvider_invalidContext;
+
+    @TranslatableMessage
+    public static String ServiceProposalProvider_newVariableExpression;
+
+    @TranslatableMessage
+    public static String TimeProfiler_action_print;
+
+    @TranslatableMessage
+    public static String TimeProfiler_action_refresh;
+
+    @TranslatableMessage
+    public static String TimeProfiler_action_reinit;
+
+    @TranslatableMessage
+    public static String TimeProfiler_column_avg;
+
+    @TranslatableMessage
+    public static String TimeProfiler_column_category;
+
+    @TranslatableMessage
+    public static String TimeProfiler_column_max;
+
+    @TranslatableMessage
+    public static String TimeProfiler_column_min;
+
+    @TranslatableMessage
+    public static String TimeProfiler_column_occ;
+
+    @TranslatableMessage
+    public static String TimeProfiler_column_task;
+
+    @TranslatableMessage
+    public static String TimeProfiler_column_time;
+
+    @TranslatableMessage
+    public static String VariableProposalProvider_newVariableExpression;
+
+    // CHECKSTYLE:ON
+
+    private Messages() {
+        // Prevents instanciation.
+    }
+}
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/business/internal/views/properties/tabbed/EclipseLabelProviderProviderDescriptor.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/business/internal/views/properties/tabbed/EclipseLabelProviderProviderDescriptor.java
index acab9524f1..a0b209bc44 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/business/internal/views/properties/tabbed/EclipseLabelProviderProviderDescriptor.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/business/internal/views/properties/tabbed/EclipseLabelProviderProviderDescriptor.java
@@ -10,12 +10,14 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.ui.business.internal.views.properties.tabbed;
 
+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.ui.Messages;
 import org.eclipse.sirius.common.ui.SiriusTransPlugin;
 import org.eclipse.sirius.common.ui.business.api.views.properties.tabbed.ILabelProviderProvider;
 
@@ -36,22 +38,19 @@ public class EclipseLabelProviderProviderDescriptor extends AbstractLabelProvide
      *            Configuration element from which to create this descriptor.
      */
     public EclipseLabelProviderProviderDescriptor(IConfigurationElement configuration) {
-        super();
         this.id = configuration.getDeclaringExtension().getUniqueIdentifier();
         this.element = configuration;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     public ILabelProviderProvider getLabelProviderProvider() {
         if (labelProviderProvider == null) {
             if (Platform.isRunning()) {
                 try {
                     labelProviderProvider = (ILabelProviderProvider) element.createExecutableExtension(LABEL_PROVIDER_PROVIDER_CLASS_ATTRIBUTE);
                 } catch (CoreException e) {
-                    SiriusTransPlugin.getPlugin().getLog()
-                            .log(new Status(IStatus.ERROR, SiriusTransPlugin.PLUGIN_ID, "Error while loading the extension " + element.getDeclaringExtension().getUniqueIdentifier(), e));
+                    String message = MessageFormat.format(Messages.EclipseLabelProviderProviderDescriptor_errorLoadingExtension, element.getDeclaringExtension().getUniqueIdentifier());
+                    SiriusTransPlugin.getPlugin().getLog().log(new Status(IStatus.ERROR, SiriusTransPlugin.PLUGIN_ID, message, e));
                 }
             }
         }
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/AbstractFolderSelectionDialog.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/AbstractFolderSelectionDialog.java
index 20d1c9ae29..ed938aff45 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/AbstractFolderSelectionDialog.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/AbstractFolderSelectionDialog.java
@@ -23,6 +23,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.window.Window;
+import org.eclipse.sirius.common.ui.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -75,7 +76,7 @@ public abstract class AbstractFolderSelectionDialog extends ElementTreeSelection
         getTreeViewer().addSelectionChangedListener(this);
         getTreeViewer().expandToLevel(2);
         fNewFolderButton = new Button(result, SWT.PUSH);
-        fNewFolderButton.setText("New Folder");
+        fNewFolderButton.setText(Messages.AbstractFolderSelectionDialog_newFolder);
         fNewFolderButton.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(final SelectionEvent event) {
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/FeatureEditorDialog.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/FeatureEditorDialog.java
index e25a4c5524..5be385040f 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/FeatureEditorDialog.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/FeatureEditorDialog.java
@@ -114,7 +114,7 @@ public class FeatureEditorDialog extends Dialog {
     @Override
     protected void configureShell(Shell shell) {
         super.configureShell(shell);
-        shell.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_FeatureEditorDialog_title", new Object[] { displayName, labelProvider.getText(object) }));
+        shell.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_FeatureEditorDialog_title", new Object[] { displayName, labelProvider.getText(object) })); //$NON-NLS-1$
         shell.setImage(labelProvider.getImage(object));
     }
 
@@ -133,12 +133,12 @@ public class FeatureEditorDialog extends Dialog {
 
         if (choiceOfValues != null) {
             Group filterGroupComposite = new Group(contents, SWT.NONE);
-            filterGroupComposite.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Choices_pattern_group"));
+            filterGroupComposite.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Choices_pattern_group")); //$NON-NLS-1$
             filterGroupComposite.setLayout(new GridLayout(2, false));
             filterGroupComposite.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false, 3, 1));
 
             Label label = new Label(filterGroupComposite, SWT.NONE);
-            label.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Choices_pattern_label"));
+            label.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Choices_pattern_label")); //$NON-NLS-1$
 
             patternText = new Text(filterGroupComposite, SWT.BORDER);
             patternText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -159,7 +159,7 @@ public class FeatureEditorDialog extends Dialog {
         }
 
         Label choiceLabel = new Label(choiceComposite, SWT.NONE);
-        choiceLabel.setText(choiceOfValues == null ? EMFEditUIPlugin.INSTANCE.getString("_UI_Value_label") : EMFEditUIPlugin.INSTANCE.getString("_UI_Choices_label"));
+        choiceLabel.setText(choiceOfValues == null ? EMFEditUIPlugin.INSTANCE.getString("_UI_Value_label") : EMFEditUIPlugin.INSTANCE.getString("_UI_Choices_label")); //$NON-NLS-1$ //$NON-NLS-2$
         GridData choiceLabelGridData = new GridData();
         choiceLabelGridData.verticalAlignment = SWT.FILL;
         choiceLabelGridData.horizontalAlignment = SWT.FILL;
@@ -238,14 +238,14 @@ public class FeatureEditorDialog extends Dialog {
         new Label(controlButtons, SWT.NONE);
 
         final Button addButton = new Button(controlButtons, SWT.PUSH);
-        addButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Add_label"));
+        addButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Add_label")); //$NON-NLS-1$
         GridData addButtonGridData = new GridData();
         addButtonGridData.verticalAlignment = SWT.FILL;
         addButtonGridData.horizontalAlignment = SWT.FILL;
         addButton.setLayoutData(addButtonGridData);
 
         final Button removeButton = new Button(controlButtons, SWT.PUSH);
-        removeButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Remove_label"));
+        removeButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Remove_label")); //$NON-NLS-1$
         GridData removeButtonGridData = new GridData();
         removeButtonGridData.verticalAlignment = SWT.FILL;
         removeButtonGridData.horizontalAlignment = SWT.FILL;
@@ -257,14 +257,14 @@ public class FeatureEditorDialog extends Dialog {
         spaceLabel.setLayoutData(spaceLabelGridData);
 
         final Button upButton = new Button(controlButtons, SWT.PUSH);
-        upButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Up_label"));
+        upButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Up_label")); //$NON-NLS-1$
         GridData upButtonGridData = new GridData();
         upButtonGridData.verticalAlignment = SWT.FILL;
         upButtonGridData.horizontalAlignment = SWT.FILL;
         upButton.setLayoutData(upButtonGridData);
 
         final Button downButton = new Button(controlButtons, SWT.PUSH);
-        downButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Down_label"));
+        downButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Down_label")); //$NON-NLS-1$
         GridData downButtonGridData = new GridData();
         downButtonGridData.verticalAlignment = SWT.FILL;
         downButtonGridData.horizontalAlignment = SWT.FILL;
@@ -285,7 +285,7 @@ public class FeatureEditorDialog extends Dialog {
         }
 
         Label featureLabel = new Label(featureComposite, SWT.NONE);
-        featureLabel.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Feature_label"));
+        featureLabel.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Feature_label")); //$NON-NLS-1$
         GridData featureLabelGridData = new GridData();
         featureLabelGridData.horizontalSpan = 2;
         featureLabelGridData.horizontalAlignment = SWT.FILL;
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/FolderSelectionDialog.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/FolderSelectionDialog.java
index 0208d88b2d..2e96c56fd5 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/FolderSelectionDialog.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/FolderSelectionDialog.java
@@ -21,6 +21,7 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.sirius.common.ui.Messages;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.PlatformUI;
@@ -45,16 +46,11 @@ public class FolderSelectionDialog extends AbstractFolderSelectionDialog {
         super(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), WorkbenchLabelProvider.getDecoratingWorkbenchLabelProvider(), FolderSelectionDialog.getContentProvider(IResource.PROJECT
                 | IResource.FOLDER));
         setAllowMultiple(false);
-        setTitle("Select a folder"); //$NON-NLS-1$
+        setTitle(Messages.FolderSelectionDialog_title);
         setMessage((message != null) ? message : ""); //$NON-NLS-1$
         setInput(ResourcesPlugin.getWorkspace().getRoot());
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.common.ui.tools.api.dialog.AbstractFolderSelectionDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-     */
     @Override
     protected Control createDialogArea(final Composite parent) {
         final Control result = super.createDialogArea(parent);
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/NewFileDialog.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/NewFileDialog.java
index 629876af8d..f7b6e39857 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/NewFileDialog.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/NewFileDialog.java
@@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
-
+import org.eclipse.sirius.common.ui.Messages;
 import org.eclipse.sirius.common.ui.SiriusTransPlugin;
 
 /**
@@ -52,8 +52,8 @@ public class NewFileDialog extends FolderSelectionDialog {
      *            is the default name of the file to create
      */
     public NewFileDialog(final String defaultName) {
-        super("Select the folder"); //$NON-NLS-1$
-        setTitle("File Name"); //$NON-NLS-1$
+        super(Messages.NewFileDialog_message);
+        setTitle(Messages.NewFileDialog_title);
         newFileName = (defaultName != null) ? defaultName : ""; //$NON-NLS-1$
     }
 
@@ -66,11 +66,6 @@ public class NewFileDialog extends FolderSelectionDialog {
         return newFileName;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.sirius.common.ui.tools.api.dialog.FolderSelectionDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-     */
     @Override
     protected Control createDialogArea(final Composite parent) {
         final Control result = super.createDialogArea(parent);
@@ -83,7 +78,7 @@ public class NewFileDialog extends FolderSelectionDialog {
         composite.setLayout(layout);
         composite.setLayoutData(new GridData(GridData.FILL_BOTH));
         final Label label = new Label(composite, SWT.NULL);
-        label.setText("File"); //$NON-NLS-1$
+        label.setText(Messages.NewFileDialog_fileLabel);
         newFileNameText = new Text(composite, SWT.BORDER);
         final GridData data = new GridData(GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
         data.heightHint = newFileNameText.getLineHeight();
@@ -98,16 +93,11 @@ public class NewFileDialog extends FolderSelectionDialog {
         return result;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.ui.dialogs.ElementTreeSelectionDialog#updateOKStatus()
-     */
     @Override
     protected void updateOKStatus() {
         if (newFileNameText == null || newFileNameText.getText() == null || newFileNameText.getText().trim().length() == 0) {
             newFileName = ""; //$NON-NLS-1$
-            updateStatus(new Status(IStatus.ERROR, SiriusTransPlugin.PLUGIN_ID, IStatus.ERROR, "Select a file", null)); //$NON-NLS-1$
+            updateStatus(new Status(IStatus.ERROR, SiriusTransPlugin.PLUGIN_ID, IStatus.ERROR, Messages.NewFileDialog_selectFileStatus, null));
         } else {
             newFileName = newFileNameText.getText();
             super.updateOKStatus();
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/RenameDialog.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/RenameDialog.java
index 2f6830ccdb..3060b2e0ad 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/RenameDialog.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/RenameDialog.java
@@ -18,6 +18,7 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.sirius.common.tools.api.util.StringUtil;
+import org.eclipse.sirius.common.ui.Messages;
 import org.eclipse.sirius.common.ui.SiriusTransPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
@@ -94,7 +95,7 @@ public class RenameDialog extends SelectionStatusDialog {
      */
     public RenameDialog(final Shell shell, final boolean isCaseSensitive, final String[] names, final String oldName) {
         super(shell);
-        setTitle("Rename representation");
+        setTitle(Messages.RenameDialog_title);
         this.isCaseSensitive = isCaseSensitive;
         initialize();
         if (names != null) {
@@ -155,11 +156,6 @@ public class RenameDialog extends SelectionStatusDialog {
         this.newName = value;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-     */
     @Override
     protected Control createDialogArea(final Composite parent) {
         final Composite container = new Composite(parent, SWT.NULL);
@@ -179,13 +175,11 @@ public class RenameDialog extends SelectionStatusDialog {
         if (!StringUtil.isEmpty(getMessage())) {
             labelText = getMessage();
         } else {
-            labelText = "Enter new name (";
             if (isCaseSensitive) {
-                labelText += "case sensitive";
+                labelText = Messages.RenameDialog_askNewName_caseSensitive;
             } else {
-                labelText += "case insensitive";
+                labelText = Messages.RenameDialog_askNewName_caseInsensitive;
             }
-            labelText += "):";
         }
         label.setText(labelText);
 
@@ -207,12 +201,6 @@ public class RenameDialog extends SelectionStatusDialog {
         return container;
     }
 
-    /**
-     * 
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.jface.window.Window#open()
-     */
     @Override
     public int open() {
         // Validate the name to enable or not the OK button.
@@ -235,7 +223,7 @@ public class RenameDialog extends SelectionStatusDialog {
         }
         for (int i = 0; i < oldNames.size(); i++) {
             if ((isCaseSensitive && newText.equals(oldNames.get(i))) || (!isCaseSensitive && newText.equalsIgnoreCase(oldNames.get(i).toString()))) {
-                status = new Status(IStatus.ERROR, SiriusTransPlugin.PLUGIN_ID, IStatus.ERROR, "New name must be different", null);
+                status = new Status(IStatus.ERROR, SiriusTransPlugin.PLUGIN_ID, IStatus.ERROR, Messages.RenameDialog_errorNameClash, null);
                 updateStatus(status);
                 okButton.setEnabled(false);
                 break;
@@ -256,22 +244,12 @@ public class RenameDialog extends SelectionStatusDialog {
         return newName;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.ui.dialogs.SelectionStatusDialog#okPressed()
-     */
     @Override
     protected void okPressed() {
         newName = text.getText().trim();
         super.okPressed();
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.ui.dialogs.SelectionStatusDialog#computeResult()
-     */
     @Override
     protected void computeResult() {
     }
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/quickoutline/QuickOutlineAdapterFactoryLabelProvider.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/quickoutline/QuickOutlineAdapterFactoryLabelProvider.java
index cffefb626b..742a30d62c 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/quickoutline/QuickOutlineAdapterFactoryLabelProvider.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/quickoutline/QuickOutlineAdapterFactoryLabelProvider.java
@@ -13,6 +13,7 @@ package org.eclipse.sirius.common.ui.tools.api.dialog.quickoutline;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.sirius.common.ui.Messages;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.HashMultimap;
@@ -42,10 +43,9 @@ public class QuickOutlineAdapterFactoryLabelProvider extends AdapterFactoryLabel
     public String getText(Object element) {
         StringBuilder sb = new StringBuilder(super.getText(element));
         if (multimap.containsKey(element)) {
-            sb.append(" (found in ");
-            Joiner joiner = Joiner.on(", ");
-            sb.append(joiner.join(multimap.get(element).toArray()));
-            sb.append(")");
+            sb.append(" (").append(Messages.QuickOutlineAdapterFactoryLabelProvider_foundIn).append(" "); //$NON-NLS-1$ //$NON-NLS-2$
+            sb.append(Joiner.on(", ").join(multimap.get(element).toArray())); //$NON-NLS-1$
+            sb.append(")"); //$NON-NLS-1$
         }
         return sb.toString();
     }
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/quickoutline/QuickOutlineControl.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/quickoutline/QuickOutlineControl.java
index 9d16de715b..fe360c15c9 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/quickoutline/QuickOutlineControl.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/dialog/quickoutline/QuickOutlineControl.java
@@ -29,6 +29,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.sirius.common.ui.Messages;
 import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.ext.e3.ui.dialogs.FilteredTree;
 import org.eclipse.sirius.ext.e3.ui.dialogs.PatternFilter;
@@ -198,9 +199,7 @@ public class QuickOutlineControl extends PopupDialog implements IInformationCont
         super(parentShell, shellStyle, true, true, true, true, false, null, null);
         this.descriptor = descriptor;
         org.eclipse.sirius.ext.base.Option<QuickOutlinePageDescriptor> firstPage = this.descriptor.getFirstPage();
-
-        Preconditions.checkArgument(firstPage.some(), "The descriptor has no page");
-
+        Preconditions.checkArgument(firstPage.some(), Messages.QuickOutlineControl_errorNoPage);
         this.currentPage = firstPage.get();
         create();
     }
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfilerTreeView.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfilerTreeView.java
index 54e662d34f..f69cba9942 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfilerTreeView.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfilerTreeView.java
@@ -22,6 +22,12 @@ import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.TreeViewerColumn;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.sirius.common.tools.DslCommonPlugin;
+import org.eclipse.sirius.common.tools.api.profiler.ProfilerEvent;
+import org.eclipse.sirius.common.tools.api.profiler.ProfilerListener;
+import org.eclipse.sirius.common.tools.api.util.TreeItemWrapper;
+import org.eclipse.sirius.common.ui.Messages;
+import org.eclipse.sirius.common.ui.tools.api.profiler.InitProfilerAction;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -29,12 +35,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.part.ViewPart;
 
-import org.eclipse.sirius.common.tools.DslCommonPlugin;
-import org.eclipse.sirius.common.tools.api.profiler.ProfilerEvent;
-import org.eclipse.sirius.common.tools.api.profiler.ProfilerListener;
-import org.eclipse.sirius.common.tools.api.util.TreeItemWrapper;
-import org.eclipse.sirius.common.ui.tools.api.profiler.InitProfilerAction;
-
 /**
  * This view displays informations in a tree of the
  * {@link org.eclipse.sirius.common.tools.api.profiler.TimeProfiler}.
@@ -132,17 +132,13 @@ public class TimeProfilerTreeView extends ViewPart implements ProfilerListener {
         DslCommonPlugin.PROFILER.addProfilerListener(this);
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-     */
     @Override
     public void createPartControl(final Composite parent) {
         viewer = new TreeViewer(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL);
         viewer.getTree().setLinesVisible(true);
         viewer.getTree().setHeaderVisible(true);
-        final String[] columnNames = { "Task Category", "Task Name", "Time", "Occurences" };
+        final String[] columnNames = {
+                Messages.TimeProfiler_column_category, Messages.TimeProfiler_column_task, Messages.TimeProfiler_column_time, Messages.TimeProfiler_column_occ, };
         final int[] columnWidths = { 100, 100, 100, 100 };
         final int[] columnAlignments = { SWT.LEFT, SWT.LEFT, SWT.RIGHT, SWT.RIGHT };
         for (int i = 0; i < columnNames.length; i++) {
@@ -190,14 +186,14 @@ public class TimeProfilerTreeView extends ViewPart implements ProfilerListener {
      */
     private void createActions() {
         initProfilerAction = new InitProfilerAction(viewer);
-        initProfilerAction.setText("Reinit profiler");
+        initProfilerAction.setText(Messages.TimeProfiler_action_reinit);
         refreshAction = new Action() {
             @Override
             public void run() {
                 viewer.refresh();
             }
         };
-        refreshAction.setText("Refresh View");
+        refreshAction.setText(Messages.TimeProfiler_action_refresh);
         printAction = new Action() {
             @Override
             public void run() {
@@ -206,7 +202,7 @@ public class TimeProfilerTreeView extends ViewPart implements ProfilerListener {
                 // CHECKSTYLE:ON
             }
         };
-        printAction.setText("Print to console");
+        printAction.setText(Messages.TimeProfiler_action_print);
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfilerView.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfilerView.java
index 099e98615d..19176c99e6 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfilerView.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/profiler/view/TimeProfilerView.java
@@ -21,6 +21,13 @@ import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.sirius.common.tools.DslCommonPlugin;
+import org.eclipse.sirius.common.tools.api.profiler.ProfilerEvent;
+import org.eclipse.sirius.common.tools.api.profiler.ProfilerListener;
+import org.eclipse.sirius.common.tools.api.profiler.TimeProfiler2;
+import org.eclipse.sirius.common.tools.api.profiler.TimeProfiler2.CompositeTask;
+import org.eclipse.sirius.common.ui.Messages;
+import org.eclipse.sirius.common.ui.tools.api.profiler.InitProfilerAction;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -29,13 +36,6 @@ import org.eclipse.swt.widgets.TreeColumn;
 import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.part.ViewPart;
 
-import org.eclipse.sirius.common.tools.DslCommonPlugin;
-import org.eclipse.sirius.common.tools.api.profiler.ProfilerEvent;
-import org.eclipse.sirius.common.tools.api.profiler.ProfilerListener;
-import org.eclipse.sirius.common.tools.api.profiler.TimeProfiler2;
-import org.eclipse.sirius.common.tools.api.profiler.TimeProfiler2.CompositeTask;
-import org.eclipse.sirius.common.ui.tools.api.profiler.InitProfilerAction;
-
 /**
  * This view displays informations of the
  * {@link org.eclipse.sirius.common.tools.api.profiler.TimeProfiler}.
@@ -62,12 +62,6 @@ public class TimeProfilerView extends ViewPart implements ProfilerListener {
     private IAction printAction;
 
     private ViewerSorter categorySorter = new ViewerSorter() {
-        /**
-         * {@inheritDoc}
-         * 
-         * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer,
-         *      java.lang.Object, java.lang.Object)
-         */
         @Override
         public int compare(final Viewer v, final Object e1, final Object e2) {
 
@@ -123,12 +117,6 @@ public class TimeProfilerView extends ViewPart implements ProfilerListener {
     };
 
     private ViewerSorter timeSorter = new ViewerSorter() {
-        /**
-         * {@inheritDoc}
-         * 
-         * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer,
-         *      java.lang.Object, java.lang.Object)
-         */
         @Override
         public int compare(final Viewer v, final Object e1, final Object e2) {
             int comparison;
@@ -217,7 +205,8 @@ public class TimeProfilerView extends ViewPart implements ProfilerListener {
         viewer.getTree().setHeaderVisible(true);
         viewer.setLabelProvider(new TimeProfiler2ViewLabelProvider());
         viewer.setContentProvider(new TimeProfiler2TreeViewContentProvider());
-        final String[] columnNames = { "Task Category", "Task Name", "Time (ms)", "Occurences", "Minimum", "Maximum", "Average" };
+        final String[] columnNames = { Messages.TimeProfiler_column_category, Messages.TimeProfiler_column_task, Messages.TimeProfiler_column_time, Messages.TimeProfiler_column_occ,
+                Messages.TimeProfiler_column_min, Messages.TimeProfiler_column_max, Messages.TimeProfiler_column_avg, };
         final int[] columnWidths = { 100, 100, 100, 100, 100, 100, 100 };
         final int[] columnAlignments = { SWT.LEFT, SWT.LEFT, SWT.RIGHT, SWT.RIGHT, SWT.RIGHT, SWT.RIGHT, SWT.RIGHT };
         for (int i = 0; i < columnNames.length; i++) {
@@ -266,14 +255,14 @@ public class TimeProfilerView extends ViewPart implements ProfilerListener {
      */
     private void createActions() {
         initProfilerAction = new InitProfilerAction(viewer);
-        initProfilerAction.setText("Reinit profiler");
+        initProfilerAction.setText(Messages.TimeProfiler_action_reinit);
         refreshAction = new Action() {
             @Override
             public void run() {
                 viewer.refresh();
             }
         };
-        refreshAction.setText("Refresh View");
+        refreshAction.setText(Messages.TimeProfiler_action_refresh);
         printAction = new Action() {
             @Override
             public void run() {
@@ -282,7 +271,7 @@ public class TimeProfilerView extends ViewPart implements ProfilerListener {
                 // CHECKSTYLE:ON
             }
         };
-        printAction.setText("Print to console");
+        printAction.setText(Messages.TimeProfiler_action_print);
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/resource/WorkspaceResourceDialogWithFilter.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/resource/WorkspaceResourceDialogWithFilter.java
index 2258325c14..6a3fc1f196 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/resource/WorkspaceResourceDialogWithFilter.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/resource/WorkspaceResourceDialogWithFilter.java
@@ -71,7 +71,7 @@ public class WorkspaceResourceDialogWithFilter extends org.eclipse.emf.common.ui
     public static IContainer[] openFolderSelection(Shell parent, String title, String message, boolean allowMultipleSelection, Object[] initialSelection, List<ViewerFilter> viewerFilters) {
         WorkspaceResourceDialogWithFilter dialog = new WorkspaceResourceDialogWithFilter(parent, new WorkbenchLabelProvider(), new WorkbenchContentProvider());
         dialog.setAllowMultiple(allowMultipleSelection);
-        dialog.setTitle(title != null ? title : CommonUIPlugin.INSTANCE.getString("_UI_FolderSelection_title"));
+        dialog.setTitle(title != null ? title : CommonUIPlugin.INSTANCE.getString("_UI_FolderSelection_title")); //$NON-NLS-1$
         dialog.setMessage(message);
         dialog.setShowNewFolderControl(true);
 
@@ -111,7 +111,7 @@ public class WorkspaceResourceDialogWithFilter extends org.eclipse.emf.common.ui
     public static IFile[] openFileSelection(Shell parent, String title, String message, boolean allowMultipleSelection, Object[] initialSelection, List<ViewerFilter> viewerFilters) {
         WorkspaceResourceDialogWithFilter dialog = new WorkspaceResourceDialogWithFilter(parent, new WorkbenchLabelProvider(), new WorkbenchContentProvider());
         dialog.setAllowMultiple(allowMultipleSelection);
-        dialog.setTitle(title != null ? title : CommonUIPlugin.INSTANCE.getString("_UI_FileSelection_title"));
+        dialog.setTitle(title != null ? title : CommonUIPlugin.INSTANCE.getString("_UI_FileSelection_title")); //$NON-NLS-1$
         dialog.setMessage(message);
 
         dialog.addFilter(dialog.createDefaultViewerFilter(true));
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/EObjectPaneBasedSelectionWizard.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/EObjectPaneBasedSelectionWizard.java
index aff8dd4543..8d0594eb63 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/EObjectPaneBasedSelectionWizard.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/EObjectPaneBasedSelectionWizard.java
@@ -16,8 +16,8 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.wizard.Wizard;
-
 import org.eclipse.sirius.common.tools.api.util.TreeItemWrapper;
+import org.eclipse.sirius.common.ui.Messages;
 import org.eclipse.sirius.common.ui.tools.api.selection.page.EObjectPaneBasedSelectionWizardPage;
 
 /**
@@ -28,16 +28,16 @@ import org.eclipse.sirius.common.ui.tools.api.selection.page.EObjectPaneBasedSel
 public class EObjectPaneBasedSelectionWizard extends Wizard {
 
     /** "Selection Wizard". */
-    public static final String WIZARD_GENERIC_DIALOG_TITLE = "Selection Wizard";
+    public static final String WIZARD_GENERIC_DIALOG_TITLE = Messages.EObjectPaneBasedSelectionWizard_title;
 
     /** "Choice of values". */
-    public static final String WIZARD_GENERIC_CHOICE_OF_VALUES_MESSAGE = "Choice of values";
+    public static final String WIZARD_GENERIC_CHOICE_OF_VALUES_MESSAGE = Messages.EObjectPaneBasedSelectionWizard_choiceMessage;
 
     /** "Selected". */
-    public static final String WIZARD_GENERIC_SELECTED_VALUES_MESSAGE = "Selected values";
+    public static final String WIZARD_GENERIC_SELECTED_VALUES_MESSAGE = Messages.EObjectPaneBasedSelectionWizard_selectedMessage;
 
     /** "Please select an element". */
-    public static final String WIZARD_GENERIC_DIALOG_MESSAGE = "Please select an element";
+    public static final String WIZARD_GENERIC_DIALOG_MESSAGE = Messages.EObjectPaneBasedSelectionWizard_askSelect;
 
     private static final String EOBJECT_PANE_BASED_SELECTION_WIZARD_PAGE_NAME = "page"; //$NON-NLS-1$
 
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/EObjectSelectionWizard.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/EObjectSelectionWizard.java
index d7e3f904bf..0ee5217741 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/EObjectSelectionWizard.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/EObjectSelectionWizard.java
@@ -16,8 +16,8 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.wizard.Wizard;
-
 import org.eclipse.sirius.common.tools.api.util.TreeItemWrapper;
+import org.eclipse.sirius.common.ui.Messages;
 import org.eclipse.sirius.common.ui.tools.api.selection.page.EObjectSelectionWizardPage;
 
 /**
@@ -28,10 +28,10 @@ import org.eclipse.sirius.common.ui.tools.api.selection.page.EObjectSelectionWiz
 public class EObjectSelectionWizard extends Wizard {
 
     /** "Selection Wizard". */
-    public static final String WIZARD_GENERIC_DIALOG_TITLE = "Selection Wizard";
+    public static final String WIZARD_GENERIC_DIALOG_TITLE = Messages.EObjectSelectionWizard_title;
 
     /** "Please select an element". */
-    public static final String WIZARD_GENERIC_DIALOG_MESSAGE = "Please select an element";
+    public static final String WIZARD_GENERIC_DIALOG_MESSAGE = Messages.EObjectSelectionWizard_message;
 
     private static final String EOBJECT_SELECTION_WIZARD_PAGE_NAME = "page"; //$NON-NLS-1$
 
@@ -87,11 +87,6 @@ public class EObjectSelectionWizard extends Wizard {
         addPage(page);
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.jface.wizard.Wizard#performFinish()
-     */
     @Override
     public boolean performFinish() {
         return true;
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/ModelElementChooserDialog.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/ModelElementChooserDialog.java
index ff83610539..c3dc519e9e 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/ModelElementChooserDialog.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/ModelElementChooserDialog.java
@@ -46,6 +46,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.sirius.common.ui.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
@@ -114,24 +115,14 @@ public class ModelElementChooserDialog extends Dialog {
         this.fileExtensions = extensions;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-     */
     @Override
     protected Control createDialogArea(final Composite parent) {
         final Composite composite = (Composite) super.createDialogArea(parent);
-        getShell().setText("Select a model element");
+        getShell().setText(Messages.ModelElementChooserDialog_title);
         createModelBrowser(composite);
         return composite;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.jface.dialogs.Dialog#createButtonBar(org.eclipse.swt.widgets.Composite)
-     */
     @Override
     protected Control createButtonBar(final Composite parent) {
         final Control buttonBar = super.createButtonBar(parent);
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/page/AbstractSelectionWizardPage.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/page/AbstractSelectionWizardPage.java
index b0774f70d0..00b1070521 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/page/AbstractSelectionWizardPage.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/page/AbstractSelectionWizardPage.java
@@ -20,8 +20,8 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.TreeItem;
-
 import org.eclipse.sirius.common.tools.api.constant.CommonPreferencesConstants;
+import org.eclipse.sirius.common.ui.Messages;
 import org.eclipse.sirius.common.ui.SiriusTransPlugin;
 import org.eclipse.sirius.common.ui.tools.api.navigator.GroupingItem;
 import org.eclipse.sirius.common.ui.tools.api.util.SWTUtil;
@@ -33,9 +33,9 @@ import org.eclipse.sirius.common.ui.tools.api.util.SWTUtil;
  */
 public abstract class AbstractSelectionWizardPage extends WizardPage {
 
-    private static final String MESSAGE_FILTER_ELEMENTS = "Filter elements";
+    private static final String MESSAGE_FILTER_ELEMENTS = Messages.AbstractSelectionWizardPage_message;
 
-    private static final String LABEL_FILTER = "Enter prefix or pattern (? = any character, * = any String): ";
+    private static final String LABEL_FILTER = Messages.AbstractSelectionWizardPage_label;
 
     /** The filter of the list. */
     protected final EObjectSelectionFilter myViewerfilter;
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/page/EObjectPaneBasedSelectionWizardPage.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/page/EObjectPaneBasedSelectionWizardPage.java
index 38d73d8849..d4fc00c073 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/page/EObjectPaneBasedSelectionWizardPage.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/page/EObjectPaneBasedSelectionWizardPage.java
@@ -27,6 +27,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.util.BasicEList;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.ui.EMFEditUIPlugin;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -417,14 +418,14 @@ public class EObjectPaneBasedSelectionWizardPage extends AbstractSelectionWizard
         label.setLayoutData(labelGridData);
 
         addButton = new Button(pane, SWT.PUSH);
-        addButton.setText("Add");
+        addButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Add_label")); //$NON-NLS-1$
         final GridData addButtonGridData = new GridData();
         addButtonGridData.verticalAlignment = SWT.FILL;
         addButtonGridData.horizontalAlignment = SWT.FILL;
         addButton.setLayoutData(addButtonGridData);
 
         removeButton = new Button(pane, SWT.PUSH);
-        removeButton.setText("Remove");
+        removeButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Remove_label")); //$NON-NLS-1$
         final GridData removeButtonGridData = new GridData();
         removeButtonGridData.verticalAlignment = SWT.FILL;
         removeButtonGridData.horizontalAlignment = SWT.FILL;
@@ -436,14 +437,14 @@ public class EObjectPaneBasedSelectionWizardPage extends AbstractSelectionWizard
         spaceLabel.setLayoutData(spaceLabelGridData);
 
         upButton = new Button(pane, SWT.PUSH);
-        upButton.setText("Up");
+        upButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Up_label")); //$NON-NLS-1$
         final GridData upButtonGridData = new GridData();
         upButtonGridData.verticalAlignment = SWT.FILL;
         upButtonGridData.horizontalAlignment = SWT.FILL;
         upButton.setLayoutData(upButtonGridData);
 
         downButton = new Button(pane, SWT.PUSH);
-        downButton.setText("Down");
+        downButton.setText(EMFEditUIPlugin.INSTANCE.getString("_UI_Down_label")); //$NON-NLS-1$
         final GridData downButtonGridData = new GridData();
         downButtonGridData.verticalAlignment = SWT.FILL;
         downButtonGridData.horizontalAlignment = SWT.FILL;
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/page/SelectModelElementWizardPage.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/page/SelectModelElementWizardPage.java
index 38f3cd60fd..e99d13b954 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/page/SelectModelElementWizardPage.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/selection/page/SelectModelElementWizardPage.java
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.ui.tools.api.selection.page;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -50,6 +51,7 @@ import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.sirius.common.ui.Messages;
 import org.eclipse.sirius.common.ui.SiriusTransPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
@@ -136,11 +138,7 @@ public class SelectModelElementWizardPage extends WizardPage {
         this.selectedFile = selectedFile;
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-     */
+    @Override
     public void createControl(final Composite parent) {
 
         initializeDialogUnits(parent);
@@ -296,7 +294,7 @@ public class SelectModelElementWizardPage extends WizardPage {
 
                 } catch (final WrappedException exception) {
                     // file seems to be not valid => log it as a warning
-                    SiriusTransPlugin.getPlugin().error("following file is not valid" + resourcePath.toString(), exception);
+                    SiriusTransPlugin.getPlugin().error(MessageFormat.format(Messages.SelectModelElementWizardPage_invalidFile, resourcePath.toString()), exception);
                 }
                 if (modelResource == null) {
                     children = Collections.EMPTY_LIST.toArray();
@@ -310,11 +308,7 @@ public class SelectModelElementWizardPage extends WizardPage {
             return children;
         }
 
-        /**
-         * {@inheritDoc}
-         * 
-         * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-         */
+        @Override
         public Object getParent(final Object element) {
             Object parent = myWorkbenchContentProvider.getParent(element);
             if (parent != null) {
@@ -337,11 +331,7 @@ public class SelectModelElementWizardPage extends WizardPage {
             return parent;
         }
 
-        /**
-         * {@inheritDoc}
-         * 
-         * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-         */
+        @Override
         public boolean hasChildren(final Object element) {
             if (element instanceof IFile) {
                 return isValidModelFile((IFile) element);
@@ -354,32 +344,19 @@ public class SelectModelElementWizardPage extends WizardPage {
             return hasChildren;
         }
 
-        /**
-         * {@inheritDoc}
-         * 
-         * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-         */
+        @Override
         public Object[] getElements(final Object inputElement) {
             final Object[] elements = myWorkbenchContentProvider.getElements(inputElement);
             return elements;
         }
 
-        /**
-         * {@inheritDoc}
-         * 
-         * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-         */
+        @Override
         public void dispose() {
             myWorkbenchContentProvider.dispose();
             myAdapterFactoryContentProvider.dispose();
         }
 
-        /**
-         * {@inheritDoc}
-         * 
-         * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
-         *      java.lang.Object, java.lang.Object)
-         */
+        @Override
         public void inputChanged(final Viewer viewer, final Object oldInput, final Object newInput) {
             myWorkbenchContentProvider.inputChanged(viewer, oldInput, newInput);
             myAdapterFactoryContentProvider.inputChanged(viewer, oldInput, newInput);
@@ -396,62 +373,37 @@ public class SelectModelElementWizardPage extends WizardPage {
 
         private WorkbenchLabelProvider myWorkbenchLabelProvider = new WorkbenchLabelProvider();
 
-        /**
-         * {@inheritDoc}
-         * 
-         * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-         */
+        @Override
         public Image getImage(final Object element) {
             final Image result = myWorkbenchLabelProvider.getImage(element);
             return result != null ? result : myAdapterFactoryLabelProvider.getImage(element);
         }
 
-        /**
-         * {@inheritDoc}
-         * 
-         * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-         */
+        @Override
         public String getText(final Object element) {
 
             final String result = myWorkbenchLabelProvider.getText(element);
             return result != null && result.length() > 0 ? result : myAdapterFactoryLabelProvider.getText(element);
         }
 
-        /**
-         * {@inheritDoc}
-         * 
-         * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
-         */
+        @Override
         public void addListener(final ILabelProviderListener listener) {
             myWorkbenchLabelProvider.addListener(listener);
             myAdapterFactoryLabelProvider.addListener(listener);
         }
 
-        /**
-         * {@inheritDoc}
-         * 
-         * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-         */
+        @Override
         public void dispose() {
             myWorkbenchLabelProvider.dispose();
             myAdapterFactoryLabelProvider.dispose();
         }
 
-        /**
-         * {@inheritDoc}
-         * 
-         * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
-         *      java.lang.String)
-         */
+        @Override
         public boolean isLabelProperty(final Object element, final String property) {
             return myWorkbenchLabelProvider.isLabelProperty(element, property) || myAdapterFactoryLabelProvider.isLabelProperty(element, property);
         }
 
-        /**
-         * {@inheritDoc}
-         * 
-         * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-         */
+        @Override
         public void removeListener(final ILabelProviderListener listener) {
             myWorkbenchLabelProvider.removeListener(listener);
             myAdapterFactoryLabelProvider.removeListener(listener);
@@ -463,11 +415,7 @@ public class SelectModelElementWizardPage extends WizardPage {
         final Collection<Boolean> result = new ArrayList<Boolean>();
         final IResourceVisitor visitor = new IResourceVisitor() {
 
-            /**
-             * {@inheritDoc}
-             * 
-             * @see org.eclipse.core.resources.IResourceVisitor#visit(org.eclipse.core.resources.IResource)
-             */
+            @Override
             public boolean visit(final IResource resource) throws CoreException {
                 if (resource instanceof IFile) {
                     if (isValidModelFile((IFile) resource)) {
@@ -491,13 +439,6 @@ public class SelectModelElementWizardPage extends WizardPage {
      * @author mchauvin
      */
     private class ModelFilesFilter extends ViewerFilter {
-
-        /**
-         * {@inheritDoc}
-         * 
-         * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer,
-         *      java.lang.Object, java.lang.Object)
-         */
         @Override
         public boolean select(final Viewer viewer, final Object parentElement, final Object element) {
 
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/EclipseUIUtil.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/EclipseUIUtil.java
index b8fa6c94e4..16ce631750 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/EclipseUIUtil.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/EclipseUIUtil.java
@@ -10,11 +10,13 @@
  *******************************************************************************/
 package org.eclipse.sirius.common.ui.tools.api.util;
 
+import java.text.MessageFormat;
 import java.util.Iterator;
 import java.util.List;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.sirius.common.ui.Messages;
 import org.eclipse.sirius.common.ui.SiriusTransPlugin;
 import org.eclipse.sirius.common.ui.tools.api.view.IExpandSelectionTarget;
 import org.eclipse.swt.widgets.Display;
@@ -110,7 +112,7 @@ public final class EclipseUIUtil {
             try {
                 return page.showView(viewId);
             } catch (final PartInitException e) {
-                SiriusTransPlugin.getPlugin().error("the view with id " + viewId + "could not be initialized", e);
+                SiriusTransPlugin.getPlugin().error(MessageFormat.format(Messages.EclipseUIUtil_showView_error, viewId), e);
             }
         }
         return null;
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/SWTUtil.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/SWTUtil.java
index a722c15a39..6ca27cae6d 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/SWTUtil.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/SWTUtil.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.MessageDialogWithToggle;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.util.NLS;
+import org.eclipse.sirius.common.ui.Messages;
 import org.eclipse.sirius.common.ui.tools.api.dialog.SiriusMessageDialogWithToggle;
 import org.eclipse.sirius.common.ui.tools.internal.util.ISaveDialogExtensionDescriptor;
 import org.eclipse.sirius.common.ui.tools.internal.util.ISaveDialogExtensionRegistry;
@@ -50,13 +50,6 @@ import com.google.common.collect.Maps;
  * @author Mariot Chauvin (mchauvin)
  */
 public final class SWTUtil {
-
-    private static final String SAVE_CHANGES_QUESTION = "{0} have been modified{1}. Save changes{2}?";
-
-    private static final String OPEN_ELSEWHERE_MESSAGE = ", but are still open elsewhere with identical changes. Closing this will not lose those changes";
-
-    private static final String OPEN_ELSEWHERE_QUESTION = " now anyway";
-
     /**
      * avoid instantiation
      */
@@ -446,11 +439,6 @@ public final class SWTUtil {
         return temporaryResult;
     }
 
-    /**
-     * @see org.eclipse.internal.SaveablesList#promptForSaving(List,
-     *      org.eclipse.jface.window.IShellProvider,
-     *      org.eclipse.jface.operation.IRunnableContext, boolean, boolean)
-     */
     private static int openSaveDialog(String label, final boolean canCancel, Map<String, Integer> buttons, boolean stillOpenElsewhere) {
         int choice = ISaveablePart2.YES;
 
@@ -508,15 +496,14 @@ public final class SWTUtil {
 
         // Provide a dialog allowing the user to change the
         // preference if several editors are opened
-        Object[] bindings = null;
+        final String message;
         if (stillOpenElsewhere) {
-            bindings = new Object[] { label, OPEN_ELSEWHERE_MESSAGE, OPEN_ELSEWHERE_QUESTION };
+            message = Messages.SWTUtil_askToSaveChanges;
         } else {
-            bindings = new Object[] { label, "", "" };
+            message = Messages.SWTUtil_askToSaveChanges_openElseWhere;
         }
-        final String message = NLS.bind(SAVE_CHANGES_QUESTION, bindings);
-        dialog = new SiriusMessageDialogWithToggle(window.getShell(), "Save", null, message, MessageDialog.QUESTION, buttons, 0, WorkbenchMessages.EditorManager_closeWithoutPromptingOption, false,
-                stillOpenElsewhere) {
+        dialog = new SiriusMessageDialogWithToggle(window.getShell(), Messages.SWTUtil_saveDialog_title, null, message, MessageDialog.QUESTION, buttons, 0,
+                WorkbenchMessages.EditorManager_closeWithoutPromptingOption, false, stillOpenElsewhere) {
             protected int getShellStyle() {
                 return getSaveDialogStyle(canCancel);
             }
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/wizard/SelectFilesWizardPage.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/wizard/SelectFilesWizardPage.java
index 435b160fbd..1f7d721c92 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/wizard/SelectFilesWizardPage.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/wizard/SelectFilesWizardPage.java
@@ -40,6 +40,7 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.OpenEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.sirius.common.ui.Messages;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ControlEvent;
 import org.eclipse.swt.events.ControlListener;
@@ -107,7 +108,7 @@ public class SelectFilesWizardPage extends WizardPage {
     public SelectFilesWizardPage(final String pageName, final int lower, final int upper, final String[] extensions) {
         super(pageName);
         setTitle(pageName);
-        setDescription("This page is used to select file(s) in the workspace."); //$NON-NLS-1$
+        setDescription(Messages.SelectFilesWizardPage_title);
         this.lower = lower;
         this.upper = upper;
         this.extensions = extensions;
@@ -120,11 +121,7 @@ public class SelectFilesWizardPage extends WizardPage {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     * 
-     * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-     */
+    @Override
     public void createControl(final Composite parent) {
         final Composite container = new Composite(parent, SWT.NULL);
         final GridLayout containerLayout = new GridLayout();
@@ -303,10 +300,10 @@ public class SelectFilesWizardPage extends WizardPage {
     private void dialogChanged() {
         final List<IPath> items = getAllCheckedListItems();
         if (items.size() < lower) {
-            updateStatus("Not enough files were selected."); //$NON-NLS-1$
+            updateStatus(Messages.SelectFilesWizardPage_notEnoughFiles);
             return;
         } else if (items.size() > upper && upper != -1) {
-            updateStatus("Too many files were selected."); //$NON-NLS-1$
+            updateStatus(Messages.SelectFilesWizardPage_tooManyFiles);
             return;
         }
         updateStatus(null);
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/FeatureProposalProvider.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/FeatureProposalProvider.java
index c00350e8e7..71d7f2dbe6 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/FeatureProposalProvider.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/FeatureProposalProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
 import org.eclipse.sirius.common.tools.api.interpreter.IInterpreterContext;
 import org.eclipse.sirius.common.tools.api.interpreter.TypeName;
 import org.eclipse.sirius.common.tools.internal.interpreter.FeatureInterpreter;
+import org.eclipse.sirius.common.ui.Messages;
 
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -47,7 +48,7 @@ public class FeatureProposalProvider implements IProposalProvider {
 
     @Override
     public ContentProposal getNewEmtpyExpression() {
-        return new ContentProposal(FeatureInterpreter.PREFIX, FeatureInterpreter.PREFIX, "New feature access expression.", FeatureInterpreter.PREFIX.length());
+        return new ContentProposal(FeatureInterpreter.PREFIX, FeatureInterpreter.PREFIX, Messages.FeatureProposalProvider_newFeatureExpression, FeatureInterpreter.PREFIX.length());
     }
 
     @Override
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/ServiceProposalProvider.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/ServiceProposalProvider.java
index 001f518a04..4b2be668c2 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/ServiceProposalProvider.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/ServiceProposalProvider.java
@@ -32,6 +32,7 @@ import org.eclipse.sirius.common.tools.internal.interpreter.IPolymorphicService;
 import org.eclipse.sirius.common.tools.internal.interpreter.IService;
 import org.eclipse.sirius.common.tools.internal.interpreter.ServiceInterpreter;
 import org.eclipse.sirius.common.tools.internal.interpreter.VariableInterpreter;
+import org.eclipse.sirius.common.ui.Messages;
 import org.eclipse.sirius.ext.base.Option;
 
 import com.google.common.collect.Lists;
@@ -44,16 +45,12 @@ import com.google.common.collect.Lists;
  */
 public class ServiceProposalProvider implements IProposalProvider {
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     public ContentProposal getNewEmtpyExpression() {
-        return new ContentProposal(ServiceInterpreter.PREFIX, ServiceInterpreter.PREFIX, "New service calls expression.", ServiceInterpreter.PREFIX.length());
+        return new ContentProposal(ServiceInterpreter.PREFIX, ServiceInterpreter.PREFIX, Messages.ServiceProposalProvider_newVariableExpression, ServiceInterpreter.PREFIX.length());
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     public List<ContentProposal> getProposals(IInterpreter interpreter, ContentContext context) {
         final List<ContentProposal> proposals;
         if (context == null || !(interpreter instanceof ServiceInterpreter)) {
@@ -159,7 +156,7 @@ public class ServiceProposalProvider implements IProposalProvider {
      */
     private List<ContentProposal> getVariableProposals(String writtenExpression, Object context) {
         if (!(context instanceof ContentContext) && !(context instanceof ContentInstanceContext)) {
-            throw new IllegalArgumentException("The context parameter should be a ContentContext or a ContentInstanceContext");
+            throw new IllegalArgumentException(Messages.ServiceProposalProvider_invalidContext);
         }
         List<ContentProposal> proposals = new ArrayList<ContentProposal>();
         Option<String> receiverVariableName = ServiceInterpreter.getReceiverVariableName(writtenExpression);
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/VariableProposalProvider.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/VariableProposalProvider.java
index b7d60a88bb..da43ae2fa7 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/VariableProposalProvider.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/interpreter/VariableProposalProvider.java
@@ -25,6 +25,7 @@ import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter;
 import org.eclipse.sirius.common.tools.api.interpreter.VariableType;
 import org.eclipse.sirius.common.tools.api.util.StringUtil;
 import org.eclipse.sirius.common.tools.internal.interpreter.VariableInterpreter;
+import org.eclipse.sirius.common.ui.Messages;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterators;
@@ -38,16 +39,12 @@ import com.google.common.collect.Maps;
  */
 public class VariableProposalProvider implements IProposalProvider {
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     public ContentProposal getNewEmtpyExpression() {
-        return new ContentProposal(VariableInterpreter.PREFIX, VariableInterpreter.PREFIX, "New variable access expression.", VariableInterpreter.PREFIX.length());
+        return new ContentProposal(VariableInterpreter.PREFIX, VariableInterpreter.PREFIX, Messages.VariableProposalProvider_newVariableExpression, VariableInterpreter.PREFIX.length());
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     public List<ContentProposal> getProposals(IInterpreter interpreter, ContentContext context) {
         final List<ContentProposal> proposals;
         if (context == null || !(interpreter instanceof VariableInterpreter)) {
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/preference/DynamicConfigurationHelper.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/preference/DynamicConfigurationHelper.java
index 0ba5cb3a96..bcca5b0eb6 100644
--- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/preference/DynamicConfigurationHelper.java
+++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/internal/preference/DynamicConfigurationHelper.java
@@ -11,11 +11,13 @@
 package org.eclipse.sirius.common.ui.tools.internal.preference;
 
 import java.lang.reflect.Field;
+import java.text.MessageFormat;
 import java.util.Map;
 
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.sirius.common.ui.Messages;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
@@ -173,7 +175,7 @@ public class DynamicConfigurationHelper implements IPropertyChangeListener {
         if (result != null) {
             return result;
         } else {
-            throw new IllegalArgumentException("No field named " + fieldName + " could be found in class " + klass.getName());
+            throw new IllegalArgumentException(MessageFormat.format(Messages.DynamicConfigurationHelper_unknownField, fieldName, klass.getName()));
         }
     }
 }
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index 0f6bb85487..926efe0812 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -290,6 +290,9 @@
 						<code>org.eclipse.sirius.common.acceleo.mtl.ide</code>
 					</li>
 					<li>
+						<code>org.eclipse.sirius.common.ui</code>
+					</li>
+					<li>
 						<code>org.eclipse.sirius.eef.adapters</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 3c7ed8ddb7..13d3407d48 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
@@ -68,6 +68,7 @@ Additional non-breaking changes:
 ** @org.eclipse.sirius.common.acceleo.aql.ide@
 ** @org.eclipse.sirius.common.acceleo.mtl@
 ** @org.eclipse.sirius.common.acceleo.mtl.ide@
+** @org.eclipse.sirius.common.ui@
 ** @org.eclipse.sirius.eef.adapters@
 ** @org.eclipse.sirius.interpreter@