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 | 14 |
1 files changed, 8 insertions, 6 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 4722d6c86..b24b106fc 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 @@ -999,8 +999,8 @@ TagFromRepository.taskName=Tagging from repository 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... +ReplaceOperation.taskName=Performing a CVS Replace operation +UpdateOperation.taskName=Performing a CVS Update operation 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. @@ -1011,11 +1011,11 @@ SafeUpdateAction.warnFilesWithConflictsDescription=Some conflicting files cannot Error.unableToShowSyncView=Error opening Synchronize View. Please ensure that the Team plugin is installed correctly. ShowAnnotationAction.1=Unexpected response from CVS Server: {0} -CVSSubscriberAction.jobName=Performing CVS operation on {0} resources. -UpdateAction.jobName=Performing CVS update on {0} resources. -MergeUpdateAction.jobName=Performing CVS merge on {0} resources. +UpdateAction.jobName=Performing a CVS Update on {0} resources. +MergeUpdateAction.jobName=Performing a CVS Merge on {0} resources. MergeUpdateAction.invalidSubscriber=Invalid subscriber: {0} -CommitAction.jobName=Performing CVS commit on {0} resources. +CommitAction.jobName=Performing a CVS Commit on {0} resources. +OverrideAndUpdateAction.jobName=Performing CVS Override and Update on {0} resources. WorkInProgressPreferencePage.0=CVS Work In Progress WorkInProgressPreferencePage.1=Preferences for enabling features that are not complete: WorkInProgressPreferencePage.2=Enable background fetching of resources in the CVS Repositories view @@ -1047,3 +1047,5 @@ MergeSynchronizeParticipant.10=Missing root nodes in cvs merge subscriber mement MergeSynchronizeParticipant.11=Root resource in cvs merge subscriber is no longer in workspace, ignoring: {0} MergeSynchronizeParticipant.12=Missing root resources for cvs merge subscriber: {0} DisconnectOperation.0=Disconnecting +SubscriberConfirmMergedAction.0=Synchronization information is missing for resource {0} +SubscriberConfirmMergedAction.jobName=Performing a CVS Mark as Merged operation on {0} resources. |