Skip to main content
summaryrefslogtreecommitdiffstats
blob: b7b2c680f125800393cb943bc2d87868a91e0132 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
################################################################################
# Copyright (c) 2012, 2013 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
################################################################################
## ! note ! double the apostrophes if you need one in the printed String
EMFSynchronizationModel.resolving = Creating EMF Synchronization Model
EMFSynchronizationModel.minimizing = Minimizing synchronization model
EMFSynchronizationModel.creatingScope = Creating comparison scope

ModelResolverRegistry.invalidResolver = Model resolver class ''{0}'' could not be instantiated.
ModelResolverRegistry.invalidRanking = Ranking of resolver ''{0}'' was not a valid integer : ''{1}''.

ModelResolver.coherenceWarning = Some models were accessible from multiple compared files and have been removed from the scope. This could break their references to the compared models as a result of merge operations.

resource.not.serializable = Resource is not serializable.

save.model.tooltip = Save Comparison Model
next.diff.tooltip = Next Difference
previous.diff.tooltip = Previous Difference
accept.change.tooltip = Accept Change
accept.all.changes.tooltip = Accept All Non-Conflicting Changes
reject.change.tooltip = Reject Change
reject.all.changes.tooltip = Reject All Non-Conflicting Changes
merged.to.left.tooltip = Copy Current Change From Right To Left
merged.to.right.tooltip = Copy Current Change From Left To Right
merged.all.to.left.tooltip = Copy All Non-Conflicting Changes From Right To Left
merged.all.to.right.tooltip = Copy All Non-Conflicting Changes From Left To Right
dropdown.left.to.right.tooltip = Show consequences of merging from left to right
dropdown.right.to.left.tooltip = Show consequences of merging from right to left
dropdown.accept.tooltip = Show consequences of accepting change
dropdown.reject.tooltip = Show consequences of rejecting change

undo.menu.item.text = Merge
redo.menu.item.text = Merge

CompareSelfWithAncestor = Cannot run a comparison between an object and one of its ancestors.

Back to the top