diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties index 07b8e9a15..503681418 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties @@ -69,6 +69,7 @@ CVSCatchupReleaseViewer.workspaceFile=Workspace file: {0} CVSCatchupReleaseViewer.showInHistory=Show in Resource History CVSCatchupReleaseViewer.fileDecoration={0} ({1}) CVSCatchupReleaseViewer.folderDecoration={0} {1} +CVSCatchupReleaseViewer.confirmMerge=C&onfirm Merge CVSCompareEditorInput.branchLabel=<branch-{0}> CVSCompareEditorInput.headLabel=<HEAD> @@ -190,6 +191,12 @@ CVSRepositoryLocationPropertySource.port=Port CVSRepositoryLocationPropertySource.root=Root CVSRepositoryLocationPropertySource.method=Connection Method +CVSSyncCompareInput.confirmMergeMessageTitle=Information +CVSSyncCompareInput.confirmMergeMessage=Your changes have been saved. You can continue merging the file \ + and saving the changes. When when you are finished \ + select it from the Structure Compare and select 'Confirm Merge' to make this \ + file an outgoing change. + CheckoutAsAction.checkoutFailed=Problems encountered performing checkout CheckoutAsAction.enterProjectTitle=Check Out {0} As... CheckoutAsAction.taskname=Checking out "{0}" from CVS as "{1}" |