diff --git a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties index 2c49135848..fed46c8bac 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties @@ -65,3 +65,14 @@ IngestMessagePanel.sortByComboBox.model.time=Time IngestMessagePanel.sortByComboBox.model.priority=Priority IngestMessagesToolbar.customizeButton.toolTipText=Ingest Messages IngestMessageTopComponent.initComponents.name=Ingest Inbox +IngestManager.StartIngestJobsTask.run.startupErr.dlgMsg=Unable to start up one or more ingest modules, ingest job cancelled. +IngestManager.StartIngestJobsTask.run.startupErr.dlgSolution=Please disable the failed modules or fix the errors and then restart ingest\ +by right clicking on the data source and selecting Run Ingest Modules. +IngestManager.StartIngestJobsTask.run.startupErr.dlgErrorList=Errors\:\ +\ +{0} +IngestManager.StartIngestJobsTask.run.startupErr.dlgTitle=Ingest Failure +IngestManager.StartIngestJobsTask.run.progress.msg1=Data source ingest tasks for {0} +IngestManager.StartIngestJobsTask.run.progress.msg2=Data source ingest tasks for {0} +IngestManager.StartIngestJobsTask.run.progress.msg3=Data source ingest tasks for {0} +IngestManager.StartIngestJobsTask.run.progress.msg4=Data source ingest tasks for {0} diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobLauncher.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobLauncher.java index 48b75efe83..1fb2ccf989 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobLauncher.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobLauncher.java @@ -132,16 +132,16 @@ public final class IngestJobLauncher { for (String name : settingNames) { // Map some old core module names to the current core module names. switch (name) { - case "Thunderbird Parser": - case "MBox Parser": - moduleNames.add("Email Parser"); + case "Thunderbird Parser": //NON-NLS + case "MBox Parser": //NON-NLS + moduleNames.add("Email Parser"); //NON-NLS break; - case "File Extension Mismatch Detection": - moduleNames.add("Extension Mismatch Detector"); + case "File Extension Mismatch Detection": //NON-NLS + moduleNames.add("Extension Mismatch Detector"); //NON-NLS break; - case "EWF Verify": - case "E01 Verify": - moduleNames.add("E01 Verifier"); + case "EWF Verify": //NON-NLS + case "E01 Verify": //NON-NLS + moduleNames.add("E01 Verifier"); //NON-NLS break; default: moduleNames.add(name); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java index 2398e9c87e..76df43cae3 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java @@ -405,13 +405,19 @@ public class IngestManager { moduleStartUpErrors.append("\n"); } StringBuilder notifyMessage = new StringBuilder(); - notifyMessage.append("Unable to start up one or more ingest modules, ingest job cancelled.\n"); - notifyMessage.append("Please disable the failed modules or fix the errors and then restart ingest\n"); - notifyMessage.append("by right clicking on the data source and selecting Run Ingest Modules.\n"); - notifyMessage.append("Errors:\n\n"); - notifyMessage.append(moduleStartUpErrors.toString()); + notifyMessage.append(NbBundle.getMessage(this.getClass(), + "IngestManager.StartIngestJobsTask.run.startupErr.dlgMsg")); + notifyMessage.append("\n"); + notifyMessage.append(NbBundle.getMessage(this.getClass(), + "IngestManager.StartIngestJobsTask.run.startupErr.dlgSolution")); + notifyMessage.append("\n"); + notifyMessage.append(NbBundle.getMessage(this.getClass(), + "IngestManager.StartIngestJobsTask.run.startupErr.dlgErrorList", + moduleStartUpErrors.toString())); notifyMessage.append("\n\n"); - JOptionPane.showMessageDialog(null, notifyMessage.toString(), "Ingest Failure", JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, notifyMessage.toString(), + NbBundle.getMessage(this.getClass(), + "IngestManager.StartIngestJobsTask.run.startupErr.dlgTitle"), JOptionPane.ERROR_MESSAGE); // Jettison the ingest job and move on to the next one. synchronized (IngestManager.this) { @@ -423,14 +429,22 @@ public class IngestManager { // Queue the data source ingest tasks for the ingest job. final String inputName = dataSource.getName(); - progress.progress("Data source ingest tasks for " + inputName, workUnitsCompleted); + progress.progress( + NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsTask.run.progress.msg1", + inputName), workUnitsCompleted); scheduler.getDataSourceIngestScheduler().queueForIngest(ingestJob); - progress.progress("Data source ingest tasks for " + inputName, ++workUnitsCompleted); + progress.progress( + NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsTask.run.progress.msg2", + inputName), ++workUnitsCompleted); // Queue the file ingest tasks for the ingest job. - progress.progress("Data source ingest tasks for " + inputName, workUnitsCompleted); + progress.progress( + NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsTask.run.progress.msg3", + inputName), workUnitsCompleted); scheduler.getFileIngestScheduler().queueForIngest(ingestJob); - progress.progress("Data source ingest tasks for " + inputName, ++workUnitsCompleted); + progress.progress( + NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsTask.run.progress.msg4", + inputName), ++workUnitsCompleted); if (!Thread.currentThread().isInterrupted()) { startIngestTasks();