diff --git a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties index 0a088da4dd..e0fadf0f85 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties @@ -21,38 +21,12 @@ IngestJob.progress.fileIngest.displayName=File Ingest of {0} IngestJob.progress.cancelling={0} (Cancelling...) IngestJobConfigurationPanel.processUnallocCheckbox.toolTipText=Processes unallocated space, such as deleted files. Produces more complete results, but it may take longer to process on large images. IngestJobConfigurationPanel.processUnallocCheckbox.text=Process Unallocated Space -IngestJob.toString.text=ScheduledTask'{'input\={0}, modules\={1}'}' -IngestJobLauncher.modName.tbirdParser.text=Thunderbird Parser -IngestJobLauncher.modName.mboxParser.text=MBox Parser -IngestJobLauncher.modName.emailParser.text=Email Parser -IngestJobLauncher.enabledMods.notFound.msg={0} was previously enabled, but could not be found IngestDialog.title.text=Ingest Modules IngestDialog.startButton.title=Start IngestDialog.closeButton.title=Close -IngestManager.moduleProperties.text=ingest IngestManager.moduleErr=Module Error IngestManager.moduleErr.errListenToUpdates.msg=A module caused an error listening to Ingest Manager updates. See log to determine which module. Some data could be incomplete. -IngestManager.displayInitError.failedToLoad.msg=Failed to load {0} ingest module.\ -\ -No ingest modules will be run. Please disable the module or fix the error and restart ingest by right clicking on the data source and selecting Run Ingest Modules.\ -\ -Error\: {1} -IngestManager.getFileModStats.moduleInfo.text={0} took\: {1} secs. to process() -IngestManager.toString.startTime.text=Start time\: {0}{1} -IngestManager.toString.endTime.text=End time\: {0}{1} -IngestManager.toString.totalIngestTime.text=Total ingest time\: {0}{1} -IngestManager.toString.totalErrs.text=Total errors\: {0}{1} -IngestManager.toString.errsPerMod.text=Errors per module\: -IngestManager.toHtmlStr.ingestTime.text=Ingest time\: {0} -IngestManager.toHtmlStr.totalErrs.text=Total errors\: {0} -IngestManager.toHtmlStr.module.text=Module -IngestManager.toHtmlStr.time.text=Time -IngestManager.toHtmlStr.errors.text=Errors -IngestManager.EnqueueWorker.displayName.text=Queueing Ingest -IngestManager.EnqueueWorker.process.cancelling={0} (Cancelling...) -IngestJob.DataSourceIngestPipeline.displayName.text={0} processing {1} IngestMessage.toString.type.text=type\: {0} -IngestMessage.toString.source.text=\ source\: {0} IngestMessage.toString.date.text=\ date\: {0} IngestMessage.toString.subject.text=\ subject\: {0} IngestMessage.toString.details.text=\ details\: {0} @@ -72,31 +46,26 @@ IngestMessagePanel.DateRenderer.exception.nonDateVal.text=Tried to use DateRende IngestMessageTopComponent.displayReport.option.OK=OK IngestMessageTopComponent.displayReport.option.GenRpt=Generate Report IngestMessageTopComponent.msgDlg.ingestRpt.text=Ingest Report -IngestModuleLoader.moduleErr=Module Error -IngestModuleLoader.moduleErr.errListenUpdates.msg=A module caused an error listening to IngestModuleLoader updates. See log to determine which module. Some data could be incomplete. -IngestModuleLoader.exception.notImplemented.msg=Not yet implemented -IngestModuleLoader.exception.cantFindPipeline.msg=Could not find expected pipeline of type\: {0}, cannot add autodiscovered module\: {1} -IngestModuleLoader.save.comment.text=Saved by\: {0} on\: {1} -IngestModuleLoader.loadRawPipeline.exception.cantLoadXML.msg=Could not load pipeline config XML\: {0} -IngestModuleLoader.loadRawPipeline.exception.invalidFileFormat.msg=Error loading pipeline configuration\: invalid file format. -IngestModuleLoader.loadRawPipeline.exception.noPipelinesInConf.msg=No pipelines found in the pipeline configuration\: {0} -IngestModuleLoader.exception.noPipelineTypeForStr.msg=No PIPELINE_TYPE for string\: {0} IngestMonitor.mgrErrMsg.lowDiskSpace.title=Ingest stopped - low disk space on {0} IngestMonitor.mgrErrMsg.lowDiskSpace.msg=Stopping ingest due to low disk space on disk {0}. \ Ensure the Case drive has at least 1GB free space and restart ingest. -IngestScheduler.FileSched.toString.rootDirs.text=\ -RootDirs(sorted), size\: {0} -IngestScheduler.FileSched.toString.curDirs.text=\ -CurDirs(stack), size\: {0} -IngestScheduler.FileSched.toString.curFiles.text=\ -CurFiles, size\: {0} -IngestScheduler.fileTask.toString.long=ProcessTask'{'file\={0}\: {1}'}' -IngestScheduler.fileTask.toString.short=ProcessTask'{'file\={0}\: {1}'}' -IngestScheduler.FileTask.next.exception.msg=No next ProcessTask, check hasNext() first\! -IngestScheduler.remove.exception.notSupported.msg=Not supported. -IngestScheduler.DataSourceScheduler.exception.next.msg=There is no data source tasks in the queue, check hasNext() -IngestScheduler.DataSourceScheduler.exception.remove.msg=Removing of scheduled data source ingest tasks is not supported. -IngestScheduler.DataSourceScheduler.toString.size=DataSourceQueue, size\: {0} -Label1 IngestJobConfigurationPanel.advancedButton.text=Advanced IngestJobConfigurationPanel.advancedButton.actionCommand=Advanced +IngestScheduler.DataSourceScheduler.toString.size=DataSourceQueue, size\: +IngestScheduler.DataSourceScheduler.exception.remove.msg=Removing of scheduled data source ingest tasks is not supported. +IngestScheduler.DataSourceScheduler.exception.next.msg=There is no data source tasks in the queue, check hasNext() +IngestScheduler.remove.exception.notSupported.msg=Not supported. +IngestScheduler.FileTask.next.exception.msg=No next ProcessTask, check hasNext() first\! +IngestScheduler.FileSched.toString.curFiles.text=\ +CurFiles, size\: +IngestScheduler.FileSched.toString.curDirs.text=\ +CurDirs(stack), size\: +IngestScheduler.FileSched.toString.rootDirs.text=\ +RootDirs(sorted), size\: +IngestManager.StartIngestJobsTask.run.displayName=Queueing ingest tasks +IngestManager.StartIngestJobsTask.run.cancelling={0} (Cancelling...) +IngestManager.StartIngestJobsTask.run.catchException.msg=An error occurred while starting ingest. Results may only be partial +IngestMessagePanel.sortByComboBox.model.time=Time +IngestMessagePanel.sortByComboBox.model.priority=Priority +IngestMessagesToolbar.customizeButton.toolTipText=Ingest Messages +IngestMessageTopComponent.initComponents.name=Ingest Inbox diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java index 1cc046ac3e..ff3e9d67b9 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java @@ -358,12 +358,15 @@ public class IngestManager { @Override public void run() { try { - final String displayName = "Queueing ingest tasks"; + final String displayName = NbBundle.getMessage(this.getClass(), + "IngestManager.StartIngestJobsTask.run.displayName"); progress = ProgressHandleFactory.createHandle(displayName, new Cancellable() { @Override public boolean cancel() { if (progress != null) { - progress.setDisplayName(displayName + " (Cancelling...)"); + progress.setDisplayName(NbBundle.getMessage(this.getClass(), + "IngestManager.StartIngestJobsTask.run.cancelling", + displayName)); } IngestManager.getInstance().cancelIngestJobs(); return true; @@ -424,7 +427,8 @@ public class IngestManager { } catch (Exception ex) { String message = String.format("StartIngestJobsTask (id=%d) caught exception", id); logger.log(Level.SEVERE, message, ex); - MessageNotifyUtil.Message.error("An error occurred while starting ingest. Results may only be partial"); + MessageNotifyUtil.Message.error( + NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsTask.run.catchException.msg")); } finally { progress.finish(); reportStartIngestJobsTaskDone(id); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java index 24dae0f312..8d2e676911 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java @@ -148,7 +148,9 @@ class IngestMessagePanel extends JPanel implements TableModelListener { sortByLabel.setText(org.openide.util.NbBundle.getMessage(IngestMessagePanel.class, "IngestMessagePanel.sortByLabel.text")); // NOI18N - sortByComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Time", "Priority" })); + sortByComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { + NbBundle.getMessage(this.getClass(), "IngestMessagePanel.sortByComboBox.model.time"), + NbBundle.getMessage(this.getClass(), "IngestMessagePanel.sortByComboBox.model.priority") })); // NOI18N sortByComboBox.setToolTipText(org.openide.util.NbBundle.getMessage(IngestMessagePanel.class, "IngestMessagePanel.sortByComboBox.toolTipText")); // NOI18N sortByComboBox.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java index b5feb6220c..dabc002c81 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java @@ -104,7 +104,7 @@ import org.sleuthkit.datamodel.Content; private void initComponents() { setDisplayName(org.openide.util.NbBundle.getMessage(IngestMessageTopComponent.class, "IngestMessageTopComponent.displayName")); // NOI18N - setName("Ingest Inbox"); // NOI18N + setName(NbBundle.getMessage(this.getClass(), "IngestMessageTopComponent.initComponents.name")); // NOI18N javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java index fcc9861f22..27613846e2 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagesToolbar.java @@ -26,6 +26,8 @@ import java.awt.Graphics; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import javax.swing.JButton; + +import org.openide.util.NbBundle; import org.openide.windows.Mode; import org.openide.windows.WindowManager; import org.sleuthkit.autopsy.casemodule.Case; @@ -89,7 +91,8 @@ import org.sleuthkit.autopsy.casemodule.Case; ingestMessagesButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/eye-bw-25.png"))); ingestMessagesButton.setRolloverEnabled(true); ingestMessagesButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/ingest/eye-bw-25-rollover.png"))); - ingestMessagesButton.setToolTipText("Ingest Messages"); + ingestMessagesButton.setToolTipText( + NbBundle.getMessage(this.getClass(), "IngestMessagesToolbar.customizeButton.toolTipText")); ingestMessagesButton.setBorder(null); ingestMessagesButton.setBorderPainted(false); ingestMessagesButton.setEnabled(false); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java index ec3c236cad..b0fd830e30 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java @@ -31,6 +31,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; + +import org.openide.util.NbBundle; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.ingest.IngestScheduler.FileScheduler.FileTask; import org.sleuthkit.datamodel.AbstractFile; @@ -133,15 +135,15 @@ final class IngestScheduler { @Override public synchronized String toString() { StringBuilder sb = new StringBuilder(); - sb.append("\nRootDirs(sorted), size: ").append(rootDirectoryTasks.size()); + sb.append(NbBundle.getMessage(this.getClass(), "IngestScheduler.FileSched.toString.rootDirs.text")).append(rootDirectoryTasks.size()); for (FileTask task : rootDirectoryTasks) { sb.append(task.toString()).append(" "); } - sb.append("\nCurDirs(stack), size: ").append(directoryTasks.size()); + sb.append(NbBundle.getMessage(this.getClass(), "IngestScheduler.FileSched.toString.curDirs.text")).append(directoryTasks.size()); for (FileTask task : directoryTasks) { sb.append(task.toString()).append(" "); } - sb.append("\nCurFiles, size: ").append(fileTasks.size()); + sb.append(NbBundle.getMessage(this.getClass(), "IngestScheduler.FileSched.toString.curFiles.text")).append(fileTasks.size()); for (FileTask task : fileTasks) { sb.append(task.toString()).append(" "); } @@ -277,7 +279,8 @@ final class IngestScheduler { @Override public synchronized FileTask next() { if (!hasNext()) { - throw new IllegalStateException("No next ProcessTask, check hasNext() first!"); + throw new IllegalStateException( + NbBundle.getMessage(this.getClass(), "IngestScheduler.FileTask.next.exception.msg")); } //dequeue the last in the list @@ -347,7 +350,8 @@ final class IngestScheduler { @Override public void remove() { - throw new UnsupportedOperationException("Not supported."); + throw new UnsupportedOperationException( + NbBundle.getMessage(this.getClass(), "IngestScheduler.remove.exception.notSupported.msg")); } /** @@ -782,7 +786,8 @@ final class IngestScheduler { @Override public synchronized IngestJob next() throws IllegalStateException { if (!hasNext()) { - throw new IllegalStateException("There is no data source tasks in the queue, check hasNext()"); + throw new IllegalStateException( + NbBundle.getMessage(this.getClass(), "IngestScheduler.DataSourceScheduler.exception.next.msg")); } final IngestJob ret = tasks.pollFirst(); @@ -809,7 +814,8 @@ final class IngestScheduler { @Override public void remove() { - throw new UnsupportedOperationException("Removing of scheduled data source ingest tasks is not supported. "); + throw new UnsupportedOperationException( + NbBundle.getMessage(this.getClass(), "IngestScheduler.DataSourceScheduler.exception.remove.msg")); } synchronized void empty() { @@ -823,7 +829,8 @@ final class IngestScheduler { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append("DataSourceQueue, size: ").append(getCount()); + sb.append(NbBundle.getMessage(this.getClass(), "IngestScheduler.DataSourceScheduler.toString.size")) + .append(getCount()); for (IngestJob task : tasks) { sb.append(task.toString()).append(" "); }