diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/CvsBundle.properties b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/CvsBundle.properties index e247c7ab6c08..2b704c3ddbe9 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/CvsBundle.properties +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/CvsBundle.properties @@ -216,7 +216,7 @@ button.text.skip=Skip button.text.get=Get button.text.skip.all=Skip All button.text.get.all=Get All -label.default.update.branch=Default +label.default.update.branch=D&efault confirmation.clean.copy='Clean copy' option was enabled and your changes will be replaced. Are you sure you want to perform update with this option? confirmation.title.clean.copy=Clean Copy Confirmation dialog.title.watchers.or.editors.settings={0} Settings @@ -326,8 +326,9 @@ radio.corrupted.project.files.skip.all.silently=Skip all silently radio.corrupted.project.files.show.this.dialog=Show this dialog label.corrupted.project.files.in.the.future=In the future: label.corrupted.project.files.description=Project file c:/test/test.ipr
cannot be merged without conflict.
Click 'Skip' to skip all changes in repository for this file.
Click 'Get' to skip local changes and get repository version for this file.
Click 'Skip All' to skip +checkbox.update.options.clean.copy.m=&Clean copy (-C) checkbo.update.options.clean.copy=Clean copy (-C) -checkbo.update.options.create.new.directories=Create new &directories (-d) +checkbo.update.options.create.new.directories=Create new d&irectories (-d) checkbo.update.options.prune.empty.directories=&Prune empty directories (-P) checkbo.update.options.reset.sticky.data=Reset sticky d&ata (-A) radio.update.options.merge.two.branches=Merge &two branches (-j -j) @@ -337,7 +338,7 @@ label.add.watching.watching.actions=Watching actions: radio.select.tag.head.revision=&HEAD revision radio.select.tag.by.date=By &date (-D) radio.select.tag.by.tag=By tag (-&r) -checkbox.change.keyword.substitution.to=Change keyword substitution to +checkbox.change.keyword.substitution.to=Change &keyword substitution to label.directories.under.cvs.were.not.deleted.in.order.to.preserve.cvs.information=Directories under CVS were not deleted in order to preserve CVS information checkbox.import.options.make.checked.out.files.read.only=Make checked out files read-&only checkbox.import.options.checkout.after.import=Checkout &after import @@ -459,6 +460,5 @@ operation.name.annotate=Annotate switched.tag.format=tag {0} switched.date.format=date {0} switched.revision.format=revision {0} -checkbox.update.options.clean.copy.m=&Clean copy (-C) changelist.column.branch=Branch annotation.tooltip=Revision: {0} Date: {1}\nAuthor: {2}\n\n{3}