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

Bug: 472057
Change-Id: Ib02ca76fbc9219f74416218772b50253d076e610
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>

25 files changed, 256 insertions, 78 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.sirius.diagram.sequence.ui/.settings/org.eclipse.jdt.core.prefs
index fc8c7f3ddc..39e1d0d4d4 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.sirius.diagram.sequence.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.diagram.sequence.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.diagram.sequence.ui/META-INF/MANIFEST.MF
index 57ab577148..9f5c812f88 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: com.google.guava;bundle-version="[11.0.2,16.0)",
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.sirius.diagram.sequence.ui;version="2.0.4",
+Export-Package: org.eclipse.sirius.diagram.sequence.ui;version="3.0.0",
  org.eclipse.sirius.diagram.sequence.ui.business.api.diagramtype;version="2.1.0",
  org.eclipse.sirius.diagram.sequence.ui.business.internal;x-internal:=true;version="2.0.4",
  org.eclipse.sirius.diagram.sequence.ui.business.internal.diagramtype;x-internal:=true;version="2.0.4",
@@ -27,13 +27,13 @@ Export-Package: org.eclipse.sirius.diagram.sequence.ui;version="2.0.4",
  org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.command;x-internal:=true;version="3.0.0",
  org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.operation;x-internal:=true;version="2.0.4",
  org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part;x-internal:=true;version="2.1.0",
- org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.policy;x-internal:=true;version="3.0.0",
+ org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.policy;x-internal:=true;version="4.0.0",
  org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.tools;x-internal:=true;version="2.0.4",
- org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.validator;x-internal:=true;version="2.0.4",
+ org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.validator;x-internal:=true;version="3.0.0",
  org.eclipse.sirius.diagram.sequence.ui.tool.internal.figure;x-internal:=true;version="3.0.0",
  org.eclipse.sirius.diagram.sequence.ui.tool.internal.layout;x-internal:=true;version="2.0.4",
  org.eclipse.sirius.diagram.sequence.ui.tool.internal.provider;x-internal:=true;version="2.0.4",
  org.eclipse.sirius.diagram.sequence.ui.tool.internal.util;x-internal:=true;version="3.0.0"
-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.draw2d.figure;version="2.0.0",
  org.eclipse.sirius.ext.gmf.runtime.editparts;version="2.0.0"
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/plugin.properties b/plugins/org.eclipse.sirius.diagram.sequence.ui/plugin.properties
index 49c6d43d0f..7e08b53b5e 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/plugin.properties
@@ -1,5 +1,5 @@
 # ====================================================================
-# Copyright (c) 2007, 2008 THALES GLOBAL SERVICES
+# Copyright (c) 2007, 2015 THALES GLOBAL SERVICES
 # 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
@@ -12,7 +12,7 @@
 # ====================================================================
 # To code developer:
 #   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
+#   %%% END OF TRANSLATED PROPERTIES %%% line.
 #   Make a new property name, append to the end of the file and change
 #   the code to use the new property.
 # ====================================================================
@@ -25,4 +25,32 @@ pluginName = Sirius Sequence Diagrams UI
 providerName = Eclipse Modeling Project
 
 extension.editPartProvider.name = Sequence Diagram Edit Parts Provider
-diagramTypeProvider.label = Sequence Diagram
\ No newline at end of file
+diagramTypeProvider.label = Sequence Diagram
+ 
+AbstractInstanceRoleValidator_nullInstanceRoleList = Validator must know on which instanceRoles check the request validation
+AbstractNodeEventResizeSelectionValidator_nullExecution = Validator must know on which executions check the request validation
+CombinedFragmentResizableEditPolicy_moveCompositeCommand = Combined Fragment Move Composite Command
+CombinedFragmentResizableEditPolicy_resizeCompositeCommand = Combined Fragment Resize Composite Command
+CombinedFragmentResizableEditPolicy_resizeSubCommand = Resize
+EndOfLifeSelectionPolicy_lifelineMoveCommand = Lifelines moves command from end of life
+ExecutionOperations_invalidMessageSource = The source of a message should always be an ISequenceEvent but was: {0} 
+ExecutionSelectionEditPolicy_moveCompositeCommand = Execution Move Composite Command
+ExecutionSelectionEditPolicy_resizeCompositeCommand = Execution Resize Composite Command
+InstanceRoleResizableEditPolicy_moveCommand = InstanceRole move
+InstanceRoleResizableEditPolicy_resizeCommand = InstanceRole resize
+InstanceRoleSiriusGraphicalNodeEditPolicy_createParticipantMessageAndMoveDownLifelineCompositeCommand = Move down lifeline / add create participant message
+InteractionUseResizableEditPolicy_moveCompositeCommand = Interaction Use Move Composite Command
+OperandResizableEditPolicy_resizeCompositeCommand = Operand Resize Composite Command
+OperandResizableEditPolicy_resizeSubCommand = Resize
+ResizeViewOperation_invalidNullSizeDelta = sizeDelta cannot be null
+ResizeViewOperation_invalidNullView = view cannot be null
+SequenceContainerCreationPolicy_combinedFragmentCreationCommand = Combined Fragment creation
+SequenceContainerCreationPolicy_interactionUseCreationCommand = Interaction Use creation
+SequenceDiagramTypeProvider_endBeforeVariableDescription = an EventEnd referencing the semantic event end 
+SequenceDiagramTypeProvider_sequenceAdditionalVariablesTooltip = Additional available variable for Sequence Diagram:
+SequenceLayoutProvider_arrangeAllCommand = Arrange all
+SequenceMessageEditPolicy_moveCreateMessageCommand = Move create message
+SequenceMessageEditPolicy_synchronizeOrderingCompositeCommand = {0} and synchronize ordering
+ShifDescendantMessagesOperation_operationName = Shift sub-messages bendpoints by {0}.
+ShiftMessagesOperation_operationName = Shift given message
+VisibilityEventHandler_nonSupportedHideRevealInSequenceDiagram = Hide/Reveal is not supported in Sequence Diagrams
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/Messages.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/Messages.java
new file mode 100644
index 0000000000..505de12ec6
--- /dev/null
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/Messages.java
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * 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.diagram.sequence.ui;
+
+import org.eclipse.sirius.ext.base.I18N;
+import org.eclipse.sirius.ext.base.I18N.TranslatableMessage;
+
+/**
+ * Helper class to obtains translated strings.
+ * 
+ * @author mporhel
+ */
+public final class Messages {
+
+    static {
+        I18N.initializeMessages(Messages.class, SequenceDiagramUIPlugin.INSTANCE);
+    }
+
+    // CHECKSTYLE:OFF
+
+    @TranslatableMessage
+    public static String AbstractInstanceRoleValidator_nullInstanceRoleList;
+
+    @TranslatableMessage
+    public static String AbstractNodeEventResizeSelectionValidator_nullExecution;
+
+    @TranslatableMessage
+    public static String CombinedFragmentResizableEditPolicy_moveCompositeCommand;
+
+    @TranslatableMessage
+    public static String CombinedFragmentResizableEditPolicy_resizeCompositeCommand;
+    
+    @TranslatableMessage
+    public static String CombinedFragmentResizableEditPolicy_resizeSubCommand;
+
+    @TranslatableMessage
+    public static String EndOfLifeSelectionPolicy_lifelineMoveCommand;
+
+    @TranslatableMessage
+    public static String ExecutionOperations_invalidMessageSource;
+
+    @TranslatableMessage
+    public static String ExecutionSelectionEditPolicy_moveCompositeCommand;
+
+    @TranslatableMessage
+    public static String ExecutionSelectionEditPolicy_resizeCompositeCommand;
+
+    @TranslatableMessage
+    public static String InstanceRoleResizableEditPolicy_moveCommand;
+
+    @TranslatableMessage
+    public static String InstanceRoleResizableEditPolicy_resizeCommand;
+
+    @TranslatableMessage
+    public static String InstanceRoleSiriusGraphicalNodeEditPolicy_createParticipantMessageAndMoveDownLifelineCompositeCommand;
+
+    @TranslatableMessage
+    public static String InteractionUseResizableEditPolicy_moveCompositeCommand;
+
+    @TranslatableMessage
+    public static String OperandResizableEditPolicy_resizeCompositeCommand;
+    
+    @TranslatableMessage
+    public static String OperandResizableEditPolicy_resizeSubCommand;
+
+    @TranslatableMessage
+    public static String ResizeViewOperation_invalidNullSizeDelta;
+
+    @TranslatableMessage
+    public static String ResizeViewOperation_invalidNullView;
+
+    @TranslatableMessage
+    public static String SequenceContainerCreationPolicy_combinedFragmentCreationCommand;
+
+    @TranslatableMessage
+    public static String SequenceContainerCreationPolicy_interactionUseCreationCommand;
+
+    @TranslatableMessage
+    public static String SequenceDiagramTypeProvider_endBeforeVariableDescription;
+
+    @TranslatableMessage
+    public static String SequenceDiagramTypeProvider_sequenceAdditionalVariablesTooltip;
+
+    @TranslatableMessage
+    public static String SequenceLayoutProvider_arrangeAllCommand;
+
+    @TranslatableMessage
+    public static String SequenceMessageEditPolicy_moveCreateMessageCommand;
+
+    @TranslatableMessage
+    public static String SequenceMessageEditPolicy_synchronizeOrderingCompositeCommand;
+
+    @TranslatableMessage
+    public static String ShifDescendantMessagesOperation_operationName;
+
+    @TranslatableMessage
+    public static String ShiftMessagesOperation_operationName;
+
+    @TranslatableMessage
+    public static String VisibilityEventHandler_nonSupportedHideRevealInSequenceDiagram;
+
+    // CHECKSTYLE:ON
+
+    private Messages() {
+        // Prevents instanciation.
+    }
+}
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/api/diagramtype/SequenceDiagramTypeProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/api/diagramtype/SequenceDiagramTypeProvider.java
index 161b7e4a51..f64aaa68e5 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/api/diagramtype/SequenceDiagramTypeProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/api/diagramtype/SequenceDiagramTypeProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2009, 2015 THALES GLOBAL SERVICES and others.
  * 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
@@ -62,6 +62,7 @@ import org.eclipse.sirius.diagram.sequence.description.tool.provider.ToolItemPro
 import org.eclipse.sirius.diagram.sequence.ordering.provider.OrderingItemProviderAdapterFactory;
 import org.eclipse.sirius.diagram.sequence.provider.SequenceItemProviderAdapterFactory;
 import org.eclipse.sirius.diagram.sequence.template.provider.TemplateItemProviderAdapterFactory;
+import org.eclipse.sirius.diagram.sequence.ui.Messages;
 import org.eclipse.sirius.diagram.sequence.ui.business.internal.diagramtype.SequenceCollapseUpdater;
 import org.eclipse.sirius.diagram.sequence.ui.business.internal.diagramtype.SequenceToolInterpretedExpressionSwitch;
 import org.eclipse.sirius.diagram.ui.business.api.query.DDiagramGraphicalQuery;
@@ -83,6 +84,7 @@ import com.google.common.collect.Sets;
 public class SequenceDiagramTypeProvider implements IDiagramDescriptionProvider {
 
     private final Predicate<DSemanticDecorator> isSequenceSemanticDecorator = new Predicate<DSemanticDecorator>() {
+        @Override
         public boolean apply(DSemanticDecorator input) {
             boolean result = false;
             if (input instanceof DDiagram) {
@@ -95,6 +97,7 @@ public class SequenceDiagramTypeProvider implements IDiagramDescriptionProvider
     };
 
     private final Predicate<DDiagramElement> isSequenceDDiagramElement = new Predicate<DDiagramElement>() {
+        @Override
         public boolean apply(DDiagramElement input) {
             // check that input has a Sequence mapping or is a simple node
             // connected to a sequence message : a lost end.
@@ -110,6 +113,7 @@ public class SequenceDiagramTypeProvider implements IDiagramDescriptionProvider
     /**
      * {@inheritDoc}
      */
+    @Override
     public DiagramDescription createDiagramDescription() {
         return DescriptionFactory.eINSTANCE.createSequenceDiagramDescription();
     }
@@ -117,6 +121,7 @@ public class SequenceDiagramTypeProvider implements IDiagramDescriptionProvider
     /**
      * {@inheritDoc}
      */
+    @Override
     public Collection<? extends CommandParameter> collectToolCommands(EObject context) {
         Collection<CommandParameter> result = Lists.newArrayList();
         Collection<EReference> refs = Arrays.asList(ToolPackage.Literals.TOOL_SECTION__OWNED_TOOLS, ToolPackage.Literals.TOOL_GROUP__TOOLS);
@@ -139,6 +144,7 @@ public class SequenceDiagramTypeProvider implements IDiagramDescriptionProvider
     /**
      * {@inheritDoc}
      */
+    @Override
     public Collection<? extends CommandParameter> collectMappingsCommands() {
         Collection<CommandParameter> result = Lists.newArrayList();
         // Nodes
@@ -163,6 +169,7 @@ public class SequenceDiagramTypeProvider implements IDiagramDescriptionProvider
     /**
      * {@inheritDoc}
      */
+    @Override
     public AdapterFactory getAdapterFactory() {
         ComposedAdapterFactory composed = new ComposedAdapterFactory();
         composed.addAdapterFactory(new SequenceItemProviderAdapterFactory());
@@ -179,6 +186,7 @@ public class SequenceDiagramTypeProvider implements IDiagramDescriptionProvider
      * 
      * @see org.eclipse.sirius.diagram.business.api.diagramtype.IDiagramDescriptionProvider#handles(org.eclipse.emf.ecore.EPackage)
      */
+    @Override
     public boolean handles(EPackage ePackage) {
         return DescriptionPackage.eINSTANCE.getNsURI().equals(ePackage.getNsURI()) || org.eclipse.sirius.diagram.sequence.description.tool.ToolPackage.eINSTANCE.getNsURI().equals(ePackage.getNsURI());
     }
@@ -190,6 +198,7 @@ public class SequenceDiagramTypeProvider implements IDiagramDescriptionProvider
      * @see org.eclipse.sirius.diagram.business.api.diagramtype.IDiagramDescriptionProvider#createInterpretedExpressionSwitch(org.eclipse.emf.ecore.EObject,
      *      org.eclipse.emf.ecore.EStructuralFeature)
      */
+    @Override
     public IInterpretedExpressionTargetSwitch createInterpretedExpressionSwitch(EStructuralFeature feature, IInterpretedExpressionTargetSwitch parentSwitch) {
         return new SequenceGlobalInterpretedTargetSwitch(feature, parentSwitch);
     }
@@ -200,6 +209,7 @@ public class SequenceDiagramTypeProvider implements IDiagramDescriptionProvider
      * 
      * @see org.eclipse.sirius.diagram.business.api.diagramtype.IDiagramDescriptionProvider#allowsLayoutingModeActivation()
      */
+    @Override
     public boolean allowsLayoutingModeActivation() {
         return false;
     }
@@ -301,6 +311,7 @@ public class SequenceDiagramTypeProvider implements IDiagramDescriptionProvider
      * 
      * @see org.eclipse.sirius.diagram.business.api.diagramtype.IDiagramDescriptionProvider#supportHeader()
      */
+    @Override
     public boolean supportHeader() {
         return true;
     }
@@ -310,6 +321,7 @@ public class SequenceDiagramTypeProvider implements IDiagramDescriptionProvider
      * 
      * @see org.eclipse.sirius.diagram.business.api.diagramtype.IDiagramDescriptionProvider#getHeaderData()
      */
+    @Override
     public LinkedList<HeaderData> getHeaderData(DDiagram diagram) {
         LinkedList<HeaderData> result = Lists.newLinkedList();
         if (diagram instanceof SequenceDDiagram) {
@@ -377,6 +389,7 @@ public class SequenceDiagramTypeProvider implements IDiagramDescriptionProvider
          * 
          * @see org.eclipse.sirius.business.api.dialect.description.IInterpretedExpressionTargetSwitch#doSwitch(org.eclipse.emf.ecore.EObject)
          */
+        @Override
         public Option<Collection<String>> doSwitch(EObject target, boolean considerFeature) {
             Collection<String> targetTypes = Sets.newLinkedHashSet();
             Option<Collection<String>> expressionTarget = Options.newSome(targetTypes);
@@ -414,6 +427,7 @@ public class SequenceDiagramTypeProvider implements IDiagramDescriptionProvider
      * @see org.eclipse.sirius.diagram.business.api.diagramtype.IDiagramDescriptionProvider
      *      #getCollapseUpdater(DDiagram)
      */
+    @Override
     public Option<? extends ICollapseUpdater> getCollapseUpdater(DDiagram diagram) {
         if (diagram != null && diagram.getDescription() != null && handles(diagram.getDescription().eClass().getEPackage())) {
             return Options.newSome(new SequenceCollapseUpdater());
@@ -440,11 +454,11 @@ public class SequenceDiagramTypeProvider implements IDiagramDescriptionProvider
             sb.append("\n"); //$NON-NLS-1$
         }
 
-        sb.append("Additional available variable for Sequence Diagram:");
-        sb.append("\n . ");
+        sb.append(Messages.SequenceDiagramTypeProvider_sequenceAdditionalVariablesTooltip);
+        sb.append("\n . "); //$NON-NLS-1$
         sb.append("endBefore"); //$NON-NLS-1$
         sb.append(": "); //$NON-NLS-1$
-        sb.append("an EventEnd referencing the semantic event end ");
+        sb.append(Messages.SequenceDiagramTypeProvider_endBeforeVariableDescription);
 
         return sb.toString();
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/internal/refresh/VisibilityEventHandler.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/internal/refresh/VisibilityEventHandler.java
index 3ae1974a8c..6145222009 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/internal/refresh/VisibilityEventHandler.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/business/internal/refresh/VisibilityEventHandler.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES and others.
  * 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
@@ -20,6 +20,7 @@ import org.eclipse.emf.transaction.RollbackException;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.sequence.SequenceDDiagram;
+import org.eclipse.sirius.diagram.sequence.ui.Messages;
 import org.eclipse.sirius.diagram.sequence.ui.SequenceDiagramUIPlugin;
 import org.eclipse.sirius.diagram.sequence.ui.business.api.diagramtype.SequenceDiagramTypeProvider;
 import org.eclipse.sirius.diagram.ui.tools.internal.util.NotificationQuery;
@@ -59,13 +60,14 @@ public class VisibilityEventHandler extends ResourceSetListenerImpl {
     @Override
     public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {
         if (containsVisibilityEvent(event)) {
-            throw new RollbackException(new Status(IStatus.ERROR, SequenceDiagramUIPlugin.PLUGIN_ID, "Hide/Reveal is not supported in Sequence Diagrams"));
+            throw new RollbackException(new Status(IStatus.ERROR, SequenceDiagramUIPlugin.PLUGIN_ID, Messages.VisibilityEventHandler_nonSupportedHideRevealInSequenceDiagram));
         }
         return null;
     }
 
     private boolean containsVisibilityEvent(ResourceSetChangeEvent event) {
         Predicate<Notification> isVisibilityEvent = new Predicate<Notification>() {
+            @Override
             public boolean apply(Notification input) {
                 NotificationQuery nq = new NotificationQuery(input);
                 return nq.isViewBecomingInvisibleEvent() || nq.isHideFilterAddEvent();
@@ -73,6 +75,7 @@ public class VisibilityEventHandler extends ResourceSetListenerImpl {
         };
 
         Predicate<Notification> isAlwaysVisibleSequenceElement = new Predicate<Notification>() {
+            @Override
             public boolean apply(Notification input) {
                 Object notifier = input.getNotifier();
                 if (notifier instanceof DDiagramElement) {
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ExecutionOperations.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ExecutionOperations.java
index 85a6e23e1a..e5279b8598 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ExecutionOperations.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ExecutionOperations.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES and others.
  * 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
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.operation;
 
+import java.text.MessageFormat;
+
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.command.CompoundCommand;
@@ -28,6 +30,7 @@ import org.eclipse.sirius.diagram.sequence.business.internal.elements.Message;
 import org.eclipse.sirius.diagram.sequence.business.internal.operation.ReparentExecutionOperation;
 import org.eclipse.sirius.diagram.sequence.business.internal.operation.SetMessageRangeOperation;
 import org.eclipse.sirius.diagram.sequence.business.internal.operation.SetVerticalRangeOperation;
+import org.eclipse.sirius.diagram.sequence.ui.Messages;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.ExecutionEditPart;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.ISequenceEventEditPart;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.LostMessageEndEditPart;
@@ -228,7 +231,7 @@ public final class ExecutionOperations {
             LostMessageEnd lostMessageEnd = ((LostMessageEndEditPart) source).getLostMessageEnd();
             sourceBounds = lostMessageEnd.getProperLogicalBounds().getCopy();
         } else {
-            throw new RuntimeException("The source of a message should always be an ISequenceEvent but was: " + String.valueOf(source));
+            throw new RuntimeException(MessageFormat.format(Messages.ExecutionOperations_invalidMessageSource, String.valueOf(source)));
         }
         smrc.setSource(source.getNotationView(), sourceBounds);
         // The target side is reconnected to the parent of the execution being
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ResizeViewOperation.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ResizeViewOperation.java
index d9c033e355..bd881db99c 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ResizeViewOperation.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ResizeViewOperation.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES and others.
  * 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
@@ -18,6 +18,7 @@ import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.Size;
 import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.sirius.diagram.sequence.ui.Messages;
 import org.eclipse.sirius.diagram.ui.business.internal.operation.AbstractModelChangeOperation;
 
 /**
@@ -43,8 +44,8 @@ public class ResizeViewOperation extends AbstractModelChangeOperation<Void> {
      */
     public ResizeViewOperation(String label, IAdaptable adapter, Dimension sizeDelta) {
         super(label);
-        Assert.isNotNull(adapter, "view cannot be null"); //$NON-NLS-1$
-        Assert.isNotNull(sizeDelta, "sizeDelta cannot be null"); //$NON-NLS-1$
+        Assert.isNotNull(adapter, Messages.ResizeViewOperation_invalidNullView); 
+        Assert.isNotNull(sizeDelta, Messages.ResizeViewOperation_invalidNullSizeDelta); 
         this.adapter = adapter;
         this.sizeDelta = sizeDelta;
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ShiftDescendantMessagesOperation.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ShiftDescendantMessagesOperation.java
index f796734546..ccd6a45291 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ShiftDescendantMessagesOperation.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ShiftDescendantMessagesOperation.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES and others.
  * 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
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.operation;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Set;
@@ -30,6 +31,7 @@ import org.eclipse.sirius.diagram.sequence.business.internal.elements.Message;
 import org.eclipse.sirius.diagram.sequence.business.internal.ordering.EventEndHelper;
 import org.eclipse.sirius.diagram.sequence.business.internal.query.ISequenceEventQuery;
 import org.eclipse.sirius.diagram.sequence.business.internal.util.ISequenceEventsTreeIterator;
+import org.eclipse.sirius.diagram.sequence.ui.Messages;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.layout.SequenceGraphicalHelper;
 import org.eclipse.sirius.diagram.sequence.util.Range;
 import org.eclipse.sirius.diagram.ui.tools.api.util.GMFNotationHelper;
@@ -93,7 +95,7 @@ public class ShiftDescendantMessagesOperation extends ShiftMessagesOperation {
      *            parentPart is resized.
      */
     public ShiftDescendantMessagesOperation(ISequenceEvent parent, int deltaY, boolean revert, boolean move, boolean fromTop) {
-        super("Shift sub-messages bendpoints by " + deltaY, deltaY, revert, move);
+        super(MessageFormat.format(Messages.ShifDescendantMessagesOperation_operationName, deltaY), deltaY, revert, move);
         this.parent = parent;
         this.fromTop = fromTop;
         this.oldParentRange = parent.getVerticalRange();
@@ -163,6 +165,7 @@ public class ShiftDescendantMessagesOperation extends ShiftMessagesOperation {
         populate(descendants);
 
         final Predicate<Message> filterReflexiveMessage = new Predicate<Message>() {
+            @Override
             public boolean apply(final Message input) {
                 return !input.isReflective();
             }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ShiftMessagesOperation.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ShiftMessagesOperation.java
index b25e645508..fba9961575 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ShiftMessagesOperation.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/operation/ShiftMessagesOperation.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES and others.
  * 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
@@ -18,6 +18,7 @@ import org.eclipse.gmf.runtime.notation.RelativeBendpoints;
 import org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.ISequenceEvent;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.Message;
+import org.eclipse.sirius.diagram.sequence.ui.Messages;
 import org.eclipse.sirius.diagram.ui.business.internal.operation.AbstractModelChangeOperation;
 
 import com.google.common.base.Preconditions;
@@ -92,7 +93,7 @@ public class ShiftMessagesOperation extends AbstractModelChangeOperation<Void> {
      *            sub messages will be shifted
      */
     public ShiftMessagesOperation(Collection<Message> messagesToShift, Collection<ISequenceEvent> movedElements, int deltaY, boolean revert, boolean move) {
-        this("Shift given message", deltaY, revert, move);
+        this(Messages.ShiftMessagesOperation_operationName, deltaY, revert, move);
         Preconditions.checkNotNull(messagesToShift);
         Preconditions.checkNotNull(movedElements);
         this.messagesToShift.addAll(messagesToShift);
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/part/InteractionUseEditPart.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/part/InteractionUseEditPart.java
index c0201f5733..6d9bce7cca 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/part/InteractionUseEditPart.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/part/InteractionUseEditPart.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES and others.
  * 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
@@ -59,6 +59,7 @@ public class InteractionUseEditPart extends DNodeContainerEditPart implements IS
      */
     private NotificationListener usedInteractionLabelUpdater = new NotificationListener() {
 
+        @Override
         public void notifyChanged(Notification notification) {
             if (!notification.isTouch()) {
                 refreshUsedInteractionLabel();
@@ -219,6 +220,7 @@ public class InteractionUseEditPart extends DNodeContainerEditPart implements IS
     /**
      * {@inheritDoc}
      */
+    @Override
     public ISequenceEvent getISequenceEvent() {
         return ISequenceElementAccessor.getInteractionUse(getNotationView()).get();
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/CombinedFragmentResizableEditPolicy.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/CombinedFragmentResizableEditPolicy.java
index a263edbfe4..96ae7fe42e 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/CombinedFragmentResizableEditPolicy.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/CombinedFragmentResizableEditPolicy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES and others.
  * 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
@@ -43,6 +43,7 @@ import org.eclipse.sirius.diagram.sequence.business.internal.elements.Operand;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.SequenceDiagram;
 import org.eclipse.sirius.diagram.sequence.business.internal.layout.LayoutConstants;
 import org.eclipse.sirius.diagram.sequence.business.internal.operation.VerticalSpaceExpansion;
+import org.eclipse.sirius.diagram.sequence.ui.Messages;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.operation.SequenceEditPartsOperations;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.CombinedFragmentCompartmentEditPart;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.CombinedFragmentEditPart;
@@ -67,8 +68,6 @@ import com.google.common.collect.Lists;
  */
 public class CombinedFragmentResizableEditPolicy extends AbstractFrameResizableEditPolicy {
 
-    private static final String RESIZE = "Resize";
-
     /**
      * {@inheritDoc}
      */
@@ -94,7 +93,7 @@ public class CombinedFragmentResizableEditPolicy extends AbstractFrameResizableE
 
     private CompositeTransactionalCommand buildNewMoveCommand(CombinedFragmentEditPart hostPart, ChangeBoundsRequest request, ISEComplexMoveValidator validator) {
         TransactionalEditingDomain editingDomain = hostPart.getEditingDomain();
-        ISEComplexMoveCommandBuilder builder = new ISEComplexMoveCommandBuilder(editingDomain, "Execution Move Composite Command", new RequestQuery(request), validator);
+        ISEComplexMoveCommandBuilder builder = new ISEComplexMoveCommandBuilder(editingDomain, Messages.CombinedFragmentResizableEditPolicy_moveCompositeCommand, new RequestQuery(request), validator);
         return builder.buildCommand();
     }
 
@@ -131,7 +130,7 @@ public class CombinedFragmentResizableEditPolicy extends AbstractFrameResizableE
     }
 
     private CompositeTransactionalCommand getRezizeCustomCommand(CombinedFragmentEditPart self, ChangeBoundsRequest request) {
-        CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(self.getEditingDomain(), "Combined Fragment Resize Composite Command");
+        CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(self.getEditingDomain(), Messages.CombinedFragmentResizableEditPolicy_resizeCompositeCommand);
         ctc.add(CombinedFragmentResizableEditPolicy.getResizeBorderItemTCommand(self, request));
         Option<CombinedFragment> combinedFragmentOption = ISequenceElementAccessor.getCombinedFragment(self.getNotationView());
         if (combinedFragmentOption.some() && !combinedFragmentOption.get().getOperands().isEmpty()) {
@@ -357,7 +356,7 @@ public class CombinedFragmentResizableEditPolicy extends AbstractFrameResizableE
             default:
                 break;
             }
-            return new SetBoundsCommand(part.getEditingDomain(), RESIZE, new EObjectAdapter(part.getNotationView()), new Rectangle(position, dimension));
+            return new SetBoundsCommand(part.getEditingDomain(), Messages.CombinedFragmentResizableEditPolicy_resizeSubCommand, new EObjectAdapter(part.getNotationView()), new Rectangle(position, dimension));
         }
         return null;
     }
@@ -374,7 +373,7 @@ public class CombinedFragmentResizableEditPolicy extends AbstractFrameResizableE
      * @return a command to resize an operand
      */
     private AbstractTransactionalCommand createOperandSetBoundsCommand(IGraphicalEditPart part, Point location, Dimension dimension) {
-        return new SetBoundsCommand(part.getEditingDomain(), RESIZE, new EObjectAdapter(part.getNotationView()), new Rectangle(location, dimension));
+        return new SetBoundsCommand(part.getEditingDomain(), Messages.CombinedFragmentResizableEditPolicy_resizeSubCommand, new EObjectAdapter(part.getNotationView()), new Rectangle(location, dimension));
     }
 
     private static Point getPositionFromView(IGraphicalEditPart part) {
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/EndOfLifeSelectionPolicy.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/EndOfLifeSelectionPolicy.java
index 3ea9d9958e..d80da835a6 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/EndOfLifeSelectionPolicy.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/EndOfLifeSelectionPolicy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES and others.
  * 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
@@ -33,6 +33,7 @@ import org.eclipse.sirius.diagram.sequence.business.internal.layout.LayoutConsta
 import org.eclipse.sirius.diagram.sequence.ordering.CompoundEventEnd;
 import org.eclipse.sirius.diagram.sequence.ordering.EventEnd;
 import org.eclipse.sirius.diagram.sequence.ordering.SingleEventEnd;
+import org.eclipse.sirius.diagram.sequence.ui.Messages;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.operation.EndOfLifeOperations;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.operation.SequenceEditPartsOperations;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.operation.ShiftDescendantMessagesOperation;
@@ -137,7 +138,7 @@ public class EndOfLifeSelectionPolicy extends SpecificBorderItemSelectionEditPol
     }
 
     private Command getLifelineMovesCommand(EndOfLifeEditPart self, ChangeBoundsRequest cbr) {
-        CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(self.getEditingDomain(), "Lifelines moves command from end of life");
+        CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(self.getEditingDomain(), Messages.EndOfLifeSelectionPolicy_lifelineMoveCommand);
         Option<EndOfLife> endOfLife = ISequenceElementAccessor.getEndOfLife(self.getNotationView());
         LifelineEditPart lep = self.getLifelineEditPart();
         boolean destroyed = endOfLife.some() && endOfLife.get().isExplicitelyDestroyed();
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/ExecutionSelectionEditPolicy.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/ExecutionSelectionEditPolicy.java
index 9e7b9c1d0a..6a6ebb8be2 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/ExecutionSelectionEditPolicy.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/ExecutionSelectionEditPolicy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2012 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES and others.
  * 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
@@ -57,6 +57,7 @@ import org.eclipse.sirius.diagram.sequence.business.internal.util.EventFinder;
 import org.eclipse.sirius.diagram.sequence.ordering.CompoundEventEnd;
 import org.eclipse.sirius.diagram.sequence.ordering.EventEnd;
 import org.eclipse.sirius.diagram.sequence.ordering.SingleEventEnd;
+import org.eclipse.sirius.diagram.sequence.ui.Messages;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.operation.SequenceEditPartsOperations;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.operation.ShiftDescendantMessagesOperation;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.ExecutionEditPart;
@@ -126,7 +127,7 @@ public class ExecutionSelectionEditPolicy extends SpecificBorderItemSelectionEdi
     private ICommand buildMoveCommand(ExecutionEditPart hostPart, ChangeBoundsRequest request, ISEComplexMoveValidator validator) {
         TransactionalEditingDomain editingDomain = hostPart.getEditingDomain();
         RequestQuery requestQuery = new RequestQuery(request);
-        ISEComplexMoveCommandBuilder builder = new ISEComplexMoveCommandBuilder(editingDomain, "Execution Move Composite Command", requestQuery, validator);
+        ISEComplexMoveCommandBuilder builder = new ISEComplexMoveCommandBuilder(editingDomain, Messages.ExecutionSelectionEditPolicy_moveCompositeCommand, requestQuery, validator);
         return postProcessCommand(builder.buildCommand(), hostPart, requestQuery);
     }
 
@@ -161,7 +162,7 @@ public class ExecutionSelectionEditPolicy extends SpecificBorderItemSelectionEdi
             validator.setExpansionZone(null);
         }
 
-        CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(hostPart.getEditingDomain(), "Execution Resize Composite Command");
+        CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(hostPart.getEditingDomain(), Messages.ExecutionSelectionEditPolicy_resizeCompositeCommand);
         if (needVerticalSpaceExpansion(validator, request)) {
             SequenceDiagramEditPart diagram = EditPartsHelper.getSequenceDiagramPart(hostPart);
             Collection<ISequenceEvent> eventToIgnore = Collections.singletonList((ISequenceEvent) self);
@@ -268,11 +269,13 @@ public class ExecutionSelectionEditPolicy extends SpecificBorderItemSelectionEdi
         final int movedBound = top ? oldRange.getLowerBound() : oldRange.getUpperBound();
         final EObject sem = self.getSemanticTargetElement().get();
         final Predicate<SingleEventEnd> toMove = new Predicate<SingleEventEnd>() {
+            @Override
             public boolean apply(SingleEventEnd input) {
                 return !input.getSemanticEvent().equals(sem);
             }
         };
         final Predicate<EventEnd> moved = new Predicate<EventEnd>() {
+            @Override
             public boolean apply(EventEnd input) {
                 return EventEndHelper.getSingleEventEnd(input, sem).isStart() == top;
             }
@@ -339,6 +342,7 @@ public class ExecutionSelectionEditPolicy extends SpecificBorderItemSelectionEdi
         boolean invalidCommand = false;
 
         Predicate<EventEnd> filterCompoundEventEnd = new Predicate<EventEnd>() {
+            @Override
             public boolean apply(EventEnd input) {
                 return input instanceof CompoundEventEnd;
             }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/InstanceRoleResizableEditPolicy.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/InstanceRoleResizableEditPolicy.java
index 2d042c27eb..35a4dadeb7 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/InstanceRoleResizableEditPolicy.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/InstanceRoleResizableEditPolicy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2011 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES and others.
  * 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
@@ -38,6 +38,7 @@ import org.eclipse.sirius.diagram.sequence.business.internal.elements.Lifeline;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.LostMessageEnd;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.Message;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.SequenceDiagram;
+import org.eclipse.sirius.diagram.sequence.ui.Messages;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.operation.ResizeViewOperation;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.operation.SequenceEditPartsOperations;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.InstanceRoleEditPart;
@@ -75,10 +76,6 @@ import com.google.common.collect.Multimap;
  */
 public class InstanceRoleResizableEditPolicy extends AirResizableEditPolicy {
 
-    private static final String INSTANCE_ROLE_MOVE_COMMAND_NAME = "InstanceRole move";
-
-    private static final String INSTANCE_ROLE_RESIZE_COMMAND_NAME = "InstanceRole resize";
-
     /**
      * Manage move requests.
      * 
@@ -117,7 +114,7 @@ public class InstanceRoleResizableEditPolicy extends AirResizableEditPolicy {
     private Command getMoveCommand(InstanceRoleMoveValidator validator, RequestQuery requestQuery) {
         GraphicalEditPart host = (GraphicalEditPart) getHost();
         TransactionalEditingDomain transactionalEditingDomain = host.getEditingDomain();
-        CompositeTransactionalCommand compositeCommand = new CompositeTransactionalCommand(transactionalEditingDomain, INSTANCE_ROLE_MOVE_COMMAND_NAME);
+        CompositeTransactionalCommand compositeCommand = new CompositeTransactionalCommand(transactionalEditingDomain, Messages.InstanceRoleResizableEditPolicy_moveCommand);
         ICommand moveCmds = getMoveViewCommands(transactionalEditingDomain, validator.getMoveDeltas());
         if (moveCmds != null && moveCmds.canExecute()) {
             compositeCommand.compose(moveCmds);
@@ -162,7 +159,7 @@ public class InstanceRoleResizableEditPolicy extends AirResizableEditPolicy {
         GraphicalEditPart host = (GraphicalEditPart) getHost();
         TransactionalEditingDomain transactionalEditingDomain = host.getEditingDomain();
 
-        CompositeTransactionalCommand compositeCommand = new CompositeTransactionalCommand(transactionalEditingDomain, INSTANCE_ROLE_RESIZE_COMMAND_NAME);
+        CompositeTransactionalCommand compositeCommand = new CompositeTransactionalCommand(transactionalEditingDomain, Messages.InstanceRoleResizableEditPolicy_resizeCommand);
         ICommand moveViewCmd = getMoveViewCommands(transactionalEditingDomain, validator.getMoveDeltas());
         if (moveViewCmd != null && moveViewCmd.canExecute()) {
             compositeCommand.compose(moveViewCmd);
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/InstanceRoleSiriusGraphicalNodeEditPolicy.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/InstanceRoleSiriusGraphicalNodeEditPolicy.java
index c6c592f877..193886b52a 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/InstanceRoleSiriusGraphicalNodeEditPolicy.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/InstanceRoleSiriusGraphicalNodeEditPolicy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 THALES GLOBAL SERVICES.
+ * Copyright (c) 2011, 2015 THALES GLOBAL SERVICES and others.
  * 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
@@ -39,6 +39,7 @@ import org.eclipse.sirius.diagram.sequence.business.internal.elements.SequenceDi
 import org.eclipse.sirius.diagram.sequence.business.internal.operation.EndOfLifeMoveOperation;
 import org.eclipse.sirius.diagram.sequence.business.internal.operation.ShiftDirectSubExecutionsOperation;
 import org.eclipse.sirius.diagram.sequence.description.tool.MessageCreationTool;
+import org.eclipse.sirius.diagram.sequence.ui.Messages;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.operation.SequenceEditPartsOperations;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.operation.ShiftDescendantMessagesOperation;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.ISequenceEventEditPart;
@@ -123,7 +124,7 @@ public class InstanceRoleSiriusGraphicalNodeEditPolicy extends SiriusGraphicalNo
             // TODO EDU : refactor this following with validators
             result = super.getConnectionCompleteCommand(request);
             if (result != null && result.canExecute() && validateIsConnectingCreateMessage(request)) {
-                CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(domain, "Move down lifeline/ add create participant message");
+                CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(domain, Messages.InstanceRoleSiriusGraphicalNodeEditPolicy_createParticipantMessageAndMoveDownLifelineCompositeCommand);
                 Point sourceLocation = ((Point) ViewLocationHint.getInstance().getData(org.eclipse.gef.RequestConstants.REQ_CONNECTION_START)).getCopy();
                 final LifelineEditPart lep = EditPartsHelper.getAllLifelines((IGraphicalEditPart) getHost()).get(0);
 
@@ -268,6 +269,7 @@ public class InstanceRoleSiriusGraphicalNodeEditPolicy extends SiriusGraphicalNo
         // to add a create message
         Predicate<ISequenceEvent> notParentCombinedFragment = new Predicate<ISequenceEvent>() {
 
+            @Override
             public boolean apply(ISequenceEvent input) {
                 if (input instanceof CombinedFragment) {
                     CombinedFragment combinedFragment = (CombinedFragment) input;
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/InteractionUseResizableEditPolicy.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/InteractionUseResizableEditPolicy.java
index a677054ea6..23c8a21874 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/InteractionUseResizableEditPolicy.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/InteractionUseResizableEditPolicy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES and others.
  * 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
@@ -24,6 +24,7 @@ import org.eclipse.sirius.diagram.sequence.business.internal.elements.ISequenceE
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.InteractionUse;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.SequenceDiagram;
 import org.eclipse.sirius.diagram.sequence.business.internal.operation.VerticalSpaceExpansion;
+import org.eclipse.sirius.diagram.sequence.ui.Messages;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.operation.SequenceEditPartsOperations;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.ISequenceEventEditPart;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.InteractionUseEditPart;
@@ -88,7 +89,7 @@ public class InteractionUseResizableEditPolicy extends AbstractFrameResizableEdi
         Command result = defaultCommand;
 
         if (result != null && result.canExecute()) {
-            CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(self.getEditingDomain(), "Interaction Use Move Composite Command");
+            CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(self.getEditingDomain(), Messages.InteractionUseResizableEditPolicy_moveCompositeCommand);
             ctc.setLabel(String.valueOf(defaultCommand.getLabel()));
             ctc.compose(new CommandProxy(defaultCommand));
 
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/OperandResizableEditPolicy.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/OperandResizableEditPolicy.java
index b099165073..75775df011 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/OperandResizableEditPolicy.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/OperandResizableEditPolicy.java
@@ -37,6 +37,7 @@ import org.eclipse.gmf.runtime.notation.Size;
 import org.eclipse.sirius.diagram.DNodeContainer;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.ISequenceElementAccessor;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.Operand;
+import org.eclipse.sirius.diagram.sequence.ui.Messages;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.operation.SequenceEditPartsOperations;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.OperandEditPart;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.validator.OperandResizeValidator;
@@ -54,8 +55,6 @@ import com.google.common.collect.Iterables;
  */
 public class OperandResizableEditPolicy extends AirResizableEditPolicy {
 
-    private static final String RESIZE = "Resize";
-
     /**
      * Constructor.
      */
@@ -137,13 +136,13 @@ public class OperandResizableEditPolicy extends AirResizableEditPolicy {
             default:
                 break;
             }
-            return new SetBoundsCommand(part.getEditingDomain(), RESIZE, new EObjectAdapter(part.getNotationView()), new Rectangle(position, dimension));
+            return new SetBoundsCommand(part.getEditingDomain(), Messages.OperandResizableEditPolicy_resizeSubCommand, new EObjectAdapter(part.getNotationView()), new Rectangle(position, dimension));
         }
         return null;
     }
 
     private Command getResizeCustomCommand(OperandEditPart self, ChangeBoundsRequest request) {
-        CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(self.getEditingDomain(), "Operand Resize Composite Command");
+        CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(self.getEditingDomain(), Messages.OperandResizableEditPolicy_resizeCompositeCommand);
         ctc.add(OperandResizableEditPolicy.getResizeBorderItemTCommand(self, request));
         Option<Operand> operandOption = ISequenceElementAccessor.getOperand(self.getNotationView());
         if (operandOption.some()) {
@@ -218,7 +217,7 @@ public class OperandResizableEditPolicy extends AirResizableEditPolicy {
      * @return a command to resize an operand
      */
     private AbstractTransactionalCommand createOperandSetBoundsCommand(IGraphicalEditPart part, Point location, Dimension dimension) {
-        return new SetBoundsCommand(part.getEditingDomain(), RESIZE, new EObjectAdapter(part.getNotationView()), new Rectangle(location, dimension));
+        return new SetBoundsCommand(part.getEditingDomain(), Messages.OperandResizableEditPolicy_resizeSubCommand, new EObjectAdapter(part.getNotationView()), new Rectangle(location, dimension));
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceContainerCreationPolicy.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceContainerCreationPolicy.java
index 24d22a08dd..0816286ab3 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceContainerCreationPolicy.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceContainerCreationPolicy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2013 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES and others.
  * 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
@@ -49,6 +49,7 @@ import org.eclipse.sirius.diagram.sequence.description.tool.InstanceRoleCreation
 import org.eclipse.sirius.diagram.sequence.description.tool.InteractionUseCreationTool;
 import org.eclipse.sirius.diagram.sequence.description.tool.ObservationPointCreationTool;
 import org.eclipse.sirius.diagram.sequence.ordering.EventEnd;
+import org.eclipse.sirius.diagram.sequence.ui.Messages;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.command.SequenceDelegatingCommandFactory;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.SequenceDiagramEditPart;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.validator.FrameCreationValidator;
@@ -79,12 +80,6 @@ import com.google.common.collect.Lists;
  */
 public class SequenceContainerCreationPolicy extends ContainerCreationEditPolicy {
 
-    /** Label use for the Interaction Use creation. */
-    public static final String INTERACTION_USE_CREATION_CMD_LABEL = "Interaction Use creation";
-
-    /** Label use for the Combined Fragment creation. */
-    public static final String COMBINED_FRAGMENT_CREATION_CMD_LABEL = "Combined Fragment creation";
-
     /**
      * Additional figures for feedback.
      */
@@ -160,9 +155,9 @@ public class SequenceContainerCreationPolicy extends ContainerCreationEditPolicy
                 }
                 if (result != null) {
                     if (ccdTool instanceof InteractionUseCreationTool) {
-                        result.setLabel(INTERACTION_USE_CREATION_CMD_LABEL);
+                        result.setLabel(Messages.SequenceContainerCreationPolicy_interactionUseCreationCommand);
                     } else if (ccdTool instanceof CombinedFragmentCreationTool) {
-                        result.setLabel(COMBINED_FRAGMENT_CREATION_CMD_LABEL);
+                        result.setLabel(Messages.SequenceContainerCreationPolicy_combinedFragmentCreationCommand);
                     }
                 }
             } else {
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceMessageEditPolicy.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceMessageEditPolicy.java
index 04b6b74fe9..3d6a912eaa 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceMessageEditPolicy.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/policy/SequenceMessageEditPolicy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2012 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES and others.
  * 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
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.policy;
 
+import java.text.MessageFormat;
 import java.util.Collection;
 import java.util.List;
 
@@ -62,6 +63,7 @@ import org.eclipse.sirius.diagram.sequence.business.internal.util.EventFinder;
 import org.eclipse.sirius.diagram.sequence.ordering.CompoundEventEnd;
 import org.eclipse.sirius.diagram.sequence.ordering.EventEnd;
 import org.eclipse.sirius.diagram.sequence.ordering.SingleEventEnd;
+import org.eclipse.sirius.diagram.sequence.ui.Messages;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.operation.EndOfLifeOperations;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.operation.SequenceEditPartsOperations;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.operation.ShiftDescendantMessagesOperation;
@@ -101,7 +103,7 @@ public class SequenceMessageEditPolicy extends ConnectionBendpointEditPolicy {
     /**
      * Key constant use for request from a BendpointRequest on Message.
      */
-    public static final String REQUEST_FROM_SEQUENCE_MESSAGE_EDIT_POLICY = "Request a Execution resize from a BendpointRequest";
+    public static final String REQUEST_FROM_SEQUENCE_MESSAGE_EDIT_POLICY = "org.eclipse.sirius.sequence.resize.execution.from.bendpoint.request"; //$NON-NLS-1$
 
     /**
      * The color top use for the horizontal feedback rules shown when moving a
@@ -230,6 +232,7 @@ public class SequenceMessageEditPolicy extends ConnectionBendpointEditPolicy {
         final Point location = request.getLocation().getCopy();
 
         final Predicate<SingleEventEnd> toMove = new Predicate<SingleEventEnd>() {
+            @Override
             public boolean apply(SingleEventEnd input) {
                 return !input.getSemanticEvent().equals(thisSemanticEvent);
             }
@@ -252,6 +255,7 @@ public class SequenceMessageEditPolicy extends ConnectionBendpointEditPolicy {
         final Point location = request.getLocation().getCopy();
 
         final Predicate<SingleEventEnd> toMove = new Predicate<SingleEventEnd>() {
+            @Override
             public boolean apply(SingleEventEnd input) {
                 return !input.getSemanticEvent().equals(thisSemanticEvent);
             }
@@ -398,7 +402,7 @@ public class SequenceMessageEditPolicy extends ConnectionBendpointEditPolicy {
             result = UnexecutableCommand.INSTANCE;
         } else {
             String label = baseCommand.getLabel();
-            CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(thisEvent.getEditingDomain(), (label != null ? label : "<null>") + " and synchronize ordering"); //$NON-NLS-1$
+            CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(thisEvent.getEditingDomain(), MessageFormat.format(Messages.SequenceMessageEditPolicy_synchronizeOrderingCompositeCommand, label != null ? label : "<null>")); //$NON-NLS-1$
             SequenceEditPartsOperations.appendFullRefresh(thisEvent, ctc);
 
             MoveType move = getMoveType(thisEvent, request, ends);
@@ -440,6 +444,7 @@ public class SequenceMessageEditPolicy extends ConnectionBendpointEditPolicy {
 
     private Collection<Integer> checkGlobalPositions(final ISequenceEvent thisEvent, final Option<Range> finalRange) {
         Function<ISequenceEvent, Range> futureRangeFunction = new Function<ISequenceEvent, Range>() {
+            @Override
             public Range apply(ISequenceEvent from) {
                 Range verticalRange = from.getVerticalRange();
                 if (thisEvent.equals(from) && finalRange.some()) {
@@ -603,6 +608,7 @@ public class SequenceMessageEditPolicy extends ConnectionBendpointEditPolicy {
         final Point location = request.getLocation().getCopy();
 
         final Predicate<SingleEventEnd> toMove = new Predicate<SingleEventEnd>() {
+            @Override
             public boolean apply(SingleEventEnd input) {
                 return !input.getSemanticEvent().equals(thisSemanticEvent);
             }
@@ -663,7 +669,7 @@ public class SequenceMessageEditPolicy extends ConnectionBendpointEditPolicy {
      *         command otherwise
      */
     private AbstractEMFOperation getMoveDestroyMessageCommand(BendpointRequest br, SequenceMessageEditPart smep, Command baseCommand) {
-        CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(smep.getEditingDomain(), "Move create message");
+        CompositeTransactionalCommand ctc = new CompositeTransactionalCommand(smep.getEditingDomain(), Messages.SequenceMessageEditPolicy_moveCreateMessageCommand);
         if (smep.getSource() instanceof ISequenceEventEditPart) {
             ISequenceEventEditPart source = (ISequenceEventEditPart) smep.getSource();
             Range sourceRange = source.getISequenceEvent().getVerticalRange();
@@ -723,7 +729,7 @@ public class SequenceMessageEditPolicy extends ConnectionBendpointEditPolicy {
         InstanceRoleEditPart instanceRoleEditPart = (InstanceRoleEditPart) smep.getTarget();
         LifelineEditPart lifelineEditPart = Iterables.getOnlyElement(EditPartsHelper.getAllLifelines(instanceRoleEditPart));
 
-        CompositeTransactionalCommand cc = new CompositeTransactionalCommand(smep.getEditingDomain(), "Move create message");
+        CompositeTransactionalCommand cc = new CompositeTransactionalCommand(smep.getEditingDomain(), Messages.SequenceMessageEditPolicy_moveCreateMessageCommand);
 
         // limite the move to the first sequence event of the target
         int firstMessageInTargetInstanceRole = lifelineEditPart.getISequenceEvent().getVerticalRange().getUpperBound() - LayoutConstants.EXECUTION_CHILDREN_MARGIN;
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/AbstractInstanceRoleValidator.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/AbstractInstanceRoleValidator.java
index 113f4bb293..95817e68fe 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/AbstractInstanceRoleValidator.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/AbstractInstanceRoleValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES and others.
  * 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
@@ -21,6 +21,7 @@ import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.gef.requests.ChangeBoundsRequest;
 import org.eclipse.gmf.runtime.notation.Bounds;
 import org.eclipse.sirius.diagram.sequence.business.internal.elements.InstanceRole;
+import org.eclipse.sirius.diagram.sequence.ui.Messages;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
@@ -60,7 +61,7 @@ public abstract class AbstractInstanceRoleValidator {
      * {@inheritDoc}
      */
     public boolean isValid(ChangeBoundsRequest request) {
-        Preconditions.checkNotNull(instanceRoles, "validator must know on which instanceRoles check the request validation");
+        Preconditions.checkNotNull(instanceRoles, Messages.AbstractInstanceRoleValidator_nullInstanceRoleList);
 
         return true;
     }
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/AbstractNodeEventResizeSelectionValidator.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/AbstractNodeEventResizeSelectionValidator.java
index adb50799eb..0f5a18d8f1 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/AbstractNodeEventResizeSelectionValidator.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/edit/validator/AbstractNodeEventResizeSelectionValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES and others.
  * 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
@@ -32,6 +32,7 @@ import org.eclipse.sirius.diagram.sequence.business.internal.ordering.EventEndHe
 import org.eclipse.sirius.diagram.sequence.ordering.CompoundEventEnd;
 import org.eclipse.sirius.diagram.sequence.ordering.EventEnd;
 import org.eclipse.sirius.diagram.sequence.ordering.SingleEventEnd;
+import org.eclipse.sirius.diagram.sequence.ui.Messages;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.ExecutionEditPart;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.util.FinalParentHelper;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.util.RequestQuery;
@@ -54,11 +55,6 @@ import com.google.common.collect.Lists;
  */
 public class AbstractNodeEventResizeSelectionValidator {
 
-    /**
-     * Key constant use for request on multiple selection.
-     */
-    public static final String GROUP_REQUEST_ALREADY_ANSWERED = "Already answered";
-
     private static final String EXECUTION_RESIZE_VALIDATOR = "org.eclipse.sirius.sequence.resize.execution.validator"; //$NON-NLS-1$
 
     /**
@@ -133,7 +129,7 @@ public class AbstractNodeEventResizeSelectionValidator {
      * the resize if it is valid, like for example avoid contact with siblings.
      */
     private void doValidation() {
-        Preconditions.checkNotNull(host, "validator must know on which executions check the request validation");
+        Preconditions.checkNotNull(host, Messages.AbstractNodeEventResizeSelectionValidator_nullExecution);
 
         FinalParentHelper finalParentHelper = new FinalParentHelper(host, requestQuery);
         finalParentHelper.computeFinalParent();
@@ -157,6 +153,7 @@ public class AbstractNodeEventResizeSelectionValidator {
      */
     protected boolean validateNewBoundsForAllTargets() {
         return Iterables.all(Iterables.filter(request.getEditParts(), ExecutionEditPart.class), new Predicate<ExecutionEditPart>() {
+            @Override
             public boolean apply(ExecutionEditPart input) {
                 return validateNewBounds(input);
             }
@@ -450,6 +447,7 @@ public class AbstractNodeEventResizeSelectionValidator {
             final Range finalRange = RangeHelper.verticalRange(newBounds);
             Function<ISequenceEvent, Range> futureRangeFunction = new Function<ISequenceEvent, Range>() {
 
+                @Override
                 public Range apply(ISequenceEvent from) {
                     Range verticalRange = from.getVerticalRange();
                     if (host.equals(from)) {
diff --git a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/layout/SequenceLayoutProvider.java b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/layout/SequenceLayoutProvider.java
index 3f89a1ba28..3c9adf1a59 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/layout/SequenceLayoutProvider.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence.ui/src/org/eclipse/sirius/diagram/sequence/ui/tool/internal/layout/SequenceLayoutProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2015 THALES GLOBAL SERVICES.
+ * Copyright (c) 2009, 2015 THALES GLOBAL SERVICES and others.
  * 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
@@ -25,6 +25,7 @@ import org.eclipse.sirius.diagram.sequence.business.internal.elements.SequenceDi
 import org.eclipse.sirius.diagram.sequence.business.internal.operation.RefreshGraphicalOrderingOperation;
 import org.eclipse.sirius.diagram.sequence.business.internal.operation.RefreshSemanticOrderingsOperation;
 import org.eclipse.sirius.diagram.sequence.business.internal.operation.SynchronizeGraphicalOrderingOperation;
+import org.eclipse.sirius.diagram.sequence.ui.Messages;
 import org.eclipse.sirius.diagram.sequence.ui.tool.internal.edit.part.SequenceDiagramEditPart;
 import org.eclipse.sirius.diagram.ui.business.internal.operation.AbstractModelChangeOperation;
 import org.eclipse.sirius.diagram.ui.tools.api.command.DoNothingCommand;
@@ -71,7 +72,7 @@ public class SequenceLayoutProvider extends AbstractLayoutProvider {
         operations.add(new SynchronizeGraphicalOrderingOperation(sdep.getDiagramView(), true));
 
         ICommand cmd = CommandFactory.createICommand(transactionalEditingDomain, operations);
-        cmd.setLabel("Arrange all");
+        cmd.setLabel(Messages.SequenceLayoutProvider_arrangeAllCommand);
 
         return new ICommandProxy(cmd);
     }
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
index d84ff80e69..27c12044bc 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.html
@@ -293,6 +293,9 @@
 						<code>org.eclipse.sirius.common.ui</code>
 					</li>
 					<li>
+						<code>org.eclipse.sirius.diagram.sequence.ui</code>
+					</li>
+					<li>
 						<code>org.eclipse.sirius.eef.adapters</code>
 					</li>
 					<li>
@@ -1879,4 +1882,4 @@
 			</li>
 		</ul>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
index 410a397713..ae9d8814e5 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release_Notes.textile
@@ -69,6 +69,7 @@ Additional non-breaking changes:
 ** @org.eclipse.sirius.common.acceleo.mtl@
 ** @org.eclipse.sirius.common.acceleo.mtl.ide@
 ** @org.eclipse.sirius.common.ui@
+** @org.eclipse.sirius.diagram.sequence.ui@
 ** @org.eclipse.sirius.eef.adapters@
 ** @org.eclipse.sirius.interpreter@
 ** @org.eclipse.sirius.table@