[472057] Fix string externalization errors

Examples of errors detected and fixed:
- Java literals externalized with one or both of their " delimiters.
- Windows-specific line delimiter sequences (\r\n), replaced by plain
  \n.
- Some mixups between the String.format() (printf-like) syntax, with %s,
  instead of the {0} expected by MessageFormat.
- Unneeded backslashes before " in property values (leftover from
  copy/pasting the Java string literal). Not harmful, but not needed in
  this context.
- In properties which are used as MessageFormat templates (and only in
  them), unescaped single quotes:

  - around format elements, e.g. '{0}' (which would produce a literal {0})
    instead of ''{0}'' (which would produce the formatted input value
    enclosed single quotes).

  - elsewhere in the template, for example:

    Can't open editor for {0}

    As it will be used in a MessageFormat.format(), the single quote
    must be doubled.

For reference about the expected syntax and quoting rules of properies
files and MessageFormat templates, see:
- http://docs.oracle.com/javase/7/docs/api/java/util/Properties.html#load(java.io.Reader)
- http://docs.oracle.com/javase/7/docs/api/java/text/MessageFormat.html

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

11 files changed, 25 insertions, 25 deletions

diff --git a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.properties b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.properties
index 72fe3c9d42..ea8e446b19 100644
--- a/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.properties
+++ b/plugins/org.eclipse.sirius.common.acceleo.mtl.ide/plugin.properties
@@ -15,4 +15,4 @@ providerName = Eclipse Modeling Project
 command.toggleAcceleoNature.name = Convert to Acceleo project
 wksJavaImportHandler.label = Java services from workspace
 
-AcceleoProposalProvider_MTL_newExpression="New Acceleo 3 expression."
\ No newline at end of file
+AcceleoProposalProvider_MTL_newExpression=New Acceleo 3 expression.
\ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.common/plugin.properties b/plugins/org.eclipse.sirius.common/plugin.properties
index 0eb47c42d1..440ce42bd9 100644
--- a/plugins/org.eclipse.sirius.common/plugin.properties
+++ b/plugins/org.eclipse.sirius.common/plugin.properties
@@ -25,7 +25,7 @@ ClassLoadingService_multipleOverridesDetected = Several overrides are contribute
 CompoundInterpreter_impossibleToCreateInterpreter = Impossible to create the interpreter {0}
 DefaultExpressionProposal_nullProposal = The proposal must not be null
 DynamicEPackageService_missingLocationAttribute = No location attribute was specified.
-DynamicPackageRegistryReader_packageConflict = Both '{0}' and '{1}' register a package for '{2}'
+DynamicPackageRegistryReader_packageConflict = Both ''{0}'' and ''{1}'' register a package for ''{2}''
 EObjectCouple_firstNull = the first eObject is null
 EObjectCouple_secondNull = the second eObject is null
 EclipseEditingDomainFactoryDescriptor_errorLoadingExtension = Error while loading the extension {0}
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/plugin.properties b/plugins/org.eclipse.sirius.diagram.sequence/plugin.properties
index 458521a6c3..097ad3a07a 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.sequence/plugin.properties
@@ -70,7 +70,7 @@ SequenceGenericToolCommandBuilder_setEndBeforeTask = Add end before variable
 SequenceGenericToolCommandBuilder_unsetEndBeforeTask = Unset end before variable
 SetMessageRangeOperation_operationName = Set Sequence Message Vertical Range
 SetVerticalRangeOperation_operationName = Set vertical range
-ShiftDirectSubExecutionsOperation_operationName = Shift sub-executions' positions by {0}
+ShiftDirectSubExecutionsOperation_operationName = Shift sub-executions'' positions by {0}
 State_invalidStateContext = Invalid context for state {0}
 State_nonStaveNode = The node does not represent an state.
 SynchronizeGraphicalOrderingOperation_operationName = Synchronize graphical ordering
diff --git a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
index 11a9cf1aeb..35b93e7f8e 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram.ui/plugin.properties
@@ -982,7 +982,7 @@ OpenDiagramCommand_saveFailedMsg = Save operation failed
 OpenMenuContribution_menuLabel = Open
 PaletteImageProvider_noIconFor = No icon is available for the tool {0}. A default icon has been set instead.
 PaletteManagerImpl_alreadyExistingEntry = An existing palette entry with name {0} already exists but it is another kind of entry.
-PaletteManagerImpl_severalCandidatesInPalette = Several {0}s with identical id '{1}' have been found in the palette. Please fix your VSM by whether set a different ID for these Palette entries or ensuring that they cannot be available in the same time.
+PaletteManagerImpl_severalCandidatesInPalette = Several {0}s with identical id ''{1}'' have been found in the palette. Please fix your VSM by whether set a different ID for these Palette entries or ensuring that they cannot be available in the same time.
 PasteFromSiriusClipboardCommand_label = Generic Paste from clipboard
 PasteLayoutAction_commandLabel = Paste Layout
 PasteLayoutAction_restoreLayoutCommandLabel = Restore layouts
@@ -1041,7 +1041,7 @@ SetLayoutingModeCommand_deactivateLabel = Deactivating Layouting mode
 SetStyleToWorkspaceImageAction_text = Set style to workspace image
 ShiftDirectBorderedNodesOperation_name = Shift bordered nodes'' positions by {0}
 SimpleImageTranscoder_svgImageTranscodingError = Error transcoding SVG image
-SimpleStyleConfiguration_iconFileNotFound = Icon file \"{0}\" not found
+SimpleStyleConfiguration_iconFileNotFound = Icon file "{0}" not found
 SiriusBaseItemSemanticEditPolicy_deleteCmdLabel = Delete element
 SiriusBaseItemSemanticEditPolicy_deleteFromDiagramCmdLabel = Delete element from diagram
 SiriusCanonicalLayoutCommand_label = Arrange Created views
@@ -1151,7 +1151,7 @@ UpdateGMFEdgeStyleCommand_label = Update GMF Edge Style
 UpdateVisibilityCommand_label = Update visibility
 ValidateActionMessage=Validate
 ValidateAction_failureMessage = Validation action failed
-ValidationFixResolution_editorOpeningError = Can't open editor for {0}
+ValidationFixResolution_editorOpeningError = Can''t open editor for {0}
 ValidationPropertySection_activatedRulesLabel = Activated rules
 ValidationPropertySection_availableRulesLabel = Available rules
 ViewOrderingProviderRegistry_viewOrderingProvider_loadingProblem = Impossible to load the view ordering provider : {0}
diff --git a/plugins/org.eclipse.sirius.diagram/plugin.properties b/plugins/org.eclipse.sirius.diagram/plugin.properties
index 7dbd78eeab..c18e5346de 100644
--- a/plugins/org.eclipse.sirius.diagram/plugin.properties
+++ b/plugins/org.eclipse.sirius.diagram/plugin.properties
@@ -162,7 +162,7 @@ AbstractDiagramCommandBuilder_refreshTaskLabel = Set RefreshEditorsPrecommitList
 AbstractNodeMappingQuery_evaluationErrorMsg = the following abstract node mapping precondition could not be correctly evaluated : {0}
 ChangeLayerActivationCommand_executeMsg = Apply layer modifications...
 ChangeLayerActivationCommand_hideLabel = Hide
-ChangeLayerActivationCommand_showLabel = Show \"{0}\" layer
+ChangeLayerActivationCommand_showLabel = Show "{0}" layer
 ContainerDropDescriptionSpec_unknownTgtMsg = Unknown drag&drop target : {0}
 ContainerMappingHelper_nodeCreationErrorMsg = Error creating nodes : domain class is not defined on a mapping
 CreateContainerTask_label = create a container
@@ -194,7 +194,7 @@ DiagramElementMappingHelper_edgeTargetMsg = The edge target {0}{1}
 DiagramElementMappingQuery_diagramRootExpressionEvaluationErrorMsg = the following diagram description root expression could not be correctly evaluated : {0}
 DiagramElementMappingQuery_mappingCandidateExpressionEvaluationErrorMsg = the following mapping semantic candidates expression could not be correctly evaluated : {0}
 DiagramIdentifier_parametersErrorMsg = semantic & descriptionName are mandatories
-DiagramMappingsManagerRegistryImpl_diagramParamErrorMsg = Parameter \"diagram\" cannot be null
+DiagramMappingsManagerRegistryImpl_diagramParamErrorMsg = Parameter "diagram" cannot be null
 DiagramTypeDescriptorRegistry_loadingErrorMsg = Error while loading the extension : {0}
 DirectEditCommandBuilder_editLabel = Edit label
 DnDTasksOperations_modelErrorMsg = Error while modifying model
@@ -224,7 +224,7 @@ ReconnectionCommandBuilder_mappingImportErrorMsg = This should not happen as IEd
 ReconnectSourceNodeCommand_commandLabel = Reconnect source node
 RefreshExtensionProviderDescriptor_instantiatingErrorMsg = Error while instantiating a provider
 RefreshSiriusElement_refreshRepresentationMsg = Refresh representation
-RepresentationExtensionDescriptionRegexConstraint_errorMsg = The representation extension description \"{0}\" uses a regular expression for viewpoint URI or for representation name, but it does not contain only style customizations.
+RepresentationExtensionDescriptionRegexConstraint_errorMsg = The representation extension description "{0}" uses a regular expression for viewpoint URI or for representation name, but it does not contain only style customizations.
 RevealAllElementsCommand_revealAllElementsLabel = Reveal all elements
 RevealDDiagramElements_revealElementLabel = Reveal element
 RevealDDiagramElements_revealElementsLabel = Reveal elements
diff --git a/plugins/org.eclipse.sirius.tree.ui/plugin.properties b/plugins/org.eclipse.sirius.tree.ui/plugin.properties
index 98d9503fcc..c6acfaf3a5 100644
--- a/plugins/org.eclipse.sirius.tree.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.tree.ui/plugin.properties
@@ -16,7 +16,7 @@ DTreeEditor_treeModelUnsaved = This tree was not saved. You can close the editor
 DTreeItemDropListener_ambigousDropWarning = There are more than one drop description that match the dropped element : {0} ({1} and {2}).
 DTreeItemDropListener_dragAndDropCommand = Drag And Drop
 DTreeItemEditingSupport_directEditCommand = Direct Edit on {0}
-DTreeItemLabelProvider_iconFileNotFound=Icon file \"{0}\" not found
+DTreeItemLabelProvider_iconFileNotFound=Icon file "{0}" not found
 DTreeMenuListener_new = New
 DTreeMenuListener_open = Open
 DeleteTreeItemsAction_deleteTargetSemanticElement = Delete the target semantic element
diff --git a/plugins/org.eclipse.sirius.tree/plugin.properties b/plugins/org.eclipse.sirius.tree/plugin.properties
index 007787b275..a52a0913cb 100644
--- a/plugins/org.eclipse.sirius.tree/plugin.properties
+++ b/plugins/org.eclipse.sirius.tree/plugin.properties
@@ -12,8 +12,8 @@
 pluginName = Sirius Tree Model
 providerName = Eclipse Modeling Project
 
-DTreeItemExpansionChangeCommand_collapseItem = Collapse \"{0}\" tree item
-DTreeItemExpansionChangeCommand_expandItem = Expand \"{0}\" tree item
+DTreeItemExpansionChangeCommand_collapseItem = Collapse "{0}" tree item
+DTreeItemExpansionChangeCommand_expandItem = Expand "{0}" tree item
 DTreeItemLocalRefreshCommand_refreshLocally = Refresh locally tree
 DTreeItemUserInteraction_treeItemExpanding = Tree item expanding
 DTreeRefresh_noMapping = no mapping to set
diff --git a/plugins/org.eclipse.sirius.ui/plugin.properties b/plugins/org.eclipse.sirius.ui/plugin.properties
index 14edacaadd..7eb35b6aae 100644
--- a/plugins/org.eclipse.sirius.ui/plugin.properties
+++ b/plugins/org.eclipse.sirius.ui/plugin.properties
@@ -19,7 +19,7 @@ AbstractCreateRepresentationFromRepresentationCreationDescription_creationError_
 AbstractCreateRepresentationFromRepresentationCreationDescription_defaultName = new {0}
 AbstractDTreeEditor_eclipseWindowTitle = {0} - Eclipse Platform
 AbstractDTreeEditor_modelerDescriptionFilesLoadedJob = Refresh
-AbstractDTreeEditor_noSessionError = "a DSemanticDecorator must be owned by a Session {0}
+AbstractDTreeEditor_noSessionError = a DSemanticDecorator must be owned by a Session {0}
 AbstractExportRepresentationsAction_cancelled = Cancelled
 AbstractExportRepresentationsAction_error = Error
 AbstractExportRepresentationsAsImagesDialog_accessError = Access to path is impossible
@@ -168,7 +168,7 @@ Messages_createRepresentationInputDialog_RepresentationDescriptionLabel=Represen
 Messages_createRepresentationInputDialog_Title=New Representation
 ModelingModelProvider_addAnotherRepresentationFile = Add another representations file to "{0}" may invalidate it.
 ModelingModelProvider_addAnotherRepresentationFileSeveralProjects = Add another representations file to {0} may invalidate them.
-ModelingModelProvider_mainRepresentationFileDeleted = Deletion of the main representations file of \"{0}\" will invalidate it.
+ModelingModelProvider_mainRepresentationFileDeleted = Deletion of the main representations file of "{0}" will invalidate it.
 ModelingModelProvider_mainRepresentationFilesOfSomeProjectsDeleted = Deletion of the main representations files of some modeling projects ({0}) will invalidate them.
 ModelingModelProvider_satusUnsaveDataWillBeLostWithProjectNames = Some modeling projects ({0}) contain unsaved data. This data will be lost.
 ModelingModelProvider_satusUnsavedDataWillBeLost = This modeling project contains unsaved data. This data will be lost.
@@ -219,7 +219,7 @@ RenameRepresentationAction_name = Rename
 RepresentationFilesRepairAction_repairError = Repair error
 RepresentationFilesRepairAction_repairFailed = Could not run repair process.
 RepresentationFilesRepairAction_repairInterrupted = Repair interrupted
-RepresentationFilesRepairValidator_askContinue = "Do you want to continue?
+RepresentationFilesRepairValidator_askContinue = Do you want to continue?
 RepresentationFilesRepairValidator_askSave = Save changes?
 RepresentationFilesRepairValidator_confirmationDialogTitle = Repair confirmation
 RepresentationFilesRepairValidator_launchImpossibleRepresentationsOpened = It''s impossible to launch the "{0}" action with opened representations file. So they will be closed before the repair process.
@@ -227,13 +227,13 @@ RepresentationFilesRepairValidator_migrationCanceled = Migration canceled by use
 RepresentationFilesRepairValidator_repairActionLabel = Repair
 RepresentationFilesRepairValidator_representationFileModified = The following representations file has been modified:
 RepresentationFilesRepairValidator_representationFilesModified =  The following representations files have been modified: 
-RepresentationSelectionWizardPage_errorReadonlyContainer = The representation container is read only.\r\n Please select another representation type.
+RepresentationSelectionWizardPage_errorReadonlyContainer = The representation container is read only.\n Please select another representation type.
 RepresentationSelectionWizardPage_message = Select a representation type
 RepresentationSelectionWizardPage_title = Create a new representation
 RepresentationsSelectionDialog_shellTitle = Startup representations
 RepresentationsSelectionWizardPage_message = Select Representations to export
 RepresentationsSelectionWizardPage_pageTitle = Selection of representations to export
-RepresentationsSelectionWizardPage_readOnlyContainerError = The representation container is read only.\r\n Please select another representation.
+RepresentationsSelectionWizardPage_readOnlyContainerError = The representation container is read only.\n Please select another representation.
 RepresentationsSelectionWizardPage_unknownCodeError = Unknown code result
 ResourcesFolderItemImpl_text = Representations per resource
 RestoreToLastSavePointListener_errorModifiedResourcesReloaded = {0} modified resources were reloaded. An error occurs while attempting to cancel all modifications.
diff --git a/plugins/org.eclipse.sirius/plugin.properties b/plugins/org.eclipse.sirius/plugin.properties
index 7344025f37..5546bd16fa 100644
--- a/plugins/org.eclipse.sirius/plugin.properties
+++ b/plugins/org.eclipse.sirius/plugin.properties
@@ -97,8 +97,8 @@ CreateInstanceTask_creationErrorMsg = Impossible to create a {0}
 CreateInstanceTask_label = Create a new instance
 CreateRepresentationCommand_label = Create representation
 CreateRepresentationCommand_nullExpresionWarningMsg = Browse expression {0} evaluated to null.
-DAnalysisSelectorService_multipleDefaultErrorMsg = Multiple default analysis selector providers found at extension point \"%s\": took only the first found.
-DAnalysisSelectorService_noDefaultWaringMsg = No default analysis selector provider found at extension point \"%s\", using the DefaultAnalysisSelectorProvider instead.
+DAnalysisSelectorService_multipleDefaultErrorMsg = Multiple default analysis selector providers found at extension point "{0}": took only the first found.
+DAnalysisSelectorService_noDefaultWarningMsg = No default analysis selector provider found at extension point "{0}", using the DefaultAnalysisSelectorProvider instead.
 DAnalysisSessionImpl_addNoParentAnalysisErrorMsg = Cant add a referenced analysis if no parent analysis exists
 DAnalysisSessionImpl_addSemanticErrorMsg = A representation file cannot be added as semantic resource.
 DAnalysisSessionImpl_addSemanticResourceMsg = Semantic resource addition : {0}
@@ -137,13 +137,13 @@ EReferenceCustomizationReferenceNameCommonToAppliedOnConstraint_EReferenceNameOn
 EReferenceCustomizationReferenceNameCommonToAppliedOnConstraint_validationNotExistErrorMsg = {0} EReference name on {1} doesn''t exists
 EReferenceCustomizationReferenceNameCommonToAppliedOnConstraint_notAReferenceErrorMsg = {0} EReference name on {1} concerns {2} which is not a EReference
 EditingDomainUndoContext_label = Affected Editing Domain
-ElementsToSelectTask_errorMsg = the following \"Elements To Select\" expression could not be correctly evaluated : {0}
+ElementsToSelectTask_errorMsg = the following "Elements To Select" expression could not be correctly evaluated : {0}
 ElementsToSelectTask_label = Get result of Elements To Select interpreted expression
 EmptyAppliedOnListConstraint_errorMsg = This customization has no style to customize.
 TaskExecutor_errorModifyingModelMsg = Error while modifying model
 ExecuteToolOperationTask_label = the main tool operation task
 ExternalJavaActionDescriptor_actionCreationErrorMsg = Impossible to create the action {0}
-ExternalJavaActionTask_label = Execute external java action \"{0}\"
+ExternalJavaActionTask_label = Execute external java action "{0}"
 FeatureContributor_targetObject = Target object
 FeatureContributor_sourceObject = Source object
 FeatureContributor_featureMissingMsg = {0} ({1}) does not have feature {2}
@@ -184,8 +184,8 @@ MigrationUtil_loadingMsg = Loading File
 MigrationUtil_IOErrorMsg = I/O Error
 MigrationUtil_invalidMappingErrorMsg = the mapping is not valid
 ModelingProject_getMainRepFileURIMsg = Get main representations resource URI
-ModelingProjectQuery_severalRepresentationsFiles = Found {0} main representations files (that means not referenced by another) in \"{1}\": {2}. A modeling project must contain only one.
-ModelingProjectQuery_mustContainOneRepFileMsg = Zero representations file found in \"{0}\". A modeling project must contain one.
+ModelingProjectQuery_severalRepresentationsFiles = Found {0} main representations files (that means not referenced by another) in "{1}": {2}. A modeling project must contain only one.
+ModelingProjectQuery_mustContainOneRepFileMsg = Zero representations file found in "{0}". A modeling project must contain one.
 ModelingProjectQuery_and =  and 
 MoveElementInListAction_notAMemberErrorMsg = 'element' parameter is not a member of the designated list.
 MoveElementInListAction_predecessorParameterErrorMsg = 'predecessor' parameter is not a member of the designated list.
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/danalysis/DAnalysisSelectorService.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/danalysis/DAnalysisSelectorService.java
index 8eb1ea612b..0a47b3bd6f 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/danalysis/DAnalysisSelectorService.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/session/danalysis/DAnalysisSelectorService.java
@@ -102,7 +102,7 @@ public final class DAnalysisSelectorService {
         Map<String, Collection<DAnalysisSelectorProvider>> providers = EclipseUtil.getExtensionPluginsByKey(DAnalysisSelectorProvider.class, ID, CLASS_ATTRIBUTE, "id"); //$NON-NLS-1$
         Collection<DAnalysisSelectorProvider> defaults = providers.get(DAnalysisSelectorService.DEFAULT_PROVIDER_ID);
         if (defaults == null || defaults.isEmpty()) {
-            SiriusPlugin.getDefault().warning(MessageFormat.format(Messages.DAnalysisSelectorService_noDefaultWaringMsg, ID), null);
+            SiriusPlugin.getDefault().warning(MessageFormat.format(Messages.DAnalysisSelectorService_noDefaultWarningMsg, ID), null);
             defaultSiriusProvider = new DefaultAnalysisSelectorProvider();
         } else if (defaultSiriusProvider == null) {
             defaultSiriusProvider = defaults.iterator().next();
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/Messages.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/Messages.java
index f17f868695..34867c4a20 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/Messages.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/viewpoint/Messages.java
@@ -120,7 +120,7 @@ public final class Messages {
     public static String DAnalysisSelectorService_multipleDefaultErrorMsg;
 
     @TranslatableMessage
-    public static String DAnalysisSelectorService_noDefaultWaringMsg;
+    public static String DAnalysisSelectorService_noDefaultWarningMsg;
 
     @TranslatableMessage
     public static String DAnalysisSessionImpl_addNoParentAnalysisErrorMsg;