diff options
author | Karla Rubio | 2014-01-30 09:56:40 +0000 |
---|---|---|
committer | Mikaƫl Barbero | 2014-01-30 13:02:04 +0000 |
commit | f03564974688d6efe98d66b4f8a793cf12c1580e (patch) | |
tree | 9dd3c2498507b9de967418e95a11fc5cbadf0664 | |
parent | 986c42ed706a0463c1cd1719e0118d11bdfe7b76 (diff) | |
download | org.eclipse.emf.compare-f03564974688d6efe98d66b4f8a793cf12c1580e.tar.gz org.eclipse.emf.compare-f03564974688d6efe98d66b4f8a793cf12c1580e.tar.xz org.eclipse.emf.compare-f03564974688d6efe98d66b4f8a793cf12c1580e.zip |
[426871] Externalize plugin.xml strings for
org.eclipse.emf.compare.ide.ui and
org.eclipse.emf.compare.rcp.ui
Change-Id: Ifacdd944266ac5ef714837943c579455835b8228
Signed-off-by: Karla Rubio <karla.rubiosopan@servexternos.isban.es>
Conflicts:
plugins/org.eclipse.emf.compare.ide.ui/plugin.properties
plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml
4 files changed, 28 insertions, 13 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/plugin.properties b/plugins/org.eclipse.emf.compare.ide.ui/plugin.properties index c87ce892d..4ee0dbeb6 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/plugin.properties +++ b/plugins/org.eclipse.emf.compare.ide.ui/plugin.properties @@ -14,3 +14,10 @@ providerName = Eclipse Modeling Project save.model.label = Save Comparison Model save.model.tooltip = Save Comparison Model save.model.command.name = EMF Compare Save Comparison Model +emf.compare.structure.merge.viewer = EMFCompare Structure Merge Viewer +model.compare.containment.feature = Model Compare (Containment Features) +model.compare.non.containment.feature = Model Compare (Non Containment Feature) +model.compare.text.feature = Model Compare (Text Feature) +command.each.other.in.dialog = Each Other <EObject> (in Dialog) +command.each.other.in.editor = Each Other <EObject> (in Editor) +compare.with.label = Compare With
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml b/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml index e3bfcbe67..6d724b4ed 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml +++ b/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml @@ -20,7 +20,7 @@ class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.EMFCompareStructureMergeViewerCreator" extensions="NODE_TYPE__EMF_EOBJECT,NODE_TYPE__EMF_RESOURCE,NODE_TYPE__EMF_RESOURCESET,NODE_TYPE__EMF_COMPARISON" id="org.eclipse.emf.compare.ide.ui.internal.structureMergeViewer" - label="EMFCompare Structure Merge Viewer"> + label="%emf.compare.structure.merge.viewer"> </viewer> <contentTypeBinding contentTypeId="org.eclipse.emf.ecore.xmi" @@ -37,19 +37,19 @@ class="org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.tree.TreeContentMergeViewerCreator" extensions="org.eclipse.emf.compare.rcp.ui.eTreeDiff,org.eclipse.emf.compare.rcp.ui.eMatch,org.eclipse.emf.compare.rcp.ui.eResourceDiff" id="org.eclipse.emf.compare.ide.ui.internal.EObjectContentMergeViewer" - label="Model Compare (Containment Features)"> + label="%model.compare.containment.feature"> </viewer> <viewer class="org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.table.TableContentMergeViewerCreator" extensions="org.eclipse.emf.compare.rcp.ui.eListDiff" id="org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.EObjectListContentMergeViewer" - label="Model Compare (Non Containment Feature)"> + label="%model.compare.non.contaiment.feature"> </viewer> <viewer class="org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.text.EMFCompareTextMergeViewerCreator" extensions="org.eclipse.emf.compare.rcp.ui.eTextDiff" id="org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.text.EMFCompareTextContentMergeViewer" - label="Model Compare (Text Feature)"> + label="%model.compare.text.feature"> </viewer> <contentTypeBinding contentTypeId="org.eclipse.emf.ecore.xmi" @@ -75,7 +75,7 @@ locationURI="popup:compareWithMenu?after=compareWithGroup"> <command commandId="org.eclipse.emf.compare.ide.ui.compareInDialog" - label="Each Other <EObject> (in Dialog)" + label="%command.each.other.in.dialog" style="push"> <visibleWhen checkEnabled="true"> @@ -83,7 +83,7 @@ </command> <command commandId="org.eclipse.emf.compare.ide.ui.compareInEditor" - label="Each Other <EObject> (in Editor)" + label="%command.each.other.in.editor" style="push"> <visibleWhen checkEnabled="true"> @@ -95,7 +95,7 @@ locationURI="popup:org.eclipse.ui.popup.any"> <menu id="compareWithMenu" - label="Compare With"> + label="%compare.with.label"> <separator name="compareWithGroup"> </separator> diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/plugin.properties b/plugins/org.eclipse.emf.compare.rcp.ui/plugin.properties index d488822c2..e20a38042 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/plugin.properties +++ b/plugins/org.eclipse.emf.compare.rcp.ui/plugin.properties @@ -10,3 +10,11 @@ ################################################################################ pluginName = EMF Compare RCP UI providerName = Eclipse Modeling Project +emf.compare.no.group = No Group +emf.compare.kind.groups = By Kind +emf.compare.side.groups = By Side +emf.compare.resource.group = By Resource +emf.compare.empty.resource.mappings.filter = Empty resource mappings +emf.compare.pseudo.conflicts.differences.filter = Pseudo conflicts differences +emf.compare.identical.elements.filter = Identical elements +emf.compare.cascading.differences.filter = Cascading differences
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml b/plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml index c5fd059b1..0c1baa3f9 100644 --- a/plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml +++ b/plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml @@ -21,12 +21,12 @@ <group activeByDefault="false" class="org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl.KindGroupProvider" - label="By Kind"> + label="%emf.compare.kind.groups"> </group> <group activeByDefault="true" class="org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl.ThreeWayComparisonGroupProvider" - label="By Side"> + label="%emf.compare.side.groups"> </group> </extension> <extension @@ -34,22 +34,22 @@ <filter activeByDefault="true" class="org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.impl.EmptyMatchedResourcesFilter" - label="Empty resource mappings"> + label="%emf.compare.empty.resource.mappings.filter"> </filter> <filter activeByDefault="true" class="org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.impl.PseudoConflictsFilter" - label="Pseudo conflicts differences"> + label="%emf.compare.pseudo.conflicts.differences.filter"> </filter> <filter activeByDefault="true" class="org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.impl.IdenticalElementsFilter" - label="Identical elements"> + label="%emf.compare.identical.elements.filter"> </filter> <filter activeByDefault="true" class="org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.impl.CascadingDifferencesFilter" - label="Cascading differences"> + label="%emf.compare.cascading.differences.filter"> </filter> </extension> <extension |