Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 2197-ProfileOptionsPanel

This commit is contained in:
William Schaefer 2017-01-20 14:27:13 -05:00
commit a9c858a3d8

View File

@ -68,7 +68,7 @@ import org.sleuthkit.datamodel.TskData;
"PhotoRecIngestModule.PermissionsNotSufficient=Insufficient permissions accessing", "PhotoRecIngestModule.PermissionsNotSufficient=Insufficient permissions accessing",
"PhotoRecIngestModule.PermissionsNotSufficientSeeReference=See 'Shared Drive Authentication' in Autopsy help.", "PhotoRecIngestModule.PermissionsNotSufficientSeeReference=See 'Shared Drive Authentication' in Autopsy help.",
"# {0} - output directory name", "cannotCreateOutputDir.message=Unable to create output directory: {0}.", "# {0} - output directory name", "cannotCreateOutputDir.message=Unable to create output directory: {0}.",
"unallocatedSpaceProcessingSettingsError.message=The selected filter ignores unallocated space. The PhotoRec module is designed to carve unallocated space. Either choose a filter which does process unallocated space or disable this module.", "unallocatedSpaceProcessingSettingsError.message=The selected file ingest filter ignores unallocated space. This module carves unallocated space. Please choose a filter which does not ignore unallocated space or disable this module.",
"unsupportedOS.message=PhotoRec module is supported on Windows platforms only.", "unsupportedOS.message=PhotoRec module is supported on Windows platforms only.",
"missingExecutable.message=Unable to locate PhotoRec executable.", "missingExecutable.message=Unable to locate PhotoRec executable.",
"cannotRunExecutable.message=Unable to execute PhotoRec.", "cannotRunExecutable.message=Unable to execute PhotoRec.",