This commit is contained in:
Bas Leijdekkers
2011-10-14 14:55:08 +02:00
parent 9b2d7ce85c
commit 590aafc160
4 changed files with 0 additions and 4 deletions
@@ -327,7 +327,6 @@ 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=<html>Project file c:/test/test.ipr<br>cannot be merged without conflict.<br>Click 'Skip' to skip all changes in repository for this file.<br>Click 'Get' to skip local changes and get repository version for this file.<br>Click 'Skip All' to skip</html>
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 d&irectories (-d)
checkbo.update.options.prune.empty.directories=&Prune empty directories (-P)
checkbo.update.options.reset.sticky.data=Reset sticky d&ata (-A)
@@ -80,7 +80,6 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<label resource-bundle="com/intellij/cvsSupport2/CvsBundle" key="checkbox.use.read.only.flag.for.not.edited.files"/>
<text resource-bundle="com/intellij/cvsSupport2/CvsBundle" key="checkbox.use.read.only.flag.for.not.edited.files"/>
</properties>
</component>
@@ -74,7 +74,6 @@
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0"/>
</constraints>
<properties>
<label resource-bundle="com/intellij/cvsSupport2/CvsBundle" key="checkbox.create.tag.override.existing"/>
<text resource-bundle="com/intellij/cvsSupport2/CvsBundle" key="checkbox.create.tag.override.existing"/>
</properties>
</component>
@@ -159,7 +159,6 @@
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<label resource-bundle="com/intellij/cvsSupport2/CvsBundle" key="checkbo.update.options.clean.copy"/>
<text resource-bundle="com/intellij/cvsSupport2/CvsBundle" key="checkbox.update.options.clean.copy.m"/>
</properties>
</component>