From db0e149d47ebb1ebcde43f2dbc05fa9ae9f145a8 Mon Sep 17 00:00:00 2001
From: momo <mhmdfy@gmail.com>
Date: Thu, 5 Nov 2015 15:25:55 -0500
Subject: [PATCH] change manager back

---
 Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties       | 4 ++--
 .../src/org/sleuthkit/autopsy/ingest/DataSourceIngestJob.java | 4 ++--
 Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
index 23dd227822..a579ac2eba 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
@@ -21,7 +21,7 @@ IngestJob.progress.dataSourceIngest.initialDisplayName=Analyzing {0}
 IngestJob.progress.dataSourceIngest.displayName={0} for {1}
 IngestJob.progress.fileIngest.displayName=Analyzing files from {0}
 IngestJob.progress.fileIngest.displayName={0} on {1}
-IngestJob.progress.cancelling={0} (Canceling... Waiting on module)
+IngestJob.progress.canceling={0} (Canceling... Waiting on module)
 IngestJob.cancellationDialog.title=Cancel Ingest
 IngestDialog.title.text=Ingest Modules
 IngestDialog.startButton.title=Start
@@ -51,7 +51,7 @@ IngestMessageTopComponent.msgDlg.ingestRpt.text=Ingest Report
 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}. \nEnsure the Case drive has at least 1GB free space and restart ingest.
 IngestManager.StartIngestJobsTask.run.displayName=Starting ingest
-IngestManager.StartIngestJobsTask.run.cancelling={0} (Canceling...)
+IngestManager.StartIngestJobsTask.run.canceling={0} (Canceling...)
 IngestMessagePanel.sortByComboBox.model.time=Time
 IngestMessagePanel.sortByComboBox.model.priority=Priority
 IngestMessagesToolbar.customizeButton.toolTipText=Ingest Messages
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestJob.java b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestJob.java
index 5f04917b7e..dc36451b92 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestJob.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestJob.java
@@ -922,7 +922,7 @@ final class DataSourceIngestJob {
                             dataSource.getName());
                     dataSourceIngestProgress.setDisplayName(
                             NbBundle.getMessage(this.getClass(),
-                                    "IngestJob.progress.cancelling",
+                                    "IngestJob.progress.canceling",
                                     displayName));
                 }
             }
@@ -937,7 +937,7 @@ final class DataSourceIngestJob {
                             "IngestJob.progress.fileIngest.displayName",
                             this.dataSource.getName());
                     this.fileIngestProgress.setDisplayName(
-                            NbBundle.getMessage(this.getClass(), "IngestJob.progress.cancelling",
+                            NbBundle.getMessage(this.getClass(), "IngestJob.progress.canceling",
                                     displayName));
                 }
             }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
index e57982e164..4b6c936381 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
@@ -945,7 +945,7 @@ public class IngestManager {
                         @Override
                         public boolean cancel() {
                             if (progress != null) {
-                                progress.setDisplayName(NbBundle.getMessage(this.getClass(), "IngestJob.progress.cancelling", displayName));
+                                progress.setDisplayName(NbBundle.getMessage(this.getClass(), "IngestManager.StartIngestJobsTask.run.canceling", displayName));
                             }
                             Future<?> handle = ingestJobStarters.remove(threadId);
                             handle.cancel(true);