Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/plugin.properties')
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/plugin.properties42
1 files changed, 42 insertions, 0 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..a9c88e240 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.compare.ide.ui/plugin.properties
@@ -14,3 +14,45 @@ 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
+
+next.diff = Next Difference
+next.diff.tooltip = Next Difference
+next.diff.command.name = EMF Compare Next Difference
+
+previous.diff = Previous Difference
+previous.diff.tooltip = Previous Difference
+previous.diff.command.name = EMF Compare Previous Difference
+
+accept.change = Accept Change
+accept.change.tooltip = Accept Change
+accept.change.command.name = EMF Compare Accept Change
+
+accept.all.changes = Accept All Non-Conflicting Changes
+accept.all.changes.tooltip = Accept All Non-Conflicting Changes
+accept.all.changes.command.name = EMF Compare Accept All Non-Conflicting Changes
+
+reject.change = Reject Change
+reject.change.tooltip = Reject Change
+reject.change.command.name = EMF Compare Reject Change
+
+reject.all.changes = Reject All Non-Conflicting Changes
+reject.all.changes.tooltip = Reject All Non-Conflicting Changes
+reject.all.changes.command.name = EMF Compare Reject All Non-Conflicting Changes
+
+merged.to.left = Copy Current Change To Left
+merged.to.left.tooltip = Copy Current Change From Right To Left
+merged.to.left.command.name = EMF Compare Copy Current Change To Left
+
+merged.to.right = Copy Current Change To Right
+merged.to.right.tooltip = Copy Current Change From Left To Right
+merged.to.right.command.name = EMF Compare Copy Current Change To Right
+
+merged.all.to.left = Copy All Non-Conflicting Changes To Left
+merged.all.to.left.tooltip = Copy All Non-Conflicting Changes From Right To Left
+merged.all.to.left.command.name = EMF Compare Copy All Non-Conflicting Changes To Left
+
+merged.all.to.right = Copy All Non-Conflicting Changes To Right
+merged.all.to.right.tooltip = Copy All Non-Conflicting Changes From Left To Right
+merged.all.to.right.command.name = EMF Compare Copy All Non-Conflicting Changes To Right
+
+dropdown.tooltip = Select the way of merge

Back to the top