Merge pull request #1479 from rcordovano/res-bundle-fix

Fix faulty merge conflict resolution
This commit is contained in:
Richard Cordovano 2015-07-31 07:33:00 -04:00
commit 035d53345a

View File

@ -252,4 +252,8 @@ SingleUserCaseImporter.PotentiallyNonUniqueDatabaseName=Unclear if database name
SingleUserCaseImporter.ConvertedToMultiUser=This case was converted to a Multi-user collaborative case on
SingleUserCaseImporter.UnableToCopySourceImages=Unable to copy source images
SingleUserCaseImporter.ConversionSuccessful=. Conversion successful:
SingleUserCaseImporter.DeletingCase=Deleting original case folder
SingleUserCaseImporter.DeletingCase=Deleting original case folder
NewCaseVisualPanel1.caseParentDirWarningLabel.text=Case directory warning label
NewCaseVisualPanel1.multiUserCaseRadioButton.text=Multi-user
NewCaseVisualPanel1.singleUserCaseRadioButton.text=Single-user
NewCaseVisualPanel1.multiUserSettingsWarningLabel.text=Multi-user settings warning label