Update bundle.properties-MERGED files

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED

@@ -89,6 +89,10 @@ AutoIngestControlPanel.runningTable.toolTipText=The Running table displays the c
 AutoIngestControlPanel.SharedConfigurationDisabled=Shared configuration disabled
 AutoIngestControlPanel.ShowLogFailed.Message=Case log file does not exist
 AutoIngestControlPanel.ShowLogFailed.Title=Unable to display case log
+# {0} - case db status
+# {1} - search svc Status
+# {2} - coord svc Status
+# {3} - msg broker status
 AutoIngestControlPanel.tbServicesStatusMessage.Message=Case databases {0}, keyword search {1}, coordination {2}, messaging {3} 
 AutoIngestControlPanel.tbServicesStatusMessage.Message.Down=down
 AutoIngestControlPanel.tbServicesStatusMessage.Message.Unknown=unknown
@@ -182,16 +186,22 @@ DeleteCaseTask.progress.acquiringManifestLocks=Acquiring exclusive manifest file
 DeleteCaseTask.progress.connectingToCoordSvc=Connecting to the coordination service...
 DeleteCaseTask.progress.deletingCaseDirCoordSvcNode=Deleting case directory znode...
 DeleteCaseTask.progress.deletingCaseNameCoordSvcNode=Deleting case name znode...
+# {0} - data source path
 DeleteCaseTask.progress.deletingDataSource=Deleting data source {0}...
 DeleteCaseTask.progress.deletingJobLogLockNode=Deleting case auto ingest log znode...
+# {0} - manifest file path
 DeleteCaseTask.progress.deletingManifest=Deleting manifest file {0}...
+# {0} - manifest file path
 DeleteCaseTask.progress.deletingManifestFileNode=Deleting the manifest file znode for {0}...
 DeleteCaseTask.progress.deletingResourcesLockNode=Deleting case resources znode...
 DeleteCaseTask.progress.gettingManifestPaths=Getting manifest file paths...
+# {0} - manifest file path
 DeleteCaseTask.progress.lockingManifest=Locking manifest file {0}...
 DeleteCaseTask.progress.openingCaseDatabase=Opening the case database...
 DeleteCaseTask.progress.openingCaseMetadataFile=Opening case metadata file...
+# {0} - manifest file path
 DeleteCaseTask.progress.parsingManifest=Parsing manifest file {0}...
+# {0} - manifest file path
 DeleteCaseTask.progress.releasingManifestLock=Releasing lock on the manifest file {0}...
 DeleteCaseTask.progress.startMessage=Starting deletion...
 DeleteOrphanCaseNodesAction.progressDisplayName=Cleanup Case Znodes
@@ -207,6 +217,7 @@ DeleteOrphanCaseNodesTask.progress.lookingForOrphanedCaseZnodes=Looking for orph
 DeleteOrphanCaseNodesTask.progress.startMessage=Starting orphaned case znode cleanup
 DeleteOrphanManifestNodesAction.progressDisplayName=Cleanup Manifest File Znodes
 DeleteOrphanManifestNodesTask.progress.connectingToCoordSvc=Connecting to the coordination service
+# {0} - node path
 DeleteOrphanManifestNodesTask.progress.deletingOrphanedManifestNode=Deleting orphaned manifest file znode {0}
 DeleteOrphanManifestNodesTask.progress.gettingManifestNodes=Querying the coordination service for manifest file znodes
 DeleteOrphanManifestNodesTask.progress.lookingForOrphanedManifestFileZnodes=Looking for orphaned manifest file znodes
@@ -215,6 +226,7 @@ HINT_CasesDashboardTopComponent=This is an adminstrative dashboard for multi-use
 OpenAutoIngestLogAction.deletedLogErrorMsg=The case auto ingest log has been deleted.
 OpenAutoIngestLogAction.logOpenFailedErrorMsg=Failed to open case auto ingest log. See application log for details.
 OpenAutoIngestLogAction.menuItemText=Open Auto Ingest Log File
+# {0} - caseErrorMessage
 OpenCaseAction.errorMsg=Failed to open case: {0}
 OpenCaseAction.menuItemText=Open
 OpenIDE-Module-Long-Description=This module contains features that are being developed by Basis Technology and are not part of the default Autopsy distribution. You can enable this module to use the new features. The features should be stable, but their exact behavior and API are subject to change.\n\nWe make no guarantee that the API of this module will not change, so developers should be careful when relying on it.

Experimental/src/org/sleuthkit/autopsy/experimental/configuration/Bundle.properties-MERGED

@@ -75,6 +75,7 @@ MultiUserTestTool.unableCreatFile=Unable to create a file in case output directo
 MultiUserTestTool.unableToCheckService=Unable to check Multi User service state: {0}
 MultiUserTestTool.unableToCreateCase=Unable to create case
 MultiUserTestTool.unableToInitializeDatabase=Case database was not successfully initialized
+MultiUserTestTool.unableToInitializeFilTypeDetector=Unable to initialize File Type Detector
 MultiUserTestTool.unableToReadDatabase=Unable to read from case database
 MultiUserTestTool.unableToReadTestFileFromDatabase=Unable to read test file info from case database
 MultiUserTestTool.unableToRunIngest=Unable to run ingest on test data source