Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
alexjacks92 2014-01-23 11:29:28 -05:00
commit c1c9075241

View File

@ -16,4 +16,4 @@ FileExtMismatchConfigPanel.mimeRemoveErrLabel.text=\
FileExtMismatchConfigPanel.extRemoveErrLabel.text=\
FileExtMismatchConfigPanel.saveMsgLabel.text=\
FileExtMismatchSimpleConfigPanel.skipNoExtCheckBox.text=Skip Files Without Extensions
FileExtMismatchSimpleConfigPanel.SkipTextPlain.text=Skip text/plain MIME type
FileExtMismatchSimpleConfigPanel.skipTextPlain.text=Skip text/plain MIME type