diff options
| author | Michael Valenta | 2003-08-20 16:20:28 +0000 |
|---|---|---|
| committer | Michael Valenta | 2003-08-20 16:20:28 +0000 |
| commit | f06692cf778294c9d0974afe5d78e51cf11134af (patch) | |
| tree | 59ffc603e715000371ba667feafbeceae62612a4 /bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties | |
| parent | fcc2f3f563ae61d65f1af4924b2ddfe80d9817d4 (diff) | |
| download | eclipse.platform.team-f06692cf778294c9d0974afe5d78e51cf11134af.tar.gz eclipse.platform.team-f06692cf778294c9d0974afe5d78e51cf11134af.tar.xz eclipse.platform.team-f06692cf778294c9d0974afe5d78e51cf11134af.zip | |
41440: CVS Session and Connection classes must be made thread safeRoot_branch_CVSQuickDiffProvider
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 | 4 |
1 files changed, 4 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 8121e91da..e784af54f 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 @@ -1009,6 +1009,10 @@ UpdateOnlyMergeable.taskName=Updating mergeable changes UpdateDialog.overwriteTitle=Overwrite Local Changes? UpdateDialog.overwriteMessage=Some conflicting files cannot be merged automatically with the update action. Should these resources be updated, overwriting any local changes? ReplaceOperation.taskName=Replacing... +UpdateOperation.taskName=Updating... + +SafeUpdateAction.warnFilesWithConflictsTitle=Non-mergeable files +SafeUpdateAction.warnFilesWithConflictsDescription=Some conflicting files cannot be merged automatically with the update action. They contain conflicting changes that will have to be merged manually. Use the Synchronize View to find the conflicts then merge the changes in a compare editor. SafeUpdateAction.warnFilesWithConflictsTitle=Non-mergeable files SafeUpdateAction.warnFilesWithConflictsDescription=Some conflicting files cannot be merged automatically with the update action. They contain conflicting changes that will have to be merged manually. Use the Synchronize View to find the conflicts then merge the changes in a compare editor. |