diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties index ae5d54c223..79a136db80 100644 --- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties +++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/messages/messages.properties @@ -96,6 +96,8 @@ CloseViewAction.1=Close the CDO view CloseViewAction.2=You have uncommitted changes. Do you want to discard them? CommitTransactionAction.0=Commit CommitTransactionAction.1=Commit this transaction +MergeConflictsAction.0=Merge Conflicts +MergeConflictsAction.1=Automatically merge conflicts when they occur CreateBranchAction.0=Create Branch CreateBranchAction.1=Create a new branch DisableViewDurabilityAction.0=Make Not Durable |