Merge pull request #5559 from wschaeferB/UpdateMergedFiles

Update merged files which were missed when message was changed

Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED

@@ -304,9 +304,6 @@ OpenReportAction.actionPerformed.ReportFileOpenPermissionDeniedMessage=Permissio
 PoolNode.createSheet.name.desc=no description
 PoolNode.createSheet.name.displayName=Name
 PoolNode.createSheet.name.name=Name
-PoolNode.createSheet.offset.desc=no description
-PoolNode.createSheet.offset.displayName=Starting offset
-PoolNode.createSheet.offset.name=Starting offset
 PoolNode.createSheet.type.desc=no description
 PoolNode.createSheet.type.displayName=Type
 PoolNode.createSheet.type.name=Type

Core/src/org/sleuthkit/autopsy/modules/plaso/Bundle.properties-MERGED

@@ -3,7 +3,7 @@ PlasoIngestModule.artifact.progress=Adding events to case: {0}
 PlasoIngestModule.bad.imageFile=Cannot find image file name and path
 PlasoIngestModule.completed=Plaso Processing Completed
 PlasoIngestModule.create.artifacts.cancelled=Cancelled Plaso Artifact Creation 
-PlasoIngestModule.dataSource.not.an.image=Datasource is not an Image.
+PlasoIngestModule.dataSource.not.an.image=Skipping non-disk image datasource
 PlasoIngestModule.error.creating.output.dir=Error creating Plaso module output directory.
 PlasoIngestModule.error.running.log2timeline=Error running log2timeline, see log file.
 PlasoIngestModule.error.running.psort=Error running Psort, see log file.
@@ -11,7 +11,7 @@ PlasoIngestModule.event.datetime=Event Date Time
 PlasoIngestModule.event.description=Event Description
 PlasoIngestModule.exception.posting.artifact=Exception Posting artifact.
 PlasoIngestModule.executable.not.found=Plaso Executable Not Found.
-PlasoIngestModule.has.run=Plaso Plugin has been run.
+PlasoIngestModule.has.run=Plaso
 PlasoIngestModule.info.empty.database=Plaso database was empty.
 PlasoIngestModule.log2timeline.cancelled=Log2timeline run was canceled
 PlasoIngestModule.psort.cancelled=psort run was canceled