diff --git a/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java
index 988d834904..8a95750924 100755
--- a/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java
@@ -69,6 +69,7 @@ class SampleFileIngestModule extends IngestModuleAdapter implements FileIngestMo
     @Override
     public void startUp(IngestJobContext context) throws IngestModuleException {
         this.context = context;
+        refCounter.incrementAndGet(context.getJobId());
 
         synchronized (SampleFileIngestModule.class) {
             if (attrId == -1) {
@@ -97,10 +98,6 @@ class SampleFileIngestModule extends IngestModuleAdapter implements FileIngestMo
                 }
             }
         }
-
-        // This method is thread-safe with per ingest job reference counted
-        // management of shared data.
-        initBlackboardPostCount(context.getJobId());
     }
 
     @Override
@@ -168,15 +165,15 @@ class SampleFileIngestModule extends IngestModuleAdapter implements FileIngestMo
         reportBlackboardPostCount(context.getJobId());
     }
 
-    synchronized static void initBlackboardPostCount(long ingestJobId) {
-        Long refCount = refCounter.incrementAndGet(ingestJobId);
-        if (refCount == 1) {
-            artifactCountsForIngestJobs.put(ingestJobId, 0L);
-        }
-    }
-
     synchronized static void addToBlackboardPostCount(long ingestJobId, long countToAdd) {
         Long fileCount = artifactCountsForIngestJobs.get(ingestJobId);
+        
+        // Ensures that this job has an entry
+        if (fileCount == null) {
+            fileCount = 0L;
+            artifactCountsForIngestJobs.put(ingestJobId, fileCount);
+        }
+        
         fileCount += countToAdd;
         artifactCountsForIngestJobs.put(ingestJobId, fileCount);
     }
diff --git a/Core/src/org/sleuthkit/autopsy/examples/SampleIngestModuleFactory.java b/Core/src/org/sleuthkit/autopsy/examples/SampleIngestModuleFactory.java
index 9e9fbba5fe..a1388ce15f 100755
--- a/Core/src/org/sleuthkit/autopsy/examples/SampleIngestModuleFactory.java
+++ b/Core/src/org/sleuthkit/autopsy/examples/SampleIngestModuleFactory.java
@@ -43,7 +43,7 @@ import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.ingest.IngestModuleFactory;
 import org.sleuthkit.autopsy.ingest.DataSourceIngestModule;
 import org.sleuthkit.autopsy.ingest.FileIngestModule;
-import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel;
+import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel;
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
 
@@ -167,7 +167,7 @@ public class SampleIngestModuleFactory implements IngestModuleFactory {
      * @return A global settings panel.
      */
     @Override
-    public IngestModuleGlobalSetttingsPanel getGlobalSettingsPanel() {
+    public IngestModuleGlobalSettingsPanel getGlobalSettingsPanel() {
         throw new UnsupportedOperationException();
     }
 
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/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/ingest/Bundle_ja.properties
index b6ed0372ad..69eee4e67e 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/ingest/Bundle_ja.properties
@@ -1,64 +1,74 @@
-CTL_IngestMessageTopComponent=\u30e1\u30c3\u30bb\u30fc\u30b8
-HINT_IngestMessageTopComponent=\u30e1\u30c3\u30bb\u30fc\u30b8\u30a6\u30a3\u30f3\u30c9\u30a6
-IngestDialog.closeButton.title=\u9589\u3058\u308b
-IngestDialog.startButton.title=\u30b9\u30bf\u30fc\u30c8
-IngestDialog.title.text=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb
-IngestJob.progress.cancelling={0}\uff08\u30ad\u30e3\u30f3\u30bb\u30eb\u4e2d\u2026\uff09
-IngestJob.progress.dataSourceIngest.displayName={0}\u306e\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u3092\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8
-IngestJob.progress.fileIngest.displayName={0}\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8
-IngestJobConfigurationPanel.advancedButton.actionCommand=\u30a2\u30c9\u30d0\u30f3\u30b9
-IngestJobConfigurationPanel.advancedButton.text=\u30a2\u30c9\u30d0\u30f3\u30b9
-IngestJobConfigurationPanel.processUnallocCheckbox.text=\u672a\u5272\u308a\u5f53\u3066\u9818\u57df\u306e\u51e6\u7406
-IngestJobConfigurationPanel.processUnallocCheckbox.toolTipText=\u524a\u9664\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u7b49\u306e\u672a\u5272\u308a\u5f53\u3066\u9818\u57df\u3092\u51e6\u7406\u3002\u3088\u308a\u5b8c\u5168\u306a\u7d50\u679c\u304c\u51fa\u307e\u3059\u304c\u3001\u5927\u304d\u3044\u30a4\u30e1\u30fc\u30b8\u3067\u306f\u51e6\u7406\u6642\u9593\u304c\u9577\u304f\u306a\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
-IngestManager.moduleErr=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a8\u30e9\u30fc
-IngestManager.moduleErr.errListenToUpdates.msg=Ingest Manager\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3092\u78ba\u8a8d\u4e2d\u306b\u30e2\u30b8\u30e5\u30fc\u30eb\u304c\u30a8\u30e9\u30fc\u3092\u8d77\u3053\u3057\u307e\u3057\u305f\u3002\u3069\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u304b\u30ed\u30b0\u3067\u78ba\u8a8d\u3057\u3066\u4e0b\u3055\u3044\u3002\u4e00\u90e8\u306e\u30c7\u30fc\u30bf\u304c\u4e0d\u5b8c\u5168\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
-IngestManager.StartIngestJobsTask.run.cancelling={0}\uff08\u30ad\u30e3\u30f3\u30bb\u30eb\u4e2d\u2026\uff09
-IngestManager.StartIngestJobsTask.run.catchException.msg=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u306e\u958b\u59cb\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7d50\u679c\u304c\u4e00\u90e8\u306e\u3082\u306e
-IngestManager.StartIngestJobsTask.run.displayName=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30bf\u30b9\u30af\u3092\u30ad\u30e5\u30fc\u30a4\u30f3\u30b0
-IngestMessage.exception.srcSubjDetailsDataNotNull.msg=\u30bd\u30fc\u30b9\u3001\u30b5\u30d6\u30b8\u30a7\u30af\u30c8\u3001\u8a73\u7d30\u304a\u3088\u3073\u30c7\u30fc\u30bf\u306f\u30cc\u30eb\u3067\u3042\u3063\u3066\u306f\u3044\u3051\u307e\u305b\u3093
-IngestMessage.exception.srcSubjNotNull.msg=\u30bd\u30fc\u30b9\u304a\u3088\u3073\u30b5\u30d6\u30b8\u30a7\u30af\u30c8\u306f\u30cc\u30eb\u3067\u3042\u3063\u3066\u306f\u3044\u3051\u307e\u305b\u3093
-IngestMessage.exception.typeSrcSubjNotNull.msg=\u30e1\u30c3\u30bb\u30fc\u30b8\u30bf\u30a4\u30d7\u3001\u30bd\u30fc\u30b9\u304a\u3088\u3073\u30b5\u30d6\u30b8\u30a7\u30af\u30c8\u306f\u30cc\u30eb\u3067\u3042\u3063\u3066\u306f\u3044\u3051\u307e\u305b\u3093
-IngestMessage.toString.data.text=\ \u30c7\u30fc\u30bf\uff1a{0}
-IngestMessage.toString.date.text=\ \u65e5\u4ed8\uff1a{0}
-IngestMessage.toString.details.text=\ \u8a73\u7d30\uff1a{0}
-IngestMessage.toString.subject.text=\ \u30b5\u30d6\u30b8\u30a7\u30af\u30c8\uff1a{0}
-IngestMessage.toString.type.text=\u30bf\u30a4\u30d7\uff1a{0}
-IngestMessageDetailsPanel.copyMenuItem.text=\u30b3\u30d4\u30fc
-IngestMessageDetailsPanel.messageDetailsPane.contentType=\u30c6\u30ad\u30b9\u30c8\uff0fhtml
-IngestMessageDetailsPanel.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629e
-IngestMessageDetailsPanel.viewArtifactButton.text=\u7d50\u679c\u3078\u79fb\u52d5
-IngestMessageDetailsPanel.viewContentButton.text=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3078\u79fb\u52d5
-IngestMessagePanel.BooleanRenderer.exception.nonBoolVal.msg=\u30d6\u30fc\u30eb\u5024\u3067\u306f\u306a\u3044\u3082\u306e\u306bBooleanRenderer\u3092\u4f7f\u7528\u3057\u3088\u3046\u3068\u3057\u307e\u3057\u305f
-IngestMessagePanel.DateRenderer.exception.nonDateVal.text=\u65e5\u4ed8\u3067\u306f\u306a\u3044\u3082\u306e\u306bDateRenderer\u3092\u4f7f\u7528\u3057\u3088\u3046\u3068\u3057\u307e\u3057\u305f\u3002
-IngestMessagePanel.moduleErr=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a8\u30e9\u30fc
-IngestMessagePanel.moduleErr.errListenUpdates.text=IngestMessagePanel\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3092\u78ba\u8a8d\u4e2d\u306b\u30e2\u30b8\u30e5\u30fc\u30eb\u304c\u30a8\u30e9\u30fc\u3092\u8d77\u3053\u3057\u307e\u3057\u305f\u3002\u3069\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u304b\u30ed\u30b0\u3067\u78ba\u8a8d\u3057\u3066\u4e0b\u3055\u3044\u3002\u4e00\u90e8\u306e\u30c7\u30fc\u30bf\u304c\u4e0d\u5b8c\u5168\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
-IngestMessagePanel.MsgTableMod.colNames.module=\u30e2\u30b8\u30e5\u30fc\u30eb
-IngestMessagePanel.MsgTableMod.colNames.new=\u65b0\u898f\uff1f
-IngestMessagePanel.MsgTableMod.colNames.num=\u756a\u53f7
-IngestMessagePanel.MsgTableMod.colNames.subject=\u30b5\u30d6\u30b8\u30a7\u30af\u30c8
-IngestMessagePanel.MsgTableMod.colNames.timestamp=\u30bf\u30a4\u30e0\u30b9\u30bf\u30f3\u30d7
-IngestMessagePanel.sortByComboBox.model.priority=\u512a\u5148\u5ea6
+CTL_IngestMessageTopComponent=\u30E1\u30C3\u30BB\u30FC\u30B8
+HINT_IngestMessageTopComponent=\u30E1\u30C3\u30BB\u30FC\u30B8\u30A6\u30A3\u30F3\u30C9\u30A6
+IngestDialog.closeButton.title=\u9589\u3058\u308B
+IngestDialog.startButton.title=\u30B9\u30BF\u30FC\u30C8
+IngestDialog.title.text=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB
+IngestJob.progress.cancelling={0}\uFF08\u30AD\u30E3\u30F3\u30BB\u30EB\u4E2D\u2026\uFF09
+IngestJob.progress.dataSourceIngest.displayName={0}\u306E\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u3092\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8
+IngestJob.progress.fileIngest.displayName={0}\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8
+IngestJobConfigurationPanel.advancedButton.actionCommand=\u30A2\u30C9\u30D0\u30F3\u30B9
+IngestJobConfigurationPanel.advancedButton.text=\u30A2\u30C9\u30D0\u30F3\u30B9
+IngestJobConfigurationPanel.processUnallocCheckbox.text=\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u306E\u51E6\u7406
+IngestJobConfigurationPanel.processUnallocCheckbox.toolTipText=\u524A\u9664\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u7B49\u306E\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u3092\u51E6\u7406\u3002\u3088\u308A\u5B8C\u5168\u306A\u7D50\u679C\u304C\u51FA\u307E\u3059\u304C\u3001\u5927\u304D\u3044\u30A4\u30E1\u30FC\u30B8\u3067\u306F\u51E6\u7406\u6642\u9593\u304C\u9577\u304F\u306A\u308B\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
+IngestManager.moduleErr=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
+IngestManager.moduleErr.errListenToUpdates.msg=Ingest Manager\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u78BA\u8A8D\u4E2D\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u30A8\u30E9\u30FC\u3092\u8D77\u3053\u3057\u307E\u3057\u305F\u3002\u3069\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\u30ED\u30B0\u3067\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002\u4E00\u90E8\u306E\u30C7\u30FC\u30BF\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
+IngestManager.StartIngestJobsTask.run.cancelling={0}\uFF08\u30AD\u30E3\u30F3\u30BB\u30EB\u4E2D\u2026\uFF09
+IngestManager.StartIngestJobsTask.run.catchException.msg=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306E\u958B\u59CB\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u7D50\u679C\u304C\u4E00\u90E8\u306E\u3082\u306E
+IngestManager.StartIngestJobsTask.run.displayName=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30BF\u30B9\u30AF\u3092\u30AD\u30E5\u30FC\u30A4\u30F3\u30B0
+IngestMessage.exception.srcSubjDetailsDataNotNull.msg=\u30BD\u30FC\u30B9\u3001\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u3001\u8A73\u7D30\u304A\u3088\u3073\u30C7\u30FC\u30BF\u306F\u30CC\u30EB\u3067\u3042\u3063\u3066\u306F\u3044\u3051\u307E\u305B\u3093
+IngestMessage.exception.srcSubjNotNull.msg=\u30BD\u30FC\u30B9\u304A\u3088\u3073\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u306F\u30CC\u30EB\u3067\u3042\u3063\u3066\u306F\u3044\u3051\u307E\u305B\u3093
+IngestMessage.exception.typeSrcSubjNotNull.msg=\u30E1\u30C3\u30BB\u30FC\u30B8\u30BF\u30A4\u30D7\u3001\u30BD\u30FC\u30B9\u304A\u3088\u3073\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\u306F\u30CC\u30EB\u3067\u3042\u3063\u3066\u306F\u3044\u3051\u307E\u305B\u3093
+IngestMessage.toString.data.text=\ \u30C7\u30FC\u30BF\uFF1A{0}
+IngestMessage.toString.date.text=\ \u65E5\u4ED8\uFF1A{0}
+IngestMessage.toString.details.text=\ \u8A73\u7D30\uFF1A{0}
+IngestMessage.toString.subject.text=\ \u30B5\u30D6\u30B8\u30A7\u30AF\u30C8\uFF1A{0}
+IngestMessage.toString.type.text=\u30BF\u30A4\u30D7\uFF1A{0}
+IngestMessageDetailsPanel.copyMenuItem.text=\u30B3\u30D4\u30FC
+IngestMessageDetailsPanel.messageDetailsPane.contentType=\u30C6\u30AD\u30B9\u30C8\uFF0Fhtml
+IngestMessageDetailsPanel.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629E
+IngestMessageDetailsPanel.viewArtifactButton.text=\u7D50\u679C\u3078\u79FB\u52D5
+IngestMessageDetailsPanel.viewContentButton.text=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3078\u79FB\u52D5
+IngestMessagePanel.BooleanRenderer.exception.nonBoolVal.msg=\u30D6\u30FC\u30EB\u5024\u3067\u306F\u306A\u3044\u3082\u306E\u306BBooleanRenderer\u3092\u4F7F\u7528\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F
+IngestMessagePanel.DateRenderer.exception.nonDateVal.text=\u65E5\u4ED8\u3067\u306F\u306A\u3044\u3082\u306E\u306BDateRenderer\u3092\u4F7F\u7528\u3057\u3088\u3046\u3068\u3057\u307E\u3057\u305F\u3002
+IngestMessagePanel.moduleErr=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
+IngestMessagePanel.moduleErr.errListenUpdates.text=IngestMessagePanel\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u78BA\u8A8D\u4E2D\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u30A8\u30E9\u30FC\u3092\u8D77\u3053\u3057\u307E\u3057\u305F\u3002\u3069\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\u30ED\u30B0\u3067\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002\u4E00\u90E8\u306E\u30C7\u30FC\u30BF\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
+IngestMessagePanel.MsgTableMod.colNames.module=\u30E2\u30B8\u30E5\u30FC\u30EB
+IngestMessagePanel.MsgTableMod.colNames.new=\u65B0\u898F\uFF1F
+IngestMessagePanel.MsgTableMod.colNames.num=\u756A\u53F7
+IngestMessagePanel.MsgTableMod.colNames.subject=\u30B5\u30D6\u30B8\u30A7\u30AF\u30C8
+IngestMessagePanel.MsgTableMod.colNames.timestamp=\u30BF\u30A4\u30E0\u30B9\u30BF\u30F3\u30D7
+IngestMessagePanel.sortByComboBox.model.priority=\u512A\u5148\u5EA6
 IngestMessagePanel.sortByComboBox.model.time=\u6642\u9593
-IngestMessagePanel.sortByComboBox.toolTipText=\u6642\u9593\u9806\uff08\u6642\u7cfb\u5217\uff09\u307e\u305f\u306f\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u512a\u5148\u5ea6\u3067\u30bd\u30fc\u30c8
-IngestMessagePanel.sortByLabel.text=\u4e0b\u8a18\u3067\u30bd\u30fc\u30c8\uff1a
-IngestMessagePanel.totalMessagesNameLabel.text=\u5408\u8a08\uff1a
+IngestMessagePanel.sortByComboBox.toolTipText=\u6642\u9593\u9806\uFF08\u6642\u7CFB\u5217\uFF09\u307E\u305F\u306F\u30E1\u30C3\u30BB\u30FC\u30B8\u306E\u512A\u5148\u5EA6\u3067\u30BD\u30FC\u30C8
+IngestMessagePanel.sortByLabel.text=\u4E0B\u8A18\u3067\u30BD\u30FC\u30C8\uFF1A
+IngestMessagePanel.totalMessagesNameLabel.text=\u5408\u8A08\uFF1A
 IngestMessagePanel.totalMessagesNameVal.text=-
-IngestMessagePanel.totalUniqueMessagesNameLabel.text=\u30e6\u30cb\u30fc\u30af\uff1a
+IngestMessagePanel.totalUniqueMessagesNameLabel.text=\u30E6\u30CB\u30FC\u30AF\uFF1A
 IngestMessagePanel.totalUniqueMessagesNameVal.text=-
-IngestMessagesToolbar.customizeButton.toolTipText=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e1\u30c3\u30bb\u30fc\u30b8
-IngestMessageTopComponent.displayName=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30a4\u30f3\u30dc\u30c3\u30af\u30b9
-IngestMessageTopComponent.displayReport.option.GenRpt=\u30ec\u30dd\u30fc\u30c8\u751f\u6210
+IngestMessagesToolbar.customizeButton.toolTipText=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E1\u30C3\u30BB\u30FC\u30B8
+IngestMessageTopComponent.displayName=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30A4\u30F3\u30DC\u30C3\u30AF\u30B9
+IngestMessageTopComponent.displayReport.option.GenRpt=\u30EC\u30DD\u30FC\u30C8\u751F\u6210
 IngestMessageTopComponent.displayReport.option.OK=OK
-IngestMessageTopComponent.initComponents.name=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30a4\u30f3\u30dc\u30c3\u30af\u30b9
-IngestMessageTopComponent.msgDlg.ingestRpt.text=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30ec\u30dd\u30fc\u30c8
-IngestMonitor.mgrErrMsg.lowDiskSpace.msg=\u30c7\u30a3\u30b9\u30af{0}\u306e\u30c7\u30a3\u30b9\u30af\u9818\u57df\u4e0d\u8db3\u306e\u305f\u3081\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u3092\u4e2d\u6b62\u3057\u307e\u3059\u3002\
-\u30b1\u30fc\u30b9\u30c9\u30e9\u30a4\u30d6\u306b\u6700\u4f4e1GB\u306e\u7a7a\u304d\u9818\u57df\u304c\u3042\u308b\u306e\u3092\u78ba\u8a8d\u3057\u3001\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u3092\u518d\u30b9\u30bf\u30fc\u30c8\u3057\u3066\u4e0b\u3055\u3044\u3002
-IngestMonitor.mgrErrMsg.lowDiskSpace.title=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u304c\u4e2d\u6b62\u3055\u308c\u307e\u3057\u305f\u30fc{0}\u306e\u30c7\u30a3\u30b9\u30af\u9818\u57df\u4e0d\u8db3
-IngestScheduler.DataSourceScheduler.toString.size=DataSourceQueue, \u30b5\u30a4\u30ba\uff1a
+IngestMessageTopComponent.initComponents.name=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30A4\u30F3\u30DC\u30C3\u30AF\u30B9
+IngestMessageTopComponent.msgDlg.ingestRpt.text=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30EC\u30DD\u30FC\u30C8
+IngestMonitor.mgrErrMsg.lowDiskSpace.msg=\u30C7\u30A3\u30B9\u30AF{0}\u306E\u30C7\u30A3\u30B9\u30AF\u9818\u57DF\u4E0D\u8DB3\u306E\u305F\u3081\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u4E2D\u6B62\u3057\u307E\u3059\u3002\
+\u30B1\u30FC\u30B9\u30C9\u30E9\u30A4\u30D6\u306B\u6700\u4F4E1GB\u306E\u7A7A\u304D\u9818\u57DF\u304C\u3042\u308B\u306E\u3092\u78BA\u8A8D\u3057\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u518D\u30B9\u30BF\u30FC\u30C8\u3057\u3066\u4E0B\u3055\u3044\u3002
+IngestMonitor.mgrErrMsg.lowDiskSpace.title=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304C\u4E2D\u6B62\u3055\u308C\u307E\u3057\u305F\u30FC{0}\u306E\u30C7\u30A3\u30B9\u30AF\u9818\u57DF\u4E0D\u8DB3
+IngestScheduler.DataSourceScheduler.toString.size=DataSourceQueue, \u30B5\u30A4\u30BA\uFF1A
 IngestScheduler.FileSched.toString.curDirs.text=\
-CurDirs(stack), \u30b5\u30a4\u30ba\uff1a
+CurDirs(stack), \u30B5\u30A4\u30BA\uFF1A
 IngestScheduler.FileSched.toString.curFiles.text=\
-CurFiles, \u30b5\u30a4\u30ba\uff1a
+CurFiles, \u30B5\u30A4\u30BA\uFF1A
 IngestScheduler.FileSched.toString.rootDirs.text=\
-RootDirs(sorted), \u30b5\u30a4\u30ba\uff1a
-OpenIDE-Module-Name=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8
\ No newline at end of file
+RootDirs(sorted), \u30B5\u30A4\u30BA\uFF1A
+OpenIDE-Module-Name=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8
+IngestManager.StartIngestJobsTask.run.progress.msg1={0}\u306E\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30BF\u30B9\u30AF
+IngestManager.StartIngestJobsTask.run.progress.msg2={0}\u306E\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30BF\u30B9\u30AF
+IngestManager.StartIngestJobsTask.run.progress.msg3={0}\u306E\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30BF\u30B9\u30AF
+IngestManager.StartIngestJobsTask.run.progress.msg4={0}\u306E\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30BF\u30B9\u30AF
+IngestManager.StartIngestJobsTask.run.startupErr.dlgErrorList=\u30A8\u30E9\u30FC\uFF1A\
+\
+{0}
+IngestManager.StartIngestJobsTask.run.startupErr.dlgMsg=\uFF11\u3064\u307E\u305F\u306F\u8907\u6570\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u30B9\u30BF\u30FC\u30C8\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30B8\u30E7\u30D6\u306F\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F\u3002
+IngestManager.StartIngestJobsTask.run.startupErr.dlgSolution=\u5931\u6557\u3057\u305F\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u7121\u52B9\u5316\u3059\u308B\u304B\u30A8\u30E9\u30FC\u3092\u89E3\u6C7A\u3057\u3001\u305D\u306E\u5F8C\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u3092\u53F3\u30AF\u30EA\u30C3\u30AF\u3057\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u5B9F\u884C\u3092\u9078\u629E\u3057\u3066\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u30EA\u30B9\u30BF\u30FC\u30C8\u3057\u3066\u4E0B\u3055\u3044\u3002
+IngestManager.StartIngestJobsTask.run.startupErr.dlgTitle=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u5931\u6557
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurationPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurationPanel.java
index 1cf4cfaa90..6ad1aa9d98 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurationPanel.java
@@ -325,7 +325,7 @@ class IngestJobConfigurationPanel extends javax.swing.JPanel {
     static private class IngestModuleModel {
 
         private final IngestModuleTemplate moduleTemplate;
-        private IngestModuleGlobalSetttingsPanel globalSettingsPanel = null;
+        private IngestModuleGlobalSettingsPanel globalSettingsPanel = null;
         private IngestModuleIngestJobSettingsPanel moduleSettingsPanel = null;
 
         IngestModuleModel(IngestModuleTemplate moduleTemplate) {
@@ -370,7 +370,7 @@ class IngestJobConfigurationPanel extends javax.swing.JPanel {
             return moduleTemplate.hasGlobalSettingsPanel();
         }
 
-        IngestModuleGlobalSetttingsPanel getGlobalSettingsPanel() {
+        IngestModuleGlobalSettingsPanel getGlobalSettingsPanel() {
             return globalSettingsPanel;
         }
 
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();
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactory.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactory.java
index d097ff557c..c59e3868c8 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactory.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactory.java
@@ -113,7 +113,7 @@ public interface IngestModuleFactory {
      *
      * @return A global settings panel.
      */
-    IngestModuleGlobalSetttingsPanel getGlobalSettingsPanel();
+    IngestModuleGlobalSettingsPanel getGlobalSettingsPanel();
 
     /**
      * Gets the default per ingest job settings for instances of the family of
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryAdapter.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryAdapter.java
index 60bea92713..2c4831bb01 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryAdapter.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryAdapter.java
@@ -39,7 +39,7 @@ public abstract class IngestModuleFactoryAdapter implements IngestModuleFactory
     }
 
     @Override
-    public IngestModuleGlobalSetttingsPanel getGlobalSettingsPanel() {
+    public IngestModuleGlobalSettingsPanel getGlobalSettingsPanel() {
         throw new UnsupportedOperationException();
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleGlobalSetttingsPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleGlobalSettingsPanel.java
similarity index 92%
rename from Core/src/org/sleuthkit/autopsy/ingest/IngestModuleGlobalSetttingsPanel.java
rename to Core/src/org/sleuthkit/autopsy/ingest/IngestModuleGlobalSettingsPanel.java
index f6de631e9b..30724bfe8d 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleGlobalSetttingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleGlobalSettingsPanel.java
@@ -23,7 +23,7 @@ import javax.swing.JPanel;
 /**
  * Base class for ingest module global settings panels.
  */
-public abstract class IngestModuleGlobalSetttingsPanel extends JPanel {
+public abstract class IngestModuleGlobalSettingsPanel extends JPanel {
 
     public abstract void saveSettings();
 }
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleTemplate.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleTemplate.java
index f536b7916e..58dbc0004f 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleTemplate.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleTemplate.java
@@ -61,7 +61,7 @@ final class IngestModuleTemplate {
         return moduleFactory.hasGlobalSettingsPanel();
     }
 
-    IngestModuleGlobalSetttingsPanel getGlobalSettingsPanel() {
+    IngestModuleGlobalSettingsPanel getGlobalSettingsPanel() {
         return moduleFactory.getGlobalSettingsPanel();
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties
index c5610f46ad..7c63074fbe 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties
@@ -50,3 +50,5 @@ FileExtMismatchSettingsPanel.userExtTextField.text=
 FileExtMismatchSettingsPanel.addExtButton.text=Add Extension
 FileExtMismatchSettingsPanel.removeExtButton.text=Remove Selected Extension
 FileExtMismatchSettingsPanel.userTypeTextField.text=
+FileExtMismatchDetectorModuleFactory.getIngestJobSettingsPanel.exception.msg=Expected settings argument to be instanceof FileExtMismatchDetectorModuleSettings
+FileExtMismatchDetectorModuleFactory.createFileIngestModule.exception.msg=Expected settings argument to be instanceof FileExtMismatchDetectorModuleSettings
diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle_ja.properties
index 5ab739bd53..ecaba3fc54 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle_ja.properties
@@ -1,46 +1,48 @@
-OpenIDE-Module-Name=\u30d5\u30a1\u30a4\u30eb\u62e1\u5f35\u5b50\u4e0d\u4e00\u81f4
-OptionsCategory_Name_FileExtMismatchOptions=\u30d5\u30a1\u30a4\u30eb\u62e1\u5f35\u5b50\u4e0d\u4e00\u81f4
-OptionsCategory_FileExtMismatch=\u30d5\u30a1\u30a4\u30eb\u62e1\u5f35\u5b50\u4e0d\u4e00\u81f4
-AddFileExtensionAction.msgDlg.msg=XML\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u3092\u66f8\u304f\u306e\u3092\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-AddFileExtensionAction.msgDlg.title=\u4e0d\u4e00\u81f4\u62e1\u5f35\u5b50\u306e\u8ffd\u52a0\u30a8\u30e9\u30fc
-FileExtMismatchConfigPanel.name.text=\u30a2\u30c9\u30d0\u30f3\u30b9\u30d5\u30a1\u30a4\u30eb\u62e1\u5f35\u5b50\u4e0d\u4e00\u81f4\u8a2d\u5b9a
-FileExtMismatchConfigPanel.addExtButton.errLabel.empty=\u62e1\u5f35\u5b50\u30c6\u30ad\u30b9\u30c8\u304c\u7a7a\u767d\u3067\u3059\uff01
-FileExtMismatchConfigPanel.addExtButton.errLabel.noMimeType=MIME\u30bf\u30a4\u30d7\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093\uff01
-FileExtMismatchConfigPanel.addExtButton.errLabel.extExists=\u62e1\u5f35\u5b50\u306f\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059\uff01
-FileExtMismatchConfigPanel.addExtButton.errLabel.extAdded=\u62e1\u5f35\u5b50{0}\u306f\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f\u3002
-FileExtMismatchConfigPanel.addTypeButton.empty=MIME\u30bf\u30a4\u30d7\u30c6\u30ad\u30b9\u30c8\u304c\u7a7a\u767d\u3067\u3059\uff01
-FileExtMismatchConfigPanel.addTypeButton.mimeTypeNotSupported=MIME\u30bf\u30a4\u30d7\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\uff01
-FileExtMismatchConfigPanel.addTypeButton.mimeTypeExists=MIME\u30bf\u30a4\u30d7\u306f\u3059\u3067\u306b\u5b58\u5728\u3057\u307e\u3059\uff01
-FileExtMismatchConfigPanel.addTypeButton.mimeTypeNotDetectable=MIME\u30bf\u30a4\u30d7\u306f\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u3067\u306f\u691c\u51fa\u3067\u304d\u307e\u305b\u3093\u3002
-FileExtMismatchConfigPanel.addTypeButton.mimeTypeAdded=MIME\u30bf\u30a4\u30d7{0}\u306f\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f\u3002
-FileExtMismatchConfigPanel.removeTypeButton.noneSelected=MIME\u30bf\u30a4\u30d7\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093\uff01
-FileExtMismatchConfigPanel.remoteTypeButton.deleted=MIME\u30bf\u30a4\u30d7{0}\u306f\u524a\u9664\u3055\u308c\u307e\u3057\u305f\u3002
-FileExtMismatchConfigPanel.removeExtButton.noneSelected=\u62e1\u5f35\u5b50\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093\uff01
-FileExtMismatchConfigPanel.removeExtButton.noMimeTypeSelected=MIME\u30bf\u30a4\u30d7\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093\uff01
-FileExtMismatchConfigPanel.removeExtButton.deleted=\u62e1\u5f35\u5b50{0}\u306f\u524a\u9664\u3055\u308c\u307e\u3057\u305f\u3002
-FileExtMismatchConfigPanel.store.msg=\u4fdd\u5b58\u3055\u308c\u307e\u3057\u305f\u3002
-FileExtMismatchConfigPanel.store.msgDlg.msg=XML\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u3092\u66f8\u304f\u306e\u3092\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-FileExtMismatchConfigPanel.save.msgDlg.title=\u4fdd\u5b58\u30a8\u30e9\u30fc
-FileExtMismatchConfigPanel.ok.confDlg.msg=\u8a2d\u5b9a\u5909\u66f4\u3092\u4fdd\u5b58\u3057\u307e\u3059\u304b\uff1f
-FileExtMismatchConfigPanel.confDlg.title=\u4fdd\u5b58\u3055\u308c\u3066\u3044\u306a\u3044\u5909\u66f4
-FileExtMismatchConfigPanel.mimeTableModel.colName=MIME\u30bf\u30a4\u30d7
-FileExtMismatchConfigPanel.extTableModel.colName=\u62e1\u5f35\u5b50
-FileExtMismatchContextMenuActionsProvider.menuItemStr=\u62e1\u5f35\u5b50{0}\u3092MIME\u30bf\u30a4\u30d7{1}\u306e\u4e00\u81f4\u3068\u3057\u3066\u8ffd\u52a0
-FileExtMismatchIngestModule.moduleName=\u62e1\u5f35\u5b50\u4e0d\u4e00\u81f4\u30c7\u30a3\u30c6\u30af\u30bf\u30fc
-FileExtMismatchIngestModule.moduleDesc.text=\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7\u306b\u57fa\u3065\u3044\u3066\u3001\u6a19\u6e96\u7684\u3067\u306f\u306a\u3044\u62e1\u5f35\u5b50\u3092\u6301\u3064\u30d5\u30a1\u30a4\u30eb\u3092\u30d5\u30e9\u30b0\u4ed8\u3051\u3057\u307e\u3059\u3002d
-FileExtMismatchIngestModule.complete.totalProcTime=\u5408\u8a08\u51e6\u7406\u6642\u9593
-FileExtMismatchIngestModule.complete.totalFiles=\u5408\u8a08\u51e6\u7406\u30d5\u30a1\u30a4\u30eb\u6570
-FileExtMismatchIngestModule.complete.svcMsg.text=\u30d5\u30a1\u30a4\u30eb\u62e1\u5f35\u5b50\u4e0d\u4e00\u81f4\u7d50\u679c
-FileExtMismatchOptionsPanelController.moduleErr=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a8\u30e9\u30fc
-FileExtMismatchOptionsPanelController.moduleErr.msg=FileExtMismatchOptionsPanelController\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u306e\u78ba\u8a8d\u4e2d\u306b\u30e2\u30b8\u30e5\u30fc\u30eb\u304c\u30a8\u30e9\u30fc\u3092\u8d77\u3053\u3057\u307e\u3057\u305f\u3002\u3069\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u304b\u30ed\u30b0\u3067\u78ba\u8a8d\u3057\u3066\u4e0b\u3055\u3044\u3002\u4e00\u90e8\u306e\u30c7\u30fc\u30bf\u304c\u4e0d\u5b8c\u5168\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
-AddFileExtensionAction.extHeaderLbl.text=\u4e0b\u8a18\u7528\u306b\u8a31\u53ef\u3055\u308c\u305f\u62e1\u5f35\u5b50
-FileExtMismatchModuleSettingsPanel.skipTextPlain.text=\u30c6\u30ad\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb\u306f\u30b9\u30ad\u30c3\u30d7
+OpenIDE-Module-Name=\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u5B50\u4E0D\u4E00\u81F4
+OptionsCategory_Name_FileExtMismatchOptions=\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u5B50\u4E0D\u4E00\u81F4
+OptionsCategory_FileExtMismatch=\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u5B50\u4E0D\u4E00\u81F4
+AddFileExtensionAction.msgDlg.msg=XML\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u3092\u66F8\u304F\u306E\u3092\u5931\u6557\u3057\u307E\u3057\u305F\u3002
+AddFileExtensionAction.msgDlg.title=\u4E0D\u4E00\u81F4\u62E1\u5F35\u5B50\u306E\u8FFD\u52A0\u30A8\u30E9\u30FC
+FileExtMismatchConfigPanel.name.text=\u30A2\u30C9\u30D0\u30F3\u30B9\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u5B50\u4E0D\u4E00\u81F4\u8A2D\u5B9A
+FileExtMismatchConfigPanel.addExtButton.errLabel.empty=\u62E1\u5F35\u5B50\u30C6\u30AD\u30B9\u30C8\u304C\u7A7A\u767D\u3067\u3059\uFF01
+FileExtMismatchConfigPanel.addExtButton.errLabel.noMimeType=MIME\u30BF\u30A4\u30D7\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093\uFF01
+FileExtMismatchConfigPanel.addExtButton.errLabel.extExists=\u62E1\u5F35\u5B50\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\uFF01
+FileExtMismatchConfigPanel.addExtButton.errLabel.extAdded=\u62E1\u5F35\u5B50{0}\u306F\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F\u3002
+FileExtMismatchConfigPanel.addTypeButton.empty=MIME\u30BF\u30A4\u30D7\u30C6\u30AD\u30B9\u30C8\u304C\u7A7A\u767D\u3067\u3059\uFF01
+FileExtMismatchConfigPanel.addTypeButton.mimeTypeNotSupported=MIME\u30BF\u30A4\u30D7\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\uFF01
+FileExtMismatchConfigPanel.addTypeButton.mimeTypeExists=MIME\u30BF\u30A4\u30D7\u306F\u3059\u3067\u306B\u5B58\u5728\u3057\u307E\u3059\uFF01
+FileExtMismatchConfigPanel.addTypeButton.mimeTypeNotDetectable=MIME\u30BF\u30A4\u30D7\u306F\u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u3067\u306F\u691C\u51FA\u3067\u304D\u307E\u305B\u3093\u3002
+FileExtMismatchConfigPanel.addTypeButton.mimeTypeAdded=MIME\u30BF\u30A4\u30D7{0}\u306F\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F\u3002
+FileExtMismatchConfigPanel.removeTypeButton.noneSelected=MIME\u30BF\u30A4\u30D7\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093\uFF01
+FileExtMismatchConfigPanel.remoteTypeButton.deleted=MIME\u30BF\u30A4\u30D7{0}\u306F\u524A\u9664\u3055\u308C\u307E\u3057\u305F\u3002
+FileExtMismatchConfigPanel.removeExtButton.noneSelected=\u62E1\u5F35\u5B50\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093\uFF01
+FileExtMismatchConfigPanel.removeExtButton.noMimeTypeSelected=MIME\u30BF\u30A4\u30D7\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093\uFF01
+FileExtMismatchConfigPanel.removeExtButton.deleted=\u62E1\u5F35\u5B50{0}\u306F\u524A\u9664\u3055\u308C\u307E\u3057\u305F\u3002
+FileExtMismatchConfigPanel.store.msg=\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F\u3002
+FileExtMismatchConfigPanel.store.msgDlg.msg=XML\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u3092\u66F8\u304F\u306E\u3092\u5931\u6557\u3057\u307E\u3057\u305F\u3002
+FileExtMismatchConfigPanel.save.msgDlg.title=\u4FDD\u5B58\u30A8\u30E9\u30FC
+FileExtMismatchConfigPanel.ok.confDlg.msg=\u8A2D\u5B9A\u5909\u66F4\u3092\u4FDD\u5B58\u3057\u307E\u3059\u304B\uFF1F
+FileExtMismatchConfigPanel.confDlg.title=\u4FDD\u5B58\u3055\u308C\u3066\u3044\u306A\u3044\u5909\u66F4
+FileExtMismatchConfigPanel.mimeTableModel.colName=MIME\u30BF\u30A4\u30D7
+FileExtMismatchConfigPanel.extTableModel.colName=\u62E1\u5F35\u5B50
+FileExtMismatchContextMenuActionsProvider.menuItemStr=\u62E1\u5F35\u5B50{0}\u3092MIME\u30BF\u30A4\u30D7{1}\u306E\u4E00\u81F4\u3068\u3057\u3066\u8FFD\u52A0
+FileExtMismatchIngestModule.moduleName=\u62E1\u5F35\u5B50\u4E0D\u4E00\u81F4\u30C7\u30A3\u30C6\u30AF\u30BF\u30FC
+FileExtMismatchIngestModule.moduleDesc.text=\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u306B\u57FA\u3065\u3044\u3066\u3001\u6A19\u6E96\u7684\u3067\u306F\u306A\u3044\u62E1\u5F35\u5B50\u3092\u6301\u3064\u30D5\u30A1\u30A4\u30EB\u3092\u30D5\u30E9\u30B0\u4ED8\u3051\u3057\u307E\u3059\u3002d
+FileExtMismatchIngestModule.complete.totalProcTime=\u5408\u8A08\u51E6\u7406\u6642\u9593
+FileExtMismatchIngestModule.complete.totalFiles=\u5408\u8A08\u51E6\u7406\u30D5\u30A1\u30A4\u30EB\u6570
+FileExtMismatchIngestModule.complete.svcMsg.text=\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u5B50\u4E0D\u4E00\u81F4\u7D50\u679C
+FileExtMismatchOptionsPanelController.moduleErr=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
+FileExtMismatchOptionsPanelController.moduleErr.msg=FileExtMismatchOptionsPanelController\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u306E\u78BA\u8A8D\u4E2D\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u30A8\u30E9\u30FC\u3092\u8D77\u3053\u3057\u307E\u3057\u305F\u3002\u3069\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\u30ED\u30B0\u3067\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002\u4E00\u90E8\u306E\u30C7\u30FC\u30BF\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
+AddFileExtensionAction.extHeaderLbl.text=\u4E0B\u8A18\u7528\u306B\u8A31\u53EF\u3059\u308B\u62E1\u5F35\u5B50
+FileExtMismatchModuleSettingsPanel.skipTextPlain.text=\u30C6\u30AD\u30B9\u30C8\u30D5\u30A1\u30A4\u30EB\u306F\u30B9\u30AD\u30C3\u30D7
 
-FileExtMismatchModuleSettingsPanel.skipNoExtCheckBox.text=\u62e1\u5f35\u5b50\u306e\u7121\u3044\u30d5\u30a1\u30a4\u30eb\u306f\u30b9\u30ad\u30c3\u30d7
-FileExtMismatchSettingsPanel.addTypeButton.text=\u30bf\u30a4\u30d7\u3092\u8ffd\u52a0
-FileExtMismatchSettingsPanel.extHeaderLabel.text=\u8a31\u53ef\u3055\u308c\u305f\u62e1\u5f35\u5b50\uff1a
-FileExtMismatchSettingsPanel.removeTypeButton.text=\u9078\u629e\u3057\u305f\u30bf\u30a4\u30d7\u3092\u524a\u9664
-FileExtMismatchSettingsPanel.saveButton.text=\u8a2d\u5b9a\u3092\u4fdd\u5b58
-FileExtMismatchSettingsPanel.jLabel1.text=\u30d5\u30a1\u30a4\u30eb\u30bf\u30a4\u30d7\uff1a
-FileExtMismatchSettingsPanel.addExtButton.text=\u62e1\u5f35\u5b50\u3092\u8ffd\u52a0
-FileExtMismatchSettingsPanel.removeExtButton.text=\u9078\u629e\u3057\u305f\u62e1\u5f35\u5b50\u3092\u524a\u9664
+FileExtMismatchModuleSettingsPanel.skipNoExtCheckBox.text=\u62E1\u5F35\u5B50\u306E\u7121\u3044\u30D5\u30A1\u30A4\u30EB\u306F\u30B9\u30AD\u30C3\u30D7
+FileExtMismatchSettingsPanel.addTypeButton.text=\u30BF\u30A4\u30D7\u3092\u8FFD\u52A0
+FileExtMismatchSettingsPanel.extHeaderLabel.text=\u8A31\u53EF\u3059\u308B\u62E1\u5F35\u5B50\uFF1A
+FileExtMismatchSettingsPanel.removeTypeButton.text=\u9078\u629E\u3057\u305F\u30BF\u30A4\u30D7\u3092\u524A\u9664
+FileExtMismatchSettingsPanel.saveButton.text=\u8A2D\u5B9A\u3092\u4FDD\u5B58
+FileExtMismatchSettingsPanel.jLabel1.text=\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\uFF1A
+FileExtMismatchSettingsPanel.addExtButton.text=\u62E1\u5F35\u5B50\u3092\u8FFD\u52A0
+FileExtMismatchSettingsPanel.removeExtButton.text=\u9078\u629E\u3057\u305F\u62E1\u5F35\u5B50\u3092\u524A\u9664
+FileExtMismatchDetectorModuleFactory.getIngestJobSettingsPanel.exception.msg=\u8A2D\u5B9A\u3092\u884C\u3046\u70BA\u306E\u60F3\u5B9A\u3055\u308C\u308B\u5F15\u6570\u306Finstanceof FileExtMismatchDetectorModuleSettings\u3067\u3059\u3002
+FileExtMismatchDetectorModuleFactory.createFileIngestModule.exception.msg=\u8A2D\u5B9A\u3092\u884C\u3046\u70BA\u306E\u60F3\u5B9A\u3055\u308C\u308B\u5F15\u6570\u306Finstanceof FileExtMismatchDetectorModuleSettings\u3067\u3059\u3002
diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchDetectorModuleFactory.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchDetectorModuleFactory.java
index 645de2ba48..6affe32554 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchDetectorModuleFactory.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchDetectorModuleFactory.java
@@ -26,7 +26,7 @@ import org.sleuthkit.autopsy.ingest.FileIngestModule;
 import org.sleuthkit.autopsy.ingest.IngestModuleFactory;
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
-import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel;
+import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel;
 
 /**
  * An factory that creates file ingest modules that detect mismatches between
@@ -70,7 +70,8 @@ public class FileExtMismatchDetectorModuleFactory extends IngestModuleFactoryAda
     public IngestModuleIngestJobSettingsPanel getIngestJobSettingsPanel(IngestModuleIngestJobSettings settings) {
         assert settings instanceof FileExtMismatchDetectorModuleSettings;
         if (!(settings instanceof FileExtMismatchDetectorModuleSettings)) {
-            throw new IllegalArgumentException("Expected settings argument to be instanceof FileExtMismatchDetectorModuleSettings");
+            throw new IllegalArgumentException(NbBundle.getMessage(this.getClass(),
+                                                                   "FileExtMismatchDetectorModuleFactory.getIngestJobSettingsPanel.exception.msg"));
         }
         FileExtMismatchModuleSettingsPanel settingsPanel = new FileExtMismatchModuleSettingsPanel((FileExtMismatchDetectorModuleSettings) settings);
         return settingsPanel;
@@ -82,7 +83,7 @@ public class FileExtMismatchDetectorModuleFactory extends IngestModuleFactoryAda
     }
 
     @Override
-    public IngestModuleGlobalSetttingsPanel getGlobalSettingsPanel() {
+    public IngestModuleGlobalSettingsPanel getGlobalSettingsPanel() {
         FileExtMismatchSettingsPanel globalOptionsPanel = new FileExtMismatchSettingsPanel();
         globalOptionsPanel.load();
         return globalOptionsPanel;
@@ -97,7 +98,8 @@ public class FileExtMismatchDetectorModuleFactory extends IngestModuleFactoryAda
     public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings settings) {
         assert settings instanceof FileExtMismatchDetectorModuleSettings;
         if (!(settings instanceof FileExtMismatchDetectorModuleSettings)) {
-            throw new IllegalArgumentException("Expected settings argument to be instanceof FileExtMismatchDetectorModuleSettings");
+            throw new IllegalArgumentException(NbBundle.getMessage(this.getClass(),
+                                                                   "FileExtMismatchDetectorModuleFactory.createFileIngestModule.exception.msg"));
         }
         return new FileExtMismatchIngestModule((FileExtMismatchDetectorModuleSettings) settings);
     }
diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchIngestModule.java
index a59768fed9..6c0928619c 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchIngestModule.java
@@ -23,7 +23,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -52,10 +51,31 @@ public class FileExtMismatchIngestModule extends IngestModuleAdapter implements
     private final FileExtMismatchDetectorModuleSettings settings;
     private HashMap<String, String[]> SigTypeToExtMap = new HashMap<>();
     private long jobId;
-    private static AtomicLong processTime = new AtomicLong(0);
-    private static AtomicLong numFiles = new AtomicLong(0);
+    private static final HashMap<Long, IngestJobTotals> totalsForIngestJobs = new HashMap<>();    
     private static final IngestModuleReferenceCounter refCounter = new IngestModuleReferenceCounter();
 
+    private static class IngestJobTotals {
+        private long processTime = 0;
+        private long numFiles = 0;
+    }
+     
+    /**
+     * Update the match time total and increment num of files for this job
+     * @param ingestJobId  
+     * @param matchTimeInc amount of time to add
+     */
+    private static synchronized void addToTotals(long ingestJobId, long processTimeInc) {
+        IngestJobTotals ingestJobTotals = totalsForIngestJobs.get(ingestJobId);
+        if (ingestJobTotals == null) {
+            ingestJobTotals = new IngestJobTotals();
+            totalsForIngestJobs.put(ingestJobId, ingestJobTotals);
+        }
+        
+        ingestJobTotals.processTime += processTimeInc;
+        ingestJobTotals.numFiles++;
+        totalsForIngestJobs.put(ingestJobId, ingestJobTotals);
+    }    
+    
     FileExtMismatchIngestModule(FileExtMismatchDetectorModuleSettings settings) {
         this.settings = settings;
     }
@@ -64,6 +84,7 @@ public class FileExtMismatchIngestModule extends IngestModuleAdapter implements
     public void startUp(IngestJobContext context) throws IngestModuleException {
         jobId = context.getJobId();
         refCounter.incrementAndGet(jobId);
+
         FileExtMismatchXML xmlLoader = FileExtMismatchXML.getDefault();
         SigTypeToExtMap = xmlLoader.load();
     }
@@ -87,8 +108,7 @@ public class FileExtMismatchIngestModule extends IngestModuleAdapter implements
 
             boolean mismatchDetected = compareSigTypeToExt(abstractFile);
 
-            processTime.getAndAdd(System.currentTimeMillis() - startTime);
-            numFiles.getAndIncrement();
+            addToTotals(jobId, System.currentTimeMillis() - startTime);
 
             if (mismatchDetected) {
                 // add artifact               
@@ -155,21 +175,28 @@ public class FileExtMismatchIngestModule extends IngestModuleAdapter implements
     @Override
     public void shutDown(boolean ingestJobCancelled) {
         // We only need to post the summary msg from the last module per job
-        if (refCounter.decrementAndGet(jobId) == 0) {       
-            StringBuilder detailsSb = new StringBuilder();
-            detailsSb.append("<table border='0' cellpadding='4' width='280'>"); //NON-NLS
-            detailsSb.append("<tr><td>").append(FileExtMismatchDetectorModuleFactory.getModuleName()).append("</td></tr>"); //NON-NLS
-            detailsSb.append("<tr><td>").append( //NON-NLS
-                    NbBundle.getMessage(this.getClass(), "FileExtMismatchIngestModule.complete.totalProcTime"))
-                    .append("</td><td>").append(processTime.get()).append("</td></tr>\n"); //NON-NLS
-            detailsSb.append("<tr><td>").append( //NON-NLS
-                    NbBundle.getMessage(this.getClass(), "FileExtMismatchIngestModule.complete.totalFiles"))
-                    .append("</td><td>").append(numFiles.get()).append("</td></tr>\n"); //NON-NLS
-            detailsSb.append("</table>"); //NON-NLS
-            services.postMessage(IngestMessage.createMessage(IngestMessage.MessageType.INFO, FileExtMismatchDetectorModuleFactory.getModuleName(),
-                    NbBundle.getMessage(this.getClass(),
-                    "FileExtMismatchIngestModule.complete.svcMsg.text"),
-                    detailsSb.toString()));
+        if (refCounter.decrementAndGet(jobId) == 0) {    
+            IngestJobTotals jobTotals;
+            synchronized(this) {
+                jobTotals = totalsForIngestJobs.remove(jobId);
+            }
+            if (jobTotals != null) {
+                StringBuilder detailsSb = new StringBuilder();
+                detailsSb.append("<table border='0' cellpadding='4' width='280'>"); //NON-NLS
+                detailsSb.append("<tr><td>").append(FileExtMismatchDetectorModuleFactory.getModuleName()).append("</td></tr>"); //NON-NLS
+                detailsSb.append("<tr><td>").append( //NON-NLS
+                        NbBundle.getMessage(this.getClass(), "FileExtMismatchIngestModule.complete.totalProcTime"))
+                        .append("</td><td>").append(jobTotals.processTime).append("</td></tr>\n"); //NON-NLS
+                detailsSb.append("<tr><td>").append( //NON-NLS
+                        NbBundle.getMessage(this.getClass(), "FileExtMismatchIngestModule.complete.totalFiles"))
+                        .append("</td><td>").append(jobTotals.numFiles).append("</td></tr>\n"); //NON-NLS
+                detailsSb.append("</table>"); //NON-NLS
+
+                services.postMessage(IngestMessage.createMessage(IngestMessage.MessageType.INFO, FileExtMismatchDetectorModuleFactory.getModuleName(),
+                        NbBundle.getMessage(this.getClass(),
+                        "FileExtMismatchIngestModule.complete.svcMsg.text"),
+                        detailsSb.toString()));
+            }
         }
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java
index 12fe3f09b4..46f683f666 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchSettingsPanel.java
@@ -29,7 +29,7 @@ import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.AbstractTableModel;
-import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel;
+import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.modules.filetypeid.FileTypeIdIngestModule;
@@ -39,7 +39,7 @@ import org.sleuthkit.autopsy.corecomponents.OptionsPanel;
  * Container panel for File Extension Mismatch Ingest Module advanced
  * configuration options
  */
-final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSetttingsPanel implements OptionsPanel {
+final class FileExtMismatchSettingsPanel extends IngestModuleGlobalSettingsPanel implements OptionsPanel {
 
     private static Logger logger = Logger.getLogger(FileExtMismatchSettingsPanel.class.getName());
     private HashMap<String, String[]> editableMap = new HashMap<>();
diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties
index 4850085f1e..dd37c22195 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle.properties
@@ -6,3 +6,5 @@ FileTypeIdIngestModule.moduleDesc.text=Matches file types based on binary signat
 FileTypeIdIngestModule.complete.totalProcTime=Total Processing Time
 FileTypeIdIngestModule.complete.totalFiles=Total Files Processed
 FileTypeIdIngestModule.complete.srvMsg.text=File Type Id Results
+FileTypeIdModuleFactory.getIngestJobSettingsPanel.exception.msg=Expected settings argument to be instanceof FileTypeIdModuleSettings
+FileTypeIdModuleFactory.createFileIngestModule.exception.msg=Expected settings argument to be instanceof FileTypeIdModuleSettings
diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle_ja.properties
index ba061fa59d..a12d0e7cd8 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle_ja.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/Bundle_ja.properties
@@ -5,4 +5,6 @@ FileTypeIdIngestModule.moduleDesc.text=\u30D0\u30A4\u30CA\u30EA\u7F72\u540D\u306
 FileTypeIdIngestModule.complete.totalProcTime=\u5408\u8A08\u51E6\u7406\u6642\u9593
 FileTypeIdIngestModule.complete.totalFiles=\u5408\u8A08\u51E6\u7406\u30D5\u30A1\u30A4\u30EB\u6570
 FileTypeIdIngestModule.complete.srvMsg.text=\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u7279\u5B9A\u306E\u7D50\u679C
-FileTypeIdModuleSettingsPanel.skipKnownCheckBox.text=\u65E2\u77E5\u30D5\u30A1\u30A4\u30EB\uFF08NSRL\uFF09\u3092\u30B9\u30AD\u30C3\u30D7
\ No newline at end of file
+FileTypeIdModuleSettingsPanel.skipKnownCheckBox.text=\u65E2\u77E5\u30D5\u30A1\u30A4\u30EB\uFF08NSRL\uFF09\u3092\u30B9\u30AD\u30C3\u30D7
+FileTypeIdModuleFactory.getIngestJobSettingsPanel.exception.msg=\u8A2D\u5B9A\u3092\u884C\u3046\u70BA\u306E\u60F3\u5B9A\u3055\u308C\u308B\u5F15\u6570\u306Finstanceof FileTypeIdModuleSettings\u3067\u3059\u3002
+FileTypeIdModuleFactory.createFileIngestModule.exception.msg=\u8A2D\u5B9A\u3092\u884C\u3046\u70BA\u306E\u60F3\u5B9A\u3055\u308C\u308B\u5F15\u6570\u306Finstanceof FileTypeIdModuleSettings\u3067\u3059\u3002
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdIngestModule.java
index 75c326fda5..2e89724e86 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdIngestModule.java
@@ -61,10 +61,6 @@ public class FileTypeIdIngestModule extends IngestModuleAdapter implements FileI
         long numFiles = 0;
     }
     
-    private static synchronized void initTotals(long ingestJobId) {
-        totalsForIngestJobs.put(ingestJobId, new IngestJobTotals());
-    }
- 
     /**
      * Update the match time total and increment num of files for this job
      * @param ingestJobId  
@@ -72,6 +68,11 @@ public class FileTypeIdIngestModule extends IngestModuleAdapter implements FileI
      */
     private static synchronized void addToTotals(long ingestJobId, long matchTimeInc) {
         IngestJobTotals ingestJobTotals = totalsForIngestJobs.get(ingestJobId);
+        if (ingestJobTotals == null) {
+            ingestJobTotals = new IngestJobTotals();
+            totalsForIngestJobs.put(ingestJobId, ingestJobTotals);
+        }        
+        
         ingestJobTotals.matchTime += matchTimeInc;
         ingestJobTotals.numFiles++;
         totalsForIngestJobs.put(ingestJobId, ingestJobTotals);
@@ -84,9 +85,7 @@ public class FileTypeIdIngestModule extends IngestModuleAdapter implements FileI
     @Override
     public void startUp(IngestJobContext context) throws IngestModuleException {
         jobId = context.getJobId();
-        if (refCounter.incrementAndGet(jobId) == 1) {
-            initTotals(jobId);
-        }        
+        refCounter.incrementAndGet(jobId);
     }    
     
     @Override
@@ -133,22 +132,26 @@ public class FileTypeIdIngestModule extends IngestModuleAdapter implements FileI
     public void shutDown(boolean ingestJobCancelled) {
         // We only need to post the summary msg from the last module per job
         if (refCounter.decrementAndGet(jobId) == 0) {
-            IngestJobTotals jobTotals = totalsForIngestJobs.remove(jobId);
-            
-            StringBuilder detailsSb = new StringBuilder();
-            detailsSb.append("<table border='0' cellpadding='4' width='280'>"); //NON-NLS
-            detailsSb.append("<tr><td>").append(FileTypeIdModuleFactory.getModuleName()).append("</td></tr>"); //NON-NLS
-            detailsSb.append("<tr><td>") //NON-NLS
-                    .append(NbBundle.getMessage(this.getClass(), "FileTypeIdIngestModule.complete.totalProcTime"))
-                    .append("</td><td>").append(jobTotals.matchTime).append("</td></tr>\n"); //NON-NLS
-            detailsSb.append("<tr><td>") //NON-NLS
-                    .append(NbBundle.getMessage(this.getClass(), "FileTypeIdIngestModule.complete.totalFiles"))
-                    .append("</td><td>").append(jobTotals.numFiles).append("</td></tr>\n"); //NON-NLS
-            detailsSb.append("</table>"); //NON-NLS
-            IngestServices.getInstance().postMessage(IngestMessage.createMessage(IngestMessage.MessageType.INFO, FileTypeIdModuleFactory.getModuleName(),
-                    NbBundle.getMessage(this.getClass(),
-                    "FileTypeIdIngestModule.complete.srvMsg.text"),
-                    detailsSb.toString()));
+            IngestJobTotals jobTotals;
+            synchronized(this) {
+                jobTotals = totalsForIngestJobs.remove(jobId);
+            }
+            if (jobTotals != null) {
+                StringBuilder detailsSb = new StringBuilder();
+                detailsSb.append("<table border='0' cellpadding='4' width='280'>"); //NON-NLS
+                detailsSb.append("<tr><td>").append(FileTypeIdModuleFactory.getModuleName()).append("</td></tr>"); //NON-NLS
+                detailsSb.append("<tr><td>") //NON-NLS
+                        .append(NbBundle.getMessage(this.getClass(), "FileTypeIdIngestModule.complete.totalProcTime"))
+                        .append("</td><td>").append(jobTotals.matchTime).append("</td></tr>\n"); //NON-NLS
+                detailsSb.append("<tr><td>") //NON-NLS
+                        .append(NbBundle.getMessage(this.getClass(), "FileTypeIdIngestModule.complete.totalFiles"))
+                        .append("</td><td>").append(jobTotals.numFiles).append("</td></tr>\n"); //NON-NLS
+                detailsSb.append("</table>"); //NON-NLS
+                IngestServices.getInstance().postMessage(IngestMessage.createMessage(IngestMessage.MessageType.INFO, FileTypeIdModuleFactory.getModuleName(),
+                        NbBundle.getMessage(this.getClass(),
+                        "FileTypeIdIngestModule.complete.srvMsg.text"),
+                        detailsSb.toString()));
+            }
         }
     }
     
diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleFactory.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleFactory.java
index 0e041f116e..6688fd8027 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleFactory.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdModuleFactory.java
@@ -69,7 +69,8 @@ public class FileTypeIdModuleFactory extends IngestModuleFactoryAdapter {
     public IngestModuleIngestJobSettingsPanel getIngestJobSettingsPanel(IngestModuleIngestJobSettings settings) {
         assert settings instanceof FileTypeIdModuleSettings;
         if (!(settings instanceof FileTypeIdModuleSettings)) {
-            throw new IllegalArgumentException("Expected settings argument to be instanceof FileTypeIdModuleSettings");
+            throw new IllegalArgumentException(NbBundle.getMessage(this.getClass(),
+                                                                   "FileTypeIdModuleFactory.getIngestJobSettingsPanel.exception.msg"));
         }        
         return new FileTypeIdModuleSettingsPanel((FileTypeIdModuleSettings) settings);
     }
@@ -83,7 +84,8 @@ public class FileTypeIdModuleFactory extends IngestModuleFactoryAdapter {
     public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings settings) {
         assert settings instanceof FileTypeIdModuleSettings;
         if (!(settings instanceof FileTypeIdModuleSettings)) {
-            throw new IllegalArgumentException("Expected settings argument to be instanceof FileTypeIdModuleSettings");
+            throw new IllegalArgumentException(
+                    NbBundle.getMessage(this.getClass(), "FileTypeIdModuleFactory.createFileIngestModule.exception.msg"));
         }        
         return new FileTypeIdIngestModule((FileTypeIdModuleSettings) settings);
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
index 2400f38c88..cd48ed2764 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
@@ -47,6 +47,7 @@ import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.SwingWorker;
 import org.openide.filesystems.FileUtil;
+import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.EscapeUtil;
@@ -909,16 +910,12 @@ import org.sleuthkit.datamodel.TskData;
                     }
                 }
  
-               // Get any tags that associated with this artifact and apply the tag filter.
-               HashSet<String> uniqueTagNames = new HashSet<>();
-               ResultSet tagNameRows = skCase.runQuery("SELECT display_name FROM tag_names WHERE artifact_id = " + rs.getLong("artifact_id")); //NON-NLS
-               while (tagNameRows.next()) {
-                   uniqueTagNames.add(tagNameRows.getString("display_name")); //NON-NLS
-               }
-               if(failsTagFilter(uniqueTagNames, tagNamesFilter)) {
-                   continue;
-               }                    
-               String tagsList = makeCommaSeparatedList(uniqueTagNames);
+                // Get any tags that associated with this artifact and apply the tag filter.
+                HashSet<String> uniqueTagNames = getUniqueTagNames(rs.getLong("artifact_id"));
+                if(failsTagFilter(uniqueTagNames, tagNamesFilter)) {
+                    continue;
+                }                    
+                String tagsList = makeCommaSeparatedList(uniqueTagNames);
                                                         
                 Long objId = rs.getLong("obj_id"); //NON-NLS
                 String keyword = rs.getString("keyword"); //NON-NLS
@@ -1050,11 +1047,7 @@ import org.sleuthkit.datamodel.TskData;
                 }
                 
                 // Get any tags that associated with this artifact and apply the tag filter.
-                HashSet<String> uniqueTagNames = new HashSet<>();
-                ResultSet tagNameRows = skCase.runQuery("SELECT display_name FROM tag_names WHERE artifact_id = " + rs.getLong("artifact_id")); //NON-NLS
-                while (tagNameRows.next()) {
-                    uniqueTagNames.add(tagNameRows.getString("display_name")); //NON-NLS
-                }
+                HashSet<String> uniqueTagNames = getUniqueTagNames(rs.getLong("artifact_id"));
                 if(failsTagFilter(uniqueTagNames, tagNamesFilter)) {
                     continue;
                 }                    
@@ -1664,6 +1657,22 @@ import org.sleuthkit.datamodel.TskData;
             return ReportGenerator.this.getMappedAttributes(attributes);
         }
     }
+    
+    /**
+     * Get any tags associated with an artifact 
+     * @param artifactId
+     * @return hash set of tag display names
+     * @throws SQLException 
+     */    
+    private HashSet<String> getUniqueTagNames(long artifactId) throws SQLException {
+        HashSet<String> uniqueTagNames = new HashSet<>();
+        ResultSet tagNameRows = skCase.runQuery("SELECT display_name, artifact_id FROM tag_names AS tn, blackboard_artifact_tags AS bat " + //NON-NLS 
+            "WHERE tn.tag_name_id = bat.tag_name_id AND bat.artifact_id = " + artifactId); //NON-NLS
+        while (tagNameRows.next()) {
+            uniqueTagNames.add(tagNameRows.getString("display_name")); //NON-NLS
+        }
+        return uniqueTagNames;
+    }    
+    
 }
 
-
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle.properties b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle.properties
index ce9c5757c4..3701d4a7ff 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle.properties
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle.properties
@@ -201,3 +201,5 @@ AddContentToHashDbAction.addFilesToHashSet.files=files
 AddContentToHashDbAction.addFilesToHashSet.file=file
 HashDbManager.errCreatingIndex.title=Error creating index
 HashDbManager.errCreatingIndex.msg=Error creating index\: {0}
+HashLookupModuleFactory.getIngestJobSettingsPanel.exception.msg=Expected settings argument to be instanceof HashLookupModuleSettings
+HashLookupModuleFactory.createFileIngestModule.exception.msg=Expected settings argument to be instanceof HashLookupModuleSettings
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle_ja.properties b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle_ja.properties
index 53ff1c1f74..c74eb76a40 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle_ja.properties
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle_ja.properties
@@ -78,7 +78,7 @@ HashDbImportDatabaseDialog.failedToGetDbPathMsg=\u9078\u629E\u3057\u305F\u30C7\u
 HashDbImportDatabaseDialog.importHashDbErr=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30A4\u30F3\u30DD\u30FC\u30C8\u30A8\u30E9\u30FC
 HashDbImportDatabaseDialog.mustSelectHashDbFilePathMsg=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9\u306E\u9078\u629E\u304C\u5FC5\u8981\u3067\u3059\u3002
 HashDbImportDatabaseDialog.hashDbDoesNotExistMsg=\u9078\u629E\u3055\u308C\u305F\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306F\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
-HashDbImportDatabaseDialog.errorMessage.failedToOpenHashDbMsg=\ {0}\u3067\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u958B\u304F\u306E\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
+HashDbImportDatabaseDialog.errorMessage.failedToOpenHashDbMsg={0}\u3067\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u958B\u304F\u306E\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
 HashDbIngestModule.moduleName=\u30CF\u30C3\u30B7\u30E5\u30EB\u30C3\u30AF\u30A2\u30C3\u30D7
 HashDbIngestModule.moduleDescription=\u6A19\u6E96\u306ENSRL\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306A\u3069\u3001\u63D0\u4F9B\u3055\u308C\u305F\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u5229\u7528\u3057\u3066\u3001\u65E2\u77E5\u307E\u305F\u306F\u7591\u308F\u3057\u3044\u3082\u306E\u3092\u7279\u5B9A\u3057\u307E\u3059\u3002
 HashDbIngestModule.noKnownHashDbSetMsg=\u65E2\u77E5\u306E\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
@@ -88,7 +88,7 @@ HashDbConfigPanel.dbNotIndexedMsg=\u4E0B\u8A18\u306E\u30C7\u30FC\u30BF\u30D9\u30
  {0}
 HashDbIngestModule.knownBadFileSearchWillNotExecuteWarn=\u65E2\u77E5\u306E\u60AA\u8CEA\u30D5\u30A1\u30A4\u30EB\u691C\u7D22\u306F\u5B9F\u884C\u3055\u308C\u307E\u305B\u3093\u3002
 HashDbIngestModule.fileReadErrorMsg=\u8AAD\u307F\u8FBC\u307F\u30A8\u30E9\u30FC\uFF1A {0}
-HashDbIngestModule.calcHashValueErr=\ {0}\u306E\u30CF\u30C3\u30B7\u30E5\u5024\u3092\u8A08\u7B97\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+HashDbIngestModule.calcHashValueErr={0}\u306E\u30CF\u30C3\u30B7\u30E5\u5024\u3092\u8A08\u7B97\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
 HashDbIngestModule.hashLookupErrorMsg=\u30CF\u30C3\u30B7\u30E5\u30EB\u30C3\u30AF\u30A2\u30C3\u30D7\u30A8\u30E9\u30FC\uFF1A {0}
 HashDbIngestModule.settingKnownBadStateErr={0}\u306E\u30B9\u30C6\u30FC\u30BF\u30B9\u3092\u65E2\u77E5\u306E\u60AA\u8CEA\u3068\u8A2D\u5B9A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
 HashDbIngestModule.lookingUpKnownBadHashValueErr={0}\u306E\u65E2\u77E5\u306E\u60AA\u8CEA\u30CF\u30C3\u30B7\u30E5\u5024\u3092\u30EB\u30C3\u30AF\u30A2\u30C3\u30D7\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
@@ -135,8 +135,9 @@ HashDbSimpleConfigPanel.dlgMsg.mustIndexDbBeforeUse=\u30CF\u30C3\u30B7\u30E5\u30
 ModalNoButtons.indexingDbsTitle=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u4E2D
 ModalNoButtons.indexingDbTitle=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u4E2D
 ModalNoButtons.exitHashDbIndexingMsg=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3092\u4E2D\u6B62\u3057\u307E\u3059\u3002\
-\u4F5C\u6210\u3055\u308C\u305F\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306F\u5229\u7528\u4E0D\u53EF\u3068\u306A\u308A\u307E\u3059\u3002\u7D9A\u884C\u3059\u308B\u5834\u5408\u306F\u30CF\u30C3\u30B7\u30E5\u30D5\u30A9\u30EB\u30C0\u5185\u306B\u3042\u308B\u3001\u5BFE\u5FDC\u3059\u308B-md5.idx \u30D5\u30A1\u30A4\u30EB\u3092\u524A\u9664\u3057\u3066\u4E0B\u3055\u3044\u3002\
-\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3092\u4E2D\u6B62\u3057\u307E\u3059\u304B\uFF1F
+\u4F5C\u6210\u3055\u308C\u305F\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306F\u5229\u7528\u4E0D\u53EF\u3068\u306A\u308A\u307E\u3059\u3002\u7D9A\u884C\u3059\u308B\u5834\u5408\u306F\
+\u30CF\u30C3\u30B7\u30E5\u30D5\u30A9\u30EB\u30C0\u5185\u306B\u3042\u308B\u3001\u5BFE\u5FDC\u3059\u308B-md5.idx \u30D5\u30A1\u30A4\u30EB\u3092\u524A\u9664\u3057\u3066\u4E0B\u3055\u3044\u3002\
+\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3092\u4E2D\u6B62\u3057\u307E\u3059\u304B\uFF1F
 ModalNoButtons.dlgTitle.unfinishedIndexing=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u672A\u5B8C\u4E86
 ModalNoButtons.indexThis.currentlyIndexing1Db=\uFF11\u3064\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u4E2D
 ModalNoButtons.indexThese.currentlyIndexing1OfNDbs=\uFF11\uFF0F {0}\u3064\u76EE\u3092\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u4E2D
@@ -196,3 +197,5 @@ HashLookupSettingsPanel.indexLabel.text=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30
 HashLookupModuleSettingsPanel.alwaysCalcHashesCheckbox.text=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u306A\u304F\u3066\u3082\u3001\u30CF\u30C3\u30B7\u30E5\u5024\u3092\u8A08\u7B97
 HashLookupModuleSettingsPanel.knownHashDbsLabel.text=\u65E2\u77E5\u306E\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u51E6\u7406\u306B\u5229\u7528\uFF1A
 HashLookupModuleSettingsPanel.knownBadHashDbsLabel.text=\u65E2\u77E5\u306E\u60AA\u8CEA\u306A\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u51E6\u7406\u306B\u5229\u7528\uFF1A
+HashLookupModuleFactory.createFileIngestModule.exception.msg=\u8A2D\u5B9A\u3092\u884C\u3046\u70BA\u306E\u60F3\u5B9A\u3055\u308C\u308B\u5F15\u6570\u306Finstanceof HashLookupModuleSettings\u3067\u3059\u3002
+HashLookupModuleFactory.getIngestJobSettingsPanel.exception.msg=\u8A2D\u5B9A\u3092\u884C\u3046\u70BA\u306E\u60F3\u5B9A\u3055\u308C\u308B\u5F15\u6570\u306Finstanceof HashLookupModuleSettings\u3067\u3059\u3002
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java
index 71ab5c2c22..d8e67613dc 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java
@@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.hashdatabase;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
@@ -57,22 +58,35 @@ public class HashDbIngestModule extends IngestModuleAdapter implements FileInges
     private List<HashDb> knownBadHashSets = new ArrayList<>();
     private List<HashDb> knownHashSets = new ArrayList<>();
     private long jobId;
-    private static AtomicLong totalKnownBadCount = new AtomicLong(0);
-    private static AtomicLong totalCalctime = new AtomicLong(0);
-    private static AtomicLong totalLookuptime = new AtomicLong(0);
+    private static final HashMap<Long, IngestJobTotals> totalsForIngestJobs = new HashMap<>();    
     private static final IngestModuleReferenceCounter refCounter = new IngestModuleReferenceCounter();
     
+    private static class IngestJobTotals {
+        private AtomicLong totalKnownBadCount = new AtomicLong(0);
+        private AtomicLong totalCalctime = new AtomicLong(0);
+        private AtomicLong totalLookuptime = new AtomicLong(0);
+    }    
+    
+    private static synchronized IngestJobTotals getTotalsForIngestJobs(long ingestJobId) {
+        IngestJobTotals totals = totalsForIngestJobs.get(ingestJobId);
+        if (totals == null) {
+            totals = new HashDbIngestModule.IngestJobTotals();
+            totalsForIngestJobs.put(ingestJobId, totals);
+        }
+        return totals;
+    }
+
     HashDbIngestModule(HashLookupModuleSettings settings) {
         this.settings = settings;
     }
         
     @Override
     public void startUp(org.sleuthkit.autopsy.ingest.IngestJobContext context) throws IngestModuleException {
-        jobId = context.getJobId();        
+        jobId = context.getJobId();  
         getEnabledHashSets(hashDbManager.getKnownBadFileHashSets(), knownBadHashSets);
         getEnabledHashSets(hashDbManager.getKnownFileHashSets(), knownHashSets);        
         
-        if (refCounter.incrementAndGet(jobId) == 1) {      
+        if (refCounter.incrementAndGet(jobId) == 1) {                  
             // if first module for this job then post error msgs if needed
             
             if (knownBadHashSets.isEmpty()) {
@@ -123,6 +137,9 @@ public class HashDbIngestModule extends IngestModuleAdapter implements FileInges
             return ProcessResult.OK;
         }
 
+        // Safely get a reference to the totalsForIngestJobs object
+        IngestJobTotals totals = getTotalsForIngestJobs(jobId);
+        
         // calc hash value
         String name = file.getName();
         String md5Hash = file.getMd5Hash();
@@ -131,7 +148,7 @@ public class HashDbIngestModule extends IngestModuleAdapter implements FileInges
                 long calcstart = System.currentTimeMillis();
                 md5Hash = hasher.calculateMd5(file);
                 long delta = (System.currentTimeMillis() - calcstart);
-                totalCalctime.addAndGet(delta);
+                totals.totalCalctime.addAndGet(delta);
                 
             } catch (IOException ex) {
                 logger.log(Level.WARNING, "Error calculating hash of file " + name, ex); //NON-NLS
@@ -156,7 +173,7 @@ public class HashDbIngestModule extends IngestModuleAdapter implements FileInges
                 HashInfo hashInfo = db.lookUp(file);
                 if (null != hashInfo) {
                     foundBad = true;
-                    totalKnownBadCount.incrementAndGet();
+                    totals.totalKnownBadCount.incrementAndGet();
                     
                     try {
                         skCase.setKnown(file, TskData.FileKnown.BAD);
@@ -191,7 +208,7 @@ public class HashDbIngestModule extends IngestModuleAdapter implements FileInges
                     postHashSetHitToBlackboard(file, md5Hash, hashSetName, comment, db.getSendIngestMessages());
                 }
                 long delta = (System.currentTimeMillis() - lookupstart);
-                totalLookuptime.addAndGet(delta);
+                totals.totalLookuptime.addAndGet(delta);
 
             } catch (TskException ex) {
                 logger.log(Level.WARNING, "Couldn't lookup known bad hash for file " + name + " - see sleuthkit log for details", ex); //NON-NLS
@@ -224,7 +241,7 @@ public class HashDbIngestModule extends IngestModuleAdapter implements FileInges
                         }
                     }
                     long delta = (System.currentTimeMillis() - lookupstart);
-                    totalLookuptime.addAndGet(delta);
+                    totals.totalLookuptime.addAndGet(delta);
 
                 } catch (TskException ex) {
                     logger.log(Level.WARNING, "Couldn't lookup known hash for file " + name + " - see sleuthkit log for details", ex); //NON-NLS
@@ -302,43 +319,49 @@ public class HashDbIngestModule extends IngestModuleAdapter implements FileInges
         }
     }
 
+    private synchronized void postSummary() {
+        IngestJobTotals jobTotals = totalsForIngestJobs.remove(jobId);
+
+        if ((!knownBadHashSets.isEmpty()) || (!knownHashSets.isEmpty())) {
+            StringBuilder detailsSb = new StringBuilder();
+            //details
+            detailsSb.append("<table border='0' cellpadding='4' width='280'>"); //NON-NLS
+
+            detailsSb.append("<tr><td>") //NON-NLS
+                     .append(NbBundle.getMessage(this.getClass(), "HashDbIngestModule.complete.knownBadsFound"))
+                     .append("</td>"); //NON-NLS
+            detailsSb.append("<td>").append(jobTotals.totalKnownBadCount.get()).append("</td></tr>"); //NON-NLS
+
+            detailsSb.append("<tr><td>") //NON-NLS
+                     .append(NbBundle.getMessage(this.getClass(), "HashDbIngestModule.complete.totalCalcTime"))
+                     .append("</td><td>").append(jobTotals.totalCalctime.get()).append("</td></tr>\n"); //NON-NLS
+            detailsSb.append("<tr><td>") //NON-NLS
+                     .append(NbBundle.getMessage(this.getClass(), "HashDbIngestModule.complete.totalLookupTime"))
+                     .append("</td><td>").append(jobTotals.totalLookuptime.get()).append("</td></tr>\n"); //NON-NLS
+            detailsSb.append("</table>"); //NON-NLS
+
+            detailsSb.append("<p>") //NON-NLS
+                     .append(NbBundle.getMessage(this.getClass(), "HashDbIngestModule.complete.databasesUsed"))
+                     .append("</p>\n<ul>"); //NON-NLS
+            for (HashDb db : knownBadHashSets) {
+                detailsSb.append("<li>").append(db.getHashSetName()).append("</li>\n"); //NON-NLS
+            }
+
+            detailsSb.append("</ul>"); //NON-NLS
+
+            services.postMessage(IngestMessage.createMessage(
+                IngestMessage.MessageType.INFO,
+                HashLookupModuleFactory.getModuleName(),
+                NbBundle.getMessage(this.getClass(),
+                                    "HashDbIngestModule.complete.hashLookupResults"),
+                detailsSb.toString()));
+        }
+    }
                
     @Override
     public void shutDown(boolean ingestJobCancelled) {
         if (refCounter.decrementAndGet(jobId) == 0) {
-            if ((!knownBadHashSets.isEmpty()) || (!knownHashSets.isEmpty())) {
-                StringBuilder detailsSb = new StringBuilder();
-                //details
-                detailsSb.append("<table border='0' cellpadding='4' width='280'>"); //NON-NLS
-
-                detailsSb.append("<tr><td>") //NON-NLS
-                         .append(NbBundle.getMessage(this.getClass(), "HashDbIngestModule.complete.knownBadsFound"))
-                         .append("</td>"); //NON-NLS
-                detailsSb.append("<td>").append(totalKnownBadCount.get()).append("</td></tr>"); //NON-NLS
-
-                detailsSb.append("<tr><td>") //NON-NLS
-                         .append(NbBundle.getMessage(this.getClass(), "HashDbIngestModule.complete.totalCalcTime"))
-                         .append("</td><td>").append(totalCalctime.get()).append("</td></tr>\n"); //NON-NLS
-                detailsSb.append("<tr><td>") //NON-NLS
-                         .append(NbBundle.getMessage(this.getClass(), "HashDbIngestModule.complete.totalLookupTime"))
-                         .append("</td><td>").append(totalLookuptime.get()).append("</td></tr>\n"); //NON-NLS
-                detailsSb.append("</table>"); //NON-NLS
-
-                detailsSb.append("<p>") //NON-NLS
-                         .append(NbBundle.getMessage(this.getClass(), "HashDbIngestModule.complete.databasesUsed"))
-                         .append("</p>\n<ul>"); //NON-NLS
-                for (HashDb db : knownBadHashSets) {
-                    detailsSb.append("<li>").append(db.getHashSetName()).append("</li>\n"); //NON-NLS
-                }
-
-                detailsSb.append("</ul>"); //NON-NLS
-                services.postMessage(IngestMessage.createMessage(
-                    IngestMessage.MessageType.INFO,
-                    HashLookupModuleFactory.getModuleName(),
-                    NbBundle.getMessage(this.getClass(),
-                                        "HashDbIngestModule.complete.hashLookupResults"),
-                    detailsSb.toString()));
-            }
+            postSummary();
         }
     }
 }
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleFactory.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleFactory.java
index 3e2934f323..554c79ee33 100755
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleFactory.java
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleFactory.java
@@ -28,7 +28,7 @@ import org.sleuthkit.autopsy.ingest.FileIngestModule;
 import org.sleuthkit.autopsy.ingest.IngestModuleFactory;
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
-import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel;
+import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel;
 
 /**
  * A factory that creates file ingest modules that do hash database lookups.
@@ -82,7 +82,8 @@ public class HashLookupModuleFactory extends IngestModuleFactoryAdapter {
     @Override
     public IngestModuleIngestJobSettingsPanel getIngestJobSettingsPanel(IngestModuleIngestJobSettings settings) {
         if (!(settings instanceof HashLookupModuleSettings)) {
-            throw new IllegalArgumentException("Expected settings argument to be instanceof HashLookupModuleSettings");
+            throw new IllegalArgumentException(NbBundle.getMessage(this.getClass(),
+                                                                   "HashLookupModuleFactory.getIngestJobSettingsPanel.exception.msg"));
         }
         if (moduleSettingsPanel == null) {
             moduleSettingsPanel = new HashLookupModuleSettingsPanel((HashLookupModuleSettings) settings);
@@ -98,7 +99,7 @@ public class HashLookupModuleFactory extends IngestModuleFactoryAdapter {
     }
 
     @Override
-    public IngestModuleGlobalSetttingsPanel getGlobalSettingsPanel() {
+    public IngestModuleGlobalSettingsPanel getGlobalSettingsPanel() {
         HashLookupSettingsPanel globalSettingsPanel = new HashLookupSettingsPanel();
         globalSettingsPanel.load();
         return globalSettingsPanel;
@@ -112,7 +113,8 @@ public class HashLookupModuleFactory extends IngestModuleFactoryAdapter {
     @Override
     public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings settings) {
         if (!(settings instanceof HashLookupModuleSettings)) {
-            throw new IllegalArgumentException("Expected settings argument to be instanceof HashLookupModuleSettings");
+            throw new IllegalArgumentException(
+                    NbBundle.getMessage(this.getClass(), "HashLookupModuleFactory.createFileIngestModule.exception.msg"));
         }
         return new HashDbIngestModule((HashLookupModuleSettings) settings);
     }
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupSettingsPanel.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupSettingsPanel.java
index 62cc8f0792..7e901fbc71 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupSettingsPanel.java
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupSettingsPanel.java
@@ -45,13 +45,13 @@ import org.sleuthkit.autopsy.ingest.IngestManager;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.autopsy.hashdatabase.HashDbManager.HashDb;
 import org.sleuthkit.autopsy.hashdatabase.HashDbManager.HashDb.KnownFilesType;
-import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel;
+import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel;
 
 /**
  * Instances of this class provide a comprehensive UI for managing the hash sets
  * configuration.
  */
-public final class HashLookupSettingsPanel extends IngestModuleGlobalSetttingsPanel implements OptionsPanel {
+public final class HashLookupSettingsPanel extends IngestModuleGlobalSettingsPanel implements OptionsPanel {
 
     private static final String NO_SELECTION_TEXT = NbBundle
             .getMessage(HashLookupSettingsPanel.class, "HashDbConfigPanel.noSelectionText");
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java
index dcb8b25728..1a8b8ae6aa 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileExtract.java
@@ -44,37 +44,37 @@ interface AbstractFileExtract {
     static final List<String> ARCHIVE_MIME_TYPES =
             Arrays.asList(
             //ignore unstructured binary and compressed data, for which string extraction or unzipper works better
-            "application/x-7z-compressed",
-            "application/x-ace-compressed",
-            "application/x-alz-compressed",
-            "application/x-arj",
-            "application/vnd.ms-cab-compressed",
-            "application/x-cfs-compressed",
-            "application/x-dgc-compressed",
-            "application/x-apple-diskimage",
-            "application/x-gca-compressed",
-            "application/x-dar",
-            "application/x-lzx",
-            "application/x-lzh",
-            "application/x-rar-compressed",
-            "application/x-stuffit",
-            "application/x-stuffitx",
-            "application/x-gtar",
-            "application/x-archive",
-            "application/x-executable",
-            "application/x-gzip",
-            "application/zip",
-            "application/x-zoo",
-            "application/x-cpio",
-            "application/x-shar",
-            "application/x-tar",
-            "application/x-bzip",
-            "application/x-bzip2",
-            "application/x-lzip",
-            "application/x-lzma",
-            "application/x-lzop",
-            "application/x-z",
-            "application/x-compress");
+            "application/x-7z-compressed", //NON-NLS
+            "application/x-ace-compressed", //NON-NLS
+            "application/x-alz-compressed", //NON-NLS
+            "application/x-arj", //NON-NLS
+            "application/vnd.ms-cab-compressed", //NON-NLS
+            "application/x-cfs-compressed", //NON-NLS
+            "application/x-dgc-compressed", //NON-NLS
+            "application/x-apple-diskimage", //NON-NLS
+            "application/x-gca-compressed", //NON-NLS
+            "application/x-dar", //NON-NLS
+            "application/x-lzx", //NON-NLS
+            "application/x-lzh", //NON-NLS
+            "application/x-rar-compressed", //NON-NLS
+            "application/x-stuffit", //NON-NLS
+            "application/x-stuffitx", //NON-NLS
+            "application/x-gtar", //NON-NLS
+            "application/x-archive", //NON-NLS
+            "application/x-executable", //NON-NLS
+            "application/x-gzip", //NON-NLS
+            "application/zip", //NON-NLS
+            "application/x-zoo", //NON-NLS
+            "application/x-cpio", //NON-NLS
+            "application/x-shar", //NON-NLS
+            "application/x-tar", //NON-NLS
+            "application/x-bzip", //NON-NLS
+            "application/x-bzip2", //NON-NLS
+            "application/x-lzip", //NON-NLS
+            "application/x-lzma", //NON-NLS
+            "application/x-lzop", //NON-NLS
+            "application/x-z", //NON-NLS
+            "application/x-compress"); //NON-NLS
 
     /**
      * Get number of chunks resulted from extracting this AbstractFile
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java
index 38a5a51e71..1faf6ada56 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java
@@ -53,12 +53,13 @@ import org.sleuthkit.datamodel.ReadContentInputStream;
     private int numChunks = 0;
     
     static final List<String> WEB_MIME_TYPES = Arrays.asList(
-            "application/javascript",
-            "application/xhtml+xml",
-            "application/json",
-            "text/css",
-            "text/html",
-            "text/javascript" //"application/xml",
+            "application/javascript", //NON-NLS
+            "application/xhtml+xml", //NON-NLS
+            "application/json", //NON-NLS
+            "text/css", //NON-NLS
+            "text/html", //NON-NLS NON-NLS
+            "text/javascript" //NON-NLS
+            //"application/xml",
             //"application/xml-dtd",
             );
 
@@ -114,7 +115,7 @@ import org.sleuthkit.datamodel.ReadContentInputStream;
 
             // In case there is an exception or parse() isn't called
             if (reader == null) {
-                logger.log(Level.WARNING, "No reader available from HTML parser");
+                logger.log(Level.WARNING, "No reader available from HTML parser"); //NON-NLS
                 return false;
             }
 
@@ -174,29 +175,29 @@ import org.sleuthkit.datamodel.ReadContentInputStream;
                     ++this.numChunks;
                 } catch (Ingester.IngesterException ingEx) {
                     success = false;
-                    logger.log(Level.WARNING, "Ingester had a problem with extracted HTML from file '"
-                            + sourceFile.getName() + "' (id: " + sourceFile.getId() + ").", ingEx);
+                    logger.log(Level.WARNING, "Ingester had a problem with extracted HTML from file '" //NON-NLS
+                            + sourceFile.getName() + "' (id: " + sourceFile.getId() + ").", ingEx); //NON-NLS
                     throw ingEx; //need to rethrow/return to signal error and move on
                 }
             }
         } catch (IOException ex) {
-            logger.log(Level.WARNING, "Unable to read content stream from " + sourceFile.getId() + ": " + sourceFile.getName(), ex);
+            logger.log(Level.WARNING, "Unable to read content stream from " + sourceFile.getId() + ": " + sourceFile.getName(), ex); //NON-NLS
             success = false;
         } catch (Exception ex) {
-            logger.log(Level.WARNING, "Unexpected error, can't read content stream from " + sourceFile.getId() + ": " + sourceFile.getName(), ex);
+            logger.log(Level.WARNING, "Unexpected error, can't read content stream from " + sourceFile.getId() + ": " + sourceFile.getName(), ex); //NON-NLS
             success = false;
         } finally {
             try {
                 stream.close();
             } catch (IOException ex) {
-                logger.log(Level.WARNING, "Unable to close content stream from " + sourceFile.getId(), ex);
+                logger.log(Level.WARNING, "Unable to close content stream from " + sourceFile.getId(), ex); //NON-NLS
             }
             try {
                 if (reader != null) {
                     reader.close();
                 }
             } catch (IOException ex) {
-                logger.log(Level.WARNING, "Unable to close content reader from " + sourceFile.getId(), ex);
+                logger.log(Level.WARNING, "Unable to close content reader from " + sourceFile.getId(), ex); //NON-NLS
             }
         }
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java
index 22c3c5a5fb..78a8f5faf0 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java
@@ -54,7 +54,7 @@ import org.sleuthkit.datamodel.AbstractFile;
 
     @Override
     public String getContentType() {
-        return "text/plain;charset=" + charset.name();
+        return "text/plain;charset=" + charset.name(); //NON-NLS
     }
 
     @Override
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
index 17b419ffab..65ef4c31a1 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringExtract.java
@@ -141,7 +141,7 @@ class AbstractFileStringExtract implements AbstractFileExtract {
                     ++this.numChunks;
                 } catch (IngesterException ingEx) {
                     success = false;
-                    logger.log(Level.WARNING, "Ingester had a problem with extracted strings from file '" + sourceFile.getName() + "' (id: " + sourceFile.getId() + ").", ingEx);
+                    logger.log(Level.WARNING, "Ingester had a problem with extracted strings from file '" + sourceFile.getName() + "' (id: " + sourceFile.getId() + ").", ingEx); //NON-NLS
                     throw ingEx; //need to rethrow/return to signal error and move on
                 }
 
@@ -153,13 +153,13 @@ class AbstractFileStringExtract implements AbstractFileExtract {
             ingester.ingest(this);
 
         } catch (IOException ex) {
-            logger.log(Level.WARNING, "Unable to read input stream to divide and send to Solr, file: " + sourceFile.getName(), ex);
+            logger.log(Level.WARNING, "Unable to read input stream to divide and send to Solr, file: " + sourceFile.getName(), ex); //NON-NLS
             success = false;
         } finally {
             try {
                 stringStream.close();
             } catch (IOException ex) {
-                logger.log(Level.WARNING, "Error closing input stream stream, file: " + sourceFile.getName(), ex);
+                logger.log(Level.WARNING, "Error closing input stream stream, file: " + sourceFile.getName(), ex); //NON-NLS
             }
         }
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java
index 4090d8b570..b04ec4d2d9 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java
@@ -80,7 +80,7 @@ class AbstractFileTikaTextExtract implements AbstractFileExtract {
         for (MediaType mt : mediaTypes) {
             TIKA_SUPPORTED_TYPES.add(mt.getType() + "/" + mt.getSubtype());
         }
-        logger.log(Level.INFO, "Tika supported media types: {0}", TIKA_SUPPORTED_TYPES);
+        logger.log(Level.INFO, "Tika supported media types: {0}", TIKA_SUPPORTED_TYPES); //NON-NLS
     }
 
     @Override
@@ -149,7 +149,7 @@ class AbstractFileTikaTextExtract implements AbstractFileExtract {
             reader = parseTask.getReader();
             if (reader == null) {
                 //likely due to exception in parse()
-                logger.log(Level.WARNING, "No reader available from Tika parse");
+                logger.log(Level.WARNING, "No reader available from Tika parse"); //NON-NLS
                 return false;
             }
 
@@ -206,7 +206,7 @@ class AbstractFileTikaTextExtract implements AbstractFileExtract {
                     //sort meta data keys
                     List<String> sortedKeyList = Arrays.asList(meta.names());
                     Collections.sort(sortedKeyList);
-                    sb.append("\n\n------------------------------METADATA------------------------------\n\n");
+                    sb.append("\n\n------------------------------METADATA------------------------------\n\n"); //NON-NLS
                     for (String key : sortedKeyList) {
                         String value = meta.get(key);
                         sb.append(key).append(": ").append(value).append("\n");
@@ -224,18 +224,18 @@ class AbstractFileTikaTextExtract implements AbstractFileExtract {
                     ++this.numChunks;
                 } catch (Ingester.IngesterException ingEx) {
                     success = false;
-                    logger.log(Level.WARNING, "Ingester had a problem with extracted strings from file '"
-                            + sourceFile.getName() + "' (id: " + sourceFile.getId() + ").", ingEx);
+                    logger.log(Level.WARNING, "Ingester had a problem with extracted strings from file '" //NON-NLS
+                            + sourceFile.getName() + "' (id: " + sourceFile.getId() + ").", ingEx); //NON-NLS
                     throw ingEx; //need to rethrow/return to signal error and move on
                 }
             }
         } catch (IOException ex) {
-            final String msg = "Exception: Unable to read Tika content stream from " + sourceFile.getId() + ": " + sourceFile.getName();
+            final String msg = "Exception: Unable to read Tika content stream from " + sourceFile.getId() + ": " + sourceFile.getName(); //NON-NLS
             KeywordSearch.getTikaLogger().log(Level.WARNING, msg, ex);
             logger.log(Level.WARNING, msg);
             success = false;
         } catch (Exception ex) {
-            final String msg = "Exception: Unexpected error, can't read Tika content stream from " + sourceFile.getId() + ": " + sourceFile.getName();
+            final String msg = "Exception: Unexpected error, can't read Tika content stream from " + sourceFile.getId() + ": " + sourceFile.getName(); //NON-NLS
             KeywordSearch.getTikaLogger().log(Level.WARNING, msg, ex);
             logger.log(Level.WARNING, msg);
             success = false;
@@ -243,14 +243,14 @@ class AbstractFileTikaTextExtract implements AbstractFileExtract {
             try {
                 stream.close();
             } catch (IOException ex) {
-                logger.log(Level.WARNING, "Unable to close Tika content stream from " + sourceFile.getId(), ex);
+                logger.log(Level.WARNING, "Unable to close Tika content stream from " + sourceFile.getId(), ex); //NON-NLS
             }
             try {
                 if (reader != null) {
                     reader.close();
                 }
             } catch (IOException ex) {
-                logger.log(Level.WARNING, "Unable to close content reader from " + sourceFile.getId(), ex);
+                logger.log(Level.WARNING, "Unable to close content reader from " + sourceFile.getId(), ex); //NON-NLS
             }
         }
 
@@ -269,17 +269,17 @@ class AbstractFileTikaTextExtract implements AbstractFileExtract {
     public boolean isSupported(AbstractFile file, String detectedFormat) {
         if (detectedFormat == null) {
             return false;
-        } else if (detectedFormat.equals("application/octet-stream")
-                || detectedFormat.equals("application/x-msdownload")) {
+        } else if (detectedFormat.equals("application/octet-stream") //NON-NLS
+                || detectedFormat.equals("application/x-msdownload")) { //NON-NLS
             //any binary unstructured blobs (string extraction will be used)
             return false;
         } else if (AbstractFileExtract.ARCHIVE_MIME_TYPES.contains(detectedFormat)) {
             return false;
         } //skip video other than flv (tika supports flv only)
-        else if (detectedFormat.contains("video/")
-                && !detectedFormat.equals("video/x-flv")) {
+        else if (detectedFormat.contains("video/") //NON-NLS
+                && !detectedFormat.equals("video/x-flv")) { //NON-NLS
             return false;
-        } else if (detectedFormat.contains("application/x-font-ttf")) {
+        } else if (detectedFormat.contains("application/x-font-ttf")) { //NON-NLS
             // Tika currently has a bug in the ttf parser in fontbox.
             // It will throw an out of memory exception
             return false;
@@ -319,11 +319,11 @@ class AbstractFileTikaTextExtract implements AbstractFileExtract {
             try {
                 reader = tika.parse(stream, meta);
             } catch (IOException ex) {
-                KeywordSearch.getTikaLogger().log(Level.WARNING, "Exception: Unable to Tika parse the content" + sourceFile.getId() + ": " + sourceFile.getName(), ex);
+                KeywordSearch.getTikaLogger().log(Level.WARNING, "Exception: Unable to Tika parse the content" + sourceFile.getId() + ": " + sourceFile.getName(), ex); //NON-NLS
                 tika = null;
                 reader = null;
             } catch (Exception ex) {
-                KeywordSearch.getTikaLogger().log(Level.WARNING, "Exception: Unable to Tika parse the content" + sourceFile.getId() + ": " + sourceFile.getName(), ex);
+                KeywordSearch.getTikaLogger().log(Level.WARNING, "Exception: Unable to Tika parse the content" + sourceFile.getId() + ": " + sourceFile.getName(), ex); //NON-NLS
                 tika = null;
                 reader = null;
             }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
index 22c95f3bd4..30513b4c21 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
@@ -280,3 +280,7 @@ KeywordSearchListsAbstract.writeLists.errMsg2.msg=A module caused an error liste
 KeywordSearchListsAbstract.deleteList.errMsg1.msg=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
 KeywordSearchListsManagementPanel.newKeywordListDescription=Keyword List <{0}> already exists as a read-only list. Do you want to replace it for the duration of the program (the change will not be persistent).
 KeywordSearchListsManagementPanel.newKeywordListDescription2=Keyword List <{0}> already exists, do you want to replace it?
+DropdownSearchPanelgetQueryList.exception.msg=No list for single-keyword search
+KeywordSearchModuleFactory.getIngestJobSettingsPanel.exception.msg=Expected settings argument to be instanceof KeywordSearchJobSettings
+KeywordSearchModuleFactory.createFileIngestModule.exception.msg=Expected settings argument to be instanceof KeywordSearchJobSettings
+SearchRunner.Searcher.done.err.msg=Error performing keyword search
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties
index 19cf99b2ac..419b184213 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties
@@ -31,13 +31,13 @@ KeywordSearchListsViewerPanel.manageListsButton.text=\u30EA\u30B9\u30C8\u3092\u7
 KeywordSearchListsViewerPanel.ingestIndexLabel.text=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\uFF1A
 ExtractedContentPanel.pageButtonsLabel.text=\u30DA\u30FC\u30B8
 ExtractedContentPanel.pagesLabel.text=\u30DA\u30FC\u30B8\uFF1A
-KeywordSearchEditListPanel.ingestMessagesCheckbox.text=\u51E6\u7406\u4E2D\u306B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u30A4\u30F3\u30DC\u30C3\u30AF\u30B9\u306B\u9001\u4FE1
-KeywordSearchEditListPanel.ingestMessagesCheckbox.toolTipText=\u3053\u306E\u30EA\u30B9\u30C8\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u304C\u691C\u7D22\u306B\u30D2\u30C3\u30C8\u3057\u305F\u5834\u5408\u3001\u51E6\u7406\u4E2D\u306B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u30A4\u30F3\u30DC\u30C3\u30AF\u30B9\u306B\u9001\u4FE1
+KeywordSearchEditListPanel.ingestMessagesCheckbox.text=\u30D2\u30C3\u30C8\u6BCE\u306B\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30A4\u30F3\u30DC\u30C3\u30AF\u30B9\u3078\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u9001\u4FE1
+KeywordSearchEditListPanel.ingestMessagesCheckbox.toolTipText=\u3053\u306E\u30EA\u30B9\u30C8\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u304C\u691C\u7D22\u306B\u30D2\u30C3\u30C8\u3057\u305F\u5834\u5408\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u4E2D\u306B\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u30A4\u30F3\u30DC\u30C3\u30AF\u30B9\u306B\u9001\u4FE1
 KeywordSearchEditListPanel.keywordOptionsLabel.text=\u30AD\u30FC\u30EF\u30FC\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3
 KeywordSearchEditListPanel.listOptionsLabel.text=\u30EA\u30B9\u30C8\u30AA\u30D7\u30B7\u30E7\u30F3
 KeywordSearchListsManagementPanel.keywordListsLabel.text=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\uFF1A
 KeywordSearchEditListPanel.keywordsLabel.text=\u30AD\u30FC\u30EF\u30FC\u30C9\uFF1A
-OpenIDE-Module-Short-Description=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u51E6\u7406\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u62BD\u51FA\u3055\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u30D3\u30E5\u30FC\u30A2\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30C4\u30FC\u30EB
+OpenIDE-Module-Short-Description=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3001\u62BD\u51FA\u3055\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u30D3\u30E5\u30FC\u30A2\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30C4\u30FC\u30EB
 KeywordSearchListsViewerPanel.manageListsButton.toolTipText=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3001\u30EA\u30B9\u30C8\u306E\u8A2D\u5B9A\u3068\u95A2\u9023\u3059\u308B\u30AD\u30FC\u30EF\u30FC\u30C9\u306E\u7BA1\u7406\u3002\u3053\u306E\u8A2D\u5B9A\u306F\u5168\u3066\u306E\u30B1\u30FC\u30B9\u306B\u9069\u7528\u3055\u308C\u307E\u3059\u3002
 AbstractKeywordSearchPerformer.search.dialogErrorHeader=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30A8\u30E9\u30FC
 AbstractKeywordSearchPerformer.search.invalidSyntaxHeader=\u30B7\u30F3\u30BF\u30C3\u30AF\u30B9\u30A8\u30E9\u30FC
@@ -46,13 +46,13 @@ AbstractKeywordSearchPerformer.search.ingestInProgressBody=<html>\u30AD\u30FC\u3
 AbstractKeywordSearchPerformer.search.emptyKeywordErrorBody=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u304C\u7A7A\u767D\u3067\u3059\u3002\u6700\u4F4E\uFF11\u3064\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u8FFD\u52A0\u3057\u3066\u4E0B\u3055\u3044\u3002
 AbstractKeywordSearchPerformer.search.pleaseEnterKeywordBody=\u691C\u7D22\u3059\u308B\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044
 AbstractKeywordSearchPerformer.search.noFilesInIdxMsg=<html>\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u307E\u3060\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093\u3002<br />\u3057\u3070\u3089\u304F\u3057\u3066\u304B\u3089\u3001\u518D\u5EA6\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306F\u3000{0}\u3000\u5206\u6BCE\u66F4\u65B0\u3055\u308C\u307E\u3059\u3002</html>
-AbstractKeywordSearchPerformer.search.noFilesIdxdMsg=<html>\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093\u3002<br />\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6709\u52B9\u5316\u3057\u3066\u30A4\u30E1\u30FC\u30B8\u3092\u518D\u51E6\u7406\u3002</html>
+AbstractKeywordSearchPerformer.search.noFilesIdxdMsg=<html>\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093\u3002<br />\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u6709\u52B9\u5316\u3057\u3066\u30A4\u30E1\u30FC\u30B8\u3092\u518D\u5EA6\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3002</html>
 ExtractedContentPanel.setMarkup.panelTxt=<span style\='font-style\:italic'>\u30C6\u30AD\u30B9\u30C8\u30ED\u30FC\u30C9\u4E2D\u3002\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044...</span>
 ExtractedContentViewer.toString=\u62BD\u51FA\u3055\u308C\u305F\u30C6\u30AD\u30B9\u30C8
-ExtractedContentViewer.toolTip=\u30D5\u30A1\u30A4\u30EB\u3084\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u7D50\u679C\u304B\u3089\u62BD\u51FA\u3055\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u3092\u8868\u793A\u3002\u3053\u306E\u30D3\u30E5\u30FC\u30A2\u3092\u30A2\u30AF\u30C6\u30A3\u30D9\u30A4\u30C8\u3059\u308B\u306B\u306F\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u51E6\u7406\u3092\u30D5\u30A1\u30A4\u30EB\u4E0A\u3067\u5B9F\u884C\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+ExtractedContentViewer.toolTip=\u30D5\u30A1\u30A4\u30EB\u3084\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u7D50\u679C\u304B\u3089\u62BD\u51FA\u3055\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u3092\u8868\u793A\u3002\u3053\u306E\u30D3\u30E5\u30FC\u30A2\u3092\u30A2\u30AF\u30C6\u30A3\u30D9\u30A4\u30C8\u3059\u308B\u306B\u306F\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u30D5\u30A1\u30A4\u30EB\u4E0A\u3067\u5B9F\u884C\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 ExtractedContentViewer.getTitle=\u30C6\u30AD\u30B9\u30C8
 ExtractedContentViewer.getSolrContent.knownFileMsg=<p style\=''font-style\:italic''>{0}\u306F\u65E2\u77E5\u30D5\u30A1\u30A4\u30EB\u3067\u3059\uFF08MDS\u30CF\u30C3\u30B7\u30E5\u306B\u57FA\u3065\u304F\u3068\uFF09\u3002\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u30C6\u30AD\u30B9\u30C8\u304C\u3042\u308A\u307E\u305B\u3093\u3002</p>
-ExtractedContentViewer.getSolrContent.noTxtYetMsg=<p style\=''font-style\:italic''>{0}\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u30C6\u30AD\u30B9\u30C8\u304C\u3042\u308A\u307E\u305B\u3093\u3002<br/>\u30C6\u30AD\u30B9\u30C8\u304C\u7121\u3044\u304B\u3001\u307E\u3060\u89E3\u6790\u3055\u308C\u3066\u3044\u306A\u3044\u304B\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u304C\u51E6\u7406\u4E2D\u306B\u6709\u52B9\u5316\u3055\u308C\u3066\u3044\u306A\u304B\u3063\u305F\u306E\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002</p>
+ExtractedContentViewer.getSolrContent.noTxtYetMsg=<p style\=''font-style\:italic''>{0}\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u30C6\u30AD\u30B9\u30C8\u304C\u3042\u308A\u307E\u305B\u3093\u3002<br/>\u30C6\u30AD\u30B9\u30C8\u304C\u7121\u3044\u304B\u3001\u307E\u3060\u89E3\u6790\u3055\u308C\u3066\u3044\u306A\u3044\u304B\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u304C\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u4E2D\u306B\u6709\u52B9\u5316\u3055\u308C\u3066\u3044\u306A\u304B\u3063\u305F\u306E\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002</p>
 HighlightedMatchesSource.getMarkup.noMatchMsg=<html><pre><span style\\\\\='background\\\\\:yellow'>\u3053\u306E\u30DA\u30FC\u30B8\u4E0A\u3067\u30AD\u30FC\u30EF\u30FC\u30C9\u304C\u30D2\u30C3\u30C8\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u3002<br />\u30AD\u30FC\u30EF\u30FC\u30C9\u304C\u30D5\u30A1\u30A4\u30EB\u540D\u306B\u542B\u307E\u308C\u3066\u3044\u305F\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002 <br />\u5225\u306E\u30DA\u30FC\u30B8\u306B\u79FB\u52D5\u3059\u308B\u304B\u3001\u30AA\u30EA\u30B8\u30CA\u30EB\u30C6\u30AD\u30B9\u30C8\u3092\u8868\u793A\u3059\u308B\u306E\u306B\u3001\u300C\u62BD\u51FA\u3055\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u300D\u3092\u9078\u629E\u3057\u3066\u4E0B\u3055\u3044\u3002</span></pre></html>
 HighlightedMatchesSource.toString=\u691C\u7D22\u7D50\u679C
 Installer.reportPortError=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30B5\u30FC\u30D0\u30FC\u30DD\u30FC\u30C8 {0} \u306F\u5229\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u4F7F\u7528\u3057\u3066\u3044\u308B\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30BD\u30D5\u30C8\u30A6\u30A7\u30A2\u304C {1} \u3092\u30D6\u30ED\u30C3\u30AF\u3057\u3066\u3044\u306A\u3044\u304B\u78BA\u8A8D\u3057\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30E6\u30FC\u30B6\u30FC\u30D5\u30A9\u30EB\u30C0\u30FC\u5185\u306E {3} \u306E {2} \u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u30D5\u30A1\u30A4\u30EB\u306E\u5909\u66F4\u3092\u691C\u8A0E\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u3082\u3057\u4ED6\u306E\u51E6\u7406\u304C\u554F\u984C\u306E\u539F\u56E0\u3067\u3042\u308C\u3070\u3001\u30B7\u30B9\u30C6\u30E0\u3092\u518D\u8D77\u52D5\u3057\u3066\u4E0B\u3055\u3044\u3002
@@ -64,7 +64,7 @@ KeywordSearchConfigurationPanel.customizeComponents.listTabTitle=\u30EA\u30B9\u3
 KeywordSearchConfigurationPanel.customizeComponents.stringExtTitle=\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA
 KeywordSearchConfigurationPanel.customizeComponents.genTabTitle=\u4E00\u822C
 KeywordSearchConfigurationPanel.customizeComponents.listLabToolTip=\u30EA\u30B9\u30C8\u8A2D\u5B9A
-KeywordSearchConfigurationPanel.customizeComponents.stringExtToolTip=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u51E6\u7406\u306E\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA\u8A2D\u5B9A
+KeywordSearchConfigurationPanel.customizeComponents.stringExtToolTip=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306E\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA\u8A2D\u5B9A
 KeywordSearchConfigurationPanel.customizeComponents.genTabToolTip=\u4E00\u822C\u8A2D\u5B9A
 KeywordSearchConfigurationPanel1.customizeComponents.title=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u524A\u9664
 KeywordSearchConfigurationPanel1.customizeComponents.body=\u5168\u3066\u306E\u30B1\u30FC\u30B9\u306B\u304A\u3051\u308B\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u524A\u9664\u3057\u307E\u3059\u3002\u3053\u306E\u524A\u9664\u3092\u5B9F\u884C\u3057\u307E\u3059\u304B\uFF1F
@@ -92,10 +92,10 @@ KeywordSearchEditListPanel.exportButtonActionPerformed.regExColName=\u6B63\u898F
 KeywordSearchFilterNode.getFileActions.openExternViewActLbl=\u5916\u90E8\u30D3\u30E5\u30FC\u30A2\u3067\u958B\u304F
 KeywordSearchFilterNode.getFileActions.searchSameMd5=\u540C\u4E00\u306EMD5\u30CF\u30C3\u30B7\u30E5\u3092\u6301\u3064\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22
 KeywordSearchFilterNode.getFileActions.viewInNewWinActionLbl=\u65B0\u3057\u3044\u30A6\u30A3\u30F3\u30C9\u30A6\u3067\u8868\u793A
-KeywordSearchIngestModule.init.badInitMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30B5\u30FC\u30D0\u30FC\u304C\u6B63\u3057\u304F\u8D77\u52D5\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u51E6\u7406\u3092\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093\u3002
-KeywordSearchIngestModule.init.tryStopSolrMsg={0}<br />\u53E4\u3044java Solr\u51E6\u7406\u3092\u505C\u6B62\u3057\uFF08\u5B58\u5728\u3059\u308C\u3070\uFF09\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u518D\u8D77\u52D5\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+KeywordSearchIngestModule.init.badInitMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30B5\u30FC\u30D0\u30FC\u304C\u6B63\u3057\u304F\u8D77\u52D5\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3092\u5B9F\u884C\u3067\u304D\u307E\u305B\u3093\u3002
+KeywordSearchIngestModule.init.tryStopSolrMsg={0}<br />\u53E4\u3044java Solr\u51E6\u7406\u3092\uFF08\u5B58\u5728\u3059\u308C\u3070\uFF09\u505C\u6B62\u3057\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u518D\u8D77\u52D5\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 KeywordSearchIngestModule.init.noKwInLstMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u306B\u30AD\u30FC\u30EF\u30FC\u30C9\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-KeywordSearchIngestModule.init.onlyIdxKwSkipMsg=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3060\u3051\u5B9F\u884C\u3055\u308C\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u306F\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u307E\u3059\uFF08\u300C\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8 - \u51E6\u7406\u306B\u8FFD\u52A0\u300D\u3092\u4F7F\u7528\u3057\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u8FFD\u52A0\u3059\u308B\u306E\u306F\u53EF\u80FD\u3067\u3059
+KeywordSearchIngestModule.init.onlyIdxKwSkipMsg=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3060\u3051\u5B9F\u884C\u3055\u308C\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u306F\u30B9\u30AD\u30C3\u30D7\u3055\u308C\u307E\u3059\uFF08\u300C\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8 - \u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306B\u8FFD\u52A0\u300D\u3092\u4F7F\u7528\u3057\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u8FFD\u52A0\u3059\u308B\u306E\u306F\u53EF\u80FD\u3067\u3059
 KeywordSearchIngestModule.postIndexSummary.knowFileHeaderLbl=\u65E2\u77E5\u30BF\u30A4\u30D7\u306E\u30D5\u30A1\u30A4\u30EB
 KeywordSearchIngestModule.postIndexSummary.fileGenStringsHead=\u4E00\u822C\u7684\u306A\u30B9\u30C8\u30EA\u30F3\u30B0\u304C\u62BD\u51FA\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB
 KeywordSearchIngestModule.postIndexSummary.mdOnlyLbl=\u30E1\u30BF\u30C7\u30FC\u30BF\u306E\u307F\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u307E\u3057\u305F
@@ -104,14 +104,14 @@ KeywordSearchIngestModule.postIndexSummary.errTxtLbl=\u30A8\u30E9\u30FC\uFF08\u3
 KeywordSearchIngestModule.postIndexSummary.errIoLbl=\u30A8\u30E9\u30FC\uFF08I/O\uFF09
 KeywordSearchIngestModule.postIndexSummary.kwIdxResultsLbl=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u7D50\u679C
 KeywordSearchIngestModule.postIndexSummary.kwIdxErrsTitle=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u30A8\u30E9\u30FC
-KeywordSearchIngestModule.postIndexSummary.kwIdxErrMsgFiles=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30B5\u30FC\u30D3\u30B9\u4E2D\u306B{0}\u30D5\u30A1\u30A4\u30EB\u306E\u51E6\u7406\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+KeywordSearchIngestModule.postIndexSummary.kwIdxErrMsgFiles=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30B5\u30FC\u30D3\u30B9\u4E2D\u306B{0}\u30D5\u30A1\u30A4\u30EB\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
 KeywordSearchIngestModule.postIndexSummary.kwIdxWarnMsgTitle=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u8B66\u544A
 KeywordSearchIngestModule.postIndexSummary.idxErrReadFilesMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30B5\u30FC\u30D3\u30B9\u4E2D\u306B\u30D5\u30A1\u30A4\u30EB\u306E\u8AAD\u307F\u8FBC\u307F\u3084\u30C6\u30AD\u30B9\u30C8\u62BD\u51FA\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u539F\u56E0\u306F\u7834\u640D\u3057\u305F\u30E1\u30C7\u30A3\u30A2\u3084\u30D5\u30A1\u30A4\u30EB\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
-KeywordSearchListsViewerPanel.initIngest.addIngestTitle=\u51E6\u7406\u306B\u8FFD\u52A0
-KeywordSearchListsViewerPanel.initIngest.addIngestMsg=<html>\u8FFD\u52A0\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u9078\u629E\u3067\u304D\u307E\u3059<br />\u305D\u3057\u3066\u5B9F\u884C\u4E2D\u306E\u51E6\u7406\u306B\u8FFD\u52A0\u3067\u304D\u307E\u3059<br />\u6B21\u56DE\u306E\u30D5\u30A1\u30A4\u30EB\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u518D\u69CB\u7BC9\u306E\u3068\u304D\u306B\u9078\u629E\u3055\u308C\u305F\u30EA\u30B9\u30C8\u3082\u691C\u7D22\u3055\u308C\u307E\u3059\u3002</html>
+KeywordSearchListsViewerPanel.initIngest.addIngestTitle=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306B\u8FFD\u52A0
+KeywordSearchListsViewerPanel.initIngest.addIngestMsg=<html>\u8FFD\u52A0\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u9078\u629E\u3067\u304D\u307E\u3059<br />\u305D\u3057\u3066\u5B9F\u884C\u4E2D\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306B\u8FFD\u52A0\u3067\u304D\u307E\u3059<br />\u6B21\u56DE\u306E\u30D5\u30A1\u30A4\u30EB\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u518D\u69CB\u7BC9\u306E\u3068\u304D\u306B\u9078\u629E\u3055\u308C\u305F\u30EA\u30B9\u30C8\u3082\u691C\u7D22\u3055\u308C\u307E\u3059\u3002</html>
 KeywordSearchListsViewerPanel.initIngest.searchIngestTitle=\u691C\u7D22
 KeywordSearchListsViewerPanel.initIngest.addIdxSearchMsg=\u9078\u629E\u3057\u305F\u30EA\u30B9\u30C8\u5185\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u5185\u3067\u691C\u7D22
-KeywordSearchListsViewerPanel.initIngest.ongoingIngestMsg=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\uFF1A {0} \uFF08\u51E6\u7406\u306F\u5B9F\u884C\u4E2D\uFF09
+KeywordSearchListsViewerPanel.initIngest.ongoingIngestMsg=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\uFF1A {0} \uFF08\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306F\u5B9F\u884C\u4E2D\uFF09
 KeywordSearchListsViewerPanel.initIngest.fileIndexCtMsg=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\uFF1A {0}
 KeywordSearch.selectedColLbl=\u9078\u629E\u6E08\u307F
 KeywordSearch.nameColLbl=\u540D\u524D
@@ -139,7 +139,7 @@ ExtractedContentPanel.pagePreviousButton.actionCommand=
 ExtractedContentPanel.pageOfLabel.text=of
 ExtractedContentPanel.pageCurLabel.text=-
 ExtractedContentPanel.pageTotalLabel.text=-
-AbstractFileChunk.index.exception.msg=\u30D5\u30A1\u30A4\u30EB\u30B9\u30C8\u30EA\u30F3\u30B0\u30C1\u30E3\u30F3\u30AF\u306E\u51E6\u7406\u4E2D\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\uFF1A {0}, \u30C1\u30E3\u30F3\u30AF\: {1}
+AbstractFileChunk.index.exception.msg=\u30D5\u30A1\u30A4\u30EB\u30B9\u30C8\u30EA\u30F3\u30B0\u30C1\u30E3\u30F3\u30AF\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u4E2D\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\uFF1A {0}, \u30C1\u30E3\u30F3\u30AF\: {1}
 AbstractFileStringContentStream.getSize.exception.msg=\u30B9\u30C8\u30EA\u30F3\u30B0\u5168\u4F53\u304C\u5909\u63DB\u3055\u308C\u306A\u3051\u308C\u3070\u3001\u5909\u63DB\u3055\u308C\u305F\u30B9\u30C8\u30EA\u30F3\u30B0\u5185\u306E\u30AD\u30E3\u30E9\u30AF\u30BF\u30FC\u6570\u306F\u4E0D\u660E\u3067\u3059\u3002
 AbstractFileStringContentStream.getSrcInfo.text=\u30D5\u30A1\u30A4\u30EB\uFF1A{0}
 ByteContentStream.getSrcInfo.text=\u30D5\u30A1\u30A4\u30EB\uFF1A{0}
@@ -158,7 +158,7 @@ HighlightedMatchesSource.nextItem.exception.msg=\u6B21\u306E\u30A2\u30A4\u30C6\u
 HighlightedMatchesSource.previousItem.exception.msg=\u524D\u306E\u30A2\u30A4\u30C6\u30E0\u304C\u3042\u308A\u307E\u305B\u3093\u3002
 Ingester.ingest.exception.unknownImgId.msg=\u4E0B\u8A18\u306E\u30D5\u30A1\u30A4\u30EB\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u3066\u3044\u307E\u3059\u3002\u4E0D\u660E\u306A\u30A4\u30E1\u30FC\u30B8ID\uFF1A{0}
 Ingester.ingest.exception.cantReadStream.msg=\u30B3\u30F3\u30C6\u30F3\u30C4\u30B9\u30C8\u30EA\u30FC\u30E0\u3092\u8AAD\u307F\u53D6\u308C\u307E\u305B\u3093\u3067\u3057\u305F\uFF1A{0}
-Ingester.ingest.exception.err.msg=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u51E6\u7406\u4E2D\u306E\u30A8\u30E9\u30FC\uFF1A{0}
+Ingester.ingest.exception.err.msg=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u4E2D\u306E\u30A8\u30E9\u30FC\uFF1A{0}
 Ingester.ingestExtract.exception.solrTimeout.msg=\u4E0B\u8A18\u306EID\u306B\u5BFE\u3059\u308B\u3001Solr\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u30EA\u30AF\u30A8\u30B9\u30C8\u306F\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u3057\u307E\u3057\u305F\uFF1A{0}, \u540D\u524D\: {1}
 Ingester.ingestExtract.exception.probPostToSolr.msg=Solr\u306B\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u30DD\u30B9\u30C8\u3059\u308B\u306E\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002ID\uFF1A{0}, \u540D\u524D\: {1}
 Ingester.UpReqestTask.run.exception.sorlNotAvail.msg=Solr\u30B3\u30A2\u304C\u5229\u7528\u4E0D\u53EF\u3067\u3059\u3002\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3067\u304D\u307E\u305B\u3093\u3002
@@ -220,29 +220,29 @@ Keyword.toString.text=Keyword'{'query\={0}, isLiteral\={1}, keywordType\={2}'}'
 KeywordSearchJobSettingsPanel.keywordSearchEncodings.text=-
 KeywordSearchJobSettingsPanel.languagesValLabel.text=-
 KeywordSearchJobSettingsPanel.encodingsLabel.text=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\uFF1A
-KeywordSearchJobSettingsPanel.titleLabel.text=\u51E6\u7406\u4E2D\u306B\u6709\u52B9\u306A\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u9078\u629E\uFF1A
+KeywordSearchJobSettingsPanel.titleLabel.text=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u4E2D\u306B\u6709\u52B9\u306A\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u9078\u629E\uFF1A
 KeywordSearchJobSettingsPanel.languagesLabel.toolTipText=\u4E0D\u660E\u306A\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u304B\u3089\u306E\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA\u3092\u6709\u52B9\u306B\u3057\u305F\u30B9\u30AF\u30EA\u30D7\u30C8\u3002\u30A2\u30C9\u30D0\u30F3\u30B9\u8A2D\u5B9A\u304B\u3089\u5909\u66F4\u304C\u53EF\u80FD\u3067\u3059\u3002
 KeywordSearchJobSettingsPanel.languagesLabel.text=\u4E0D\u660E\u306A\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u304B\u3089\u306E\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA\u3092\u6709\u52B9\u306B\u3057\u305F\u30B9\u30AF\u30EA\u30D7\u30C8\uFF1A
 KeywordSearchGlobalLanguageSettingsPanel.enableUTF8Checkbox.text=UTF8\u30C6\u30AD\u30B9\u30C8\u62BD\u51FA\u306E\u6709\u52B9\u5316
-KeywordSearchGlobalLanguageSettingsPanel.ingestSettingsLabel.text=\u4E0D\u660E\u306A\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u304B\u3089\u306E\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA\u306E\u51E6\u7406\u65B9\u6CD5\u306E\u8A2D\u5B9A\uFF08\u5909\u66F4\u306F\u6B21\u56DE\u306E\u51E6\u7406\u304B\u3089\u6709\u52B9\uFF09\uFF1A
+KeywordSearchGlobalLanguageSettingsPanel.ingestSettingsLabel.text=\u4E0D\u660E\u306A\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7\u304B\u3089\u306E\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u8A2D\u5B9A\uFF08\u5909\u66F4\u306F\u6B21\u56DE\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u304B\u3089\u6709\u52B9\uFF09\uFF1A
 KeywordSearchGlobalLanguageSettingsPanel.enableUTF16Checkbox.text=UTF16LE\u3068UTF16BE\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA\u306E\u6709\u52B9\u5316
 KeywordSearchGlobalLanguageSettingsPanel.languagesLabel.text=\u6709\u52B9\u306A\u30B9\u30AF\u30EA\u30D7\u30C8\uFF08\u8A00\u8A9E\uFF09\uFF1A
-KeywordSearchGlobalSearchSettingsPanel.timeRadioButton1.toolTipText=\uFF12\uFF10\u5206\uFF08\u6700\u77ED\u306E\u51E6\u7406\u6642\u9593\uFF09
-KeywordSearchGlobalSearchSettingsPanel.timeRadioButton1.text=\uFF12\uFF10\u5206\uFF08\u6700\u3082\u9045\u3044\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3001\u6700\u77ED\u306E\u51E6\u7406\u6642\u9593\uFF09
-KeywordSearchGlobalSearchSettingsPanel.timeRadioButton2.toolTipText=\uFF11\uFF10\u5206\uFF08\u30C7\u30D5\u30A9\u30EB\u30C8\u3088\u308A\u5168\u4F53\u7684\u306B\u901F\u3044\u51E6\u7406\u6642\u9593\uFF09
-KeywordSearchGlobalSearchSettingsPanel.timeRadioButton2.text=\uFF11\uFF10\u5206\uFF08\u3088\u308A\u9045\u3044\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3001\u3088\u308A\u901F\u3044\u51E6\u7406\u6642\u9593\uFF09
-KeywordSearchGlobalSearchSettingsPanel.frequencyLabel.text=\u51E6\u7406\u4E2D\u306E\u7D50\u679C\u66F4\u65B0\u306E\u983B\u5EA6\uFF1A
-KeywordSearchGlobalSearchSettingsPanel.skipNSRLCheckBox.toolTipText=Hash DB\u30B5\u30FC\u30D3\u30B9\u3092\u4E8B\u524D\u306B\u5B9F\u884C\u3059\u308B\u304B\u3001\u6B21\u56DE\u306E\u51E6\u7406\u306B\u9078\u629E\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-KeywordSearchGlobalSearchSettingsPanel.skipNSRLCheckBox.text=\u51E6\u7406\u4E2D\u306BNSRL\u306E\u30D5\u30A1\u30A4\u30EB\uFF08\u65E2\u77E5\u306E\u30D5\u30A1\u30A4\u30EB\uFF09\u3092\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u8FFD\u52A0\u3057\u306A\u3044
+KeywordSearchGlobalSearchSettingsPanel.timeRadioButton1.toolTipText=\uFF12\uFF10\u5206\uFF08\u6700\u77ED\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u6642\u9593\uFF09
+KeywordSearchGlobalSearchSettingsPanel.timeRadioButton1.text=\uFF12\uFF10\u5206\uFF08\u6700\u3082\u9045\u3044\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3001\u6700\u77ED\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u6642\u9593\uFF09
+KeywordSearchGlobalSearchSettingsPanel.timeRadioButton2.toolTipText=\uFF11\uFF10\u5206\uFF08\u30C7\u30D5\u30A9\u30EB\u30C8\u3088\u308A\u5168\u4F53\u7684\u306B\u901F\u3044\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u6642\u9593\uFF09
+KeywordSearchGlobalSearchSettingsPanel.timeRadioButton2.text=\uFF11\uFF10\u5206\uFF08\u3088\u308A\u9045\u3044\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3001\u3088\u308A\u901F\u3044\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u6642\u9593\uFF09
+KeywordSearchGlobalSearchSettingsPanel.frequencyLabel.text=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u4E2D\u306E\u7D50\u679C\u66F4\u65B0\u306E\u983B\u5EA6\uFF1A
+KeywordSearchGlobalSearchSettingsPanel.skipNSRLCheckBox.toolTipText=Hash DB\u30B5\u30FC\u30D3\u30B9\u3092\u4E8B\u524D\u306B\u5B9F\u884C\u3059\u308B\u304B\u3001\u6B21\u56DE\u306E\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306B\u9078\u629E\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+KeywordSearchGlobalSearchSettingsPanel.skipNSRLCheckBox.text=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u4E2D\u306BNSRL\u306E\u30D5\u30A1\u30A4\u30EB\uFF08\u65E2\u77E5\u306E\u30D5\u30A1\u30A4\u30EB\uFF09\u3092\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306B\u8FFD\u52A0\u3057\u306A\u3044
 KeywordSearchGlobalSearchSettingsPanel.informationLabel.text=\u60C5\u5831
 KeywordSearchGlobalSearchSettingsPanel.settingsLabel.text=\u8A2D\u5B9A
 KeywordSearchGlobalSearchSettingsPanel.filesIndexedValue.text=-
 KeywordSearchGlobalSearchSettingsPanel.filesIndexedLabel.text=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5185\u306E\u30D5\u30A1\u30A4\u30EB\uFF1A
 KeywordSearchGlobalSearchSettingsPanel.chunksValLabel.text=-
-KeywordSearchGlobalSearchSettingsPanel.timeRadioButton4.toolTipText=\uFF11\u5206\uFF08\u5168\u4F53\u7684\u306A\u51E6\u7406\u6642\u9593\u304C\u9577\u304F\u306A\u308A\u307E\u3059\uFF09
-KeywordSearchGlobalSearchSettingsPanel.timeRadioButton4.text_1=\uFF11\u5206\uFF08\u3088\u308A\u901F\u3044\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3001\u6700\u3082\u9577\u3044\u51E6\u7406\u6642\u9593\uFF09
+KeywordSearchGlobalSearchSettingsPanel.timeRadioButton4.toolTipText=\uFF11\u5206\uFF08\u5168\u4F53\u7684\u306A\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u6642\u9593\u304C\u9577\u304F\u306A\u308A\u307E\u3059\uFF09
+KeywordSearchGlobalSearchSettingsPanel.timeRadioButton4.text_1=\uFF11\u5206\uFF08\u3088\u308A\u901F\u3044\u30D5\u30A3\u30FC\u30C9\u30D0\u30C3\u30AF\u3001\u6700\u3082\u9577\u3044\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u6642\u9593\uFF09
 KeywordSearchGlobalSearchSettingsPanel.chunksLabel.text=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5185\u306E\u30C1\u30E3\u30F3\u30AF\uFF1A
-KeywordSearchGlobalSearchSettingsPanel.timeRadioButton3.toolTipText=\uFF15\u5206\uFF08\u5168\u4F53\u7684\u306A\u51E6\u7406\u6642\u9593\u304C\u9577\u304F\u306A\u308A\u307E\u3059\uFF09
+KeywordSearchGlobalSearchSettingsPanel.timeRadioButton3.toolTipText=\uFF15\u5206\uFF08\u5168\u4F53\u7684\u306A\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u6642\u9593\u304C\u9577\u304F\u306A\u308A\u307E\u3059\uFF09
 KeywordSearchGlobalSearchSettingsPanel.timeRadioButton3.text=\uFF15\u5206\uFF08\u30C7\u30D5\u30A9\u30EB\u30C8\uFF09
 DropdownSearchPanel.substringRadioButton.text=\u30B5\u30D6\u30B9\u30C8\u30EA\u30F3\u30B0\u4E00\u81F4
 AbstractFileTikaTextExtract.index.exception.tikaParse.msg=\u4F8B\u5916\uFF1A\u30D5\u30A1\u30A4\u30EB\uFF1A{0}, {1}\u306EApache Tika\u30D1\u30FC\u30B9\u30BF\u30B9\u30AF\u5B9F\u884C\u4E2D\u306E\u4E88\u671F\u305B\u306C\u4F8B\u5916
@@ -272,3 +272,7 @@ KeywordSearchListsAbstract.writeLists.errMsg1.msg=KeywordSearchListsAbstract\u30
 KeywordSearchListsAbstract.writeLists.errMsg2.msg=KeywordSearchListsAbstract\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3092\u78BA\u8A8D\u4E2D\u306B\u30E2\u30B8\u30E5\u30FC\u30EB\u304C\u30A8\u30E9\u30FC\u3092\u8D77\u3053\u3057\u307E\u3057\u305F\u3002\u3069\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\u30ED\u30B0\u3067\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002\u4E00\u90E8\u306E\u30C7\u30FC\u30BF\u304C\u4E0D\u5B8C\u5168\u304B\u3082\u3057\u308C\u307E\u305B\u3093\u3002
 KeywordSearchListsManagementPanel.newKeywordListDescription=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8<{0}>\u306F\u8AAD\u307F\u53D6\u308A\u5C02\u7528\u30EA\u30B9\u30C8\u3068\u3057\u3066\u5B58\u5728\u3057\u307E\u3059\u3002\u30D7\u30ED\u30B0\u30E9\u30E0\u3092\u4F7F\u7528\u4E2D\u306E\u307F\u3053\u306E\u30EA\u30B9\u30C8\u3092\u7F6E\u304D\u63DB\u3048\u307E\u3059\u304B\uFF1F\uFF08\u3053\u306E\u5909\u66F4\u306F\u7D99\u7D9A\u3055\u308C\u307E\u305B\u3093\uFF09
 KeywordSearchListsManagementPanel.newKeywordListDescription2=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8<{0}>\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u7F6E\u304D\u63DB\u3048\u307E\u3059\u304B\uFF1F
+DropdownSearchPanelgetQueryList.exception.msg=\u30B7\u30F3\u30B0\u30EB\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u306E\u30EA\u30B9\u30C8\u306F\u5B58\u5728\u3057\u307E\u305B\u3093
+KeywordSearchModuleFactory.createFileIngestModule.exception.msg=\u8A2D\u5B9A\u3092\u884C\u3046\u70BA\u306E\u60F3\u5B9A\u3055\u308C\u308B\u5F15\u6570\u306Finstanceof KeywordSearchJobSettings
+KeywordSearchModuleFactory.getIngestJobSettingsPanel.exception.msg=\u8A2D\u5B9A\u3092\u884C\u3046\u70BA\u306E\u60F3\u5B9A\u3055\u308C\u308B\u5F15\u6570\u306Finstanceof KeywordSearchJobSettings
+SearchRunner.Searcher.done.err.msg=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u3092\u5B9F\u884C\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ByteContentStream.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ByteContentStream.java
index 8dc2b4fe80..97157facbb 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ByteContentStream.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ByteContentStream.java
@@ -65,7 +65,7 @@ class ByteContentStream implements ContentStream {
 
     @Override
     public String getContentType() {
-        return "text/plain;charset=" + charset.name();
+        return "text/plain;charset=" + charset.name(); //NON-NLS
     }
 
     @Override
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.java
index 96f48ad393..df719daa41 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.java
@@ -25,6 +25,8 @@ import java.awt.event.FocusListener;
 import java.util.List;
 import java.util.logging.Level;
 import javax.swing.JMenuItem;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
 /**
@@ -120,7 +122,8 @@ public class DropdownSearchPanel extends AbstractKeywordSearchPerformer {
 
     @Override
     public List<Keyword> getQueryList() {
-        throw new UnsupportedOperationException("No list for single-keyword search");
+        throw new UnsupportedOperationException(
+                NbBundle.getMessage(this.getClass(), "DropdownSearchPanelgetQueryList.exception.msg"));
     }    
 
     @Override
@@ -161,7 +164,7 @@ public class DropdownSearchPanel extends AbstractKeywordSearchPerformer {
         org.openide.awt.Mnemonics.setLocalizedText(selectAllMenuItem, org.openide.util.NbBundle.getMessage(DropdownSearchPanel.class, "DropdownSearchPanel.selectAllMenuItem.text")); // NOI18N
         rightClickMenu.add(selectAllMenuItem);
 
-        keywordTextField.setFont(new java.awt.Font("Monospaced", 0, 14)); // NOI18N
+        keywordTextField.setFont(new java.awt.Font("Monospaced", 0, 14)); // NOI18N NON-NLS
         keywordTextField.setText(org.openide.util.NbBundle.getMessage(DropdownSearchPanel.class, "DropdownSearchPanel.keywordTextField.text")); // NOI18N
         keywordTextField.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(192, 192, 192), 1, true));
         keywordTextField.setMinimumSize(new java.awt.Dimension(2, 25));
@@ -177,7 +180,7 @@ public class DropdownSearchPanel extends AbstractKeywordSearchPerformer {
             }
         });
 
-        searchButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/search-icon.png"))); // NOI18N
+        searchButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/search-icon.png"))); // NOI18N NON-NLS
         org.openide.awt.Mnemonics.setLocalizedText(searchButton, org.openide.util.NbBundle.getMessage(DropdownSearchPanel.class, "DropdownSearchPanel.searchButton.text")); // NOI18N
         searchButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -239,7 +242,7 @@ public class DropdownSearchPanel extends AbstractKeywordSearchPerformer {
         try {
             search();
         } catch(Exception e) {
-            logger.log(Level.SEVERE, "search() threw exception", e);
+            logger.log(Level.SEVERE, "search() threw exception", e); //NON-NLS
         }
     }//GEN-LAST:event_keywordTextFieldActionPerformed
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java
index 14b5679582..596a7f7bf1 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java
@@ -122,7 +122,7 @@ class ExtractedContentPanel extends javax.swing.JPanel {
         // set font size manually in an effort to get fonts in this panel to look
         // similar to what is in the 'String View' content viewer.
         StyleSheet ss = editorKit.getStyleSheet();
-        ss.addRule("body {font-size: 8.5px;}");
+        ss.addRule("body {font-size: 8.5px;}"); //NON-NLS
         
         extractedTextPane.setEditorKit(editorKit);
 
@@ -226,43 +226,43 @@ class ExtractedContentPanel extends javax.swing.JPanel {
 
             hitButtonsLabel.setText(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.hitButtonsLabel.text")); // NOI18N
 
-            hitPreviousButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back.png"))); // NOI18N
+            hitPreviousButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back.png"))); // NOI18N NON-NLS
             hitPreviousButton.setText(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.hitPreviousButton.text")); // NOI18N
             hitPreviousButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
             hitPreviousButton.setBorderPainted(false);
             hitPreviousButton.setContentAreaFilled(false);
-            hitPreviousButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back_disabled.png"))); // NOI18N
+            hitPreviousButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back_disabled.png"))); // NOI18N NON-NLS
             hitPreviousButton.setMargin(new java.awt.Insets(2, 0, 2, 0));
             hitPreviousButton.setPreferredSize(new java.awt.Dimension(23, 23));
-            hitPreviousButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back_hover.png"))); // NOI18N
+            hitPreviousButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back_hover.png"))); // NOI18N NON-NLS
 
-            hitNextButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward.png"))); // NOI18N
+            hitNextButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward.png"))); // NOI18N NON-NLS
             hitNextButton.setText(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.hitNextButton.text")); // NOI18N
             hitNextButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
             hitNextButton.setBorderPainted(false);
             hitNextButton.setContentAreaFilled(false);
-            hitNextButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward_disabled.png"))); // NOI18N
+            hitNextButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward_disabled.png"))); // NOI18N NON-NLS
             hitNextButton.setMargin(new java.awt.Insets(2, 0, 2, 0));
             hitNextButton.setPreferredSize(new java.awt.Dimension(23, 23));
-            hitNextButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward_hover.png"))); // NOI18N
+            hitNextButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward_hover.png"))); // NOI18N NON-NLS
 
             pageButtonsLabel.setText(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.pageButtonsLabel.text")); // NOI18N
 
-            pagePreviousButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back.png"))); // NOI18N
+            pagePreviousButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back.png"))); // NOI18N NON-NLS
             pagePreviousButton.setText(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.pagePreviousButton.text")); // NOI18N
             pagePreviousButton.setActionCommand(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.pagePreviousButton.actionCommand")); // NOI18N
             pagePreviousButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
             pagePreviousButton.setBorderPainted(false);
             pagePreviousButton.setContentAreaFilled(false);
-            pagePreviousButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back_disabled.png"))); // NOI18N
+            pagePreviousButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_back_disabled.png"))); // NOI18N NON-NLS
             pagePreviousButton.setMargin(new java.awt.Insets(2, 0, 2, 0));
 
-            pageNextButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward.png"))); // NOI18N
+            pageNextButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward.png"))); // NOI18N NON-NLS
             pageNextButton.setText(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.pageNextButton.text")); // NOI18N
             pageNextButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
             pageNextButton.setBorderPainted(false);
             pageNextButton.setContentAreaFilled(false);
-            pageNextButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward_disabled.png"))); // NOI18N
+            pageNextButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/btn_step_forward_disabled.png"))); // NOI18N NON-NLS
             pageNextButton.setMargin(new java.awt.Insets(2, 0, 2, 0));
             pageNextButton.setPreferredSize(new java.awt.Dimension(23, 23));
 
@@ -416,7 +416,7 @@ class ExtractedContentPanel extends javax.swing.JPanel {
             //detect text direction using first 1024 chars and set it
             //get first up to 1024 chars, strip <pre> tag and unescape html to get the string on which to detect
             final int len = text.length();
-            final int prefixLen = "<pre>".length();
+            final int prefixLen = "<pre>".length(); //NON-NLS
             if (len > prefixLen) {
                 final int maxOrientChars = Math.min(len, 1024);
                 final String orientDetectText = EscapeUtil.unEscapeHtml(text.substring(prefixLen, maxOrientChars));
@@ -709,7 +709,7 @@ class ExtractedContentPanel extends javax.swing.JPanel {
             try {
                 get();
             } catch (InterruptedException | ExecutionException ex) {
-                logger.log(Level.SEVERE, "Error getting marked up text" );               
+                logger.log(Level.SEVERE, "Error getting marked up text" ); //NON-NLS
             }
             // catch and ignore if we were cancelled
             catch (java.util.concurrent.CancellationException ex ) { }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java
index 2289064e4d..8358ec222b 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,24 +24,19 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.logging.Level;
 
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.apache.solr.client.solrj.SolrServerException;
 import org.openide.nodes.Node;
 import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataContentViewer;
-import org.sleuthkit.autopsy.coreutils.EscapeUtil;
 import org.sleuthkit.autopsy.datamodel.HighlightLookup;
-import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.ContentVisitor;
 import org.sleuthkit.datamodel.Directory;
-import org.sleuthkit.datamodel.TskData.FileKnown;
 
 /**
  * Displays marked-up (HTML) content for a Node. The sources are all the
@@ -59,7 +54,7 @@ public class ExtractedContentViewer implements DataContentViewer {
 
 
     public ExtractedContentViewer() {
-        logger.log(Level.INFO, "Created TextView instance: " + this);
+        logger.log(Level.INFO, "Created TextView instance: " + this); //NON-NLS
     }
 
     @Override
@@ -258,15 +253,14 @@ public class ExtractedContentViewer implements DataContentViewer {
         try {
             return solrServer.queryIsIndexed(contentID);
         } catch (NoOpenCoreException ex) {
-            logger.log(Level.WARNING, "Couldn't determine whether content is supported.", ex);
+            logger.log(Level.WARNING, "Couldn't determine whether content is supported.", ex); //NON-NLS
             return false;
         } catch (KeywordSearchModuleException ex) {
-            logger.log(Level.WARNING, "Couldn't determine whether content is supported.", ex);
+            logger.log(Level.WARNING, "Couldn't determine whether content is supported.", ex); //NON-NLS
             return false;
         }
     }
 
-    
 
     private class NextFindActionListener implements ActionListener {
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java
index 3baa12442b..d346834640 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java
@@ -43,8 +43,8 @@ import org.sleuthkit.datamodel.Content;
 class HighlightedMatchesSource implements MarkupSource, HighlightLookup {
 
     private static final Logger logger = Logger.getLogger(HighlightedMatchesSource.class.getName());
-    private static final String HIGHLIGHT_PRE = "<span style='background:yellow'>";
-    private static final String HIGHLIGHT_POST = "</span>";
+    private static final String HIGHLIGHT_PRE = "<span style='background:yellow'>"; //NON-NLS
+    private static final String HIGHLIGHT_POST = "</span>"; //NON-NLS
     private static final String ANCHOR_PREFIX = HighlightedMatchesSource.class.getName() + "_";
 
     private Content content;
@@ -104,10 +104,10 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup {
         try {
             this.numberPages = solrServer.queryNumFileChunks(content.getId());
         } catch (KeywordSearchModuleException ex) {
-            logger.log(Level.WARNING, "Could not get number pages for content: " + content.getId());
+            logger.log(Level.WARNING, "Could not get number pages for content: " + content.getId()); //NON-NLS
             return;
         } catch (NoOpenCoreException ex) {
-            logger.log(Level.WARNING, "Could not get number pages for content: " + content.getId());
+            logger.log(Level.WARNING, "Could not get number pages for content: " + content.getId()); //NON-NLS
             return;
         }
 
@@ -145,7 +145,7 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup {
                 try {
                     hits = chunksQuery.performQuery();
                 } catch (NoOpenCoreException ex) {
-                    logger.log(Level.INFO, "Could not get chunk info and get highlights", ex);
+                    logger.log(Level.INFO, "Could not get chunk info and get highlights", ex); //NON-NLS
                     return;
                 }
             }
@@ -354,13 +354,13 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup {
         q.setHighlightFragsize(0); // don't fragment the highlight, works with original highlighter, or needs "single" list builder with FVH
 
         //tune the highlighter
-        q.setParam("hl.useFastVectorHighlighter", "on"); //fast highlighter scales better than standard one
-        q.setParam("hl.tag.pre", HIGHLIGHT_PRE); //makes sense for FastVectorHighlighter only
-        q.setParam("hl.tag.post", HIGHLIGHT_POST); //makes sense for FastVectorHighlighter only
-        q.setParam("hl.fragListBuilder", "single"); //makes sense for FastVectorHighlighter only
+        q.setParam("hl.useFastVectorHighlighter", "on"); //fast highlighter scales better than standard one NON-NLS
+        q.setParam("hl.tag.pre", HIGHLIGHT_PRE); //makes sense for FastVectorHighlighter only NON-NLS
+        q.setParam("hl.tag.post", HIGHLIGHT_POST); //makes sense for FastVectorHighlighter only NON-NLS
+        q.setParam("hl.fragListBuilder", "single"); //makes sense for FastVectorHighlighter only NON-NLS
 
         //docs says makes sense for the original Highlighter only, but not really
-        q.setParam("hl.maxAnalyzedChars", Server.HL_ANALYZE_CHARS_UNLIMITED);
+        q.setParam("hl.maxAnalyzedChars", Server.HL_ANALYZE_CHARS_UNLIMITED); //NON-NLS
 
         try {
             QueryResponse response = solrServer.query(q, METHOD.POST);
@@ -380,13 +380,13 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup {
                 highlightedContent = insertAnchors(highlightedContent);
 
 
-                return "<html><pre>" + highlightedContent + "</pre></html>";
+                return "<html><pre>" + highlightedContent + "</pre></html>"; //NON-NLS
             }
         } catch (NoOpenCoreException ex) {
-            logger.log(Level.WARNING, "Couldn't query markup for page: " + currentPage, ex);
+            logger.log(Level.WARNING, "Couldn't query markup for page: " + currentPage, ex); //NON-NLS
             return "";
         } catch (KeywordSearchModuleException ex) {
-            logger.log(Level.WARNING, "Could not query markup for page: " + currentPage, ex);
+            logger.log(Level.WARNING, "Could not query markup for page: " + currentPage, ex); //NON-NLS
             return "";
         }
     }
@@ -422,8 +422,8 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup {
 
         final String searchToken = HIGHLIGHT_PRE;
         final int indexSearchTokLen = searchToken.length();
-        final String insertPre = "<a name='" + ANCHOR_PREFIX;
-        final String insertPost = "'></a>";
+        final String insertPre = "<a name='" + ANCHOR_PREFIX; //NON-NLS
+        final String insertPost = "'></a>"; //NON-NLS
         int count = 0;
         while ((index = buf.indexOf(searchToken, searchOffset)) >= 0) {
             String insertString = insertPre + Integer.toString(count + 1) + insertPost;
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
index b772c9e5bf..7aa2bfede8 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
@@ -74,7 +74,7 @@ class Ingester {
     //for ingesting chunk as SolrInputDocument (non-content-streaming, by-pass tika)
     //TODO use a streaming way to add content to /update handler
     private static final int MAX_DOC_CHUNK_SIZE = 1024*1024;
-    private static final String docContentEncoding = "UTF-8";
+    private static final String docContentEncoding = "UTF-8"; //NON-NLS
 
 
     private Ingester() {
@@ -94,7 +94,7 @@ class Ingester {
 
         // Warn if files might have been left uncommited.
         if (uncommitedIngests) {
-            logger.warning("Ingester was used to add files that it never committed.");
+            logger.warning("Ingester was used to add files that it never committed."); //NON-NLS
         }
     }
 
@@ -249,7 +249,7 @@ class Ingester {
                 dataSourceId = curCase.getFileDataSource(af);
                 params.put(Server.Schema.IMAGE_ID.toString(), Long.toString(dataSourceId));
             } catch (TskCoreException ex) {
-                logger.log(Level.SEVERE, "Could not get data source id to properly index the file " + af.getId());
+                logger.log(Level.SEVERE, "Could not get data source id to properly index the file " + af.getId()); //NON-NLS
                 params.put(Server.Schema.IMAGE_ID.toString(), Long.toString(-1));
             }
 
@@ -309,7 +309,7 @@ class Ingester {
                 try {
                     is.close();
                 } catch (IOException ex) {
-                    logger.log(Level.WARNING, "Could not close input stream after reading content, " + cs.getName(), ex);
+                    logger.log(Level.WARNING, "Could not close input stream after reading content, " + cs.getName(), ex); //NON-NLS
                 }
             }
 
@@ -356,34 +356,34 @@ class Ingester {
      * content, but the Solr server is probably fine.
      */
     private void ingestExtract(ContentStream cs, Map<String, String> fields, final long size) throws IngesterException {
-        final ContentStreamUpdateRequest up = new ContentStreamUpdateRequest("/update/extract");
+        final ContentStreamUpdateRequest up = new ContentStreamUpdateRequest("/update/extract"); //NON-NLS
         up.addContentStream(cs);
         setFields(up, fields);
         up.setAction(AbstractUpdateRequest.ACTION.COMMIT, true, true);
 
         final String contentType = cs.getContentType();
         if (contentType != null && !contentType.trim().equals("")) {
-            up.setParam("stream.contentType", contentType);
+            up.setParam("stream.contentType", contentType); //NON-NLS
         }
 
         //logger.log(Level.INFO, "Ingesting " + fields.get("file_name"));
-        up.setParam("commit", "false");
+        up.setParam("commit", "false"); //NON-NLS
 
         final Future<?> f = upRequestExecutor.submit(new UpRequestTask(up));
 
         try {
             f.get(getTimeout(size), TimeUnit.SECONDS);
         } catch (TimeoutException te) {
-            logger.log(Level.WARNING, "Solr timeout encountered, trying to restart Solr");
+            logger.log(Level.WARNING, "Solr timeout encountered, trying to restart Solr"); //NON-NLS
             //restart may be needed to recover from some error conditions
             hardSolrRestart();
             throw new IngesterException(
                     NbBundle.getMessage(this.getClass(), "Ingester.ingestExtract.exception.solrTimeout.msg",
-                                        fields.get("id"), fields.get("file_name")));
+                                        fields.get("id"), fields.get("file_name"))); //NON-NLS
         } catch (Exception e) {
             throw new IngesterException(
                     NbBundle.getMessage(this.getClass(), "Ingester.ingestExtract.exception.probPostToSolr.msg",
-                                        fields.get("id"), fields.get("file_name")), e);
+                                        fields.get("id"), fields.get("file_name")), e); //NON-NLS
         }
         uncommitedIngests = true;
     }
@@ -395,7 +395,7 @@ class Ingester {
         try {
             solrServer.closeCore();
         } catch (KeywordSearchModuleException ex) {
-            logger.log(Level.WARNING, "Cannot close core", ex);
+            logger.log(Level.WARNING, "Cannot close core", ex); //NON-NLS
         }
 
         solrServer.stop();
@@ -403,15 +403,15 @@ class Ingester {
         try {
             solrServer.start();
         } catch (KeywordSearchModuleException ex) {
-            logger.log(Level.WARNING, "Cannot start", ex);
+            logger.log(Level.WARNING, "Cannot start", ex); //NON-NLS
         } catch (SolrServerNoPortException ex) {
-            logger.log(Level.WARNING, "Cannot start server with this port", ex);
+            logger.log(Level.WARNING, "Cannot start server with this port", ex); //NON-NLS
         }
 
         try {
             solrServer.openCore();
         } catch (KeywordSearchModuleException ex) {
-            logger.log(Level.WARNING, "Cannot open core", ex);
+            logger.log(Level.WARNING, "Cannot open core", ex); //NON-NLS
         }
     }
 
@@ -491,9 +491,9 @@ class Ingester {
             solrServer.commit();
             uncommitedIngests = false;
         } catch (NoOpenCoreException ex) {
-            logger.log(Level.WARNING, "Error commiting index", ex);
+            logger.log(Level.WARNING, "Error commiting index", ex); //NON-NLS
         } catch (SolrServerException ex) {
-            logger.log(Level.WARNING, "Error commiting index", ex);
+            logger.log(Level.WARNING, "Error commiting index", ex); //NON-NLS
         }
     }
 
@@ -505,7 +505,7 @@ class Ingester {
      */
     private static void setFields(ContentStreamUpdateRequest up, Map<String, String> fields) {
         for (Entry<String, String> field : fields.entrySet()) {
-            up.setParam("literal." + field.getKey(), field.getValue());
+            up.setParam("literal." + field.getKey(), field.getValue()); //NON-NLS
         }
     }
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java
index f38b9fdd81..99f4f288d4 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Installer.java
@@ -53,19 +53,19 @@ class Installer extends ModuleInstall {
         //TODO revise this logic, handle other server types, move some logic to Server class
         try {
             //check if running from previous application instance and try to shut down
-            logger.log(Level.INFO, "Checking if server is running");
+            logger.log(Level.INFO, "Checking if server is running"); //NON-NLS
             if (server.isRunning()) {
                 //TODO this could hang if other type of server is running 
-                logger.log(Level.WARNING, "Already a server running on " + server.getCurrentSolrServerPort()
-                        + " port, maybe leftover from a previous run. Trying to shut it down.");
+                logger.log(Level.WARNING, "Already a server running on " + server.getCurrentSolrServerPort() //NON-NLS
+                        + " port, maybe leftover from a previous run. Trying to shut it down."); //NON-NLS
                 //stop gracefully
                 server.stop();
-                logger.log(Level.INFO, "Re-checking if server is running");
+                logger.log(Level.INFO, "Re-checking if server is running"); //NON-NLS
                 if (server.isRunning()) {
                     int serverPort = server.getCurrentSolrServerPort();
                     int serverStopPort = server.getCurrentSolrStopPort();
-                    logger.log(Level.SEVERE, "There's already a server running on "
-                            + serverPort + " port that can't be shutdown.");
+                    logger.log(Level.SEVERE, "There's already a server running on " //NON-NLS
+                            + serverPort + " port that can't be shutdown."); //NON-NLS
                     if (!Server.isPortAvailable(serverPort)) {
                         reportPortError(serverPort);
                     } else if (!Server.isPortAvailable(serverStopPort)) {
@@ -78,13 +78,13 @@ class Installer extends ModuleInstall {
                     //in this case give up
 
                 } else {
-                    logger.log(Level.INFO, "Old Solr server shutdown successfully.");
+                    logger.log(Level.INFO, "Old Solr server shutdown successfully."); //NON-NLS
                     //make sure there really isn't a hang Solr process, in case isRunning() reported false
                     server.killSolr();
                 }
             }
         } catch (KeywordSearchModuleException e) {
-            logger.log(Level.SEVERE, "Starting server failed, will try to kill. ", e);
+            logger.log(Level.SEVERE, "Starting server failed, will try to kill. ", e); //NON-NLS
             server.killSolr();
         }
 
@@ -94,13 +94,13 @@ class Installer extends ModuleInstall {
             //Try to bind to the port 4 times at 1 second intervals. 
             //TODO move some of this logic to Server class
             for (int i = 0; i <= 3; i++) {
-                logger.log(Level.INFO, "Checking if port available.");
+                logger.log(Level.INFO, "Checking if port available."); //NON-NLS
                 if (Server.isPortAvailable(server.getCurrentSolrServerPort())) {
-                    logger.log(Level.INFO, "Port available, trying to start server.");
+                    logger.log(Level.INFO, "Port available, trying to start server."); //NON-NLS
                     server.start();
                     break;
                 } else if (i == 3) {
-                    logger.log(Level.INFO, "No port available, done retrying.");
+                    logger.log(Level.INFO, "No port available, done retrying."); //NON-NLS
                     reportPortError(server.getCurrentSolrServerPort());
                     retries = 0;
                     break;
@@ -108,16 +108,16 @@ class Installer extends ModuleInstall {
                     try {
                         Thread.sleep(1000);
                     } catch (InterruptedException iex) {
-                        logger.log(Level.WARNING, "Timer interrupted");
+                        logger.log(Level.WARNING, "Timer interrupted"); //NON-NLS
                     }
                 }
             }
         } catch (SolrServerNoPortException npe) {
-            logger.log(Level.SEVERE, "Starting server failed due to no port available. ", npe);
+            logger.log(Level.SEVERE, "Starting server failed due to no port available. ", npe); //NON-NLS
             //try to kill it
 
         } catch (KeywordSearchModuleException e) {
-            logger.log(Level.SEVERE, "Starting server failed. ", e);
+            logger.log(Level.SEVERE, "Starting server failed. ", e); //NON-NLS
         }
 
 
@@ -127,25 +127,25 @@ class Installer extends ModuleInstall {
             try {
                 Thread.sleep(1000);
             } catch (InterruptedException ex) {
-                logger.log(Level.WARNING, "Timer interrupted.");
+                logger.log(Level.WARNING, "Timer interrupted."); //NON-NLS
             }
 
             try {
-                logger.log(Level.INFO, "Ensuring the server is running, retries remaining: " + retries);
+                logger.log(Level.INFO, "Ensuring the server is running, retries remaining: " + retries); //NON-NLS
                 if (!server.isRunning()) {
-                    logger.log(Level.WARNING, "Server still not running");
+                    logger.log(Level.WARNING, "Server still not running"); //NON-NLS
                     try {
-                        logger.log(Level.WARNING, "Trying to start the server. ");
+                        logger.log(Level.WARNING, "Trying to start the server. "); //NON-NLS
                         server.start();
                     } catch (SolrServerNoPortException npe) {
-                        logger.log(Level.SEVERE, "Starting server failed due to no port available. ", npe);
+                        logger.log(Level.SEVERE, "Starting server failed due to no port available. ", npe); //NON-NLS
                     }
                 } else {
-                    logger.log(Level.INFO, "Server appears now running. ");
+                    logger.log(Level.INFO, "Server appears now running. "); //NON-NLS
                     break;
                 }
             } catch (KeywordSearchModuleException ex) {
-                logger.log(Level.SEVERE, "Starting server failed. ", ex);
+                logger.log(Level.SEVERE, "Starting server failed. ", ex); //NON-NLS
                 //retry if has retries
             }
 
@@ -156,12 +156,12 @@ class Installer extends ModuleInstall {
         try {
             Thread.sleep(1000);
         } catch (InterruptedException ex) {
-            logger.log(Level.WARNING, "Timer interrupted.");
+            logger.log(Level.WARNING, "Timer interrupted."); //NON-NLS
         }
         try {
-            logger.log(Level.INFO, "Last check if server is running. ");
+            logger.log(Level.INFO, "Last check if server is running. "); //NON-NLS
             if (!server.isRunning()) {
-                logger.log(Level.SEVERE, "Server is still not running. ");
+                logger.log(Level.SEVERE, "Server is still not running. "); //NON-NLS
                 //check if port is taken or some other reason
                 int serverPort = server.getCurrentSolrServerPort();
                 int serverStopPort = server.getCurrentSolrStopPort();
@@ -175,7 +175,7 @@ class Installer extends ModuleInstall {
                 }
             }
         } catch (KeywordSearchModuleException ex) {
-            logger.log(Level.SEVERE, "Starting server failed. ", ex);
+            logger.log(Level.SEVERE, "Starting server failed. ", ex); //NON-NLS
             reportInitError();
         }
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/JerichoParserWrapper.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/JerichoParserWrapper.java
index 7c98ec2d18..70a217bdff 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/JerichoParserWrapper.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/JerichoParserWrapper.java
@@ -83,7 +83,7 @@ class JerichoParserWrapper {
             // Get all the tags in the source
             List<StartTag> tags = source.getAllStartTags();
             for(StartTag tag : tags) {
-                if(tag.getName().equals("script")) {
+                if(tag.getName().equals("script")) { //NON-NLS
                     // If the <script> tag has attributes
                     scripts.append(numScripts).append(") ");
                     if(tag.getTagContent().length()>0) {
@@ -92,11 +92,11 @@ class JerichoParserWrapper {
                     // Get whats between the <script> .. </script> tags
                     scripts.append(tag.getElement().getContent()).append("\n");
                     numScripts++;
-                } else if(tag.getName().equals("a")) {
+                } else if(tag.getName().equals("a")) { //NON-NLS
                     links.append(numLinks).append(") ");
                     links.append(tag.getTagContent()).append("\n");
                     numLinks++;
-                } else if(tag.getName().equals("img")) {
+                } else if(tag.getName().equals("img")) { //NON-NLS
                     images.append(numImages).append(") ");
                     images.append(tag.getTagContent()).append("\n");
                     numImages++;
@@ -118,27 +118,27 @@ class JerichoParserWrapper {
 
             out.append(text).append("\n\n");
 
-            out.append("----------NONVISIBLE TEXT----------\n\n");
+            out.append("----------NONVISIBLE TEXT----------\n\n"); //NON-NLS
             if(numScripts>1) {
-                out.append("---Scripts---\n");
+                out.append("---Scripts---\n"); //NON-NLS
                 out.append(scripts.toString()).append("\n");
             } if(numLinks>1) {
-                out.append("---Links---\n");
+                out.append("---Links---\n"); //NON-NLS
                 out.append(links.toString()).append("\n");
             } if(numImages>1) {
-                out.append("---Images---\n");
+                out.append("---Images---\n"); //NON-NLS
                 out.append(images.toString()).append("\n");
             } if(numComments>1) {
-                out.append("---Comments---\n");
+                out.append("---Comments---\n"); //NON-NLS
                 out.append(comments.toString()).append("\n");
             } if(numOthers>1) {
-                out.append("---Others---\n");
+                out.append("---Others---\n"); //NON-NLS
                 out.append(others.toString()).append("\n");
             }
             // All done, now make it a reader
             reader = new StringReader(out.toString());
         } catch (IOException ex) {
-            logger.log(Level.WARNING, "Unable to parse the HTML file", ex);
+            logger.log(Level.WARNING, "Unable to parse the HTML file", ex); //NON-NLS
         }
     }
     
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java
index 21573c7a96..d1a8286e03 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java
@@ -42,12 +42,12 @@ public class KeywordSearch {
     private static Server server;
     //we want a custom java.util.logging.Logger here for a reason
     //a separate logger from framework logs
-    private static final Logger TIKA_LOGGER = Logger.getLogger("Tika");
+    private static final Logger TIKA_LOGGER = Logger.getLogger("Tika"); //NON-NLS
     private static final Logger logger = Logger.getLogger(Case.class.getName());
     public enum QueryType {
         LITERAL, REGEX
     };
-    public static final String NUM_FILES_CHANGE_EVT = "NUM_FILES_CHANGE_EVT";
+    public static final String NUM_FILES_CHANGE_EVT = "NUM_FILES_CHANGE_EVT"; //NON-NLS
     private static PropertyChangeSupport changeSupport = new PropertyChangeSupport(KeywordSearch.class);
 
     /**
@@ -66,7 +66,7 @@ public class KeywordSearch {
     static {
         try {
             final int MAX_TIKA_LOG_FILES = 3;
-            FileHandler tikaLogHandler = new FileHandler(PlatformUtil.getUserDirectory().getAbsolutePath() + "/var/log/tika.log",
+            FileHandler tikaLogHandler = new FileHandler(PlatformUtil.getUserDirectory().getAbsolutePath() + "/var/log/tika.log", //NON-NLS
                     0, MAX_TIKA_LOG_FILES);
             tikaLogHandler.setFormatter(new SimpleFormatter());
             tikaLogHandler.setEncoding(PlatformUtil.getLogFileEncoding());
@@ -104,7 +104,7 @@ public class KeywordSearch {
             changeSupport.firePropertyChange(NUM_FILES_CHANGE_EVT, oldNum, newNum);
         }
         catch (Exception e) {
-            logger.log(Level.SEVERE, "KeywordSearch listener threw exception", e);
+            logger.log(Level.SEVERE, "KeywordSearch listener threw exception", e); //NON-NLS
             MessageNotifyUtil.Notify.show(NbBundle.getMessage(KeywordSearch.class, "KeywordSearch.moduleErr"),
                                           NbBundle.getMessage(KeywordSearch.class,
                                                               "KeywordSearch.fireNumIdxFileChg.moduleErr.msg"),
@@ -133,7 +133,7 @@ public class KeywordSearch {
                     try {
                         server.openCore();
                     } catch (Exception e) {
-                        logger.log(Level.WARNING, "Could not open core.");
+                        logger.log(Level.WARNING, "Could not open core."); //NON-NLS
                     }
                 } else if (oldValue != null) {
                     // a case was closed
@@ -142,7 +142,7 @@ public class KeywordSearch {
                         Thread.sleep(2000);
                         server.closeCore();
                     } catch (Exception e) {
-                        logger.log(Level.WARNING, "Could not close core.");
+                        logger.log(Level.WARNING, "Could not close core."); //NON-NLS
                     }
                 }
             }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
index 359ee87d4f..90e7f197d1 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
@@ -291,13 +291,13 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
 
         listOptionsLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchEditListPanel.class, "KeywordSearchEditListPanel.listOptionsLabel.text")); // NOI18N
 
-        deleteListButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/delete16.png"))); // NOI18N
+        deleteListButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/delete16.png"))); // NOI18N NON-NLS
         deleteListButton.setText(org.openide.util.NbBundle.getMessage(KeywordSearchEditListPanel.class, "KeywordSearchEditListPanel.deleteListButton.text")); // NOI18N
 
-        saveListButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/save16.png"))); // NOI18N
+        saveListButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/save16.png"))); // NOI18N NON-NLS
         saveListButton.setText(org.openide.util.NbBundle.getMessage(KeywordSearchEditListPanel.class, "KeywordSearchEditListPanel.saveListButton.text")); // NOI18N
 
-        exportButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/export16.png"))); // NOI18N
+        exportButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/export16.png"))); // NOI18N NON-NLS
         exportButton.setText(org.openide.util.NbBundle.getMessage(KeywordSearchEditListPanel.class, "KeywordSearchEditListPanel.exportButton.text")); // NOI18N
         exportButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -442,7 +442,7 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
                                                         "KeywordSearchEditListPanel.exportButtonAction.featureName.text");
 
         JFileChooser chooser = new JFileChooser();
-        final String EXTENSION = "xml";
+        final String EXTENSION = "xml"; //NON-NLS
         FileNameExtensionFilter filter = new FileNameExtensionFilter(
                 NbBundle.getMessage(this.getClass(), "KeywordSearchEditListPanel.exportButtonActionPerformed.fileFilterLabel"), EXTENSION);
         chooser.setFileFilter(filter);
@@ -608,7 +608,7 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
                     ret = (Object) !word.isLiteral();
                     break;
                 default:
-                    logger.log(Level.SEVERE, "Invalid table column index: {0}", columnIndex);
+                    logger.log(Level.SEVERE, "Invalid table column index: {0}", columnIndex); //NON-NLS
                     break;
             }
             return ret;
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSearchSettingsPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSearchSettingsPanel.java
index 1bc9cccc73..7f9ce6ed0c 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSearchSettingsPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSearchSettingsPanel.java
@@ -267,7 +267,7 @@ class KeywordSearchGlobalSearchSettingsPanel extends javax.swing.JPanel implemen
             filesIndexedValue.setText(Integer.toString(KeywordSearch.getServer().queryNumIndexedFiles()));
             chunksValLabel.setText(Integer.toString(KeywordSearch.getServer().queryNumIndexedChunks()));
         } catch (KeywordSearchModuleException | NoOpenCoreException ex) {
-            logger.log(Level.WARNING, "Could not get number of indexed files/chunks");
+            logger.log(Level.WARNING, "Could not get number of indexed files/chunks"); //NON-NLS
         }
 
         KeywordSearch.addNumIndexedFilesChangeListener(
@@ -283,7 +283,7 @@ class KeywordSearchGlobalSearchSettingsPanel extends javax.swing.JPanel implemen
                     try {
                         chunksValLabel.setText(Integer.toString(KeywordSearch.getServer().queryNumIndexedChunks()));
                     } catch (KeywordSearchModuleException | NoOpenCoreException ex) {
-                        logger.log(Level.WARNING, "Could not get number of indexed chunks");
+                        logger.log(Level.WARNING, "Could not get number of indexed chunks"); //NON-NLS
 
                     }
                 }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java
index d400abe80c..dc0fdf2912 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java
@@ -20,12 +20,12 @@ package org.sleuthkit.autopsy.keywordsearch;
 
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.corecomponents.OptionsPanel;
-import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel;
+import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel;
 
 /**
  * Global options panel for keyword searching.
  */
-final class KeywordSearchGlobalSettingsPanel extends IngestModuleGlobalSetttingsPanel implements OptionsPanel {
+final class KeywordSearchGlobalSettingsPanel extends IngestModuleGlobalSettingsPanel implements OptionsPanel {
 
     private KeywordSearchGlobalListSettingsPanel listsPanel;
     private KeywordSearchGlobalLanguageSettingsPanel languagesPanel;
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
index dbb9c198e5..a02b143c20 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
@@ -103,11 +103,18 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
         SKIPPED_ERROR_TEXTEXTRACT, ///< File was skipped because of text extraction issues
         SKIPPED_ERROR_IO    ///< File was skipped because of IO issues reading it
     };
-    private static final Map<Long, IngestStatus> ingestStatus = new HashMap<>(); //guarded by itself
-
-    static void putIngestStatus(long id, IngestStatus status) {
-        synchronized(ingestStatus) {
-            ingestStatus.put(id, status);
+    private static final Map<Long, Map<Long, IngestStatus>> ingestStatus = new HashMap<>(); //guarded by itself
+   
+    private static void putIngestStatus(long ingestJobId, long fileId, IngestStatus status) {
+        synchronized(ingestStatus) {            
+            Map<Long, IngestStatus> ingestStatusForJob = ingestStatus.get(ingestJobId);                       
+            if (ingestStatusForJob == null) {
+                ingestStatusForJob = new HashMap<>();
+                ingestStatus.put(ingestJobId, ingestStatusForJob);
+            }
+            
+            ingestStatusForJob.put(fileId, status);
+            ingestStatus.put(ingestJobId, ingestStatusForJob);
         }
     }    
     
@@ -123,9 +130,9 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
      */
     @Override
     public void startUp(IngestJobContext context) throws IngestModuleException {
-        logger.log(Level.INFO, "Initializing instance {0}", instanceNum);
+        logger.log(Level.INFO, "Initializing instance {0}", instanceNum); //NON-NLS
         initialized = false;       
-        jobId = context.getJobId();
+        jobId = context.getJobId();        
         caseHandle = Case.getCurrentCase().getSleuthkitCase();
         tikaFormatDetector = new Tika();
         ingester = Server.getIngester();
@@ -143,7 +150,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
                     throw new IngestModuleException(msg);
                 }
             } catch (KeywordSearchModuleException ex) {
-                logger.log(Level.WARNING, "Error checking if Solr server is running while initializing ingest", ex);
+                logger.log(Level.WARNING, "Error checking if Solr server is running while initializing ingest", ex); //NON-NLS
                 //this means Solr is not properly initialized
                 String msg = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.badInitMsg");
                 String details = NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.tryStopSolrMsg", msg);
@@ -185,7 +192,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
         for (SCRIPT s : KeywordSearchSettings.getStringExtractScripts()) {
             sbScripts.append(s.name()).append(" ");
         }
-        logger.log(Level.INFO, "Using string extract scripts: {0}", sbScripts.toString());
+        logger.log(Level.INFO, "Using string extract scripts: {0}", sbScripts.toString()); //NON-NLS
 
         textExtractors = new ArrayList<>();
         //order matters, more specific extractors first
@@ -200,8 +207,8 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
     public ProcessResult process(AbstractFile abstractFile) {
         if (initialized == false) //error initializing indexing/Solr
         {
-            logger.log(Level.WARNING, "Skipping processing, module not initialized, file: {0}", abstractFile.getName());
-            putIngestStatus(abstractFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
+            logger.log(Level.WARNING, "Skipping processing, module not initialized, file: {0}", abstractFile.getName());  //NON-NLS
+            putIngestStatus(jobId, abstractFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
             return ProcessResult.OK;
         }
         try {
@@ -209,7 +216,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
             dataSourceId = caseHandle.getFileDataSource(abstractFile);
 
         } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Error getting image id of file processed by keyword search: " + abstractFile.getName(), ex);
+            logger.log(Level.SEVERE, "Error getting image id of file processed by keyword search: " + abstractFile.getName(), ex); //NON-NLS
         }
 
         if (abstractFile.getType().equals(TskData.TSK_DB_FILES_TYPE_ENUM.VIRTUAL_DIR)) {
@@ -242,14 +249,14 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
      */
     @Override
     public void shutDown(boolean ingestJobCancelled) {
-        logger.log(Level.INFO, "Instance {0}", instanceNum);
+        logger.log(Level.INFO, "Instance {0}", instanceNum); //NON-NLS
        
         if (initialized == false) {
             return;
         }
 
         if (ingestJobCancelled) {
-            logger.log(Level.INFO, "Ingest job cancelled");
+            logger.log(Level.INFO, "Ingest job cancelled"); //NON-NLS
             stop();
             return;
         }
@@ -260,6 +267,9 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
         // We only need to post the summary msg from the last module per job
         if (refCounter.decrementAndGet(jobId) == 0) {
             postIndexSummary();
+            synchronized(ingestStatus) {
+                ingestStatus.remove(jobId);
+            }            
         }
         
         //log number of files / chunks in index
@@ -267,18 +277,20 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
         try {
             final int numIndexedFiles = KeywordSearch.getServer().queryNumIndexedFiles();
             final int numIndexedChunks = KeywordSearch.getServer().queryNumIndexedChunks();
-            logger.log(Level.INFO, "Indexed files count: {0}", numIndexedFiles);
-            logger.log(Level.INFO, "Indexed file chunks count: {0}", numIndexedChunks);
+            logger.log(Level.INFO, "Indexed files count: {0}", numIndexedFiles); //NON-NLS
+            logger.log(Level.INFO, "Indexed file chunks count: {0}", numIndexedChunks); //NON-NLS
         } catch (NoOpenCoreException | KeywordSearchModuleException ex) {
-            logger.log(Level.WARNING, "Error executing Solr query to check number of indexed files/chunks: ", ex);
+            logger.log(Level.WARNING, "Error executing Solr query to check number of indexed files/chunks: ", ex); //NON-NLS
         }
+        
+        cleanup();
     }
 
     /**
      * Handle stop event (ingest interrupted) Cleanup resources, threads, timers
      */
     private void stop() {
-        logger.log(Level.INFO, "stop()");
+        logger.log(Level.INFO, "stop()"); //NON-NLS
 
         SearchRunner.getInstance().stopJob(jobId);
     
@@ -289,10 +301,6 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
      * Common cleanup code when module stops or final searcher completes
      */
     private void cleanup() {
-        synchronized(ingestStatus) {
-            ingestStatus.clear();            
-        }
-
         textExtractors.clear();
         textExtractors = null;
         stringExtractor = null;
@@ -314,16 +322,17 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
         int error_io = 0;
 
         synchronized(ingestStatus) {
-            for (IngestStatus s : ingestStatus.values()) {
+            Map<Long, IngestStatus> ingestStatusForJob = ingestStatus.get(jobId);
+            for (IngestStatus s : ingestStatusForJob.values()) {
                 switch (s) {
                     case TEXT_INGESTED:
-                        ++text_ingested;
+                        text_ingested++;
                         break;
                     case METADATA_INGESTED:
-                        ++metadata_ingested;
+                        metadata_ingested++;
                         break;
                     case STRINGS_INGESTED:
-                        ++strings_ingested;
+                        strings_ingested++;
                         break;
                     case SKIPPED_ERROR_TEXTEXTRACT:
                         error_text++;
@@ -341,15 +350,15 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
         }
         
         StringBuilder msg = new StringBuilder();
-        msg.append("<table border=0><tr><td>").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.knowFileHeaderLbl")).append("</td><td>").append(text_ingested).append("</td></tr>");
-        msg.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.fileGenStringsHead")).append("</td><td>").append(strings_ingested).append("</td></tr>");
-        msg.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.mdOnlyLbl")).append("</td><td>").append(metadata_ingested).append("</td></tr>");
-        msg.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.idxErrLbl")).append("</td><td>").append(error_index).append("</td></tr>");
-        msg.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.errTxtLbl")).append("</td><td>").append(error_text).append("</td></tr>");
-        msg.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.errIoLbl")).append("</td><td>").append(error_io).append("</td></tr>");
-        msg.append("</table>");
+        msg.append("<table border=0><tr><td>").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.knowFileHeaderLbl")).append("</td><td>").append(text_ingested).append("</td></tr>"); //NON-NLS
+        msg.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.fileGenStringsHead")).append("</td><td>").append(strings_ingested).append("</td></tr>"); //NON-NLS
+        msg.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.mdOnlyLbl")).append("</td><td>").append(metadata_ingested).append("</td></tr>"); //NON-NLS
+        msg.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.idxErrLbl")).append("</td><td>").append(error_index).append("</td></tr>"); //NON-NLS
+        msg.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.errTxtLbl")).append("</td><td>").append(error_text).append("</td></tr>"); //NON-NLS
+        msg.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.errIoLbl")).append("</td><td>").append(error_io).append("</td></tr>"); //NON-NLS
+        msg.append("</table>"); //NON-NLS
         String indexStats = msg.toString();
-        logger.log(Level.INFO, "Keyword Indexing Completed: {0}", indexStats);
+        logger.log(Level.INFO, "Keyword Indexing Completed: {0}", indexStats); //NON-NLS
         services.postMessage(IngestMessage.createMessage(MessageType.INFO, KeywordSearchModuleFactory.getModuleName(), NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.kwIdxResultsLbl"), indexStats));
         if (error_index > 0) {
             MessageNotifyUtil.Notify.error(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.postIndexSummary.kwIdxErrsTitle"),
@@ -391,7 +400,7 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
             }
 
             if (fileExtract == null) {
-                logger.log(Level.INFO, "No text extractor found for file id:{0}, name: {1}, detected format: {2}", new Object[]{aFile.getId(), aFile.getName(), detectedFormat});
+                logger.log(Level.INFO, "No text extractor found for file id:{0}, name: {1}, detected format: {2}", new Object[]{aFile.getId(), aFile.getName(), detectedFormat}); //NON-NLS
                 return false;
             }
 
@@ -411,16 +420,16 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
         private boolean extractStringsAndIndex(AbstractFile aFile) {
             try {
                 if (stringExtractor.index(aFile)) {
-                    putIngestStatus(aFile.getId(), IngestStatus.STRINGS_INGESTED);
+                    putIngestStatus(jobId, aFile.getId(), IngestStatus.STRINGS_INGESTED);
                     return true;
                 } else {
-                    logger.log(Level.WARNING, "Failed to extract strings and ingest, file ''{0}'' (id: {1}).", new Object[]{aFile.getName(), aFile.getId()});
-                    putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT);
+                    logger.log(Level.WARNING, "Failed to extract strings and ingest, file ''{0}'' (id: {1}).", new Object[]{aFile.getName(), aFile.getId()});  //NON-NLS
+                    putIngestStatus(jobId, aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT);
                     return false;
                 }
             } catch (IngesterException ex) {
-                logger.log(Level.WARNING, "Failed to extract strings and ingest, file '" + aFile.getName() + "' (id: " + aFile.getId() + ").", ex);
-                putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
+                logger.log(Level.WARNING, "Failed to extract strings and ingest, file '" + aFile.getName() + "' (id: " + aFile.getId() + ").", ex);  //NON-NLS
+                putIngestStatus(jobId, aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
                 return false;
             }
         }
@@ -466,10 +475,10 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
             if ((indexContent == false || aFile.isDir() || size == 0)) {
                 try {
                     ingester.ingest(aFile, false); //meta-data only
-                    putIngestStatus(aFile.getId(), IngestStatus.METADATA_INGESTED);
+                    putIngestStatus(jobId, aFile.getId(), IngestStatus.METADATA_INGESTED);
                 } catch (IngesterException ex) {
-                    putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
-                    logger.log(Level.WARNING, "Unable to index meta-data for file: " + aFile.getId(), ex);
+                    putIngestStatus(jobId, aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
+                    logger.log(Level.WARNING, "Unable to index meta-data for file: " + aFile.getId(), ex); //NON-NLS
                 }
                 return;
             }
@@ -481,13 +490,13 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
                 is = new ReadContentInputStream(aFile);
                 detectedFormat = tikaFormatDetector.detect(is, aFile.getName());
             } catch (Exception e) {
-                logger.log(Level.WARNING, "Could not detect format using tika for file: " + aFile, e);
+                logger.log(Level.WARNING, "Could not detect format using tika for file: " + aFile, e); //NON-NLS
             } finally {
                 if (is != null) {
                     try {
                         is.close();
                     } catch (IOException ex) {
-                        logger.log(Level.WARNING, "Could not close stream after detecting format using tika for file: "
+                        logger.log(Level.WARNING, "Could not close stream after detecting format using tika for file: " //NON-NLS
                                 + aFile, ex);
                     }
                 }
@@ -502,10 +511,10 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
             if (AbstractFileExtract.ARCHIVE_MIME_TYPES.contains(detectedFormat)) {
                 try {
                     ingester.ingest(aFile, false); //meta-data only
-                    putIngestStatus(aFile.getId(), IngestStatus.METADATA_INGESTED);
+                    putIngestStatus(jobId, aFile.getId(), IngestStatus.METADATA_INGESTED);
                 } catch (IngesterException ex) {
-                    putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
-                    logger.log(Level.WARNING, "Unable to index meta-data for file: " + aFile.getId(), ex);
+                    putIngestStatus(jobId, aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
+                    logger.log(Level.WARNING, "Unable to index meta-data for file: " + aFile.getId(), ex); //NON-NLS
                 }
                 return;
             }
@@ -516,21 +525,21 @@ public final class KeywordSearchIngestModule extends IngestModuleAdapter impleme
                 try {
                     //logger.log(Level.INFO, "indexing: " + aFile.getName());
                     if (!extractTextAndIndex(aFile, detectedFormat)) {
-                        logger.log(Level.WARNING, "Failed to extract text and ingest, file ''{0}'' (id: {1}).", new Object[]{aFile.getName(), aFile.getId()});
-                        putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT);
+                        logger.log(Level.WARNING, "Failed to extract text and ingest, file ''{0}'' (id: {1}).", new Object[]{aFile.getName(), aFile.getId()}); //NON-NLS
+                        putIngestStatus(jobId, aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT);
                     } else {
-                        putIngestStatus(aFile.getId(), IngestStatus.TEXT_INGESTED);
+                        putIngestStatus(jobId, aFile.getId(), IngestStatus.TEXT_INGESTED);
                         wasTextAdded = true;
                     }
 
                 } catch (IngesterException e) {
-                    logger.log(Level.INFO, "Could not extract text with Tika, " + aFile.getId() + ", "
+                    logger.log(Level.INFO, "Could not extract text with Tika, " + aFile.getId() + ", " //NON-NLS
                             + aFile.getName(), e);
-                    putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
+                    putIngestStatus(jobId, aFile.getId(), IngestStatus.SKIPPED_ERROR_INDEXING);
                 } catch (Exception e) {
-                    logger.log(Level.WARNING, "Error extracting text with Tika, " + aFile.getId() + ", "
+                    logger.log(Level.WARNING, "Error extracting text with Tika, " + aFile.getId() + ", " //NON-NLS
                             + aFile.getName(), e);
-                    putIngestStatus(aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT);
+                    putIngestStatus(jobId, aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT);
                 }
             }
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettingsPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettingsPanel.java
index d57f1d0e66..24b5973577 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettingsPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchJobSettingsPanel.java
@@ -86,14 +86,14 @@ public final class KeywordSearchJobSettingsPanel extends IngestModuleIngestJobSe
     private void displayLanguages() {
         List<SCRIPT> scripts = KeywordSearchSettings.getStringExtractScripts();
         StringBuilder langs = new StringBuilder();
-        langs.append("<html>");
+        langs.append("<html>"); //NON-NLS
         for (int i = 0; i < scripts.size(); i++) {
             langs.append(scripts.get(i).toString());
             if (i + 1 < scripts.size()) {
                 langs.append(", ");
             }
         }
-        langs.append("</html>");
+        langs.append("</html>"); //NON-NLS
         String langsS = langs.toString();
         this.languagesValLabel.setText(langsS);
         this.languagesValLabel.setToolTipText(langsS);
@@ -107,7 +107,7 @@ public final class KeywordSearchJobSettingsPanel extends IngestModuleIngestJobSe
             encodingsList.add("UTF8");
         }
         if (utf16 == null || Boolean.parseBoolean(utf16)) {
-            encodingsList.add("UTF16");
+            encodingsList.add("UTF16"); //NON-NLS
         }
         String encodings = encodingsList.toString();
         encodings = encodings.substring(1, encodings.length() - 1);
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java
index a6296fd7e4..546a155fe9 100755
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java
@@ -69,7 +69,7 @@ abstract class KeywordSearchListsAbstract {
         try {
             changeSupport.firePropertyChange(event.toString(), null, null);
         } catch (Exception e) {
-            logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e);
+            logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e); //NON-NLS
         }        
     }
     
@@ -87,40 +87,40 @@ abstract class KeywordSearchListsAbstract {
         }
         //phone number
         List<Keyword> phones = new ArrayList<>();
-        phones.add(new Keyword("[(]{0,1}\\d\\d\\d[)]{0,1}[\\.-]\\d\\d\\d[\\.-]\\d\\d\\d\\d", false, BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PHONE_NUMBER));
+        phones.add(new Keyword("[(]{0,1}\\d\\d\\d[)]{0,1}[\\.-]\\d\\d\\d[\\.-]\\d\\d\\d\\d", false, BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PHONE_NUMBER)); //NON-NLS
         //phones.add(new Keyword("\\d{8,10}", false));
         //IP address
         List<Keyword> ips = new ArrayList<>();
         ips.add(new Keyword("(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])", false, BlackboardAttribute.ATTRIBUTE_TYPE.TSK_IP_ADDRESS));
         //email
         List<Keyword> emails = new ArrayList<>();
-        emails.add(new Keyword("(?=.{8})[a-z0-9%+_-]+(?:\\.[a-z0-9%+_-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z]{2,4}(?<!\\.txt|\\.exe|\\.dll|\\.jpg|\\.xml)",
+        emails.add(new Keyword("(?=.{8})[a-z0-9%+_-]+(?:\\.[a-z0-9%+_-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z]{2,4}(?<!\\.txt|\\.exe|\\.dll|\\.jpg|\\.xml)", //NON-NLS
                 false, BlackboardAttribute.ATTRIBUTE_TYPE.TSK_EMAIL));
         //emails.add(new Keyword("[A-Z0-9._%-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}", 
         //                       false, BlackboardAttribute.ATTRIBUTE_TYPE.TSK_EMAIL));
         //URL
         List<Keyword> urls = new ArrayList<>();
         //urls.add(new Keyword("http://|https://|^www\\.", false, BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL));
-        urls.add(new Keyword("((((ht|f)tp(s?))\\://)|www\\.)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,5})(\\:[0-9]+)*(/($|[a-zA-Z0-9\\.\\,\\;\\?\\'\\\\+&amp;%\\$#\\=~_\\-]+))*", false, BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL));
+        urls.add(new Keyword("((((ht|f)tp(s?))\\://)|www\\.)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,5})(\\:[0-9]+)*(/($|[a-zA-Z0-9\\.\\,\\;\\?\\'\\\\+&amp;%\\$#\\=~_\\-]+))*", false, BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL)); //NON-NLS
 
         //urls.add(new Keyword("ssh://", false, BlackboardAttribute.ATTRIBUTE_TYPE.TSK_URL));
 
         //disable messages for harcoded/locked lists
         String name;
 
-        name = "Phone Numbers";
+        name = "Phone Numbers"; //NON-NLS
         lockedLists.add(name);
         addList(name, phones, false, false, true);
 
-        name = "IP Addresses";
+        name = "IP Addresses"; //NON-NLS
         lockedLists.add(name);
         addList(name, ips, false, false, true);
 
-        name = "Email Addresses";
+        name = "Email Addresses"; //NON-NLS
         lockedLists.add(name);
         addList(name, emails, true, false, true);
 
-        name = "URLs";
+        name = "URLs"; //NON-NLS
         lockedLists.add(name);
         addList(name, urls, false, false, true);
     }
@@ -287,7 +287,7 @@ abstract class KeywordSearchListsAbstract {
             try {
                 changeSupport.firePropertyChange(ListsEvt.LIST_ADDED.toString(), null, name);
             } catch (Exception e) {
-                logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e);
+                logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e); //NON-NLS
                 MessageNotifyUtil.Notify.show(
                         NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.moduleErr"),
                         NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.addList.errMsg1.msg"),
@@ -300,7 +300,7 @@ abstract class KeywordSearchListsAbstract {
             try {
                 changeSupport.firePropertyChange(ListsEvt.LIST_UPDATED.toString(), null, name);
             } catch (Exception e) {
-                logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e);
+                logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e); //NON-NLS
                 MessageNotifyUtil.Notify.show(
                         NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.moduleErr"),
                         NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.addList.errMsg2.msg"),
@@ -349,7 +349,7 @@ abstract class KeywordSearchListsAbstract {
                 try {
                     changeSupport.firePropertyChange(ListsEvt.LIST_ADDED.toString(), null, list.getName());
                 } catch (Exception e) {
-                    logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e);
+                    logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e); //NON-NLS
                     MessageNotifyUtil.Notify.show(
                             NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.moduleErr"),
                             NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.saveList.errMsg1.msg"),
@@ -360,7 +360,7 @@ abstract class KeywordSearchListsAbstract {
                 try {
                     changeSupport.firePropertyChange(ListsEvt.LIST_UPDATED.toString(), null, over.getName());
                 } catch (Exception e) {
-                    logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e);
+                    logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e); //NON-NLS
                     MessageNotifyUtil.Notify.show(
                             NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.moduleErr"),
                             NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.saveList.errMsg2.msg"),
@@ -395,7 +395,7 @@ abstract class KeywordSearchListsAbstract {
             try {
                 changeSupport.firePropertyChange(ListsEvt.LIST_ADDED.toString(), null, list.getName());
             } catch (Exception e) {
-                logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e);
+                logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e); //NON-NLS
                 MessageNotifyUtil.Notify.show(
                         NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.moduleErr"),
                         NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.writeLists.errMsg1.msg"),
@@ -408,7 +408,7 @@ abstract class KeywordSearchListsAbstract {
             try {
                 changeSupport.firePropertyChange(ListsEvt.LIST_UPDATED.toString(), null, over.getName());
             } catch (Exception e) {
-                logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e);
+                logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e); //NON-NLS
                 MessageNotifyUtil.Notify.show(
                         NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.moduleErr"),
                         NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.writeLists.errMsg2.msg"),
@@ -434,7 +434,7 @@ abstract class KeywordSearchListsAbstract {
         try {
             changeSupport.firePropertyChange(ListsEvt.LIST_DELETED.toString(), null, name);
         } catch (Exception e) {
-            logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e);
+            logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e); //NON-NLS
             MessageNotifyUtil.Notify.show(
                     NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.moduleErr"),
                     NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.deleteList.errMsg1.msg"),
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsEncase.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsEncase.java
index 1cdf4c050d..ca9f26c974 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsEncase.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsEncase.java
@@ -130,7 +130,7 @@ class KeywordSearchListsEncase extends KeywordSearchListsAbstract{
     @Override
     public boolean load() {
         try {
-            BufferedReader readBuffer = new BufferedReader(new InputStreamReader(new FileInputStream(filePath), "utf-16"));
+            BufferedReader readBuffer = new BufferedReader(new InputStreamReader(new FileInputStream(filePath), "utf-16")); //NON-NLS
             String structLine;
             String metaLine;
             entriesUnsorted = new ArrayList<>();
@@ -161,9 +161,9 @@ class KeywordSearchListsEncase extends KeywordSearchListsAbstract{
             return true;
             
         } catch (FileNotFoundException ex) {
-            logger.log(Level.INFO, "File at " + filePath + " does not exist!", ex);
+            logger.log(Level.INFO, "File at " + filePath + " does not exist!", ex); //NON-NLS
         } catch (IOException ex) {
-            logger.log(Level.INFO, "Failed to read file at " + filePath, ex);
+            logger.log(Level.INFO, "Failed to read file at " + filePath, ex); //NON-NLS
         }
         return false;
     }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java
index 71f50f7dd2..36562b776f 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java
@@ -113,7 +113,7 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel implements Op
         });
         jScrollPane1.setViewportView(listsTable);
 
-        newListButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/new16.png"))); // NOI18N
+        newListButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/new16.png"))); // NOI18N NON-NLS
         newListButton.setText(org.openide.util.NbBundle.getMessage(KeywordSearchListsManagementPanel.class, "KeywordSearchListsManagementPanel.newListButton.text")); // NOI18N
         newListButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -121,7 +121,7 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel implements Op
             }
         });
 
-        importButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/import16.png"))); // NOI18N
+        importButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/import16.png"))); // NOI18N NON-NLS
         importButton.setText(org.openide.util.NbBundle.getMessage(KeywordSearchListsManagementPanel.class, "KeywordSearchListsManagementPanel.importButton.text")); // NOI18N
         importButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -208,7 +208,7 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel implements Op
     private void importButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_importButtonActionPerformed
 
         JFileChooser chooser = new JFileChooser();
-        final String[] EXTENSION = new String[]{"xml", "txt"};
+        final String[] EXTENSION = new String[]{"xml", "txt"}; //NON-NLS
         FileNameExtensionFilter filter = new FileNameExtensionFilter(
                 NbBundle.getMessage(this.getClass(), "KeywordSearchListsManagementPanel.fileExtensionFilterLbl"), EXTENSION);
         chooser.setFileFilter(filter);
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java
index 8464a1ecc5..898b21bfc5 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java
@@ -141,7 +141,7 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer {
             public void actionPerformed(ActionEvent e) {
                 if (ingestRunning) {                    
                     SearchRunner.getInstance().addKeywordListsToAllJobs(listsTableModel.getSelectedLists());
-                    logger.log(Level.INFO, "Submitted enqueued lists to ingest");
+                    logger.log(Level.INFO, "Submitted enqueued lists to ingest"); //NON-NLS
                 } else {
                     searchAction(e);
                 }
@@ -233,7 +233,7 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer {
 
         searchAddButton.setText(org.openide.util.NbBundle.getMessage(KeywordSearchListsViewerPanel.class, "KeywordSearchListsViewerPanel.searchAddButton.text")); // NOI18N
 
-        ingestIndexLabel.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N
+        ingestIndexLabel.setFont(new java.awt.Font("Tahoma", 0, 10)); // NOI18N NON-NLS
         ingestIndexLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchListsViewerPanel.class, "KeywordSearchListsViewerPanel.ingestIndexLabel.text")); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java
index 929ec49ac3..ca072e00f8 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsXML.java
@@ -44,21 +44,21 @@ import org.w3c.dom.NodeList;
 final class KeywordSearchListsXML extends KeywordSearchListsAbstract {
 
     private static final Logger xmlListslogger = Logger.getLogger(KeywordSearchListsXML.class.getName());
-    private static final String CUR_LISTS_FILE_NAME = "keywords.xml";    
+    private static final String CUR_LISTS_FILE_NAME = "keywords.xml";     //NON-NLS
     private static String CUR_LISTS_FILE = PlatformUtil.getUserConfigDirectory() + File.separator + CUR_LISTS_FILE_NAME;   
-    private static final String XSDFILE = "KeywordsSchema.xsd";
-    private static final String ROOT_EL = "keyword_lists";
-    private static final String LIST_EL = "keyword_list";
-    private static final String LIST_NAME_ATTR = "name";
-    private static final String LIST_CREATE_ATTR = "created";
-    private static final String LIST_MOD_ATTR = "modified";
-    private static final String LIST_USE_FOR_INGEST = "use_for_ingest";
-    private static final String LIST_INGEST_MSGS = "ingest_messages";
-    private static final String KEYWORD_EL = "keyword";
-    private static final String KEYWORD_LITERAL_ATTR = "literal";
-    private static final String KEYWORD_SELECTOR_ATTR = "selector";
-    private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
-    private static final String ENCODING = "UTF-8";
+    private static final String XSDFILE = "KeywordsSchema.xsd"; //NON-NLS
+    private static final String ROOT_EL = "keyword_lists"; //NON-NLS
+    private static final String LIST_EL = "keyword_list"; //NON-NLS
+    private static final String LIST_NAME_ATTR = "name"; //NON-NLS
+    private static final String LIST_CREATE_ATTR = "created"; //NON-NLS
+    private static final String LIST_MOD_ATTR = "modified"; //NON-NLS
+    private static final String LIST_USE_FOR_INGEST = "use_for_ingest"; //NON-NLS
+    private static final String LIST_INGEST_MSGS = "ingest_messages"; //NON-NLS
+    private static final String KEYWORD_EL = "keyword"; //NON-NLS
+    private static final String KEYWORD_LITERAL_ATTR = "literal"; //NON-NLS
+    private static final String KEYWORD_SELECTOR_ATTR = "selector"; //NON-NLS
+    private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; //NON-NLS
+    private static final String ENCODING = "UTF-8"; //NON-NLS
     private static KeywordSearchListsXML currentInstance = null; 
     private DateFormat dateFormatter;
 
@@ -127,7 +127,7 @@ final class KeywordSearchListsXML extends KeywordSearchListsAbstract {
 
                 for (Keyword keyword : keywords) {
                     Element keywordEl = doc.createElement(KEYWORD_EL);
-                    String literal = keyword.isLiteral()?"true":"false";
+                    String literal = keyword.isLiteral()?"true":"false"; //NON-NLS
                     keywordEl.setAttribute(KEYWORD_LITERAL_ATTR, literal);
                     BlackboardAttribute.ATTRIBUTE_TYPE selectorType = keyword.getType();
                     if (selectorType != null) {
@@ -141,7 +141,7 @@ final class KeywordSearchListsXML extends KeywordSearchListsAbstract {
 
             success = XMLUtil.saveDoc(KeywordSearchListsXML.class, filePath, ENCODING, doc);
         } catch (ParserConfigurationException e) {
-            xmlListslogger.log(Level.SEVERE, "Error saving keyword list: can't initialize parser.", e);
+            xmlListslogger.log(Level.SEVERE, "Error saving keyword list: can't initialize parser.", e); //NON-NLS
         }
         return success;
     }
@@ -158,7 +158,7 @@ final class KeywordSearchListsXML extends KeywordSearchListsAbstract {
 
         Element root = doc.getDocumentElement();
         if (root == null) {
-            xmlListslogger.log(Level.SEVERE, "Error loading keyword list: invalid file format.");
+            xmlListslogger.log(Level.SEVERE, "Error loading keyword list: invalid file format."); //NON-NLS
             return false;
         }
         try {
@@ -200,7 +200,7 @@ final class KeywordSearchListsXML extends KeywordSearchListsAbstract {
                 for (int j = 0; j < numKeywords; ++j) {
                     Element wordEl = (Element) wordsNList.item(j);
                     String literal = wordEl.getAttribute(KEYWORD_LITERAL_ATTR);
-                    boolean isLiteral = literal.equals("true");
+                    boolean isLiteral = literal.equals("true"); //NON-NLS
                     Keyword keyword = new Keyword(wordEl.getTextContent(), isLiteral);
                     String selector = wordEl.getAttribute(KEYWORD_SELECTOR_ATTR);
                     if (! selector.equals("")) {
@@ -214,7 +214,7 @@ final class KeywordSearchListsXML extends KeywordSearchListsAbstract {
             }
         } catch (ParseException e) {
             //error parsing dates
-            xmlListslogger.log(Level.SEVERE, "Error loading keyword list: can't parse dates.", e);
+            xmlListslogger.log(Level.SEVERE, "Error loading keyword list: can't parse dates.", e); //NON-NLS
             return false;
         }
         return true;
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchModuleFactory.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchModuleFactory.java
index d20d7c4c96..4a6c91d7ea 100755
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchModuleFactory.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchModuleFactory.java
@@ -30,7 +30,7 @@ import org.sleuthkit.autopsy.ingest.FileIngestModule;
 import org.sleuthkit.autopsy.ingest.IngestModuleFactory;
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
-import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel;
+import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel;
 
 /**
  * An ingest module factory that creates file ingest modules that do keyword
@@ -39,7 +39,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel;
 @ServiceProvider(service = IngestModuleFactory.class)
 public class KeywordSearchModuleFactory extends IngestModuleFactoryAdapter {
 
-    private static final HashSet<String> defaultDisabledKeywordListNames = new HashSet<>(Arrays.asList("Phone Numbers", "IP Addresses", "URLs"));
+    private static final HashSet<String> defaultDisabledKeywordListNames = new HashSet<>(Arrays.asList("Phone Numbers", "IP Addresses", "URLs")); //NON-NLS
     private KeywordSearchJobSettingsPanel jobSettingsPanel = null;
 
     @Override
@@ -83,7 +83,8 @@ public class KeywordSearchModuleFactory extends IngestModuleFactoryAdapter {
     public IngestModuleIngestJobSettingsPanel getIngestJobSettingsPanel(IngestModuleIngestJobSettings settings) {
         assert settings instanceof KeywordSearchJobSettings;
         if (!(settings instanceof KeywordSearchJobSettings)) {
-            throw new IllegalArgumentException("Expected settings argument to be instanceof KeywordSearchJobSettings");
+            throw new IllegalArgumentException(NbBundle.getMessage(this.getClass(),
+                                                                   "KeywordSearchModuleFactory.getIngestJobSettingsPanel.exception.msg"));
         }
 
         if (jobSettingsPanel == null) {
@@ -100,7 +101,7 @@ public class KeywordSearchModuleFactory extends IngestModuleFactoryAdapter {
     }
 
     @Override
-    public IngestModuleGlobalSetttingsPanel getGlobalSettingsPanel() {
+    public IngestModuleGlobalSettingsPanel getGlobalSettingsPanel() {
         KeywordSearchGlobalSettingsPanel globalSettingsPanel = new KeywordSearchGlobalSettingsPanel();
         globalSettingsPanel.load();
         return globalSettingsPanel;
@@ -115,7 +116,8 @@ public class KeywordSearchModuleFactory extends IngestModuleFactoryAdapter {
     public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings settings) {
         assert settings instanceof KeywordSearchJobSettings;
         if (!(settings instanceof KeywordSearchJobSettings)) {
-            throw new IllegalArgumentException("Expected settings argument to be instanceof KeywordSearchJobSettings");
+            throw new IllegalArgumentException(NbBundle.getMessage(this.getClass(),
+                                                                   "KeywordSearchModuleFactory.createFileIngestModule.exception.msg"));
         }
         return new KeywordSearchIngestModule((KeywordSearchJobSettings) settings);
     }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchOptionsPanelController.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchOptionsPanelController.java
index 7a5d132174..68fe399c3e 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchOptionsPanelController.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchOptionsPanelController.java
@@ -103,7 +103,7 @@ public final class KeywordSearchOptionsPanelController extends OptionsPanelContr
             try {
                 pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, false, true);
             } catch (Exception e) {
-                logger.log(Level.SEVERE, "KeywordSearchOptionsPanelController listener threw exception", e);
+                logger.log(Level.SEVERE, "KeywordSearchOptionsPanelController listener threw exception", e); //NON-NLS
                 MessageNotifyUtil.Notify.show(
                         NbBundle.getMessage(this.getClass(), "KeywordSearchOptionsPanelController.moduleErr"),
                         NbBundle.getMessage(this.getClass(), "KeywordSearchOptionsPanelController.moduleErr.msg1"),
@@ -113,7 +113,7 @@ public final class KeywordSearchOptionsPanelController extends OptionsPanelContr
         try {
             pcs.firePropertyChange(OptionsPanelController.PROP_VALID, null, null);
         } catch (Exception e) {
-            logger.log(Level.SEVERE, "KeywordSearchOptionsPanelController listener threw exception", e);
+            logger.log(Level.SEVERE, "KeywordSearchOptionsPanelController listener threw exception", e); //NON-NLS
             MessageNotifyUtil.Notify.show(
                     NbBundle.getMessage(this.getClass(), "KeywordSearchOptionsPanelController.moduleErr"),
                     NbBundle.getMessage(this.getClass(), "KeywordSearchOptionsPanelController.moduleErr.msg2"),
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java
index 4627a21e22..f33b450c7e 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java
@@ -143,13 +143,13 @@ class KeywordSearchPanel extends javax.swing.JPanel {
 
         setOpaque(false);
 
-        listsButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/watchbutton-icon.png"))); // NOI18N
+        listsButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/watchbutton-icon.png"))); // NOI18N NON-NLS
         listsButton.setText(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "ListBundleName")); // NOI18N
         listsButton.setBorderPainted(false);
         listsButton.setContentAreaFilled(false);
         listsButton.setEnabled(false);
-        listsButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/watchbutton-icon-rollover.png"))); // NOI18N
-        listsButton.setRolloverSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/watchbutton-icon-pressed.png"))); // NOI18N
+        listsButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/watchbutton-icon-rollover.png"))); // NOI18N NON-NLS
+        listsButton.setRolloverSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/watchbutton-icon-pressed.png"))); // NOI18N NON-NLS
         listsButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mousePressed(java.awt.event.MouseEvent evt) {
                 listsButtonMousePressed(evt);
@@ -161,7 +161,7 @@ class KeywordSearchPanel extends javax.swing.JPanel {
             }
         });
 
-        searchDropButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon.png"))); // NOI18N
+        searchDropButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon.png"))); // NOI18N NON-NLS
         searchDropButton.setText(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "KeywordSearchPanel.searchDropButton.text")); // NOI18N
         searchDropButton.setBorderPainted(false);
         searchDropButton.setContentAreaFilled(false);
@@ -169,8 +169,8 @@ class KeywordSearchPanel extends javax.swing.JPanel {
         searchDropButton.setMaximumSize(new java.awt.Dimension(146, 27));
         searchDropButton.setMinimumSize(new java.awt.Dimension(146, 27));
         searchDropButton.setPreferredSize(new java.awt.Dimension(146, 27));
-        searchDropButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon-rollover.png"))); // NOI18N
-        searchDropButton.setRolloverSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon-pressed.png"))); // NOI18N
+        searchDropButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon-rollover.png"))); // NOI18N NON-NLS
+        searchDropButton.setRolloverSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon-pressed.png"))); // NOI18N NON-NLS
         searchDropButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mousePressed(java.awt.event.MouseEvent evt) {
                 searchDropButtonMousePressed(evt);
@@ -247,10 +247,10 @@ class KeywordSearchPanel extends javax.swing.JPanel {
                             //setFilesIndexed(numIndexedFiles);
                         } 
                         catch (NoOpenCoreException ex) {
-                            logger.log(Level.SEVERE, "Error executing Solr query, " + ex);
+                            logger.log(Level.SEVERE, "Error executing Solr query, " + ex); //NON-NLS
                         }
                         catch (KeywordSearchModuleException se) {
-                            logger.log(Level.SEVERE, "Error executing Solr query, " + se.getMessage());
+                            logger.log(Level.SEVERE, "Error executing Solr query, " + se.getMessage()); //NON-NLS
                         }
                         break;
                     case STOPPED:
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java
index c1ed4330b1..c3271b7ac1 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java
@@ -178,7 +178,7 @@ class KeywordSearchQueryManager {
         boolean allValid = true;
         for (KeywordSearchQuery tcq : queryDelegates) {
             if (!tcq.validate()) {
-                logger.log(Level.WARNING, "Query has invalid syntax: {0}", tcq.getQueryString());
+                logger.log(Level.WARNING, "Query has invalid syntax: {0}", tcq.getQueryString()); //NON-NLS
                 allValid = false;
                 break;
             }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java
index 315d7f6fe2..de3656f210 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java
@@ -172,7 +172,7 @@ class KeywordSearchResultFactory extends ChildFactory<KeyValueQueryContent> {
         try {
             queryResults = keywordSearchQuery.performQuery();
         } catch (NoOpenCoreException ex) {
-            logger.log(Level.WARNING, "Could not perform the query. ", ex);
+            logger.log(Level.WARNING, "Could not perform the query. ", ex); //NON-NLS
             return false;
         }
 
@@ -440,11 +440,11 @@ class KeywordSearchResultFactory extends ChildFactory<KeyValueQueryContent> {
                         try {
                             snippet = LuceneQuery.querySnippet(snippetQuery, f.getId(), chunkId, !query.isLiteral(), true);
                         } catch (NoOpenCoreException e) {
-                            logger.log(Level.WARNING, "Error querying snippet: " + snippetQuery, e);
+                            logger.log(Level.WARNING, "Error querying snippet: " + snippetQuery, e); //NON-NLS
                             //no reason to continie
                             return null;
                         } catch (Exception e) {
-                            logger.log(Level.WARNING, "Error querying snippet: " + snippetQuery, e);
+                            logger.log(Level.WARNING, "Error querying snippet: " + snippetQuery, e); //NON-NLS
                             continue;
                         }
                         if (snippet != null) {
@@ -468,9 +468,7 @@ class KeywordSearchResultFactory extends ChildFactory<KeyValueQueryContent> {
                 // test if any exceptions were thrown
                 get();
             } catch (InterruptedException | ExecutionException ex) {
-                logger.log(Level.SEVERE, "Error querying ", ex);
-            } // catch and ignore if we were cancelled
-            catch (java.util.concurrent.CancellationException ex) {
+                logger.log(Level.SEVERE, "Error querying ", ex); //NON-NLS
             }
         }
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchSettings.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchSettings.java
index d6de286665..b2cecd6805 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchSettings.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchSettings.java
@@ -38,7 +38,7 @@ class KeywordSearchSettings {
     static final String PROPERTIES_OPTIONS = NbBundle.getMessage(KeywordSearchSettings.class, "KeywordSearchSettings.properties_options.text", MODULE_NAME);
     static final String PROPERTIES_NSRL = NbBundle.getMessage(KeywordSearchSettings.class, "KeywordSearchSettings.propertiesNSRL.text", MODULE_NAME);
     static final String PROPERTIES_SCRIPTS = NbBundle.getMessage(KeywordSearchSettings.class, "KeywordSearchSettings.propertiesScripts.text", MODULE_NAME);
-    static final String SHOW_SNIPPETS = "showSnippets";
+    static final String SHOW_SNIPPETS = "showSnippets"; //NON-NLS
     static final boolean DEFAULT_SHOW_SNIPPETS = true;
     private static boolean skipKnown = true;
     private static final Logger logger = Logger.getLogger(KeywordSearchSettings.class.getName());
@@ -52,11 +52,11 @@ class KeywordSearchSettings {
      * @return KeywordSearchIngestModule's update frequency
      */
     static UpdateFrequency getUpdateFrequency() {
-        if (ModuleSettings.getConfigSetting(PROPERTIES_OPTIONS, "UpdateFrequency") != null) {
-            return UpdateFrequency.valueOf(ModuleSettings.getConfigSetting(PROPERTIES_OPTIONS, "UpdateFrequency"));
+        if (ModuleSettings.getConfigSetting(PROPERTIES_OPTIONS, "UpdateFrequency") != null) { //NON-NLS
+            return UpdateFrequency.valueOf(ModuleSettings.getConfigSetting(PROPERTIES_OPTIONS, "UpdateFrequency")); //NON-NLS
         }
         //if it failed, return the default/last known value
-        logger.log(Level.WARNING, "Could not read property for UpdateFrequency, returning backup value.");
+        logger.log(Level.WARNING, "Could not read property for UpdateFrequency, returning backup value."); //NON-NLS
         return UpdateFrequency.DEFAULT;
     }
 
@@ -66,7 +66,7 @@ class KeywordSearchSettings {
      * @param freq Sets KeywordSearchIngestModule to this value.
      */
     static void setUpdateFrequency(UpdateFrequency freq) {
-        ModuleSettings.setConfigSetting(PROPERTIES_OPTIONS, "UpdateFrequency", freq.name());
+        ModuleSettings.setConfigSetting(PROPERTIES_OPTIONS, "UpdateFrequency", freq.name()); //NON-NLS
         UpdateFreq = freq;
     }
 
@@ -77,7 +77,7 @@ class KeywordSearchSettings {
      * @param skip
      */
     static void setSkipKnown(boolean skip) {
-        ModuleSettings.setConfigSetting(PROPERTIES_NSRL, "SkipKnown", Boolean.toString(skip));
+        ModuleSettings.setConfigSetting(PROPERTIES_NSRL, "SkipKnown", Boolean.toString(skip)); //NON-NLS
         skipKnown = skip;
     }
 
@@ -88,11 +88,11 @@ class KeywordSearchSettings {
      * @return skip setting
      */
     static boolean getSkipKnown() {
-        if (ModuleSettings.getConfigSetting(PROPERTIES_NSRL, "SkipKnown") != null) {
-            return Boolean.parseBoolean(ModuleSettings.getConfigSetting(PROPERTIES_NSRL, "SkipKnown"));
+        if (ModuleSettings.getConfigSetting(PROPERTIES_NSRL, "SkipKnown") != null) { //NON-NLS
+            return Boolean.parseBoolean(ModuleSettings.getConfigSetting(PROPERTIES_NSRL, "SkipKnown")); //NON-NLS
         }
         //if it fails, return the default/last known value
-        logger.log(Level.WARNING, "Could not read property for SkipKnown, returning backup value.");
+        logger.log(Level.WARNING, "Could not read property for SkipKnown, returning backup value."); //NON-NLS
         return skipKnown;
     }
 
@@ -108,12 +108,12 @@ class KeywordSearchSettings {
         //Disabling scripts that weren't selected
         for (String s : ModuleSettings.getConfigSettings(PROPERTIES_SCRIPTS).keySet()) {
             if (!scripts.contains(StringExtract.StringExtractUnicodeTable.SCRIPT.valueOf(s))) {
-                ModuleSettings.setConfigSetting(PROPERTIES_SCRIPTS, s, "false");
+                ModuleSettings.setConfigSetting(PROPERTIES_SCRIPTS, s, "false"); //NON-NLS
             }
         }
         //Writing and enabling selected scripts
         for (StringExtract.StringExtractUnicodeTable.SCRIPT s : stringExtractScripts) {
-            ModuleSettings.setConfigSetting(PROPERTIES_SCRIPTS, s.name(), "true");
+            ModuleSettings.setConfigSetting(PROPERTIES_SCRIPTS, s.name(), "true"); //NON-NLS
         }
 
     }
@@ -130,12 +130,12 @@ class KeywordSearchSettings {
     }
 
     static void setShowSnippets(boolean showSnippets) {
-        ModuleSettings.setConfigSetting(PROPERTIES_OPTIONS, SHOW_SNIPPETS, (showSnippets ? "true" : "false"));
+        ModuleSettings.setConfigSetting(PROPERTIES_OPTIONS, SHOW_SNIPPETS, (showSnippets ? "true" : "false")); //NON-NLS
     }
 
     static boolean getShowSnippets() {
         if (ModuleSettings.settingExists(PROPERTIES_OPTIONS, SHOW_SNIPPETS)) {
-            return ModuleSettings.getConfigSetting(PROPERTIES_OPTIONS, SHOW_SNIPPETS).equals("true");
+            return ModuleSettings.getConfigSetting(PROPERTIES_OPTIONS, SHOW_SNIPPETS).equals("true"); //NON-NLS
         } else {
             return DEFAULT_SHOW_SNIPPETS;
         }
@@ -150,14 +150,14 @@ class KeywordSearchSettings {
         if (ModuleSettings.getConfigSettings(PROPERTIES_SCRIPTS) != null && !ModuleSettings.getConfigSettings(PROPERTIES_SCRIPTS).isEmpty()) {
             List<SCRIPT> scripts = new ArrayList<>();
             for (Map.Entry<String, String> kvp : ModuleSettings.getConfigSettings(PROPERTIES_SCRIPTS).entrySet()) {
-                if (kvp.getValue().equals("true")) {
+                if (kvp.getValue().equals("true")) { //NON-NLS
                     scripts.add(SCRIPT.valueOf(kvp.getKey()));
                 }
             }
             return scripts;
         }
         //if it failed, try to return the built-in list maintained by the singleton.
-        logger.log(Level.WARNING, "Could not read properties for extracting scripts, returning backup values.");
+        logger.log(Level.WARNING, "Could not read properties for extracting scripts, returning backup values."); //NON-NLS
         return new ArrayList<>(stringExtractScripts);
     }
 
@@ -171,7 +171,7 @@ class KeywordSearchSettings {
         if (ModuleSettings.getConfigSetting(PROPERTIES_OPTIONS, key) != null) {
             return ModuleSettings.getConfigSetting(PROPERTIES_OPTIONS, key);
         } else {
-            logger.log(Level.WARNING, "Could not read property for key {0}, returning backup value.", key);
+            logger.log(Level.WARNING, "Could not read property for key {0}, returning backup value.", key); //NON-NLS
             return stringExtractOptions.get(key);
         }
     }
@@ -185,7 +185,7 @@ class KeywordSearchSettings {
         Map<String, String> settings = ModuleSettings.getConfigSettings(PROPERTIES_OPTIONS);
         if (settings == null) {
             Map<String, String> settingsv2 = new HashMap<>();
-            logger.log(Level.WARNING, "Could not read properties for {0}.properties, returning backup values", PROPERTIES_OPTIONS);
+            logger.log(Level.WARNING, "Could not read properties for {0}.properties, returning backup values", PROPERTIES_OPTIONS); //NON-NLS
             settingsv2.putAll(stringExtractOptions);
             return settingsv2;
         } else {
@@ -198,30 +198,30 @@ class KeywordSearchSettings {
      * already exist.
      */
     static void setDefaults() {
-        logger.log(Level.INFO, "Detecting default settings.");
+        logger.log(Level.INFO, "Detecting default settings."); //NON-NLS
         //setting default NSRL
-        if (!ModuleSettings.settingExists(KeywordSearchSettings.PROPERTIES_NSRL, "SkipKnown")) {
-            logger.log(Level.INFO, "No configuration for NSRL found, generating default...");
+        if (!ModuleSettings.settingExists(KeywordSearchSettings.PROPERTIES_NSRL, "SkipKnown")) { //NON-NLS
+            logger.log(Level.INFO, "No configuration for NSRL found, generating default..."); //NON-NLS
             KeywordSearchSettings.setSkipKnown(true);
         }
         //setting default Update Frequency
-        if (!ModuleSettings.settingExists(KeywordSearchSettings.PROPERTIES_OPTIONS, "UpdateFrequency")) {
-            logger.log(Level.INFO, "No configuration for Update Frequency found, generating default...");
+        if (!ModuleSettings.settingExists(KeywordSearchSettings.PROPERTIES_OPTIONS, "UpdateFrequency")) { //NON-NLS
+            logger.log(Level.INFO, "No configuration for Update Frequency found, generating default..."); //NON-NLS
             KeywordSearchSettings.setUpdateFrequency(UpdateFrequency.DEFAULT);
         }
         //setting default Extract UTF8
         if (!ModuleSettings.settingExists(KeywordSearchSettings.PROPERTIES_OPTIONS, AbstractFileExtract.ExtractOptions.EXTRACT_UTF8.toString())) {
-            logger.log(Level.INFO, "No configuration for UTF8 found, generating default...");
+            logger.log(Level.INFO, "No configuration for UTF8 found, generating default..."); //NON-NLS
             KeywordSearchSettings.setStringExtractOption(AbstractFileExtract.ExtractOptions.EXTRACT_UTF8.toString(), Boolean.TRUE.toString());
         }
         //setting default Extract UTF16
         if (!ModuleSettings.settingExists(KeywordSearchSettings.PROPERTIES_OPTIONS, AbstractFileExtract.ExtractOptions.EXTRACT_UTF16.toString())) {
-            logger.log(Level.INFO, "No configuration for UTF16 found, generating defaults...");
+            logger.log(Level.INFO, "No configuration for UTF16 found, generating defaults..."); //NON-NLS
             KeywordSearchSettings.setStringExtractOption(AbstractFileExtract.ExtractOptions.EXTRACT_UTF16.toString(), Boolean.TRUE.toString());
         }
         //setting default Latin-1 Script
         if (!ModuleSettings.settingExists(KeywordSearchSettings.PROPERTIES_SCRIPTS, SCRIPT.LATIN_1.name())) {
-            logger.log(Level.INFO, "No configuration for Scripts found, generating defaults...");
+            logger.log(Level.INFO, "No configuration for Scripts found, generating defaults..."); //NON-NLS
             ModuleSettings.setConfigSetting(KeywordSearchSettings.PROPERTIES_SCRIPTS, SCRIPT.LATIN_1.name(), Boolean.toString(true));
         }
     }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchUtil.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchUtil.java
index 91d0aee2c0..ac37ba0513 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchUtil.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchUtil.java
@@ -141,6 +141,6 @@ class KeywordSearchUtil {
      */
     static boolean isXMLList(String absPath) {
         //TODO: make this more robust, if necessary
-        return new File(absPath).getName().endsWith(".xml");
+        return new File(absPath).getName().endsWith(".xml"); //NON-NLS
     }
 }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
index 12eda70f99..05d87ecc69 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
@@ -163,7 +163,7 @@ class LuceneQuery implements KeywordSearchQuery {
             bba = newFsHit.newArtifact(ARTIFACT_TYPE.TSK_KEYWORD_HIT);
             writeResult = new KeywordWriteResult(bba);
         } catch (Exception e) {
-            logger.log(Level.WARNING, "Error adding bb artifact for keyword hit", e);
+            logger.log(Level.WARNING, "Error adding bb artifact for keyword hit", e); //NON-NLS
             return null;
         }
 
@@ -193,7 +193,7 @@ class LuceneQuery implements KeywordSearchQuery {
             writeResult.add(attributes);
             return writeResult;
         } catch (TskException e) {
-            logger.log(Level.WARNING, "Error adding bb attributes to artifact", e);
+            logger.log(Level.WARNING, "Error adding bb attributes to artifact", e); //NON-NLS
         }
         return null;
     }
@@ -245,10 +245,10 @@ class LuceneQuery implements KeywordSearchQuery {
                 }
                 
             } catch (NoOpenCoreException ex) {
-                logger.log(Level.WARNING, "Error executing Lucene Solr Query: " + keywordString, ex);
+                logger.log(Level.WARNING, "Error executing Lucene Solr Query: " + keywordString, ex); //NON-NLS
                 throw ex;
             } catch (KeywordSearchModuleException ex) {
-                logger.log(Level.WARNING, "Error executing Lucene Solr Query: " + keywordString, ex);
+                logger.log(Level.WARNING, "Error executing Lucene Solr Query: " + keywordString, ex); //NON-NLS
             }
 
         }
@@ -293,17 +293,17 @@ class LuceneQuery implements KeywordSearchQuery {
             q.setHighlightFragsize(SNIPPET_LENGTH);
 
             //tune the highlighter
-            q.setParam("hl.useFastVectorHighlighter", "on"); //fast highlighter scales better than standard one
-            q.setParam("hl.tag.pre", "&laquo;"); //makes sense for FastVectorHighlighter only
-            q.setParam("hl.tag.post", "&laquo;"); //makes sense for FastVectorHighlighter only
-            q.setParam("hl.fragListBuilder", "simple"); //makes sense for FastVectorHighlighter only
+            q.setParam("hl.useFastVectorHighlighter", "on"); //fast highlighter scales better than standard one NON-NLS
+            q.setParam("hl.tag.pre", "&laquo;"); //makes sense for FastVectorHighlighter only NON-NLS
+            q.setParam("hl.tag.post", "&laquo;"); //makes sense for FastVectorHighlighter only NON-NLS
+            q.setParam("hl.fragListBuilder", "simple"); //makes sense for FastVectorHighlighter only NON-NLS
 
              //Solr bug if fragCharSize is smaller than Query string, StringIndexOutOfBoundsException is thrown.
-            q.setParam("hl.fragCharSize", Integer.toString(theQueryStr.length())); //makes sense for FastVectorHighlighter only
+            q.setParam("hl.fragCharSize", Integer.toString(theQueryStr.length())); //makes sense for FastVectorHighlighter only NON-NLS
 
             //docs says makes sense for the original Highlighter only, but not really
             //analyze all content SLOW! consider lowering
-            q.setParam("hl.maxAnalyzedChars", Server.HL_ANALYZE_CHARS_UNLIMITED);
+            q.setParam("hl.maxAnalyzedChars", Server.HL_ANALYZE_CHARS_UNLIMITED); //NON-NLS
         }
         
         return q;
@@ -357,7 +357,7 @@ class LuceneQuery implements KeywordSearchQuery {
                     contentHit.setSnippet(snippet);
                 }
             } catch (TskException ex) {
-                logger.log(Level.WARNING, "Could not get the AbstractFile for keyword hit, ", ex);
+                logger.log(Level.WARNING, "Could not get the AbstractFile for keyword hit, ", ex); //NON-NLS
                 //something wrong with case/db
                 throw ex;
             }
@@ -372,7 +372,7 @@ class LuceneQuery implements KeywordSearchQuery {
                     contentHit.setSnippet(snippet);
                 }
             } catch (TskException ex) {
-                logger.log(Level.WARNING, "Could not get the AbstractFile for keyword hit, ", ex);
+                logger.log(Level.WARNING, "Could not get the AbstractFile for keyword hit, ", ex); //NON-NLS
                 //something wrong with case/db
                 throw ex;
             }
@@ -455,17 +455,17 @@ class LuceneQuery implements KeywordSearchQuery {
         
         
         //tune the highlighter
-        q.setParam("hl.useFastVectorHighlighter", "on"); //fast highlighter scales better than standard one
-        q.setParam("hl.tag.pre", "&laquo;"); //makes sense for FastVectorHighlighter only
-        q.setParam("hl.tag.post", "&laquo;"); //makes sense for FastVectorHighlighter only
-        q.setParam("hl.fragListBuilder", "simple"); //makes sense for FastVectorHighlighter only
+        q.setParam("hl.useFastVectorHighlighter", "on"); //fast highlighter scales better than standard one NON-NLS
+        q.setParam("hl.tag.pre", "&laquo;"); //makes sense for FastVectorHighlighter only NON-NLS
+        q.setParam("hl.tag.post", "&laquo;"); //makes sense for FastVectorHighlighter only NON-NLS
+        q.setParam("hl.fragListBuilder", "simple"); //makes sense for FastVectorHighlighter only NON-NLS
         
          //Solr bug if fragCharSize is smaller than Query string, StringIndexOutOfBoundsException is thrown.
-        q.setParam("hl.fragCharSize", Integer.toString(queryStr.length())); //makes sense for FastVectorHighlighter only
+        q.setParam("hl.fragCharSize", Integer.toString(queryStr.length())); //makes sense for FastVectorHighlighter only NON-NLS
         
         //docs says makes sense for the original Highlighter only, but not really
         //analyze all content SLOW! consider lowering
-        q.setParam("hl.maxAnalyzedChars", Server.HL_ANALYZE_CHARS_UNLIMITED); 
+        q.setParam("hl.maxAnalyzedChars", Server.HL_ANALYZE_CHARS_UNLIMITED);  //NON-NLS
 
         try {
             QueryResponse response = solrServer.query(q, METHOD.POST);
@@ -482,10 +482,10 @@ class LuceneQuery implements KeywordSearchQuery {
                 return EscapeUtil.unEscapeHtml(contentHighlights.get(0)).trim();
             }
         } catch (NoOpenCoreException ex) {
-            logger.log(Level.WARNING, "Error executing Lucene Solr Query: " + query, ex);
+            logger.log(Level.WARNING, "Error executing Lucene Solr Query: " + query, ex); //NON-NLS
             throw ex;
         } catch (KeywordSearchModuleException ex) {
-            logger.log(Level.WARNING, "Error executing Lucene Solr Query: " + query, ex);
+            logger.log(Level.WARNING, "Error executing Lucene Solr Query: " + query, ex); //NON-NLS
             return "";
         }
     }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RawMarkupSource.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RawMarkupSource.java
index 79e5aa7f3e..cbb21ec3e2 100755
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RawMarkupSource.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RawMarkupSource.java
@@ -126,7 +126,7 @@ class RawMarkupSource implements MarkupSource {
         try {
             return getSolrContent(currentPage, hasChunks);
         } catch (SolrServerException ex) {
-            logger.log(Level.WARNING, "Couldn't get extracted content.", ex);
+            logger.log(Level.WARNING, "Couldn't get extracted content.", ex); //NON-NLS
             return "";
         }
     }
@@ -178,10 +178,10 @@ class RawMarkupSource implements MarkupSource {
                 hasChunks = true;
             }
         } catch (KeywordSearchModuleException ex) {
-            logger.log(Level.WARNING, "Could not get number of chunks: ", ex);
+            logger.log(Level.WARNING, "Could not get number of chunks: ", ex); //NON-NLS
 
         } catch (NoOpenCoreException ex) {
-            logger.log(Level.WARNING, "Could not get number of chunks: ", ex);
+            logger.log(Level.WARNING, "Could not get number of chunks: ", ex); //NON-NLS
         }
     }
 
@@ -237,11 +237,11 @@ class RawMarkupSource implements MarkupSource {
             }
             cachedString = EscapeUtil.escapeHtml(content).trim();
             StringBuilder sb = new StringBuilder(cachedString.length() + 20);
-            sb.append("<pre>").append(cachedString).append("</pre>");
+            sb.append("<pre>").append(cachedString).append("</pre>"); //NON-NLS
             cachedString = sb.toString();
             cachedChunk = chunkId;
         } catch (NoOpenCoreException ex) {
-            logger.log(Level.WARNING, "Couldn't get text content.", ex);
+            logger.log(Level.WARNING, "Couldn't get text content.", ex); //NON-NLS
             return "";
         }
         return cachedString;
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java
index fbdfec75c2..0a27738819 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java
@@ -86,7 +86,7 @@ public final class SearchRunner {
      */
     public synchronized void startJob(long jobId, long dataSourceId, List<String> keywordListNames) {
         if (!jobs.containsKey(jobId)) {
-            logger.log(Level.INFO, "Adding job {0}", jobId);
+            logger.log(Level.INFO, "Adding job {0}", jobId); //NON-NLS
             SearchJobInfo jobData = new SearchJobInfo(jobId, dataSourceId, keywordListNames);
             jobs.put(jobId, jobData);         
         }
@@ -136,7 +136,7 @@ public final class SearchRunner {
      * @param jobId
      */
     public void stopJob(long jobId) {
-        logger.log(Level.INFO, "Stopping job {0}", jobId);
+        logger.log(Level.INFO, "Stopping job {0}", jobId); //NON-NLS
         commit(); 
 
         SearchJobInfo job;
@@ -162,7 +162,7 @@ public final class SearchRunner {
      */
     public synchronized void addKeywordListsToAllJobs(List<String> keywordListNames) {
         for(String listName : keywordListNames) {
-            logger.log(Level.INFO, "Adding keyword list {0} to all jobs", listName);
+            logger.log(Level.INFO, "Adding keyword list {0} to all jobs", listName); //NON-NLS
             for(SearchJobInfo j : jobs.values()) {
                 j.addKeywordListName(listName);
             }
@@ -180,7 +180,7 @@ public final class SearchRunner {
             final int numIndexedFiles = KeywordSearch.getServer().queryNumIndexedFiles();
             KeywordSearch.fireNumIndexedFilesChange(null, new Integer(numIndexedFiles));
         } catch (NoOpenCoreException | KeywordSearchModuleException ex) {
-            logger.log(Level.WARNING, "Error executing Solr query to check number of indexed files: ", ex);
+            logger.log(Level.WARNING, "Error executing Solr query to check number of indexed files: ", ex); //NON-NLS
         }
     }    
     
@@ -191,7 +191,7 @@ public final class SearchRunner {
      */
     private void doFinalSearch(SearchJobInfo job) {
         // Run one last search as there are probably some new files committed
-        logger.log(Level.INFO, "Running final search for jobid {0}", job.getJobId());        
+        logger.log(Level.INFO, "Running final search for jobid {0}", job.getJobId());         //NON-NLS
         if (!job.getKeywordListNames().isEmpty()) {
             try {
                 // In case this job still has a worker running, wait for it to finish
@@ -205,7 +205,7 @@ public final class SearchRunner {
                 finalSearcher.get();
                 
             } catch (InterruptedException | ExecutionException ex) {
-                logger.log(Level.WARNING, "Job {1} final search thread failed: {2}", new Object[]{job.getJobId(), ex});
+                logger.log(Level.WARNING, "Job {1} final search thread failed: {2}", new Object[]{job.getJobId(), ex}); //NON-NLS
             }
         }
     }
@@ -381,7 +381,7 @@ public final class SearchRunner {
             progressGroup = AggregateProgressFactory.createSystemHandle(pgDisplayName, null, new Cancellable() {
                 @Override
                 public boolean cancel() {
-                    logger.log(Level.INFO, "Cancelling the searcher by user.");
+                    logger.log(Level.INFO, "Cancelling the searcher by user."); //NON-NLS
                     if (progressGroup != null) {
                         progressGroup.setDisplayName(displayName + " (" + NbBundle.getMessage(this.getClass(), "SearchRunner.doInBackGround.cancelMsg") + "...)");
                     }
@@ -410,7 +410,7 @@ public final class SearchRunner {
 
                 for (Keyword keywordQuery : keywords) {
                     if (this.isCancelled()) {
-                        logger.log(Level.INFO, "Cancel detected, bailing before new keyword processed: {0}", keywordQuery.getQuery());
+                        logger.log(Level.INFO, "Cancel detected, bailing before new keyword processed: {0}", keywordQuery.getQuery()); //NON-NLS
                         return null;
                     }
 
@@ -444,16 +444,16 @@ public final class SearchRunner {
                     try {
                         queryResult = del.performQuery();
                     } catch (NoOpenCoreException ex) {
-                        logger.log(Level.WARNING, "Error performing query: " + keywordQuery.getQuery(), ex);
+                        logger.log(Level.WARNING, "Error performing query: " + keywordQuery.getQuery(), ex); //NON-NLS
                         //no reason to continue with next query if recovery failed
                         //or wait for recovery to kick in and run again later
                         //likely case has closed and threads are being interrupted
                         return null;
                     } catch (CancellationException e) {
-                        logger.log(Level.INFO, "Cancel detected, bailing during keyword query: {0}", keywordQuery.getQuery());
+                        logger.log(Level.INFO, "Cancel detected, bailing during keyword query: {0}", keywordQuery.getQuery()); //NON-NLS
                         return null;
                     } catch (Exception e) {
-                        logger.log(Level.WARNING, "Error performing query: " + keywordQuery.getQuery(), e);
+                        logger.log(Level.WARNING, "Error performing query: " + keywordQuery.getQuery(), e); //NON-NLS
                         continue;
                     }
 
@@ -483,7 +483,7 @@ public final class SearchRunner {
                         for (final Keyword hitTerm : newResults.getKeywordsK()) {
                             //checking for cancellation between results
                             if (this.isCancelled()) {
-                                logger.log(Level.INFO, "Cancel detected, bailing before new hit processed for query: {0}", keywordQuery.getQuery());
+                                logger.log(Level.INFO, "Cancel detected, bailing before new hit processed for query: {0}", keywordQuery.getQuery()); //NON-NLS
                                 return null;
                             }
 
@@ -505,18 +505,18 @@ public final class SearchRunner {
                                 try {
                                     snippet = LuceneQuery.querySnippet(snippetQuery, hitFile.getId(), chunkId, isRegex, true);
                                 } catch (NoOpenCoreException e) {
-                                    logger.log(Level.WARNING, "Error querying snippet: " + snippetQuery, e);
+                                    logger.log(Level.WARNING, "Error querying snippet: " + snippetQuery, e); //NON-NLS
                                     //no reason to continue
                                     return null;
                                 } catch (Exception e) {
-                                    logger.log(Level.WARNING, "Error querying snippet: " + snippetQuery, e);
+                                    logger.log(Level.WARNING, "Error querying snippet: " + snippetQuery, e); //NON-NLS
                                     continue;
                                 }
 
                                 // write the blackboard artifact for this keyword in this file
                                 KeywordWriteResult written = del.writeToBlackBoard(hitTerm.getQuery(), hitFile, snippet, listName);
                                 if (written == null) {
-                                    logger.log(Level.WARNING, "BB artifact for keyword hit not written, file: {0}, hit: {1}", new Object[]{hitFile, hitTerm.toString()});
+                                    logger.log(Level.WARNING, "BB artifact for keyword hit not written, file: {0}, hit: {1}", new Object[]{hitFile, hitTerm.toString()}); //NON-NLS
                                     continue;
                                 }
 
@@ -541,46 +541,46 @@ public final class SearchRunner {
                                     }
 
                                     //details
-                                    detailsSb.append("<table border='0' cellpadding='4' width='280'>");
+                                    detailsSb.append("<table border='0' cellpadding='4' width='280'>"); //NON-NLS
                                     //hit
-                                    detailsSb.append("<tr>");
+                                    detailsSb.append("<tr>"); //NON-NLS
                                     detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.kwHitThLbl"));
-                                    detailsSb.append("<td>").append(EscapeUtil.escapeHtml(attr.getValueString())).append("</td>");
-                                    detailsSb.append("</tr>");
+                                    detailsSb.append("<td>").append(EscapeUtil.escapeHtml(attr.getValueString())).append("</td>"); //NON-NLS
+                                    detailsSb.append("</tr>"); //NON-NLS
 
                                     //preview
                                     attr = written.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD_PREVIEW.getTypeID());
                                     if (attr != null) {
-                                        detailsSb.append("<tr>");
+                                        detailsSb.append("<tr>"); //NON-NLS
                                         detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.previewThLbl"));
-                                        detailsSb.append("<td>").append(EscapeUtil.escapeHtml(attr.getValueString())).append("</td>");
-                                        detailsSb.append("</tr>");
+                                        detailsSb.append("<td>").append(EscapeUtil.escapeHtml(attr.getValueString())).append("</td>"); //NON-NLS
+                                        detailsSb.append("</tr>"); //NON-NLS
                                     }
 
                                     //file
-                                    detailsSb.append("<tr>");
+                                    detailsSb.append("<tr>"); //NON-NLS
                                     detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.fileThLbl"));
-                                    detailsSb.append("<td>").append(hitFile.getParentPath()).append(hitFile.getName()).append("</td>");
-                                    detailsSb.append("</tr>");
+                                    detailsSb.append("<td>").append(hitFile.getParentPath()).append(hitFile.getName()).append("</td>"); //NON-NLS
+                                    detailsSb.append("</tr>"); //NON-NLS
 
                                     //list
                                     attr = written.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID());
-                                    detailsSb.append("<tr>");
+                                    detailsSb.append("<tr>"); //NON-NLS
                                     detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.listThLbl"));
-                                    detailsSb.append("<td>").append(attr.getValueString()).append("</td>");
-                                    detailsSb.append("</tr>");
+                                    detailsSb.append("<td>").append(attr.getValueString()).append("</td>"); //NON-NLS
+                                    detailsSb.append("</tr>"); //NON-NLS
 
                                     //regex
                                     if (!keywordQuery.isLiteral()) {
                                         attr = written.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD_REGEXP.getTypeID());
                                         if (attr != null) {
-                                            detailsSb.append("<tr>");
+                                            detailsSb.append("<tr>"); //NON-NLS
                                             detailsSb.append(NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.regExThLbl"));
-                                            detailsSb.append("<td>").append(attr.getValueString()).append("</td>");
-                                            detailsSb.append("</tr>");
+                                            detailsSb.append("<td>").append(attr.getValueString()).append("</td>"); //NON-NLS
+                                            detailsSb.append("</tr>"); //NON-NLS
                                         }
                                     }
-                                    detailsSb.append("</table>");
+                                    detailsSb.append("</table>"); //NON-NLS
 
                                     services.postMessage(IngestMessage.createDataMessage(KeywordSearchModuleFactory.getModuleName(), subjectSb.toString(), detailsSb.toString(), uniqueKey, written.getArtifact()));
                                 }
@@ -605,13 +605,13 @@ public final class SearchRunner {
 
             } //end try block
             catch (Exception ex) {
-                logger.log(Level.WARNING, "searcher exception occurred", ex);
+                logger.log(Level.WARNING, "searcher exception occurred", ex); //NON-NLS
             } finally {
                 try {
                     finalizeSearcher();
                     stopWatch.stop();                   
                     
-                    logger.log(Level.INFO, "Searcher took to run: {0} secs.", stopWatch.getElapsedTimeSecs());
+                    logger.log(Level.INFO, "Searcher took to run: {0} secs.", stopWatch.getElapsedTimeSecs()); //NON-NLS
                 } finally {
                     // In case a thread is waiting on this worker to be done
                     job.searchNotify();
@@ -627,8 +627,10 @@ public final class SearchRunner {
             try {
                 get();
             } catch (InterruptedException | ExecutionException e) {
-                logger.log(Level.SEVERE, "Error performing keyword search: " + e.getMessage());
-                services.postMessage(IngestMessage.createErrorMessage(KeywordSearchModuleFactory.getModuleName(), "Error performing keyword search", e.getMessage()));
+                logger.log(Level.SEVERE, "Error performing keyword search: " + e.getMessage()); //NON-NLS
+                services.postMessage(IngestMessage.createErrorMessage(KeywordSearchModuleFactory.getModuleName(),
+                                                                      NbBundle.getMessage(this.getClass(),
+                                                                                          "SearchRunner.Searcher.done.err.msg"), e.getMessage()));
             } // catch and ignore if we were cancelled
             catch (java.util.concurrent.CancellationException ex) {
             }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
index 04b2a1d76d..701017788b 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
@@ -72,20 +72,20 @@ public class Server {
         ID {
             @Override
             public String toString() {
-                return "id";
+                return "id"; //NON-NLS
             }
         },
         IMAGE_ID {
             @Override
             public String toString() {
-                return "image_id";
+                return "image_id"; //NON-NLS
             }
         },
         // This is not stored or index . it is copied to Text and Content_Ws
         CONTENT {
             @Override
             public String toString() {
-                return "content";
+                return "content"; //NON-NLS
             }
         },
         TEXT {
@@ -97,47 +97,47 @@ public class Server {
         CONTENT_WS {
             @Override
             public String toString() {
-                return "content_ws";
+                return "content_ws"; //NON-NLS
             }
         },
         FILE_NAME {
             @Override
             public String toString() {
-                return "file_name";
+                return "file_name"; //NON-NLS
             }
         },
         // note that we no longer index this field
         CTIME {
             @Override
             public String toString() {
-                return "ctime";
+                return "ctime"; //NON-NLS
             }
         },
         // note that we no longer index this field
         ATIME {
             @Override
             public String toString() {
-                return "atime";
+                return "atime"; //NON-NLS
             }
         },
         // note that we no longer index this field
         MTIME {
             @Override
             public String toString() {
-                return "mtime";
+                return "mtime"; //NON-NLS
             }
         },
         // note that we no longer index this field
         CRTIME {
             @Override
             public String toString() {
-                return "crtime";
+                return "crtime"; //NON-NLS
             }
         },
         NUM_CHUNKS {
             @Override
             public String toString() {
-                return "num_chunks";
+                return "num_chunks"; //NON-NLS
             }
         },
     };
@@ -145,19 +145,19 @@ public class Server {
     //max content size we can send to Solr
     public static final long MAX_CONTENT_SIZE = 1L * 1024 * 1024 * 1024;
     private static final Logger logger = Logger.getLogger(Server.class.getName());
-    private static final String DEFAULT_CORE_NAME = "coreCase";
+    private static final String DEFAULT_CORE_NAME = "coreCase"; //NON-NLS
     // TODO: DEFAULT_CORE_NAME needs to be replaced with unique names to support multiple open cases
-    public static final String CORE_EVT = "CORE_EVT";
+    public static final String CORE_EVT = "CORE_EVT"; //NON-NLS
     public static final char ID_CHUNK_SEP = '_';
-    private String javaPath = "java";
+    private String javaPath = "java"; //NON-NLS
     public static final Charset DEFAULT_INDEXED_TEXT_CHARSET = Charset.forName("UTF-8"); ///< default Charset to index text as
     private static final int MAX_SOLR_MEM_MB = 512; //TODO set dynamically based on avail. system resources
     private Process curSolrProcess = null;
     private static Ingester ingester = null;
     static final String PROPERTIES_FILE = KeywordSearchSettings.MODULE_NAME;
-    static final String PROPERTIES_CURRENT_SERVER_PORT = "IndexingServerPort";
-    static final String PROPERTIES_CURRENT_STOP_PORT = "IndexingServerStopPort";
-    private static final String KEY = "jjk#09s";
+    static final String PROPERTIES_CURRENT_SERVER_PORT = "IndexingServerPort"; //NON-NLS
+    static final String PROPERTIES_CURRENT_STOP_PORT = "IndexingServerStopPort"; //NON-NLS
+    private static final String KEY = "jjk#09s"; //NON-NLS
     static final int DEFAULT_SOLR_SERVER_PORT = 23232;
     static final int DEFAULT_SOLR_STOP_PORT = 34343;
     private int currentSolrServerPort = 0;
@@ -183,14 +183,14 @@ public class Server {
     Server() {
         initSettings();
 
-        this.solrUrl = "http://localhost:" + currentSolrServerPort + "/solr";
+        this.solrUrl = "http://localhost:" + currentSolrServerPort + "/solr"; //NON-NLS
         this.solrServer = new HttpSolrServer(solrUrl);
         serverAction = new ServerAction();
-        solrFolder = InstalledFileLocator.getDefault().locate("solr", Server.class.getPackage().getName(), false);
-        instanceDir = solrFolder.getAbsolutePath() + File.separator + "solr";
+        solrFolder = InstalledFileLocator.getDefault().locate("solr", Server.class.getPackage().getName(), false); //NON-NLS
+        instanceDir = solrFolder.getAbsolutePath() + File.separator + "solr"; //NON-NLS
         javaPath = PlatformUtil.getJavaPath();
 
-        logger.log(Level.INFO, "Created Server instance");
+        logger.log(Level.INFO, "Created Server instance"); //NON-NLS
     }
 
     private void initSettings() {
@@ -198,7 +198,7 @@ public class Server {
             try {
                 currentSolrServerPort = Integer.decode(ModuleSettings.getConfigSetting(PROPERTIES_FILE, PROPERTIES_CURRENT_SERVER_PORT));
             } catch (NumberFormatException nfe) {
-                logger.log(Level.WARNING, "Could not decode indexing server port, value was not a valid port number, using the default. ", nfe);
+                logger.log(Level.WARNING, "Could not decode indexing server port, value was not a valid port number, using the default. ", nfe); //NON-NLS
                 currentSolrServerPort = DEFAULT_SOLR_SERVER_PORT;
             }
         } else {
@@ -210,7 +210,7 @@ public class Server {
             try {
                 currentSolrStopPort = Integer.decode(ModuleSettings.getConfigSetting(PROPERTIES_FILE, PROPERTIES_CURRENT_STOP_PORT));
             } catch (NumberFormatException nfe) {
-                logger.log(Level.WARNING, "Could not decode indexing server stop port, value was not a valid port number, using default", nfe);
+                logger.log(Level.WARNING, "Could not decode indexing server stop port, value was not a valid port number, using default", nfe); //NON-NLS
                 currentSolrStopPort = DEFAULT_SOLR_STOP_PORT;
             }
         } else {
@@ -250,8 +250,8 @@ public class Server {
             this.stream = stream;
             try {
                 final String log = Places.getUserDirectory().getAbsolutePath()
-                        + File.separator + "var" + File.separator + "log"
-                        + File.separator + "solr.log." + type;
+                        + File.separator + "var" + File.separator + "log" //NON-NLS
+                        + File.separator + "solr.log." + type; //NON-NLS
                 File outputFile = new File(log.concat(".0"));
                 File first = new File(log.concat(".1"));
                 File second = new File(log.concat(".2"));
@@ -269,7 +269,7 @@ public class Server {
                 out = new FileOutputStream(outputFile);
 
             } catch (Exception ex) {
-                logger.log(Level.WARNING, "Failed to create solr log file", ex);
+                logger.log(Level.WARNING, "Failed to create solr log file", ex); //NON-NLS
             }
         }
 
@@ -297,20 +297,20 @@ public class Server {
                 }
                 bw.flush();
             } catch (IOException ex) {
-                logger.log(Level.WARNING, "Error redirecting Solr output stream");
+                logger.log(Level.WARNING, "Error redirecting Solr output stream"); //NON-NLS
             } finally {
                 if (bw != null) {
                     try {
                         bw.close();
                     } catch (IOException ex) {
-                        logger.log(Level.WARNING, "Error closing Solr output stream writer");
+                        logger.log(Level.WARNING, "Error closing Solr output stream writer"); //NON-NLS
                     }
                 }
                  if (br != null) {
                     try {
                         br.close();
                     } catch (IOException ex) {
-                        logger.log(Level.WARNING, "Error closing Solr output stream reader");
+                        logger.log(Level.WARNING, "Error closing Solr output stream reader"); //NON-NLS
                     }
                 }
             }
@@ -326,7 +326,7 @@ public class Server {
         List<Long> pids = new ArrayList<Long>();
 
         //NOTE: these needs to be in sync with process start string in start()
-        final String pidsQuery = "Args.4.eq=-DSTOP.KEY=" + KEY + ",Args.7.eq=start.jar";
+        final String pidsQuery = "Args.4.eq=-DSTOP.KEY=" + KEY + ",Args.7.eq=start.jar"; //NON-NLS
 
         long[] pidsArr = PlatformUtil.getJavaPIDs(pidsQuery);
         if (pidsArr != null) {
@@ -345,7 +345,7 @@ public class Server {
     void killSolr() {
         List<Long> solrPids = getSolrPIDs();
         for (long pid : solrPids) {
-            logger.log(Level.INFO, "Trying to kill old Solr process, PID: " + pid);
+            logger.log(Level.INFO, "Trying to kill old Solr process, PID: " + pid); //NON-NLS
             PlatformUtil.killProcess(pid);
         }
     }
@@ -356,19 +356,19 @@ public class Server {
      * successful.
      */
     void start() throws KeywordSearchModuleException, SolrServerNoPortException {
-        logger.log(Level.INFO, "Starting Solr server from: " + solrFolder.getAbsolutePath());
+        logger.log(Level.INFO, "Starting Solr server from: " + solrFolder.getAbsolutePath()); //NON-NLS
         if (isPortAvailable(currentSolrServerPort)) {
-            logger.log(Level.INFO, "Port [" + currentSolrServerPort + "] available, starting Solr");
+            logger.log(Level.INFO, "Port [" + currentSolrServerPort + "] available, starting Solr"); //NON-NLS
             try {
-                final String MAX_SOLR_MEM_MB_PAR = "-Xmx" + Integer.toString(MAX_SOLR_MEM_MB) + "m";
+                final String MAX_SOLR_MEM_MB_PAR = "-Xmx" + Integer.toString(MAX_SOLR_MEM_MB) + "m"; //NON-NLS
 
-                String loggingPropertiesOpt = "-Djava.util.logging.config.file=";
-                String loggingPropertiesFilePath = instanceDir + File.separator + "conf" + File.separator;
+                String loggingPropertiesOpt = "-Djava.util.logging.config.file="; //NON-NLS
+                String loggingPropertiesFilePath = instanceDir + File.separator + "conf" + File.separator; //NON-NLS
 
                 if (DEBUG) {
-                    loggingPropertiesFilePath += "logging-development.properties";
+                    loggingPropertiesFilePath += "logging-development.properties"; //NON-NLS
                 } else {
-                    loggingPropertiesFilePath += "logging-release.properties";
+                    loggingPropertiesFilePath += "logging-release.properties"; //NON-NLS
                 }
 
                 final String loggingProperties = loggingPropertiesOpt + loggingPropertiesFilePath;
@@ -376,47 +376,47 @@ public class Server {
                 final String [] SOLR_START_CMD = {
                     javaPath,
                     MAX_SOLR_MEM_MB_PAR,
-                    "-DSTOP.PORT=" + currentSolrStopPort,
-                    "-Djetty.port=" + currentSolrServerPort,
-                    "-DSTOP.KEY=" + KEY,
+                    "-DSTOP.PORT=" + currentSolrStopPort, //NON-NLS
+                    "-Djetty.port=" + currentSolrServerPort, //NON-NLS
+                    "-DSTOP.KEY=" + KEY, //NON-NLS
                     loggingProperties,
-                    "-jar",
-                    "start.jar"};
+                    "-jar", //NON-NLS
+                    "start.jar"}; //NON-NLS
                 
                 StringBuilder cmdSb = new StringBuilder();
                 for (int i = 0; i<SOLR_START_CMD.length; ++i ) {
                     cmdSb.append(SOLR_START_CMD[i]).append(" ");
                 }
                 
-                logger.log(Level.INFO, "Starting Solr using: " + cmdSb.toString());
+                logger.log(Level.INFO, "Starting Solr using: " + cmdSb.toString()); //NON-NLS
                 curSolrProcess = Runtime.getRuntime().exec(SOLR_START_CMD, null, solrFolder);
-                logger.log(Level.INFO, "Finished starting Solr");
+                logger.log(Level.INFO, "Finished starting Solr"); //NON-NLS
 
                 try {
                     //block for 10 seconds, give time to fully start the process
                     //so if it's restarted solr operations can be resumed seamlessly
                     Thread.sleep(10 * 1000);
                 } catch (InterruptedException ex) {
-                    logger.log(Level.WARNING, "Timer interrupted");
+                    logger.log(Level.WARNING, "Timer interrupted"); //NON-NLS
                 }
                 // Handle output to prevent process from blocking
 
-                errorRedirectThread = new InputStreamPrinterThread(curSolrProcess.getErrorStream(), "stderr");
+                errorRedirectThread = new InputStreamPrinterThread(curSolrProcess.getErrorStream(), "stderr"); //NON-NLS
                 errorRedirectThread.start();
 
                 final List<Long> pids = this.getSolrPIDs();
-                logger.log(Level.INFO, "New Solr process PID: " + pids);
+                logger.log(Level.INFO, "New Solr process PID: " + pids); //NON-NLS
             } catch (SecurityException ex) {
-                logger.log(Level.SEVERE, "Could not start Solr process!", ex);
+                logger.log(Level.SEVERE, "Could not start Solr process!", ex); //NON-NLS
                 throw new KeywordSearchModuleException(
                         NbBundle.getMessage(this.getClass(), "Server.start.exception.cantStartSolr.msg"), ex);
             } catch (IOException ex) {
-                logger.log(Level.SEVERE, "Could not start Solr server process!", ex);
+                logger.log(Level.SEVERE, "Could not start Solr server process!", ex); //NON-NLS
                 throw new KeywordSearchModuleException(
                         NbBundle.getMessage(this.getClass(), "Server.start.exception.cantStartSolr.msg2"), ex);
             }
         } else {
-            logger.log(Level.SEVERE, "Could not start Solr server process, port [" + currentSolrServerPort + "] not available!");
+            logger.log(Level.SEVERE, "Could not start Solr server process, port [" + currentSolrServerPort + "] not available!"); //NON-NLS
             throw new SolrServerNoPortException(currentSolrServerPort);
         }
     }
@@ -430,7 +430,7 @@ public class Server {
         ServerSocket ss = null;
         try {
 
-            ss = new ServerSocket(port, 0, java.net.Inet4Address.getByName("localhost"));
+            ss = new ServerSocket(port, 0, java.net.Inet4Address.getByName("localhost")); //NON-NLS
             if (ss.isBound()) {
                 ss.setReuseAddress(true);
                 ss.close();
@@ -477,18 +477,18 @@ public class Server {
      */
     synchronized void stop() {
         try {
-            logger.log(Level.INFO, "Stopping Solr server from: " + solrFolder.getAbsolutePath());
+            logger.log(Level.INFO, "Stopping Solr server from: " + solrFolder.getAbsolutePath()); //NON-NLS
             //try graceful shutdown
             final String [] SOLR_STOP_CMD = {
               javaPath,
-              "-DSTOP.PORT=" + currentSolrStopPort,
-              "-DSTOP.KEY=" + KEY,
-              "-jar",
-              "start.jar",
-              "--stop",
+              "-DSTOP.PORT=" + currentSolrStopPort, //NON-NLS
+              "-DSTOP.KEY=" + KEY, //NON-NLS
+              "-jar", //NON-NLS
+              "start.jar", //NON-NLS
+              "--stop", //NON-NLS
             };
             Process stop = Runtime.getRuntime().exec(SOLR_STOP_CMD, null, solrFolder);
-            logger.log(Level.INFO, "Waiting for stopping Solr server");
+            logger.log(Level.INFO, "Waiting for stopping Solr server"); //NON-NLS
             stop.waitFor();
 
             //if still running, forcefully stop it
@@ -511,7 +511,7 @@ public class Server {
                 killSolr();
             }
 
-            logger.log(Level.INFO, "Finished stopping Solr server");
+            logger.log(Level.INFO, "Finished stopping Solr server"); //NON-NLS
         }
     }
 
@@ -532,7 +532,7 @@ public class Server {
             //TODO handle timeout in cases when some other type of server on that port
             CoreAdminRequest.getStatus(null, solrServer);
             
-            logger.log(Level.INFO, "Solr server is running");
+            logger.log(Level.INFO, "Solr server is running"); //NON-NLS
         } catch (SolrServerException ex) {
 
             Throwable cause = ex.getRootCause();
@@ -541,7 +541,7 @@ public class Server {
             // probably caused by starting a connection as the server finishes
             // shutting down)
             if (cause instanceof ConnectException || cause instanceof SocketException) { //|| cause instanceof NoHttpResponseException) {
-                logger.log(Level.INFO, "Solr server is not running, cause: {0}", cause.getMessage());
+                logger.log(Level.INFO, "Solr server is not running, cause: {0}", cause.getMessage()); //NON-NLS
                 return false;
             } else {
                 throw new KeywordSearchModuleException(
@@ -549,7 +549,7 @@ public class Server {
             }
         } catch (SolrException ex) { 
                 // Just log 404 errors for now...
-                logger.log(Level.INFO, "Solr server is not running", ex);
+                logger.log(Level.INFO, "Solr server is not running", ex); //NON-NLS
                 return false;
         } catch (IOException ex) {
             throw new KeywordSearchModuleException(
@@ -582,25 +582,25 @@ public class Server {
      * backwards compatibility with older cases)
      */
     private void validateIndexLocation(Case theCase) {
-        logger.log(Level.INFO, "Validating keyword search index location");
+        logger.log(Level.INFO, "Validating keyword search index location"); //NON-NLS
         String properIndexPath = getIndexDirPath(theCase);
 
         String legacyIndexPath = theCase.getCaseDirectory()
-                + File.separator + "keywordsearch" + File.separator + "data";
+                + File.separator + "keywordsearch" + File.separator + "data"; //NON-NLS
 
 
         File properIndexDir = new File(properIndexPath);
         File legacyIndexDir = new File(legacyIndexPath);
         if (!properIndexDir.exists()
                 && legacyIndexDir.exists() && legacyIndexDir.isDirectory()) {
-            logger.log(Level.INFO, "Moving keyword search index location from: "
-                    + legacyIndexPath + " to: " + properIndexPath);
+            logger.log(Level.INFO, "Moving keyword search index location from: " //NON-NLS
+                    + legacyIndexPath + " to: " + properIndexPath); //NON-NLS
             try {
                 Files.move(Paths.get(legacyIndexDir.getParent()), Paths.get(properIndexDir.getParent()));
             } catch (IOException | SecurityException ex) {
-                logger.log(Level.WARNING, "Error moving keyword search index folder from: "
-                        + legacyIndexPath + " to: " + properIndexPath
-                        + " will recreate a new index.", ex);
+                logger.log(Level.WARNING, "Error moving keyword search index folder from: " //NON-NLS
+                        + legacyIndexPath + " to: " + properIndexPath //NON-NLS
+                        + " will recreate a new index.", ex); //NON-NLS
             }
         }
     }
@@ -626,7 +626,7 @@ public class Server {
      */
     String getIndexDirPath(Case theCase) {
         String indexDir = theCase.getModulesOutputDirAbsPath()
-                + File.separator + "keywordsearch" + File.separator + "data";
+                + File.separator + "keywordsearch" + File.separator + "data"; //NON-NLS
         return indexDir;
     }
 
@@ -894,7 +894,7 @@ public class Server {
 
             //handle a possible scenario when server process might not be fully started
             if (!this.isRunning()) {
-                logger.log(Level.WARNING, "Core open requested, but server not yet running");
+                logger.log(Level.WARNING, "Core open requested, but server not yet running"); //NON-NLS
                 throw new KeywordSearchModuleException(
                         NbBundle.getMessage(this.getClass(), "Server.openCore.exception.msg"));
             }
@@ -955,7 +955,7 @@ public class Server {
             try {
                 return solrCore.request(request);
             } catch (IOException e) {
-                logger.log(Level.WARNING, "Could not issue Solr request. ", e);
+                logger.log(Level.WARNING, "Could not issue Solr request. ", e); //NON-NLS
                 throw new SolrServerException(
                         NbBundle.getMessage(this.getClass(), "Server.request.exception.exception.msg"), e);
             }
@@ -976,7 +976,7 @@ public class Server {
                 //commit and block
                 solrCore.commit(true, true);
             } catch (IOException e) {
-                logger.log(Level.WARNING, "Could not commit index. ", e);
+                logger.log(Level.WARNING, "Could not commit index. ", e); //NON-NLS
                 throw new SolrServerException(NbBundle.getMessage(this.getClass(), "Server.commit.exception.msg"), e);
             }
         }
@@ -985,13 +985,13 @@ public class Server {
             try {
                 solrCore.add(doc);
             } catch (SolrServerException ex) {
-                logger.log(Level.SEVERE, "Could not add document to index via update handler: " + doc.getField("id"), ex);
+                logger.log(Level.SEVERE, "Could not add document to index via update handler: " + doc.getField("id"), ex); //NON-NLS
                 throw new KeywordSearchModuleException(
-                        NbBundle.getMessage(this.getClass(), "Server.addDoc.exception.msg", doc.getField("id")), ex);
+                        NbBundle.getMessage(this.getClass(), "Server.addDoc.exception.msg", doc.getField("id")), ex); //NON-NLS
             } catch (IOException ex) {
-                logger.log(Level.SEVERE, "Could not add document to index via update handler: " + doc.getField("id"), ex);
+                logger.log(Level.SEVERE, "Could not add document to index via update handler: " + doc.getField("id"), ex); //NON-NLS
                 throw new KeywordSearchModuleException(
-                        NbBundle.getMessage(this.getClass(), "Server.addDoc.exception.msg2", doc.getField("id")), ex);
+                        NbBundle.getMessage(this.getClass(), "Server.addDoc.exception.msg2", doc.getField("id")), ex); //NON-NLS
             }
         }
 
@@ -1015,7 +1015,7 @@ public class Server {
                 ArrayList<String> values = (ArrayList<String>)solrCore.query(q).getResults().get(0).getFieldValue(Schema.TEXT.toString());
                 return values.get(1);
             } catch (SolrServerException ex) {
-                logger.log(Level.WARNING, "Error getting content from Solr", ex);
+                logger.log(Level.WARNING, "Error getting content from Solr", ex); //NON-NLS
                 return null;
             }
         }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java
index a4b62a0ef0..ddaa708a99 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java
@@ -49,7 +49,7 @@ class TermComponentQuery implements KeywordSearchQuery {
     private static final int TERMS_UNLIMITED = -1;
     //corresponds to field in Solr schema, analyzed with white-space tokenizer only
     private static final String TERMS_SEARCH_FIELD = Server.Schema.CONTENT_WS.toString();
-    private static final String TERMS_HANDLER = "/terms";
+    private static final String TERMS_HANDLER = "/terms"; //NON-NLS
     private static final int TERMS_TIMEOUT = 90 * 1000; //in ms
     private static Logger logger = Logger.getLogger(TermComponentQuery.class.getName());
     private String termsQuery;
@@ -126,7 +126,7 @@ class TermComponentQuery implements KeywordSearchQuery {
         q.setRequestHandler(TERMS_HANDLER);
         q.setTerms(true);
         q.setTermsLimit(TERMS_UNLIMITED);
-        q.setTermsRegexFlag("case_insensitive");
+        q.setTermsRegexFlag("case_insensitive"); //NON-NLS
         //q.setTermsLimit(200);
         //q.setTermsRegexFlag(regexFlag);
         //q.setTermsRaw(true);
@@ -148,7 +148,7 @@ class TermComponentQuery implements KeywordSearchQuery {
             List<Term> termsCol = tr.getTerms(TERMS_SEARCH_FIELD);
             return termsCol;
         } catch (KeywordSearchModuleException ex) {
-            logger.log(Level.WARNING, "Error executing the regex terms query: " + termsQuery, ex);
+            logger.log(Level.WARNING, "Error executing the regex terms query: " + termsQuery, ex); //NON-NLS
             return null;  //no need to create result view, just display error dialog
         }
     }
@@ -180,7 +180,7 @@ class TermComponentQuery implements KeywordSearchQuery {
             bba = newFsHit.newArtifact(ARTIFACT_TYPE.TSK_KEYWORD_HIT);
             writeResult = new KeywordWriteResult(bba);
         } catch (Exception e) {
-            logger.log(Level.WARNING, "Error adding bb artifact for keyword hit", e);
+            logger.log(Level.WARNING, "Error adding bb artifact for keyword hit", e); //NON-NLS
             return null;
         }
 
@@ -204,7 +204,7 @@ class TermComponentQuery implements KeywordSearchQuery {
             writeResult.add(attributes);
             return writeResult;
         } catch (TskException e) {
-            logger.log(Level.WARNING, "Error adding bb attributes for terms search artifact", e);
+            logger.log(Level.WARNING, "Error adding bb attributes for terms search artifact", e); //NON-NLS
         }
 
         return null;
@@ -217,7 +217,7 @@ class TermComponentQuery implements KeywordSearchQuery {
         final SolrQuery q = createQuery();
         q.setShowDebugInfo(DEBUG);
         q.setTermsLimit(MAX_TERMS_RESULTS); 
-        logger.log(Level.INFO, "Query: {0}", q.toString());
+        logger.log(Level.INFO, "Query: {0}", q.toString()); //NON-NLS
         terms = executeQuery(q);
 
         int resultSize = 0;
@@ -243,16 +243,16 @@ class TermComponentQuery implements KeywordSearchQuery {
                 }
                 results.addResult(term.getTerm(), new ArrayList<>(filesResults));
             } catch (NoOpenCoreException e) {
-                logger.log(Level.WARNING, "Error executing Solr query,", e);
+                logger.log(Level.WARNING, "Error executing Solr query,", e); //NON-NLS
                 throw e;
             } catch (RuntimeException e) {
-                logger.log(Level.WARNING, "Error executing Solr query,", e);
+                logger.log(Level.WARNING, "Error executing Solr query,", e); //NON-NLS
             }
 
         }
         
         //TODO limit how many results we store, not to hit memory limits
-        logger.log(Level.INFO, "Regex # results: {0}", resultSize);
+        logger.log(Level.INFO, "Regex # results: {0}", resultSize); //NON-NLS
 
         return results;
     }
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties
index 5d31979a4d..a16dd418f9 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties
@@ -94,3 +94,4 @@ SearchEngineURLQueryAnalyzer.toString=Name\: {0}\
  {3}
 SearchEngineURLQueryAnalyzer.parentModuleName.noSpace=RecentActivity
 SearchEngineURLQueryAnalyzer.parentModuleName=Recent Activity
+SearchEngineURLQueryAnalyzer.init.exception.msg=Unable to find {0}
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle_ja.properties b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle_ja.properties
index bebd4a710d..2c336fe6d6 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle_ja.properties
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle_ja.properties
@@ -1,7 +1,7 @@
 OpenIDE-Module-Display-Category=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB
 OpenIDE-Module-Long-Description=\
     \u6700\u8FD1\u306E\u30A2\u30AF\u30C6\u30A3\u30D3\u30C6\u30A3\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3002\n\n\
-    \u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u51E6\u7406\u4E2D\u306E\u30C7\u30A3\u30B9\u30AF\u30A4\u30E1\u30FC\u30B8\u306E\u6700\u8FD1\u306E\u30E6\u30FC\u30B6\u30A2\u30AF\u30C6\u30A3\u30D3\u30C6\u30A3\u306B\u95A2\u3057\u3066\u5F79\u7ACB\u3064\u60C5\u5831\u3092\u62BD\u51FA\u3057\u307E\u3059\u3002\u4F8B\u3048\u3070\uFF1A\n\n-\u6700\u8FD1\u958B\u3044\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3001\n-\u30A6\u30A7\u30D6\u30A2\u30AF\u30C6\u30A3\u30D3\u30C6\u30A3\uFF08\u8A2A\u308C\u305F\u30B5\u30A4\u30C8\u3001Cookie\u3001\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u3055\u308C\u305F\u30B5\u30A4\u30C8\u3001\u30B5\u30FC\u30C1\u30A8\u30F3\u30B8\u30F3\u30AF\u30A8\u30EA\u3001\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\uFF09\u3001\n-\u6700\u8FD1\u30A2\u30BF\u30C3\u30C1\u3055\u308C\u305F\u30C7\u30D0\u30A4\u30B9\u3001\n-\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u305F\u30D7\u30ED\u30B0\u30E9\u30E0\u3002\n\n
+    \u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u4E2D\u306E\u30C7\u30A3\u30B9\u30AF\u30A4\u30E1\u30FC\u30B8\u306E\u6700\u8FD1\u306E\u30E6\u30FC\u30B6\u30A2\u30AF\u30C6\u30A3\u30D3\u30C6\u30A3\u306B\u95A2\u3057\u3066\u5F79\u7ACB\u3064\u60C5\u5831\u3092\u62BD\u51FA\u3057\u307E\u3059\u3002\u4F8B\u3048\u3070\uFF1A\n\n-\u6700\u8FD1\u958B\u3044\u305F\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u3001\n-\u30A6\u30A7\u30D6\u30A2\u30AF\u30C6\u30A3\u30D3\u30C6\u30A3\uFF08\u8A2A\u308C\u305F\u30B5\u30A4\u30C8\u3001Cookie\u3001\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u3055\u308C\u305F\u30B5\u30A4\u30C8\u3001\u30B5\u30FC\u30C1\u30A8\u30F3\u30B8\u30F3\u30AF\u30A8\u30EA\u3001\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\uFF09\u3001\n-\u6700\u8FD1\u30A2\u30BF\u30C3\u30C1\u3055\u308C\u305F\u30C7\u30D0\u30A4\u30B9\u3001\n-\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u305F\u30D7\u30ED\u30B0\u30E9\u30E0\u3002\n\n
 OpenIDE-Module-Name=\u6700\u8FD1\u306E\u30A2\u30AF\u30C6\u30A3\u30D3\u30C6\u30A3
 OpenIDE-Module-Short-Description=\u6700\u8FD1\u306E\u30A2\u30AF\u30C6\u30A3\u30D3\u30C6\u30A3\u30D5\u30A1\u30A4\u30F3\u30C0\u30FC\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB
 Chrome.moduleName=Chrome
@@ -63,13 +63,13 @@ Firefox.getDlPre24.errMsg.errParsingArtifacts={0}\:{1} Firefox\u30A6\u30A7\u30D6
 Firefox.getDlV24.errMsg.errFetchFiles=Firefox\u306E\u300C\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u300D\u30D5\u30A1\u30A4\u30EB\u3092\u53D6\u5F97\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
 Firefox.getDlV24.errMsg.errAnalyzeFile={0}\:\u30D5\u30A1\u30A4\u30EB\:{1}\u3092\u89E3\u6790\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
 Firefox.getDlV24.errMsg.errParsingArtifacts={0}\:{1} Firefox\u30A6\u30A7\u30D6\u5C65\u6B74\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u306E\u30D1\u30FC\u30B9\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
-RAImageIngestModule.process.started={0}\u958B\u59CB\u3057\u307E\u3057\u305F
+RAImageIngestModule.process.started={0}\u3092\u958B\u59CB\u3057\u307E\u3057\u305F
 RAImageIngestModule.process.errModFailed={0}\u5931\u6557\u3057\u307E\u3057\u305F - \u8A73\u7D30\u306F\u30ED\u30B0\u3067\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044<br>
 RAImageIngestModule.process.errModErrs={0}\u306B\u306F\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3057\u305F -- \u30ED\u30B0\u3092\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044
 RAImageIngestModule.process.errMsg.errsEncountered=<p>\u89E3\u6790\u4E2D\u306B\u767A\u751F\u3057\u305F\u30A8\u30E9\u30FC\uFF1A <ul>
-RAImageIngestModule.process.errMsgSub.oneErr=1\u500B\u306E\u30A8\u30E9\u30FC\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3000
+RAImageIngestModule.process.errMsgSub.oneErr=1\u3064\u306E\u30A8\u30E9\u30FC\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3000
 RAImageIngestModule.process.errMsgSub.nErrs={0}\u306E\u30A8\u30E9\u30FC\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
-RAImageIngestModule.process.ingestMsg.finished=\u5B8C\u4E86\u3000{0} - {1}
+RAImageIngestModule.process.ingestMsg.finished=\u5B8C\u4E86 {0} - {1}
 RAImageIngestModule.process.errMsg.noErrs=<p>\u30A8\u30E9\u30FC\u306F\u767A\u751F\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u3002</p>
 RAImageIngestModule.process.errMsgSub.noErrs=\u30A8\u30E9\u30FC\u306F\u30EC\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093
 RAImageIngestModule.process.histMsg.title=<p>{0}\u306B\u95A2\u3057\u3066\u306E\u30D6\u30E9\u30A6\u30B6\u30C7\u30FC\u30BF\uFF1A<ul>
@@ -91,4 +91,5 @@ SearchEngineURLQueryAnalyzer.toString=\u540D\u79F0\uFF1A {0}\
  \u5206\u5272\u30C8\u30FC\u30AF\u30F3\
  {3}
 SearchEngineURLQueryAnalyzer.parentModuleName.noSpace=\u6700\u8FD1\u306E\u30A2\u30AF\u30C6\u30A3\u30D3\u30C6\u30A3
-SearchEngineURLQueryAnalyzer.parentModuleName=\u6700\u8FD1\u306E\u30A2\u30AF\u30C6\u30A3\u30D3\u30C6\u30A3
\ No newline at end of file
+SearchEngineURLQueryAnalyzer.parentModuleName=\u6700\u8FD1\u306E\u30A2\u30AF\u30C6\u30A3\u30D3\u30C6\u30A3
+SearchEngineURLQueryAnalyzer.init.exception.msg={0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F
\ No newline at end of file
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
index b0b8cae007..b9a187ccec 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
@@ -55,12 +55,12 @@ import org.sleuthkit.datamodel.TskData;
  */
 class Chrome extends Extract {
 
-    private static final String historyQuery = "SELECT urls.url, urls.title, urls.visit_count, urls.typed_count, "
-            + "last_visit_time, urls.hidden, visits.visit_time, (SELECT urls.url FROM urls WHERE urls.id=visits.url) as from_visit, visits.transition FROM urls, visits WHERE urls.id = visits.url";
-    private static final String cookieQuery = "select name, value, host_key, expires_utc,last_access_utc, creation_utc from cookies";
-    private static final String downloadQuery = "select full_path, url, start_time, received_bytes from downloads";
-    private static final String downloadQueryVersion30 = "SELECT current_path as full_path, url, start_time, received_bytes FROM downloads, downloads_url_chains WHERE downloads.id=downloads_url_chains.id";
-    private static final String loginQuery = "select origin_url, username_value, signon_realm from logins";
+    private static final String historyQuery = "SELECT urls.url, urls.title, urls.visit_count, urls.typed_count, " //NON-NLS
+            + "last_visit_time, urls.hidden, visits.visit_time, (SELECT urls.url FROM urls WHERE urls.id=visits.url) as from_visit, visits.transition FROM urls, visits WHERE urls.id = visits.url"; //NON-NLS
+    private static final String cookieQuery = "select name, value, host_key, expires_utc,last_access_utc, creation_utc from cookies"; //NON-NLS
+    private static final String downloadQuery = "select full_path, url, start_time, received_bytes from downloads"; //NON-NLS
+    private static final String downloadQueryVersion30 = "SELECT current_path as full_path, url, start_time, received_bytes FROM downloads, downloads_url_chains WHERE downloads.id=downloads_url_chains.id"; //NON-NLS
+    private static final String loginQuery = "select origin_url, username_value, signon_realm from logins"; //NON-NLS
     private final Logger logger = Logger.getLogger(this.getClass().getName());
     private Content dataSource;
     private IngestJobContext context;
@@ -88,7 +88,7 @@ class Chrome extends Extract {
         FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> historyFiles;
         try {
-            historyFiles = fileManager.findFiles(dataSource, "History", "Chrome");
+            historyFiles = fileManager.findFiles(dataSource, "History", "Chrome"); //NON-NLS
         } catch (TskCoreException ex) {
             String msg = NbBundle.getMessage(this.getClass(), "Chrome.getHistory.errMsg.errGettingFiles");
             logger.log(Level.SEVERE, msg, ex);
@@ -114,7 +114,7 @@ class Chrome extends Extract {
         dataFound = true;
         int j = 0;
         while (j < historyFiles.size()) {
-            String temps = RAImageIngestModule.getRATempPath(currentCase, "chrome") + File.separator + historyFiles.get(j).getName().toString() + j + ".db";
+            String temps = RAImageIngestModule.getRATempPath(currentCase, "chrome") + File.separator + historyFiles.get(j).getName().toString() + j + ".db"; //NON-NLS
             final AbstractFile historyFile = historyFiles.get(j++);
             if (historyFile.getSize() == 0) {
                 continue;
@@ -122,7 +122,7 @@ class Chrome extends Extract {
             try {
                 ContentUtils.writeToFile(historyFile, new File(temps));
             } catch (IOException ex) {
-                logger.log(Level.SEVERE, "Error writing temp sqlite db for Chrome web history artifacts.{0}", ex);
+                logger.log(Level.SEVERE, "Error writing temp sqlite db for Chrome web history artifacts.{0}", ex); //NON-NLS
                 this.addErrorMessage(NbBundle.getMessage(this.getClass(), "Chrome.getHistory.errMsg.errAnalyzingFile",
                                                          this.getName(), historyFile.getName()));
                 continue;
@@ -134,27 +134,27 @@ class Chrome extends Extract {
             }
             List<HashMap<String, Object>> tempList;
             tempList = this.dbConnect(temps, historyQuery);
-            logger.log(Level.INFO, "{0}- Now getting history from {1} with {2}artifacts identified.", new Object[]{moduleName, temps, tempList.size()});
+            logger.log(Level.INFO, "{0}- Now getting history from {1} with {2}artifacts identified.", new Object[]{moduleName, temps, tempList.size()}); //NON-NLS
             for (HashMap<String, Object> result : tempList) {
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
-                                                         ((result.get("url").toString() != null) ? result.get("url").toString() : "")));
+                                                         ((result.get("url").toString() != null) ? result.get("url").toString() : ""))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
-                                                         ((Long.valueOf(result.get("last_visit_time").toString())) / 10000000)));
+                                                         ((Long.valueOf(result.get("last_visit_time").toString())) / 10000000))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_REFERRER.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
-                                                         ((result.get("from_visit").toString() != null) ? result.get("from_visit").toString() : "")));
+                                                         ((result.get("from_visit").toString() != null) ? result.get("from_visit").toString() : ""))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_TITLE.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
-                                                         ((result.get("title").toString() != null) ? result.get("title").toString() : "")));
+                                                         ((result.get("title").toString() != null) ? result.get("title").toString() : ""))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.moduleName")));
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
-                                                         (Util.extractDomain((result.get("url").toString() != null) ? result.get("url").toString() : ""))));
+                                                         (Util.extractDomain((result.get("url").toString() != null) ? result.get("url").toString() : "")))); //NON-NLS
                 this.addArtifact(ARTIFACT_TYPE.TSK_WEB_HISTORY, historyFile, bbattributes);
             }
             dbFile.delete();
@@ -171,7 +171,7 @@ class Chrome extends Extract {
         FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> bookmarkFiles = null;
         try {
-            bookmarkFiles = fileManager.findFiles(dataSource, "Bookmarks", "Chrome");
+            bookmarkFiles = fileManager.findFiles(dataSource, "Bookmarks", "Chrome"); //NON-NLS
         } catch (TskCoreException ex) {
             String msg = NbBundle.getMessage(this.getClass(), "Chrome.getBookmark.errMsg.errGettingFiles");
             logger.log(Level.SEVERE, msg, ex);
@@ -180,7 +180,7 @@ class Chrome extends Extract {
         }
 
         if (bookmarkFiles.isEmpty()) {
-            logger.log(Level.INFO, "Didn't find any Chrome bookmark files.");
+            logger.log(Level.INFO, "Didn't find any Chrome bookmark files."); //NON-NLS
             return;
         }
         
@@ -192,17 +192,17 @@ class Chrome extends Extract {
             if (bookmarkFile.getSize() == 0) {
                 continue;
             }
-            String temps = RAImageIngestModule.getRATempPath(currentCase, "chrome") + File.separator + bookmarkFile.getName().toString() + j + ".db";
+            String temps = RAImageIngestModule.getRATempPath(currentCase, "chrome") + File.separator + bookmarkFile.getName().toString() + j + ".db"; //NON-NLS
             try {
                 ContentUtils.writeToFile(bookmarkFile, new File(temps));
             } catch (IOException ex) {
-                logger.log(Level.SEVERE, "Error writing temp sqlite db for Chrome bookmark artifacts.{0}", ex);
+                logger.log(Level.SEVERE, "Error writing temp sqlite db for Chrome bookmark artifacts.{0}", ex); //NON-NLS
                 this.addErrorMessage(NbBundle.getMessage(this.getClass(), "Chrome.getBookmark.errMsg.errAnalyzingFile",
                                                          this.getName(), bookmarkFile.getName()));
                 continue;
             }
             
-            logger.log(Level.INFO, "{0}- Now getting Bookmarks from {1}", new Object[]{moduleName, temps});
+            logger.log(Level.INFO, "{0}- Now getting Bookmarks from {1}", new Object[]{moduleName, temps}); //NON-NLS
             File dbFile = new File(temps);
             if (context.isJobCancelled()) {
                 dbFile.delete();
@@ -213,7 +213,7 @@ class Chrome extends Extract {
             try {
                  tempReader = new FileReader(temps);
             } catch (FileNotFoundException ex) {
-                logger.log(Level.SEVERE, "Error while trying to read into the Bookmarks for Chrome.", ex);
+                logger.log(Level.SEVERE, "Error while trying to read into the Bookmarks for Chrome.", ex); //NON-NLS
                 this.addErrorMessage(
                         NbBundle.getMessage(this.getClass(), "Chrome.getBookmark.errMsg.errAnalyzeFile", this.getName(),
                                             bookmarkFile.getName()));
@@ -228,11 +228,11 @@ class Chrome extends Extract {
             try {
                 jsonElement = parser.parse(tempReader);
                 jElement = jsonElement.getAsJsonObject();
-                jRoot = jElement.get("roots").getAsJsonObject();
-                jBookmark = jRoot.get("bookmark_bar").getAsJsonObject();
-                jBookmarkArray = jBookmark.getAsJsonArray("children");
+                jRoot = jElement.get("roots").getAsJsonObject(); //NON-NLS
+                jBookmark = jRoot.get("bookmark_bar").getAsJsonObject(); //NON-NLS
+                jBookmarkArray = jBookmark.getAsJsonArray("children"); //NON-NLS
             } catch (JsonIOException | JsonSyntaxException | IllegalStateException ex) {
-                logger.log(Level.WARNING, "Error parsing Json from Chrome Bookmark.", ex);
+                logger.log(Level.WARNING, "Error parsing Json from Chrome Bookmark.", ex); //NON-NLS
                 this.addErrorMessage(NbBundle.getMessage(this.getClass(), "Chrome.getBookmark.errMsg.errAnalyzingFile3",
                                                          this.getName(), bookmarkFile.getName()));
                 continue;
@@ -243,7 +243,7 @@ class Chrome extends Extract {
                 if (address == null) {
                     continue;
                 }
-                JsonElement urlEl = address.get("url");
+                JsonElement urlEl = address.get("url"); //NON-NLS
                 String url;
                 if (urlEl != null) {
                     url = urlEl.getAsString();
@@ -252,7 +252,7 @@ class Chrome extends Extract {
                     url = "";
                 }
                 String name;
-                JsonElement nameEl = address.get("name");
+                JsonElement nameEl = address.get("name"); //NON-NLS
                 if (nameEl != null) {
                     name = nameEl.getAsString();
                 }
@@ -260,7 +260,7 @@ class Chrome extends Extract {
                     name = "";
                 }
                 Long date;
-                JsonElement dateEl = address.get("date_added");
+                JsonElement dateEl = address.get("date_added"); //NON-NLS
                 if (dateEl != null) {
                     date = dateEl.getAsLong();
                 }
@@ -291,7 +291,7 @@ class Chrome extends Extract {
                                                                                  "Chrome.parentModuleName"), domain));
                     bbart.addAttributes(bbattributes);
                 } catch (TskCoreException ex) {
-                    logger.log(Level.SEVERE, "Error while trying to insert Chrome bookmark artifact{0}", ex);
+                    logger.log(Level.SEVERE, "Error while trying to insert Chrome bookmark artifact{0}", ex); //NON-NLS
                     this.addErrorMessage(
                             NbBundle.getMessage(this.getClass(), "Chrome.getBookmark.errMsg.errAnalyzingFile4",
                                                 this.getName(), bookmarkFile.getName()));
@@ -311,7 +311,7 @@ class Chrome extends Extract {
         FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> cookiesFiles;
         try {
-            cookiesFiles = fileManager.findFiles(dataSource, "Cookies", "Chrome");
+            cookiesFiles = fileManager.findFiles(dataSource, "Cookies", "Chrome"); //NON-NLS
         } catch (TskCoreException ex) {
             String msg = NbBundle.getMessage(this.getClass(), "Chrome.getCookie.errMsg.errGettingFiles");
             logger.log(Level.SEVERE, msg, ex);
@@ -320,7 +320,7 @@ class Chrome extends Extract {
         }
 
         if (cookiesFiles.isEmpty()) {
-            logger.log(Level.INFO, "Didn't find any Chrome cookies files.");
+            logger.log(Level.INFO, "Didn't find any Chrome cookies files."); //NON-NLS
             return;
         }
         
@@ -331,11 +331,11 @@ class Chrome extends Extract {
             if (cookiesFile.getSize() == 0) {
                 continue;
             }
-            String temps = RAImageIngestModule.getRATempPath(currentCase, "chrome") + File.separator + cookiesFile.getName().toString() + j + ".db";
+            String temps = RAImageIngestModule.getRATempPath(currentCase, "chrome") + File.separator + cookiesFile.getName().toString() + j + ".db"; //NON-NLS
             try {
                 ContentUtils.writeToFile(cookiesFile, new File(temps));
             } catch (IOException ex) {
-                logger.log(Level.SEVERE, "Error writing temp sqlite db for Chrome cookie artifacts.{0}", ex);
+                logger.log(Level.SEVERE, "Error writing temp sqlite db for Chrome cookie artifacts.{0}", ex); //NON-NLS
                 this.addErrorMessage(
                         NbBundle.getMessage(this.getClass(), "Chrome.getCookie.errMsg.errAnalyzeFile", this.getName(),
                                             cookiesFile.getName()));
@@ -348,25 +348,25 @@ class Chrome extends Extract {
             }
 
             List<HashMap<String, Object>> tempList = this.dbConnect(temps, cookieQuery);
-            logger.log(Level.INFO, "{0}- Now getting cookies from {1} with {2}artifacts identified.", new Object[]{moduleName, temps, tempList.size()});
+            logger.log(Level.INFO, "{0}- Now getting cookies from {1} with {2}artifacts identified.", new Object[]{moduleName, temps, tempList.size()}); //NON-NLS
             for (HashMap<String, Object> result : tempList) {
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
-                                                         ((result.get("host_key").toString() != null) ? result.get("host_key").toString() : "")));
+                                                         ((result.get("host_key").toString() != null) ? result.get("host_key").toString() : ""))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
-                                                         ((Long.valueOf(result.get("last_access_utc").toString())) / 10000000)));
+                                                         ((Long.valueOf(result.get("last_access_utc").toString())) / 10000000))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
-                                                         ((result.get("name").toString() != null) ? result.get("name").toString() : "")));
+                                                         ((result.get("name").toString() != null) ? result.get("name").toString() : ""))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_VALUE.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
-                                                         ((result.get("value").toString() != null) ? result.get("value").toString() : "")));
+                                                         ((result.get("value").toString() != null) ? result.get("value").toString() : ""))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.moduleName")));
-                String domain = result.get("host_key").toString();
+                String domain = result.get("host_key").toString(); //NON-NLS
                 domain = domain.replaceFirst("^\\.+(?!$)", "");
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"), domain));
@@ -386,7 +386,7 @@ class Chrome extends Extract {
         FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> downloadFiles = null;
         try {
-            downloadFiles = fileManager.findFiles(dataSource, "History", "Chrome");
+            downloadFiles = fileManager.findFiles(dataSource, "History", "Chrome"); //NON-NLS
         } catch (TskCoreException ex) {
             String msg = NbBundle.getMessage(this.getClass(), "Chrome.getDownload.errMsg.errGettingFiles");
             logger.log(Level.SEVERE, msg, ex);
@@ -395,7 +395,7 @@ class Chrome extends Extract {
         }
 
         if (downloadFiles.isEmpty()) {
-            logger.log(Level.INFO, "Didn't find any Chrome download files.");
+            logger.log(Level.INFO, "Didn't find any Chrome download files."); //NON-NLS
             return;
         }
         
@@ -406,11 +406,11 @@ class Chrome extends Extract {
             if (downloadFile.getSize() == 0) {
                 continue;
             }
-            String temps = RAImageIngestModule.getRATempPath(currentCase, "chrome") + File.separator + downloadFile.getName().toString() + j + ".db";
+            String temps = RAImageIngestModule.getRATempPath(currentCase, "chrome") + File.separator + downloadFile.getName().toString() + j + ".db"; //NON-NLS
             try {
                 ContentUtils.writeToFile(downloadFile, new File(temps));
             } catch (IOException ex) {
-                logger.log(Level.SEVERE, "Error writing temp sqlite db for Chrome download artifacts.{0}", ex);
+                logger.log(Level.SEVERE, "Error writing temp sqlite db for Chrome download artifacts.{0}", ex); //NON-NLS
                 this.addErrorMessage(NbBundle.getMessage(this.getClass(), "Chrome.getDownload.errMsg.errAnalyzeFiles1",
                                                          this.getName(), downloadFile.getName()));
                 continue;
@@ -429,12 +429,12 @@ class Chrome extends Extract {
                 tempList = this.dbConnect(temps, downloadQueryVersion30);
             }
             
-            logger.log(Level.INFO, "{0}- Now getting downloads from {1} with {2}artifacts identified.", new Object[]{moduleName, temps, tempList.size()});
+            logger.log(Level.INFO, "{0}- Now getting downloads from {1} with {2}artifacts identified.", new Object[]{moduleName, temps, tempList.size()}); //NON-NLS
             for (HashMap<String, Object> result : tempList) {
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH.getTypeID(),
-                                                         NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"), (result.get("full_path").toString())));
-                long pathID = Util.findID(dataSource, (result.get("full_path").toString()));
+                                                         NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"), (result.get("full_path").toString()))); //NON-NLS
+                long pathID = Util.findID(dataSource, (result.get("full_path").toString())); //NON-NLS
                 if (pathID != -1) {
                     bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH_ID.getTypeID(),
                                                              NbBundle.getMessage(this.getClass(),
@@ -442,16 +442,16 @@ class Chrome extends Extract {
                 }
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
-                                                         ((result.get("url").toString() != null) ? result.get("url").toString() : "")));
+                                                         ((result.get("url").toString() != null) ? result.get("url").toString() : ""))); //NON-NLS
                 //bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL_DECODED.getTypeID(), "Recent Activity", ((result.get("url").toString() != null) ? EscapeUtil.decodeURL(result.get("url").toString()) : "")));
-                Long time = (Long.valueOf(result.get("start_time").toString()));
+                Long time = (Long.valueOf(result.get("start_time").toString())); //NON-NLS
                 String Tempdate = time.toString();
                 time = Long.valueOf(Tempdate) / 10000000;
                 //TODO Revisit usage of deprecated constructor as per TSK-583
                 //bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_LAST_ACCESSED.getTypeID(), "Recent Activity", "Last Visited", time));
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"), time));
-                String domain = Util.extractDomain((result.get("url").toString() != null) ? result.get("url").toString() : "");
+                String domain = Util.extractDomain((result.get("url").toString() != null) ? result.get("url").toString() : ""); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"), domain));
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),
@@ -474,7 +474,7 @@ class Chrome extends Extract {
         FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> signonFiles;
         try {
-            signonFiles = fileManager.findFiles(dataSource, "signons.sqlite", "Chrome");
+            signonFiles = fileManager.findFiles(dataSource, "signons.sqlite", "Chrome"); //NON-NLS
         } catch (TskCoreException ex) {
             String msg = NbBundle.getMessage(this.getClass(), "Chrome.getLogin.errMsg.errGettingFiles");
             logger.log(Level.SEVERE, msg, ex);
@@ -483,7 +483,7 @@ class Chrome extends Extract {
         }
 
         if (signonFiles.isEmpty()) {
-            logger.log(Level.INFO, "Didn't find any Chrome signon files.");
+            logger.log(Level.INFO, "Didn't find any Chrome signon files."); //NON-NLS
             return;
         }
         
@@ -494,11 +494,11 @@ class Chrome extends Extract {
             if (signonFile.getSize() == 0) {
                 continue;
             }
-            String temps = RAImageIngestModule.getRATempPath(currentCase, "chrome") + File.separator + signonFile.getName().toString() + j + ".db";
+            String temps = RAImageIngestModule.getRATempPath(currentCase, "chrome") + File.separator + signonFile.getName().toString() + j + ".db"; //NON-NLS
             try {
                 ContentUtils.writeToFile(signonFile, new File(temps));
             } catch (IOException ex) {
-                logger.log(Level.SEVERE, "Error writing temp sqlite db for Chrome login artifacts.{0}", ex);
+                logger.log(Level.SEVERE, "Error writing temp sqlite db for Chrome login artifacts.{0}", ex); //NON-NLS
                 this.addErrorMessage(
                         NbBundle.getMessage(this.getClass(), "Chrome.getLogin.errMsg.errAnalyzingFiles", this.getName(),
                                             signonFile.getName()));
@@ -510,36 +510,36 @@ class Chrome extends Extract {
                 break;
             }
             List<HashMap<String, Object>> tempList = this.dbConnect(temps, loginQuery);
-            logger.log(Level.INFO, "{0}- Now getting login information from {1} with {2}artifacts identified.", new Object[]{moduleName, temps, tempList.size()});
+            logger.log(Level.INFO, "{0}- Now getting login information from {1} with {2}artifacts identified.", new Object[]{moduleName, temps, tempList.size()}); //NON-NLS
             for (HashMap<String, Object> result : tempList) {
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<>();
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
-                                                         ((result.get("origin_url").toString() != null) ? result.get("origin_url").toString() : "")));
+                                                         ((result.get("origin_url").toString() != null) ? result.get("origin_url").toString() : ""))); //NON-NLS
                 //bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL_DECODED.getTypeID(), "Recent Activity", ((result.get("origin_url").toString() != null) ? EscapeUtil.decodeURL(result.get("origin_url").toString()) : "")));
                 //TODO Revisit usage of deprecated constructor as per TSK-583
                 //bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED.getTypeID(), "Recent Activity", "Last Visited", ((Long.valueOf(result.get("last_visit_time").toString())) / 1000000)));
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
-                                                         ((Long.valueOf(result.get("last_visit_time").toString())) / 1000000)));
+                                                         ((Long.valueOf(result.get("last_visit_time").toString())) / 1000000))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_REFERRER.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
-                                                         ((result.get("from_visit").toString() != null) ? result.get("from_visit").toString() : "")));
+                                                         ((result.get("from_visit").toString() != null) ? result.get("from_visit").toString() : ""))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
-                                                         ((result.get("title").toString() != null) ? result.get("title").toString() : "")));
+                                                         ((result.get("title").toString() != null) ? result.get("title").toString() : ""))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.moduleName")));
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
-                                                         (Util.extractDomain((result.get("origin_url").toString() != null) ? result.get("url").toString() : ""))));
+                                                         (Util.extractDomain((result.get("origin_url").toString() != null) ? result.get("url").toString() : "")))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_USER_NAME.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
-                                                         ((result.get("username_value").toString() != null) ? result.get("username_value").toString().replaceAll("'", "''") : "")));
+                                                         ((result.get("username_value").toString() != null) ? result.get("username_value").toString().replaceAll("'", "''") : ""))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
-                                                         result.get("signon_realm").toString()));
+                                                         result.get("signon_realm").toString())); //NON-NLS
                 this.addArtifact(ARTIFACT_TYPE.TSK_WEB_HISTORY, signonFile, bbattributes);
             }
 
@@ -550,10 +550,10 @@ class Chrome extends Extract {
     }
 
     private boolean isChromePreVersion30(String temps) {
-        String query = "PRAGMA table_info(downloads)";
+        String query = "PRAGMA table_info(downloads)"; //NON-NLS
         List<HashMap<String, Object>> columns = this.dbConnect(temps, query);
         for (HashMap<String, Object> col : columns) {
-            if (col.get("name").equals("url")) {
+            if (col.get("name").equals("url")) { //NON-NLS
                 return true;
             }
         }
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
index 7a22ac6a8c..88812760bf 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
@@ -92,7 +92,7 @@ abstract class Extract {
             BlackboardArtifact bbart = content.newArtifact(type);
             bbart.addAttributes(bbattributes);
         } catch (TskException ex) {
-            logger.log(Level.SEVERE, "Error while trying to add an artifact: {0}", ex);
+            logger.log(Level.SEVERE, "Error while trying to add an artifact: {0}", ex); //NON-NLS
         }
     }
 
@@ -109,14 +109,14 @@ abstract class Extract {
     protected List<HashMap<String, Object>> dbConnect(String path, String query) {
         ResultSet temprs;
         List<HashMap<String, Object>> list;
-        String connectionString = "jdbc:sqlite:" + path;
+        String connectionString = "jdbc:sqlite:" + path; //NON-NLS
         try {
-            SQLiteDBConnect tempdbconnect = new SQLiteDBConnect("org.sqlite.JDBC", connectionString);
+            SQLiteDBConnect tempdbconnect = new SQLiteDBConnect("org.sqlite.JDBC", connectionString); //NON-NLS
             temprs = tempdbconnect.executeQry(query);
             list = this.resultSetToArrayList(temprs);
             tempdbconnect.closeConnection();
         } catch (SQLException ex) {
-            logger.log(Level.SEVERE, "Error while trying to read into a sqlite db." + connectionString, ex);
+            logger.log(Level.SEVERE, "Error while trying to read into a sqlite db." + connectionString, ex); //NON-NLS
             errorMessages.add(NbBundle.getMessage(this.getClass(), "Extract.dbConn.errMsg.failedToQueryDb", getName()));
             return Collections.<HashMap<String,Object>>emptyList();
         }
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
index 21875852ee..7cd56c4b43 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
@@ -71,7 +71,7 @@ class ExtractIE extends Extract {
 
     ExtractIE() {
         moduleName = NbBundle.getMessage(ExtractIE.class, "ExtractIE.moduleName.text");
-        moduleTempResultsDir = RAImageIngestModule.getRATempPath(Case.getCurrentCase(), "IE") + File.separator + "results";
+        moduleTempResultsDir = RAImageIngestModule.getRATempPath(Case.getCurrentCase(), "IE") + File.separator + "results"; //NON-NLS
         JAVA_PATH = PlatformUtil.getJavaPath();
     }
 
@@ -92,9 +92,9 @@ class ExtractIE extends Extract {
         org.sleuthkit.autopsy.casemodule.services.FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> favoritesFiles;
         try {
-            favoritesFiles = fileManager.findFiles(dataSource, "%.url", "Favorites");
+            favoritesFiles = fileManager.findFiles(dataSource, "%.url", "Favorites"); //NON-NLS
         } catch (TskCoreException ex) {
-            logger.log(Level.WARNING, "Error fetching 'url' files for Internet Explorer bookmarks.", ex);
+            logger.log(Level.WARNING, "Error fetching 'url' files for Internet Explorer bookmarks.", ex); //NON-NLS
             this.addErrorMessage(
                     NbBundle.getMessage(this.getClass(), "ExtractIE.getBookmark.errMsg.errGettingBookmarks",
                                                      this.getName()));
@@ -102,7 +102,7 @@ class ExtractIE extends Extract {
         }
 
         if (favoritesFiles.isEmpty()) {
-            logger.log(Level.INFO, "Didn't find any IE bookmark files.");
+            logger.log(Level.INFO, "Didn't find any IE bookmark files."); //NON-NLS
             return;
         }
         
@@ -154,18 +154,18 @@ class ExtractIE extends Extract {
             while ((line = reader.readLine()) != null) {
                 // The actual shortcut line we are interested in is of the
                 // form URL=http://path/to/website
-                if (line.startsWith("URL")) {
+                if (line.startsWith("URL")) { //NON-NLS
                     url = line.substring(line.indexOf("=") + 1);
                     break;
                 }
             }
         } catch (IOException ex) {
-            logger.log(Level.WARNING, "Failed to read from content: " + fav.getName(), ex);
+            logger.log(Level.WARNING, "Failed to read from content: " + fav.getName(), ex); //NON-NLS
             this.addErrorMessage(
                     NbBundle.getMessage(this.getClass(), "ExtractIE.getURLFromIEBmkFile.errMsg", this.getName(),
                                         fav.getName()));
         } catch (IndexOutOfBoundsException ex) {
-            logger.log(Level.WARNING, "Failed while getting URL of IE bookmark. Unexpected format of the bookmark file: " + fav.getName(), ex);
+            logger.log(Level.WARNING, "Failed while getting URL of IE bookmark. Unexpected format of the bookmark file: " + fav.getName(), ex); //NON-NLS
             this.addErrorMessage(
                     NbBundle.getMessage(this.getClass(), "ExtractIE.getURLFromIEBmkFile.errMsg2", this.getName(),
                                         fav.getName()));
@@ -173,7 +173,7 @@ class ExtractIE extends Extract {
             try {
                 reader.close();
             } catch (IOException ex) {
-                logger.log(Level.WARNING, "Failed to close reader.", ex);
+                logger.log(Level.WARNING, "Failed to close reader.", ex); //NON-NLS
             }
         }
         
@@ -187,16 +187,16 @@ class ExtractIE extends Extract {
         org.sleuthkit.autopsy.casemodule.services.FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> cookiesFiles;
         try {
-            cookiesFiles = fileManager.findFiles(dataSource, "%.txt", "Cookies");
+            cookiesFiles = fileManager.findFiles(dataSource, "%.txt", "Cookies"); //NON-NLS
         } catch (TskCoreException ex) {
-            logger.log(Level.WARNING, "Error getting cookie files for IE");
+            logger.log(Level.WARNING, "Error getting cookie files for IE"); //NON-NLS
             this.addErrorMessage(
                     NbBundle.getMessage(this.getClass(), "ExtractIE.getCookie.errMsg.errGettingFile", this.getName()));
             return;
         }
 
         if (cookiesFiles.isEmpty()) {
-            logger.log(Level.INFO, "Didn't find any IE cookies files.");
+            logger.log(Level.INFO, "Didn't find any IE cookies files."); //NON-NLS
             return;
         }
         
@@ -213,7 +213,7 @@ class ExtractIE extends Extract {
             try {
                 final int bytesRead = cookiesFile.read(t, 0, cookiesFile.getSize());
             } catch (TskCoreException ex) {
-                logger.log(Level.SEVERE, "Error reading bytes of Internet Explorer cookie.", ex);
+                logger.log(Level.SEVERE, "Error reading bytes of Internet Explorer cookie.", ex); //NON-NLS
                 this.addErrorMessage(
                         NbBundle.getMessage(this.getClass(), "ExtractIE.getCookie.errMsg.errReadingIECookie",
                                             this.getName(), cookiesFile.getName()));
@@ -259,21 +259,21 @@ class ExtractIE extends Extract {
      * Locates index.dat files, runs Pasco on them, and creates artifacts. 
      */
     private void getHistory() {
-        logger.log(Level.INFO, "Pasco results path: {0}", moduleTempResultsDir);
+        logger.log(Level.INFO, "Pasco results path: {0}", moduleTempResultsDir); //NON-NLS
         boolean foundHistory = false;
 
-        final File pascoRoot = InstalledFileLocator.getDefault().locate("pasco2", ExtractIE.class.getPackage().getName(), false);
+        final File pascoRoot = InstalledFileLocator.getDefault().locate("pasco2", ExtractIE.class.getPackage().getName(), false); //NON-NLS
         if (pascoRoot == null) {
             this.addErrorMessage(
                     NbBundle.getMessage(this.getClass(), "ExtractIE.getHistory.errMsg.unableToGetHist", this.getName()));
-            logger.log(Level.SEVERE, "Error finding pasco program ");
+            logger.log(Level.SEVERE, "Error finding pasco program "); //NON-NLS
             return;
         } 
        
         final String pascoHome = pascoRoot.getAbsolutePath();
-        logger.log(Level.INFO, "Pasco2 home: {0}", pascoHome);
+        logger.log(Level.INFO, "Pasco2 home: {0}", pascoHome); //NON-NLS
 
-        PASCO_LIB_PATH = pascoHome + File.separator + "pasco2.jar" + File.pathSeparator
+        PASCO_LIB_PATH = pascoHome + File.separator + "pasco2.jar" + File.pathSeparator //NON-NLS
                 + pascoHome + File.separator + "*";
 
         File resultsDir = new File(moduleTempResultsDir);
@@ -283,11 +283,11 @@ class ExtractIE extends Extract {
         org.sleuthkit.autopsy.casemodule.services.FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> indexFiles;
         try {
-            indexFiles = fileManager.findFiles(dataSource, "index.dat");
+            indexFiles = fileManager.findFiles(dataSource, "index.dat"); //NON-NLS
         } catch (TskCoreException ex) {
             this.addErrorMessage(NbBundle.getMessage(this.getClass(), "ExtractIE.getHistory.errMsg.errGettingHistFiles",
                                                      this.getName()));
-            logger.log(Level.WARNING, "Error fetching 'index.data' files for Internet Explorer history.");
+            logger.log(Level.WARNING, "Error fetching 'index.data' files for Internet Explorer history."); //NON-NLS
             return;
         }
 
@@ -306,9 +306,9 @@ class ExtractIE extends Extract {
             // index<Number>.dat (i.e. index0.dat, index1.dat,..., indexN.dat)
             // Write each index.dat file to a temp directory.
             //BlackboardArtifact bbart = fsc.newArtifact(ARTIFACT_TYPE.TSK_WEB_HISTORY);
-            indexFileName = "index" + Integer.toString((int) indexFile.getId()) + ".dat";
+            indexFileName = "index" + Integer.toString((int) indexFile.getId()) + ".dat"; //NON-NLS
             //indexFileName = "index" + Long.toString(bbart.getArtifactID()) + ".dat";
-            temps = RAImageIngestModule.getRATempPath(currentCase, "IE") + File.separator + indexFileName;
+            temps = RAImageIngestModule.getRATempPath(currentCase, "IE") + File.separator + indexFileName; //NON-NLS
             File datFile = new File(temps);
             if (context.isJobCancelled()) {
                 break;
@@ -316,14 +316,14 @@ class ExtractIE extends Extract {
             try {
                 ContentUtils.writeToFile(indexFile, datFile);
             } catch (IOException e) {
-                logger.log(Level.SEVERE, "Error while trying to write index.dat file " + datFile.getAbsolutePath(), e);
+                logger.log(Level.SEVERE, "Error while trying to write index.dat file " + datFile.getAbsolutePath(), e); //NON-NLS
                 this.addErrorMessage(
                         NbBundle.getMessage(this.getClass(), "ExtractIE.getHistory.errMsg.errWriteFile", this.getName(),
                                             datFile.getAbsolutePath()));
                 continue;
             }
 
-            String filename = "pasco2Result." + indexFile.getId() + ".txt";
+            String filename = "pasco2Result." + indexFile.getId() + ".txt"; //NON-NLS
             boolean bPascProcSuccess = executePasco(temps, filename);
 
             //At this point pasco2 proccessed the index files.
@@ -335,7 +335,7 @@ class ExtractIE extends Extract {
                 //Delete index<n>.dat file since it was succcessfully by Pasco
                 datFile.delete();
             } else {
-                logger.log(Level.WARNING, "pasco execution failed on: {0}", this.getName());
+                logger.log(Level.WARNING, "pasco execution failed on: {0}", this.getName()); //NON-NLS
                 this.addErrorMessage(
                         NbBundle.getMessage(this.getClass(), "ExtractIE.getHistory.errMsg.errProcHist", this.getName()));
             }
@@ -359,19 +359,19 @@ class ExtractIE extends Extract {
         Writer writer = null;
         try {
             final String outputFileFullPath = moduleTempResultsDir + File.separator + outputFileName;
-            logger.log(Level.INFO, "Writing pasco results to: {0}", outputFileFullPath);
+            logger.log(Level.INFO, "Writing pasco results to: {0}", outputFileFullPath); //NON-NLS
             writer = new FileWriter(outputFileFullPath);
             execPasco = new ExecUtil();
             execPasco.execute(writer, JAVA_PATH, 
-                    "-cp", PASCO_LIB_PATH, 
-                    "isi.pasco2.Main", "-T", "history", indexFilePath );
+                    "-cp", PASCO_LIB_PATH,  //NON-NLS
+                    "isi.pasco2.Main", "-T", "history", indexFilePath ); //NON-NLS
             // @@@ Investigate use of history versus cache as type.
         } catch (IOException ex) {
             success = false;
-            logger.log(Level.SEVERE, "Unable to execute Pasco to process Internet Explorer web history.", ex);
+            logger.log(Level.SEVERE, "Unable to execute Pasco to process Internet Explorer web history.", ex); //NON-NLS
         } catch (InterruptedException ex) {
             success = false;
-            logger.log(Level.SEVERE, "Pasco has been interrupted, failed to extract some web history from Internet Explorer.", ex);
+            logger.log(Level.SEVERE, "Pasco has been interrupted, failed to extract some web history from Internet Explorer.", ex); //NON-NLS
         }
         finally {
             if (writer != null) {
@@ -379,7 +379,7 @@ class ExtractIE extends Extract {
                     writer.flush();
                     writer.close();
                 } catch (IOException ex) {
-                    logger.log(Level.WARNING, "Error closing writer stream after for Pasco result", ex);
+                    logger.log(Level.WARNING, "Error closing writer stream after for Pasco result", ex); //NON-NLS
                 }
             }
         }
@@ -400,7 +400,7 @@ class ExtractIE extends Extract {
             this.addErrorMessage(
                     NbBundle.getMessage(this.getClass(), "ExtractIE.parsePascoOutput.errMsg.notFound", this.getName(),
                                         file.getName()));
-            logger.log(Level.WARNING, "Pasco Output not found: {0}", file.getPath());
+            logger.log(Level.WARNING, "Pasco Output not found: {0}", file.getPath()); //NON-NLS
             return;
         }
 
@@ -417,20 +417,20 @@ class ExtractIE extends Extract {
             this.addErrorMessage(
                     NbBundle.getMessage(this.getClass(), "ExtractIE.parsePascoOutput.errMsg.errParsing", this.getName(),
                                         file.getName()));
-            logger.log(Level.WARNING, "Unable to find the Pasco file at " + file.getPath(), ex);
+            logger.log(Level.WARNING, "Unable to find the Pasco file at " + file.getPath(), ex); //NON-NLS
             return;
         }
 
         while (fileScanner.hasNext()) {
             String line = fileScanner.nextLine();
-            if (!line.startsWith("URL")) {  
+            if (!line.startsWith("URL")) {   //NON-NLS
                 continue;
             }
 
-            String[] lineBuff = line.split("\\t");
+            String[] lineBuff = line.split("\\t"); //NON-NLS
 
             if (lineBuff.length < 4) {
-                logger.log(Level.INFO, "Found unrecognized IE history format.");
+                logger.log(Level.INFO, "Found unrecognized IE history format."); //NON-NLS
                 continue;
             }
 
@@ -448,14 +448,14 @@ class ExtractIE extends Extract {
             if (lineBuff[1].contains("@")) {
                 String url[] = lineBuff[1].split("@", 2);
                 user = url[0];
-                user = user.replace("Visited:", "");
-                user = user.replace(":Host:", "");
+                user = user.replace("Visited:", ""); //NON-NLS
+                user = user.replace(":Host:", ""); //NON-NLS
                 user = user.replaceAll("(:)(.*?)(:)", "");
                 user = user.trim();
                 realurl = url[1];
-                realurl = realurl.replace("Visited:", "");
+                realurl = realurl.replace("Visited:", ""); //NON-NLS
                 realurl = realurl.replaceAll(":(.*?):", "");
-                realurl = realurl.replace(":Host:", "");
+                realurl = realurl.replace(":Host:", ""); //NON-NLS
                 realurl = realurl.trim();
             } else {
                 user = "";
@@ -465,7 +465,7 @@ class ExtractIE extends Extract {
             domain = Util.extractDomain(realurl);
 
             if (!ddtime.isEmpty()) {
-                ddtime = ddtime.replace("T", " ");
+                ddtime = ddtime.replace("T", " "); //NON-NLS
                 ddtime = ddtime.substring(ddtime.length() - 5);
             }
 
@@ -478,7 +478,7 @@ class ExtractIE extends Extract {
                     this.addErrorMessage(
                             NbBundle.getMessage(this.getClass(), "ExtractIE.parsePascoOutput.errMsg.errParsingEntry",
                                                 this.getName()));
-                    logger.log(Level.SEVERE, "Error parsing Pasco results.", e);
+                    logger.log(Level.SEVERE, "Error parsing Pasco results.", e); //NON-NLS
                 }
             }
 
@@ -510,7 +510,7 @@ class ExtractIE extends Extract {
                                                                              "ExtractIE.parentModuleName.noSpace"), user));
                 bbart.addAttributes(bbattributes);
             } catch (TskCoreException ex) {
-                logger.log(Level.SEVERE, "Error writing Internet Explorer web history artifact to the blackboard.", ex);
+                logger.log(Level.SEVERE, "Error writing Internet Explorer web history artifact to the blackboard.", ex); //NON-NLS
             }                                    
         }
         fileScanner.close();        
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
index 2e3cadcde9..81049cb211 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
@@ -69,9 +69,9 @@ class ExtractRegistry extends Extract {
 
     //hide public constructor to prevent from instantiation by ingest module loader
     ExtractRegistry() {
-        final File rrRoot = InstalledFileLocator.getDefault().locate("rr", ExtractRegistry.class.getPackage().getName(), false);
+        final File rrRoot = InstalledFileLocator.getDefault().locate("rr", ExtractRegistry.class.getPackage().getName(), false); //NON-NLS
         if (rrRoot == null) {
-            logger.log(Level.SEVERE, "RegRipper not found");
+            logger.log(Level.SEVERE, "RegRipper not found"); //NON-NLS
             rrFound = false;
             return;
         } else {
@@ -79,29 +79,29 @@ class ExtractRegistry extends Extract {
         }
         
         final String rrHome = rrRoot.getAbsolutePath();
-        logger.log(Level.INFO, "RegRipper home: {0}", rrHome);
+        logger.log(Level.INFO, "RegRipper home: {0}", rrHome); //NON-NLS
 
         if (PlatformUtil.isWindowsOS()) {
-            RR_PATH = rrHome + File.separator + "rip.exe";
+            RR_PATH = rrHome + File.separator + "rip.exe"; //NON-NLS
         } else {
-            RR_PATH = "perl " + rrHome + File.separator + "rip.pl";
+            RR_PATH = "perl " + rrHome + File.separator + "rip.pl"; //NON-NLS
         }
         
-        final File rrFullRoot = InstalledFileLocator.getDefault().locate("rr-full", ExtractRegistry.class.getPackage().getName(), false);
+        final File rrFullRoot = InstalledFileLocator.getDefault().locate("rr-full", ExtractRegistry.class.getPackage().getName(), false); //NON-NLS
         if (rrFullRoot == null) {
-            logger.log(Level.SEVERE, "RegRipper Full not found");
+            logger.log(Level.SEVERE, "RegRipper Full not found"); //NON-NLS
             rrFullFound = false;
         } else {
             rrFullFound = true;
         }
         
         final String rrFullHome = rrFullRoot.getAbsolutePath();
-        logger.log(Level.INFO, "RegRipper Full home: {0}", rrFullHome);
+        logger.log(Level.INFO, "RegRipper Full home: {0}", rrFullHome); //NON-NLS
 
         if (PlatformUtil.isWindowsOS()) {
-            RR_FULL_PATH = rrFullHome + File.separator + "rip.exe";
+            RR_FULL_PATH = rrFullHome + File.separator + "rip.exe"; //NON-NLS
         } else {
-            RR_FULL_PATH = "perl " + rrFullHome + File.separator + "rip.pl";
+            RR_FULL_PATH = "perl " + rrFullHome + File.separator + "rip.pl"; //NON-NLS
         }
     }
     
@@ -114,17 +114,17 @@ class ExtractRegistry extends Extract {
         
         // find the user-specific ntuser-dat files
         try {
-            allRegistryFiles.addAll(fileManager.findFiles(dataSource, "ntuser.dat"));
+            allRegistryFiles.addAll(fileManager.findFiles(dataSource, "ntuser.dat")); //NON-NLS
         } 
         catch (TskCoreException ex) {
-            logger.log(Level.WARNING, "Error fetching 'ntuser.dat' file.");
+            logger.log(Level.WARNING, "Error fetching 'ntuser.dat' file."); //NON-NLS
         }
 
         // find the system hives'
-        String[] regFileNames = new String[] {"system", "software", "security", "sam"};
+        String[] regFileNames = new String[] {"system", "software", "security", "sam"}; //NON-NLS
         for (String regFileName : regFileNames) {
             try {
-                allRegistryFiles.addAll(fileManager.findFiles(dataSource, regFileName, "/system32/config"));
+                allRegistryFiles.addAll(fileManager.findFiles(dataSource, regFileName, "/system32/config")); //NON-NLS
             } 
             catch (TskCoreException ex) {
                 String msg = NbBundle.getMessage(this.getClass(),
@@ -145,7 +145,7 @@ class ExtractRegistry extends Extract {
         // open the log file
         FileWriter logFile = null;
         try {
-            logFile = new FileWriter(RAImageIngestModule.getRAOutputPath(currentCase, "reg") + File.separator + "regripper-info.txt");
+            logFile = new FileWriter(RAImageIngestModule.getRAOutputPath(currentCase, "reg") + File.separator + "regripper-info.txt"); //NON-NLS
         } catch (IOException ex) {
             java.util.logging.Logger.getLogger(ExtractRegistry.class.getName()).log(Level.SEVERE, null, ex);
         }
@@ -156,12 +156,12 @@ class ExtractRegistry extends Extract {
         for (AbstractFile regFile : allRegistryFiles) {
             String regFileName = regFile.getName();
             String regFileNameLocal = RAImageIngestModule.getRATempPath(currentCase, "reg") + File.separator + regFileName;
-            String outputPathBase = RAImageIngestModule.getRAOutputPath(currentCase, "reg") + File.separator + regFileName + "-regripper-" + Integer.toString(j++);
+            String outputPathBase = RAImageIngestModule.getRAOutputPath(currentCase, "reg") + File.separator + regFileName + "-regripper-" + Integer.toString(j++); //NON-NLS
             File regFileNameLocalFile = new File(regFileNameLocal);
             try {
                 ContentUtils.writeToFile(regFile, regFileNameLocalFile);
             } catch (IOException ex) {
-                logger.log(Level.SEVERE, "Error writing the temp registry file. {0}", ex);
+                logger.log(Level.SEVERE, "Error writing the temp registry file. {0}", ex); //NON-NLS
                 this.addErrorMessage(
                         NbBundle.getMessage(this.getClass(), "ExtractRegistry.analyzeRegFiles.errMsg.errWritingTemp",
                                             this.getName(), regFileName));
@@ -181,7 +181,7 @@ class ExtractRegistry extends Extract {
                 java.util.logging.Logger.getLogger(ExtractRegistry.class.getName()).log(Level.SEVERE, null, ex);
             }
             
-            logger.log(Level.INFO, moduleName + "- Now getting registry information from " + regFileNameLocal);
+            logger.log(Level.INFO, moduleName + "- Now getting registry information from " + regFileNameLocal); //NON-NLS
             RegOutputFiles regOutputFiles = executeRegRip(regFileNameLocal, outputPathBase);
             
             if (context.isJobCancelled()) {
@@ -226,7 +226,7 @@ class ExtractRegistry extends Extract {
                         try {
                             input.close();
                         } catch (IOException ex) {
-                            logger.log(Level.WARNING, "Failed to close reader.", ex);
+                            logger.log(Level.WARNING, "Failed to close reader.", ex); //NON-NLS
                         }
                     }
                     att = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_TEXT.getTypeID(),
@@ -273,23 +273,23 @@ class ExtractRegistry extends Extract {
 
         RegOutputFiles regOutputFiles = new RegOutputFiles();
         
-        if (regFilePath.toLowerCase().contains("system")) {
-            autopsyType = "autopsysystem";
-            fullType = "system";
+        if (regFilePath.toLowerCase().contains("system")) { //NON-NLS
+            autopsyType = "autopsysystem"; //NON-NLS
+            fullType = "system"; //NON-NLS
         } 
-        else if (regFilePath.toLowerCase().contains("software")) {
-            autopsyType = "autopsysoftware";
-            fullType = "software";
+        else if (regFilePath.toLowerCase().contains("software")) { //NON-NLS
+            autopsyType = "autopsysoftware"; //NON-NLS
+            fullType = "software"; //NON-NLS
         } 
-        else if (regFilePath.toLowerCase().contains("ntuser")) {
-            autopsyType = "autopsyntuser";
-            fullType = "ntuser";
+        else if (regFilePath.toLowerCase().contains("ntuser")) { //NON-NLS
+            autopsyType = "autopsyntuser"; //NON-NLS
+            fullType = "ntuser"; //NON-NLS
         }  
-        else if (regFilePath.toLowerCase().contains("sam")) {
-            fullType = "sam";
+        else if (regFilePath.toLowerCase().contains("sam")) { //NON-NLS
+            fullType = "sam"; //NON-NLS
         } 
-        else if (regFilePath.toLowerCase().contains("security")) {
-            fullType = "security";
+        else if (regFilePath.toLowerCase().contains("security")) { //NON-NLS
+            fullType = "security"; //NON-NLS
         } 
         else {
             return regOutputFiles;
@@ -300,19 +300,19 @@ class ExtractRegistry extends Extract {
             // TODO - add error messages
             Writer writer = null;
             try {
-                regOutputFiles.autopsyPlugins = outFilePathBase + "-autopsy.txt";
-                logger.log(Level.INFO, "Writing RegRipper results to: " + regOutputFiles.autopsyPlugins);
+                regOutputFiles.autopsyPlugins = outFilePathBase + "-autopsy.txt"; //NON-NLS
+                logger.log(Level.INFO, "Writing RegRipper results to: " + regOutputFiles.autopsyPlugins); //NON-NLS
                 writer = new FileWriter(regOutputFiles.autopsyPlugins);
                 execRR = new ExecUtil();
                 execRR.execute(writer, RR_PATH,
-                        "-r", regFilePath, "-f", autopsyType);
+                        "-r", regFilePath, "-f", autopsyType); //NON-NLS
             } catch (IOException ex) {
-                logger.log(Level.SEVERE, "Unable to RegRipper and process parse some registry files.", ex);
+                logger.log(Level.SEVERE, "Unable to RegRipper and process parse some registry files.", ex); //NON-NLS
                 this.addErrorMessage(
                         NbBundle.getMessage(this.getClass(), "ExtractRegistry.execRegRip.errMsg.failedAnalyzeRegFile",
                                             this.getName()));
             } catch (InterruptedException ex) {
-                logger.log(Level.SEVERE, "RegRipper has been interrupted, failed to parse registry.", ex);
+                logger.log(Level.SEVERE, "RegRipper has been interrupted, failed to parse registry.", ex); //NON-NLS
                 this.addErrorMessage(
                         NbBundle.getMessage(this.getClass(), "ExtractRegistry.execRegRip.errMsg.failedAnalyzeRegFile2",
                                             this.getName()));
@@ -321,7 +321,7 @@ class ExtractRegistry extends Extract {
                     try {
                         writer.close();
                     } catch (IOException ex) {
-                        logger.log(Level.SEVERE, "Error closing output writer after running RegRipper", ex);
+                        logger.log(Level.SEVERE, "Error closing output writer after running RegRipper", ex); //NON-NLS
                     }
                 }
             }
@@ -331,19 +331,19 @@ class ExtractRegistry extends Extract {
         if (!fullType.isEmpty() && rrFullFound) {
             Writer writer = null;
             try {
-                regOutputFiles.fullPlugins = outFilePathBase + "-full.txt";
-                logger.log(Level.INFO, "Writing Full RegRipper results to: " + regOutputFiles.fullPlugins);
+                regOutputFiles.fullPlugins = outFilePathBase + "-full.txt"; //NON-NLS
+                logger.log(Level.INFO, "Writing Full RegRipper results to: " + regOutputFiles.fullPlugins); //NON-NLS
                 writer = new FileWriter(regOutputFiles.fullPlugins);
                 execRR = new ExecUtil();
                 execRR.execute(writer, RR_FULL_PATH,
-                        "-r", regFilePath, "-f", fullType);
+                        "-r", regFilePath, "-f", fullType); //NON-NLS
             } catch (IOException ex) {
-                logger.log(Level.SEVERE, "Unable to run full RegRipper and process parse some registry files.", ex);
+                logger.log(Level.SEVERE, "Unable to run full RegRipper and process parse some registry files.", ex); //NON-NLS
                 this.addErrorMessage(
                         NbBundle.getMessage(this.getClass(), "ExtractRegistry.execRegRip.errMsg.failedAnalyzeRegFile3",
                                             this.getName()));
             } catch (InterruptedException ex) {
-                logger.log(Level.SEVERE, "RegRipper full has been interrupted, failed to parse registry.", ex);
+                logger.log(Level.SEVERE, "RegRipper full has been interrupted, failed to parse registry.", ex); //NON-NLS
                 this.addErrorMessage(
                         NbBundle.getMessage(this.getClass(), "ExtractRegistry.execRegRip.errMsg.failedAnalyzeRegFile4",
                                             this.getName()));
@@ -352,7 +352,7 @@ class ExtractRegistry extends Extract {
                     try {
                         writer.close();
                     } catch (IOException ex) {
-                        logger.log(Level.SEVERE, "Error closing output writer after running RegRipper full", ex);
+                        logger.log(Level.SEVERE, "Error closing output writer after running RegRipper full", ex); //NON-NLS
                     }
                 }
             }
@@ -371,14 +371,14 @@ class ExtractRegistry extends Extract {
             File regfile = new File(regRecord);
             fstream = new FileInputStream(regfile);
             
-            String regString = new Scanner(fstream, "UTF-8").useDelimiter("\\Z").next();
-            String startdoc = "<?xml version=\"1.0\"?><document>";
+            String regString = new Scanner(fstream, "UTF-8").useDelimiter("\\Z").next(); //NON-NLS
+            String startdoc = "<?xml version=\"1.0\"?><document>"; //NON-NLS
             String result = regString.replaceAll("----------------------------------------", "");
-            result = result.replaceAll("\\n", "");
-            result = result.replaceAll("\\r", "");
-            result = result.replaceAll("'", "&apos;");
-            result = result.replaceAll("&", "&amp;");
-            String enddoc = "</document>";
+            result = result.replaceAll("\\n", ""); //NON-NLS
+            result = result.replaceAll("\\r", ""); //NON-NLS
+            result = result.replaceAll("'", "&apos;"); //NON-NLS
+            result = result.replaceAll("&", "&amp;"); //NON-NLS
+            String enddoc = "</document>"; //NON-NLS
             String stringdoc = startdoc + result + enddoc;
             DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
             Document doc = builder.parse(new InputSource(new StringReader(stringdoc)));
@@ -392,7 +392,7 @@ class ExtractRegistry extends Extract {
                 
                 String dataType = tempnode.getNodeName();
 
-                NodeList timenodes = tempnode.getElementsByTagName("mtime");
+                NodeList timenodes = tempnode.getElementsByTagName("mtime"); //NON-NLS
                 Long mtime = null;
                 if (timenodes.getLength() > 0) {
                     Element timenode = (Element) timenodes.item(0);
@@ -403,11 +403,11 @@ class ExtractRegistry extends Extract {
                         String Tempdate = mtime.toString();
                         mtime = Long.valueOf(Tempdate) / 1000;
                     } catch (ParseException ex) {
-                        logger.log(Level.WARNING, "Failed to parse epoch time when parsing the registry.");
+                        logger.log(Level.WARNING, "Failed to parse epoch time when parsing the registry."); //NON-NLS
                     }
                 }
 
-                NodeList artroots = tempnode.getElementsByTagName("artifacts");
+                NodeList artroots = tempnode.getElementsByTagName("artifacts"); //NON-NLS
                 if (artroots.getLength() == 0) {
                     // If there isn't an artifact node, skip this entry
                     continue;
@@ -425,7 +425,7 @@ class ExtractRegistry extends Extract {
                         String value = artnode.getTextContent().trim();
                         Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
 
-                        if ("recentdocs".equals(dataType)) {
+                        if ("recentdocs".equals(dataType)) { //NON-NLS
                             //               BlackboardArtifact bbart = tempDb.getContentById(orgId).newArtifact(ARTIFACT_TYPE.TSK_RECENT_OBJECT);
                             //               bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_LAST_ACCESSED.getTypeID(), "RecentActivity", dataType, mtime));
                             //               bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(), "RecentActivity", dataType, mtimeItem));
@@ -433,18 +433,18 @@ class ExtractRegistry extends Extract {
                             //               bbart.addAttributes(bbattributes);
                             // @@@ BC: Why are we ignoring this...
                         } 
-                        else if ("usb".equals(dataType)) {
+                        else if ("usb".equals(dataType)) { //NON-NLS
                             try {      
-                                Long usbMtime = Long.parseLong(artnode.getAttribute("mtime"));
+                                Long usbMtime = Long.parseLong(artnode.getAttribute("mtime")); //NON-NLS
                                 usbMtime = Long.valueOf(usbMtime.toString());
 
                                 BlackboardArtifact bbart = tempDb.getContentById(orgId).newArtifact(ARTIFACT_TYPE.TSK_DEVICE_ATTACHED);
                                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(),
                                                                          NbBundle.getMessage(this.getClass(),
                                                                                              "ExtractRegistry.parentModuleName.noSpace"), usbMtime));
-                                String dev = artnode.getAttribute("dev");       
+                                String dev = artnode.getAttribute("dev"); //NON-NLS
                                 String model = dev; 
-                                if (dev.toLowerCase().contains("vid")) {
+                                if (dev.toLowerCase().contains("vid")) { //NON-NLS
                                     USBInfo info = extrctr.parseAndLookup(dev);
                                     if(info.getVendor()!=null)
                                         bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DEVICE_MAKE.getTypeID(),
@@ -461,17 +461,17 @@ class ExtractRegistry extends Extract {
                                                                                              "ExtractRegistry.parentModuleName.noSpace"), value));
                                 bbart.addAttributes(bbattributes);
                             } catch (TskCoreException ex) {
-                                logger.log(Level.SEVERE, "Error adding device attached artifact to blackboard.");
+                                logger.log(Level.SEVERE, "Error adding device attached artifact to blackboard."); //NON-NLS
                             }
                         } 
-                        else if ("uninstall".equals(dataType)) {
+                        else if ("uninstall".equals(dataType)) { //NON-NLS
                             Long itemMtime = null;
                             try {
-                                Long epochtime = new SimpleDateFormat("EEE MMM d HH:mm:ss yyyy").parse(artnode.getAttribute("mtime")).getTime();
+                                Long epochtime = new SimpleDateFormat("EEE MMM d HH:mm:ss yyyy").parse(artnode.getAttribute("mtime")).getTime(); //NON-NLS
                                 itemMtime = epochtime.longValue();
                                 itemMtime = itemMtime / 1000;
                             } catch (ParseException e) {
-                                logger.log(Level.WARNING, "Failed to parse epoch time for installed program artifact.");
+                                logger.log(Level.WARNING, "Failed to parse epoch time for installed program artifact."); //NON-NLS
                             }
 
                             try {
@@ -484,19 +484,19 @@ class ExtractRegistry extends Extract {
                                 BlackboardArtifact bbart = tempDb.getContentById(orgId).newArtifact(ARTIFACT_TYPE.TSK_INSTALLED_PROG);
                                 bbart.addAttributes(bbattributes);
                             } catch (TskCoreException ex) {
-                                logger.log(Level.SEVERE, "Error adding installed program artifact to blackboard.");
+                                logger.log(Level.SEVERE, "Error adding installed program artifact to blackboard."); //NON-NLS
                             }
                         } 
-                        else if ("WinVersion".equals(dataType)) {
-                            String name = artnode.getAttribute("name");
+                        else if ("WinVersion".equals(dataType)) { //NON-NLS
+                            String name = artnode.getAttribute("name"); //NON-NLS
 
-                            if (name.contains("ProductName")) {
+                            if (name.contains("ProductName")) { //NON-NLS
                                 winver = value;
                             }
-                            if (name.contains("CSDVersion")) {
+                            if (name.contains("CSDVersion")) { //NON-NLS
                                 winver = winver + " " + value;
                             }
-                            if (name.contains("InstallDate")) {
+                            if (name.contains("InstallDate")) { //NON-NLS
                                 Long installtime = null;
                                 try {
                                     Long epochtime = new SimpleDateFormat("EEE MMM d HH:mm:ss yyyy").parse(value).getTime();
@@ -504,7 +504,7 @@ class ExtractRegistry extends Extract {
                                     String Tempdate = installtime.toString();
                                     installtime = Long.valueOf(Tempdate) / 1000;
                                 } catch (ParseException e) {
-                                    logger.log(Level.SEVERE, "RegRipper::Conversion on DateTime -> ", e);
+                                    logger.log(Level.SEVERE, "RegRipper::Conversion on DateTime -> ", e); //NON-NLS
                                 }
                                 try {
                                     bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),
@@ -516,12 +516,12 @@ class ExtractRegistry extends Extract {
                                     BlackboardArtifact bbart = tempDb.getContentById(orgId).newArtifact(ARTIFACT_TYPE.TSK_INSTALLED_PROG);
                                     bbart.addAttributes(bbattributes);
                                 } catch (TskCoreException ex) {
-                                    logger.log(Level.SEVERE, "Error adding installed program artifact to blackboard.");
+                                    logger.log(Level.SEVERE, "Error adding installed program artifact to blackboard."); //NON-NLS
                                 }
                             }
                         } 
-                        else if ("office".equals(dataType)) {
-                            String name = artnode.getAttribute("name");
+                        else if ("office".equals(dataType)) { //NON-NLS
+                            String name = artnode.getAttribute("name"); //NON-NLS
                             
                             try {
                                 BlackboardArtifact bbart = tempDb.getContentById(orgId).newArtifact(ARTIFACT_TYPE.TSK_RECENT_OBJECT);
@@ -542,7 +542,7 @@ class ExtractRegistry extends Extract {
                                                                                              "ExtractRegistry.parentModuleName.noSpace"), artnode.getNodeName()));
                                 bbart.addAttributes(bbattributes);
                             } catch (TskCoreException ex) {
-                                logger.log(Level.SEVERE, "Error adding recent object artifact to blackboard.");
+                                logger.log(Level.SEVERE, "Error adding recent object artifact to blackboard."); //NON-NLS
                             }
                         }
                     }
@@ -550,13 +550,13 @@ class ExtractRegistry extends Extract {
             }
             return true;
         } catch (FileNotFoundException ex) {
-            logger.log(Level.SEVERE, "Error finding the registry file.");
+            logger.log(Level.SEVERE, "Error finding the registry file."); //NON-NLS
         } catch (SAXException ex) {
-            logger.log(Level.SEVERE, "Error parsing the registry XML: {0}", ex);
+            logger.log(Level.SEVERE, "Error parsing the registry XML: {0}", ex); //NON-NLS
         } catch (IOException ex) {
-            logger.log(Level.SEVERE, "Error building the document parser: {0}", ex);
+            logger.log(Level.SEVERE, "Error building the document parser: {0}", ex); //NON-NLS
         } catch (ParserConfigurationException ex) {
-            logger.log(Level.SEVERE, "Error configuring the registry parser: {0}", ex);
+            logger.log(Level.SEVERE, "Error configuring the registry parser: {0}", ex); //NON-NLS
         } finally {
             try {
                 if (fstream != null) {
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java
index 1208d96080..61497afbb1 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java
@@ -53,12 +53,12 @@ import org.sleuthkit.datamodel.TskCoreException;
 class Firefox extends Extract {
 
     private static final Logger logger = Logger.getLogger(Firefox.class.getName());
-    private static final String historyQuery = "SELECT moz_historyvisits.id,url,title,visit_count,(visit_date/1000000) as visit_date,from_visit,(SELECT url FROM moz_places WHERE id=moz_historyvisits.from_visit) as ref FROM moz_places, moz_historyvisits WHERE moz_places.id = moz_historyvisits.place_id AND hidden = 0";
-    private static final String cookieQuery = "SELECT name,value,host,expiry,(lastAccessed/1000000) as lastAccessed,(creationTime/1000000) as creationTime FROM moz_cookies";
-    private static final String cookieQueryV3 = "SELECT name,value,host,expiry,(lastAccessed/1000000) as lastAccessed FROM moz_cookies";
-    private static final String bookmarkQuery = "SELECT fk, moz_bookmarks.title, url, (moz_bookmarks.dateAdded/1000000) as dateAdded FROM moz_bookmarks INNER JOIN moz_places ON moz_bookmarks.fk=moz_places.id";
-    private static final String downloadQuery = "SELECT target, source,(startTime/1000000) as startTime, maxBytes  FROM moz_downloads";
-    private static final String downloadQueryVersion24 = "SELECT url, content as target, (lastModified/1000000) as lastModified FROM moz_places, moz_annos WHERE moz_places.id = moz_annos.place_id AND moz_annos.anno_attribute_id = 3";
+    private static final String historyQuery = "SELECT moz_historyvisits.id,url,title,visit_count,(visit_date/1000000) as visit_date,from_visit,(SELECT url FROM moz_places WHERE id=moz_historyvisits.from_visit) as ref FROM moz_places, moz_historyvisits WHERE moz_places.id = moz_historyvisits.place_id AND hidden = 0"; //NON-NLS
+    private static final String cookieQuery = "SELECT name,value,host,expiry,(lastAccessed/1000000) as lastAccessed,(creationTime/1000000) as creationTime FROM moz_cookies"; //NON-NLS
+    private static final String cookieQueryV3 = "SELECT name,value,host,expiry,(lastAccessed/1000000) as lastAccessed FROM moz_cookies"; //NON-NLS
+    private static final String bookmarkQuery = "SELECT fk, moz_bookmarks.title, url, (moz_bookmarks.dateAdded/1000000) as dateAdded FROM moz_bookmarks INNER JOIN moz_places ON moz_bookmarks.fk=moz_places.id"; //NON-NLS
+    private static final String downloadQuery = "SELECT target, source,(startTime/1000000) as startTime, maxBytes  FROM moz_downloads"; //NON-NLS
+    private static final String downloadQueryVersion24 = "SELECT url, content as target, (lastModified/1000000) as lastModified FROM moz_places, moz_annos WHERE moz_places.id = moz_annos.place_id AND moz_annos.anno_attribute_id = 3"; //NON-NLS
     private final IngestServices services = IngestServices.getInstance();
     private Content dataSource;
     private IngestJobContext context;
@@ -82,7 +82,7 @@ class Firefox extends Extract {
         FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> historyFiles;
         try {
-            historyFiles = fileManager.findFiles(dataSource, "places.sqlite", "Firefox");
+            historyFiles = fileManager.findFiles(dataSource, "places.sqlite", "Firefox"); //NON-NLS
         } catch (TskCoreException ex) {
             String msg = NbBundle.getMessage(this.getClass(), "Firefox.getHistory.errMsg.errFetchingFiles");
             logger.log(Level.WARNING, msg);
@@ -105,11 +105,11 @@ class Firefox extends Extract {
             }
 
             String fileName = historyFile.getName();
-            String temps = RAImageIngestModule.getRATempPath(currentCase, "firefox") + File.separator + fileName + j + ".db";
+            String temps = RAImageIngestModule.getRATempPath(currentCase, "firefox") + File.separator + fileName + j + ".db"; //NON-NLS
             try {
                 ContentUtils.writeToFile(historyFile, new File(temps));
             } catch (IOException ex) {
-                logger.log(Level.SEVERE, "Error writing the sqlite db for firefox web history artifacts.{0}", ex);
+                logger.log(Level.SEVERE, "Error writing the sqlite db for firefox web history artifacts.{0}", ex); //NON-NLS
                 this.addErrorMessage(
                         NbBundle.getMessage(this.getClass(), "Firefox.getHistory.errMsg.errAnalyzeFile", this.getName(),
                                             fileName));
@@ -121,33 +121,33 @@ class Firefox extends Extract {
                 break;
             }
             List<HashMap<String, Object>> tempList = this.dbConnect(temps, historyQuery);
-            logger.log(Level.INFO, "{0} - Now getting history from {1} with {2} artifacts identified.", new Object[]{moduleName, temps, tempList.size()});
+            logger.log(Level.INFO, "{0} - Now getting history from {1} with {2} artifacts identified.", new Object[]{moduleName, temps, tempList.size()}); //NON-NLS
             for (HashMap<String, Object> result : tempList) {
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<>();
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
-                                                         ((result.get("url").toString() != null) ? result.get("url").toString() : "")));
+                                                         ((result.get("url").toString() != null) ? result.get("url").toString() : ""))); //NON-NLS
                 //bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL_DECODED.getTypeID(), "RecentActivity", ((result.get("url").toString() != null) ? EscapeUtil.decodeURL(result.get("url").toString()) : "")));
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
-                                                         (Long.valueOf(result.get("visit_date").toString()))));
+                                                         (Long.valueOf(result.get("visit_date").toString())))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_REFERRER.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
-                                                         ((result.get("ref").toString() != null) ? result.get("ref").toString() : "")));
+                                                         ((result.get("ref").toString() != null) ? result.get("ref").toString() : ""))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_TITLE.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
-                                                         ((result.get("title").toString() != null) ? result.get("title").toString() : "")));
+                                                         ((result.get("title").toString() != null) ? result.get("title").toString() : ""))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
                                                          NbBundle.getMessage(this.getClass(), "Firefox.moduleName")));
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
-                                                                             "Firefox.parentModuleName.noSpace"), (Util.extractDomain((result.get("url").toString() != null) ? result.get("url").toString() : ""))));
+                                                                             "Firefox.parentModuleName.noSpace"), (Util.extractDomain((result.get("url").toString() != null) ? result.get("url").toString() : "")))); //NON-NLS
                 this.addArtifact(ARTIFACT_TYPE.TSK_WEB_HISTORY, historyFile, bbattributes);
             }
             ++j;
@@ -166,7 +166,7 @@ class Firefox extends Extract {
         FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> bookmarkFiles;
         try {
-            bookmarkFiles = fileManager.findFiles(dataSource, "places.sqlite", "Firefox");
+            bookmarkFiles = fileManager.findFiles(dataSource, "places.sqlite", "Firefox"); //NON-NLS
         } catch (TskCoreException ex) {
             String msg = NbBundle.getMessage(this.getClass(), "Firefox.getBookmark.errMsg.errFetchFiles");
             logger.log(Level.WARNING, msg);
@@ -175,7 +175,7 @@ class Firefox extends Extract {
         }
 
         if (bookmarkFiles.isEmpty()) {
-            logger.log(Level.INFO, "Didn't find any firefox bookmark files.");
+            logger.log(Level.INFO, "Didn't find any firefox bookmark files."); //NON-NLS
             return;
         }
 
@@ -187,11 +187,11 @@ class Firefox extends Extract {
                 continue;
             }
             String fileName = bookmarkFile.getName();
-            String temps = RAImageIngestModule.getRATempPath(currentCase, "firefox") + File.separator + fileName + j + ".db";
+            String temps = RAImageIngestModule.getRATempPath(currentCase, "firefox") + File.separator + fileName + j + ".db"; //NON-NLS
             try {
                 ContentUtils.writeToFile(bookmarkFile, new File(temps));
             } catch (IOException ex) {
-                logger.log(Level.SEVERE, "Error writing the sqlite db for firefox bookmark artifacts.{0}", ex);
+                logger.log(Level.SEVERE, "Error writing the sqlite db for firefox bookmark artifacts.{0}", ex); //NON-NLS
                 this.addErrorMessage(NbBundle.getMessage(this.getClass(), "Firefox.getBookmark.errMsg.errAnalyzeFile",
                                                          this.getName(), fileName));
                 continue;
@@ -202,23 +202,23 @@ class Firefox extends Extract {
                 break;
             }
             List<HashMap<String, Object>> tempList = this.dbConnect(temps, bookmarkQuery);
-            logger.log(Level.INFO, "{0} - Now getting bookmarks from {1} with {2} artifacts identified.", new Object[]{moduleName, temps, tempList.size()});
+            logger.log(Level.INFO, "{0} - Now getting bookmarks from {1} with {2} artifacts identified.", new Object[]{moduleName, temps, tempList.size()}); //NON-NLS
             for (HashMap<String, Object> result : tempList) {
 
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<>();
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
-                                                         ((result.get("url").toString() != null) ? result.get("url").toString() : "")));
+                                                         ((result.get("url").toString() != null) ? result.get("url").toString() : ""))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_TITLE.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
-                                                         ((result.get("title").toString() != null) ? result.get("title").toString() : "")));
-                if (Long.valueOf(result.get("dateAdded").toString()) > 0) {
+                                                         ((result.get("title").toString() != null) ? result.get("title").toString() : ""))); //NON-NLS
+                if (Long.valueOf(result.get("dateAdded").toString()) > 0) { //NON-NLS
                     bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_CREATED.getTypeID(),
                                                              NbBundle.getMessage(this.getClass(),
                                                                                  "Firefox.parentModuleName.noSpace"),
-                                                             (Long.valueOf(result.get("dateAdded").toString()))));
+                                                             (Long.valueOf(result.get("dateAdded").toString())))); //NON-NLS
                 }
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
@@ -227,7 +227,7 @@ class Firefox extends Extract {
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
-                                                         (Util.extractDomain((result.get("url").toString() != null) ? result.get("url").toString() : ""))));
+                                                         (Util.extractDomain((result.get("url").toString() != null) ? result.get("url").toString() : "")))); //NON-NLS
                 this.addArtifact(ARTIFACT_TYPE.TSK_WEB_BOOKMARK, bookmarkFile, bbattributes);
 
             }
@@ -246,7 +246,7 @@ class Firefox extends Extract {
         FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> cookiesFiles;
         try {
-            cookiesFiles = fileManager.findFiles(dataSource, "cookies.sqlite", "Firefox");
+            cookiesFiles = fileManager.findFiles(dataSource, "cookies.sqlite", "Firefox"); //NON-NLS
         } catch (TskCoreException ex) {
             String msg = NbBundle.getMessage(this.getClass(), "Firefox.getCookie.errMsg.errFetchFile");
             logger.log(Level.WARNING, msg);
@@ -255,7 +255,7 @@ class Firefox extends Extract {
         }
 
         if (cookiesFiles.isEmpty()) {
-            logger.log(Level.INFO, "Didn't find any Firefox cookie files.");
+            logger.log(Level.INFO, "Didn't find any Firefox cookie files."); //NON-NLS
             return;
         }
 
@@ -266,11 +266,11 @@ class Firefox extends Extract {
                 continue;
             }
             String fileName = cookiesFile.getName();
-            String temps = RAImageIngestModule.getRATempPath(currentCase, "firefox") + File.separator + fileName + j + ".db";
+            String temps = RAImageIngestModule.getRATempPath(currentCase, "firefox") + File.separator + fileName + j + ".db"; //NON-NLS
             try {
                 ContentUtils.writeToFile(cookiesFile, new File(temps));
             } catch (IOException ex) {
-                logger.log(Level.SEVERE, "Error writing the sqlite db for firefox cookie artifacts.{0}", ex);
+                logger.log(Level.SEVERE, "Error writing the sqlite db for firefox cookie artifacts.{0}", ex); //NON-NLS
                 this.addErrorMessage(
                         NbBundle.getMessage(this.getClass(), "Firefox.getCookie.errMsg.errAnalyzeFile", this.getName(),
                                             fileName));
@@ -281,7 +281,7 @@ class Firefox extends Extract {
                 dbFile.delete();
                 break;
             }
-            boolean checkColumn = Util.checkColumn("creationTime", "moz_cookies", temps);
+            boolean checkColumn = Util.checkColumn("creationTime", "moz_cookies", temps); //NON-NLS
             String query;
             if (checkColumn) {
                 query = cookieQuery;
@@ -290,26 +290,26 @@ class Firefox extends Extract {
             }
 
             List<HashMap<String, Object>> tempList = this.dbConnect(temps, query);
-            logger.log(Level.INFO, "{0} - Now getting cookies from {1} with {2} artifacts identified.", new Object[]{moduleName, temps, tempList.size()});
+            logger.log(Level.INFO, "{0} - Now getting cookies from {1} with {2} artifacts identified.", new Object[]{moduleName, temps, tempList.size()}); //NON-NLS
             for (HashMap<String, Object> result : tempList) {
 
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<>();
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
-                                                         ((result.get("host").toString() != null) ? result.get("host").toString() : "")));
+                                                         ((result.get("host").toString() != null) ? result.get("host").toString() : ""))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
-                                                         (Long.valueOf(result.get("lastAccessed").toString()))));
+                                                         (Long.valueOf(result.get("lastAccessed").toString())))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
-                                                         ((result.get("name").toString() != null) ? result.get("name").toString() : "")));
+                                                         ((result.get("name").toString() != null) ? result.get("name").toString() : ""))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_VALUE.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
-                                                         ((result.get("value").toString() != null) ? result.get("value").toString() : "")));
+                                                         ((result.get("value").toString() != null) ? result.get("value").toString() : ""))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
@@ -319,9 +319,9 @@ class Firefox extends Extract {
                     bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_CREATED.getTypeID(),
                                                              NbBundle.getMessage(this.getClass(),
                                                                                  "Firefox.parentModuleName.noSpace"),
-                                                             (Long.valueOf(result.get("creationTime").toString()))));
+                                                             (Long.valueOf(result.get("creationTime").toString())))); //NON-NLS
                 }
-                String domain = Util.extractDomain(result.get("host").toString());
+                String domain = Util.extractDomain(result.get("host").toString()); //NON-NLS
                 domain = domain.replaceFirst("^\\.+(?!$)", "");
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
@@ -354,7 +354,7 @@ class Firefox extends Extract {
         FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> downloadsFiles;
         try {
-            downloadsFiles = fileManager.findFiles(dataSource, "downloads.sqlite", "Firefox");
+            downloadsFiles = fileManager.findFiles(dataSource, "downloads.sqlite", "Firefox"); //NON-NLS
         } catch (TskCoreException ex) {
             String msg = NbBundle.getMessage(this.getClass(), "Firefox.getDlPre24.errMsg.errFetchFiles");
             logger.log(Level.WARNING, msg);
@@ -363,7 +363,7 @@ class Firefox extends Extract {
         }
 
         if (downloadsFiles.isEmpty()) {
-            logger.log(Level.INFO, "Didn't find any pre-version-24.0 Firefox download files.");
+            logger.log(Level.INFO, "Didn't find any pre-version-24.0 Firefox download files."); //NON-NLS
             return;
         }
 
@@ -374,12 +374,12 @@ class Firefox extends Extract {
                 continue;
             }
             String fileName = downloadsFile.getName();
-            String temps = RAImageIngestModule.getRATempPath(currentCase, "firefox") + File.separator + fileName + j + ".db";
+            String temps = RAImageIngestModule.getRATempPath(currentCase, "firefox") + File.separator + fileName + j + ".db"; //NON-NLS
             int errors = 0;
             try {
                 ContentUtils.writeToFile(downloadsFile, new File(temps));
             } catch (IOException ex) {
-                logger.log(Level.SEVERE, "Error writing the sqlite db for firefox download artifacts.{0}", ex);
+                logger.log(Level.SEVERE, "Error writing the sqlite db for firefox download artifacts.{0}", ex); //NON-NLS
                 this.addErrorMessage(NbBundle.getMessage(this.getClass(), "Firefox.getDlPre24.errMsg.errAnalyzeFiles",
                                                          this.getName(), fileName));
                 continue;
@@ -391,7 +391,7 @@ class Firefox extends Extract {
             }
 
             List<HashMap<String, Object>> tempList = this.dbConnect(temps, downloadQuery);
-            logger.log(Level.INFO, moduleName + "- Now getting downloads from " + temps + " with " + tempList.size() + "artifacts identified.");
+            logger.log(Level.INFO, moduleName + "- Now getting downloads from " + temps + " with " + tempList.size() + "artifacts identified."); //NON-NLS
             for (HashMap<String, Object> result : tempList) {
 
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
@@ -399,18 +399,18 @@ class Firefox extends Extract {
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
-                                                         ((result.get("source").toString() != null) ? result.get("source").toString() : "")));
+                                                         ((result.get("source").toString() != null) ? result.get("source").toString() : ""))); //NON-NLS
                 //bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL_DECODED.getTypeID(), "RecentActivity", ((result.get("source").toString() != null) ? EscapeUtil.decodeURL(result.get("source").toString()) : "")));
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
-                                                         (Long.valueOf(result.get("startTime").toString()))));
+                                                         (Long.valueOf(result.get("startTime").toString())))); //NON-NLS
                 
-                String target = result.get("target").toString();
+                String target = result.get("target").toString(); //NON-NLS
 
                 if (target != null) {
                     try {
-                        String decodedTarget = URLDecoder.decode(target.toString().replaceAll("file:///", ""), "UTF-8");
+                        String decodedTarget = URLDecoder.decode(target.toString().replaceAll("file:///", ""), "UTF-8"); //NON-NLS
                         bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH.getTypeID(),
                                                                  NbBundle.getMessage(this.getClass(),
                                                                                      "Firefox.parentModuleName.noSpace"),
@@ -423,7 +423,7 @@ class Firefox extends Extract {
                                                                      pathID));
                         }
                     } catch (UnsupportedEncodingException ex) {
-                        logger.log(Level.SEVERE, "Error decoding Firefox download URL in " + temps, ex);
+                        logger.log(Level.SEVERE, "Error decoding Firefox download URL in " + temps, ex); //NON-NLS
                         errors++;
                     }
                 }
@@ -435,7 +435,7 @@ class Firefox extends Extract {
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
-                                                         (Util.extractDomain((result.get("source").toString() != null) ? result.get("source").toString() : ""))));
+                                                         (Util.extractDomain((result.get("source").toString() != null) ? result.get("source").toString() : "")))); //NON-NLS
                 this.addArtifact(ARTIFACT_TYPE.TSK_WEB_DOWNLOAD, downloadsFile, bbattributes);
 
             }
@@ -462,7 +462,7 @@ class Firefox extends Extract {
         FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> downloadsFiles;
         try {
-            downloadsFiles = fileManager.findFiles(dataSource, "places.sqlite", "Firefox");
+            downloadsFiles = fileManager.findFiles(dataSource, "places.sqlite", "Firefox"); //NON-NLS
         } catch (TskCoreException ex) {
             String msg = NbBundle.getMessage(this.getClass(), "Firefox.getDlV24.errMsg.errFetchFiles");
             logger.log(Level.WARNING, msg);
@@ -471,7 +471,7 @@ class Firefox extends Extract {
         }
 
         if (downloadsFiles.isEmpty()) {
-            logger.log(Level.INFO, "Didn't find any version-24.0 Firefox download files.");
+            logger.log(Level.INFO, "Didn't find any version-24.0 Firefox download files."); //NON-NLS
             return;
         }
 
@@ -482,12 +482,12 @@ class Firefox extends Extract {
                 continue;
             }
             String fileName = downloadsFile.getName();
-            String temps = RAImageIngestModule.getRATempPath(currentCase, "firefox") + File.separator + fileName + "-downloads" + j + ".db";
+            String temps = RAImageIngestModule.getRATempPath(currentCase, "firefox") + File.separator + fileName + "-downloads" + j + ".db"; //NON-NLS
             int errors = 0;
             try {
                 ContentUtils.writeToFile(downloadsFile, new File(temps));
             } catch (IOException ex) {
-                logger.log(Level.SEVERE, "Error writing the sqlite db for firefox download artifacts.{0}", ex);
+                logger.log(Level.SEVERE, "Error writing the sqlite db for firefox download artifacts.{0}", ex); //NON-NLS
                 this.addErrorMessage(
                         NbBundle.getMessage(this.getClass(), "Firefox.getDlV24.errMsg.errAnalyzeFile", this.getName(),
                                             fileName));
@@ -501,7 +501,7 @@ class Firefox extends Extract {
 
             List<HashMap<String, Object>> tempList = this.dbConnect(temps, downloadQueryVersion24);
 
-            logger.log(Level.INFO, "{0} - Now getting downloads from {1} with {2} artifacts identified.", new Object[]{moduleName, temps, tempList.size()});
+            logger.log(Level.INFO, "{0} - Now getting downloads from {1} with {2} artifacts identified.", new Object[]{moduleName, temps, tempList.size()}); //NON-NLS
             for (HashMap<String, Object> result : tempList) {
 
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<>();
@@ -509,15 +509,15 @@ class Firefox extends Extract {
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
-                                                         ((result.get("url").toString() != null) ? result.get("url").toString() : "")));
+                                                         ((result.get("url").toString() != null) ? result.get("url").toString() : ""))); //NON-NLS
                 //bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL_DECODED.getTypeID(), "RecentActivity", ((result.get("source").toString() != null) ? EscapeUtil.decodeURL(result.get("source").toString()) : "")));
                 //TODO Revisit usage of deprecated constructor as per TSK-583
                 //bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_LAST_ACCESSED.getTypeID(), "RecentActivity", "Last Visited", (Long.valueOf(result.get("startTime").toString()))));
 
-                String target = result.get("target").toString();
+                String target = result.get("target").toString(); //NON-NLS
                 if (target != null) {
                     try {
-                        String decodedTarget = URLDecoder.decode(target.toString().replaceAll("file:///", ""), "UTF-8");
+                        String decodedTarget = URLDecoder.decode(target.toString().replaceAll("file:///", ""), "UTF-8"); //NON-NLS
                         bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH.getTypeID(),
                                                                  NbBundle.getMessage(this.getClass(),
                                                                                      "Firefox.parentModuleName.noSpace"),
@@ -530,14 +530,14 @@ class Firefox extends Extract {
                                                                      pathID));
                         }
                     } catch (UnsupportedEncodingException ex) {
-                        logger.log(Level.SEVERE, "Error decoding Firefox download URL in " + temps, ex);
+                        logger.log(Level.SEVERE, "Error decoding Firefox download URL in " + temps, ex); //NON-NLS
                         errors++;
                     }
                 }
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
-                                                         Long.valueOf(result.get("lastModified").toString())));
+                                                         Long.valueOf(result.get("lastModified").toString()))); //NON-NLS
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
@@ -545,7 +545,7 @@ class Firefox extends Extract {
                 bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(),
                                                          NbBundle.getMessage(this.getClass(),
                                                                              "Firefox.parentModuleName.noSpace"),
-                                                         (Util.extractDomain((result.get("url").toString() != null) ? result.get("url").toString() : ""))));
+                                                         (Util.extractDomain((result.get("url").toString() != null) ? result.get("url").toString() : "")))); //NON-NLS
                 this.addArtifact(ARTIFACT_TYPE.TSK_WEB_DOWNLOAD, downloadsFile, bbattributes);
 
             }
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
index b8e7d2e02f..5150895502 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
@@ -95,14 +95,14 @@ public final class RAImageIngestModule extends IngestModuleAdapter implements Da
         for (int i = 0; i < extracters.size(); i++) {
             Extract extracter = extracters.get(i);
             if (context.isJobCancelled()) {
-                logger.log(Level.INFO, "Recent Activity has been canceled, quitting before {0}", extracter.getName());
+                logger.log(Level.INFO, "Recent Activity has been canceled, quitting before {0}", extracter.getName()); //NON-NLS
                 break;
             }
 
             try {
                 extracter.process(dataSource, context);
             } catch (Exception ex) {
-                logger.log(Level.SEVERE, "Exception occurred in " + extracter.getName(), ex);
+                logger.log(Level.SEVERE, "Exception occurred in " + extracter.getName(), ex); //NON-NLS
                 subCompleted.append(NbBundle.getMessage(this.getClass(), "RAImageIngestModule.process.errModFailed",
                                                         extracter.getName()));
                 errors.add(
@@ -121,9 +121,9 @@ public final class RAImageIngestModule extends IngestModuleAdapter implements Da
             errorMessage.append(
                     NbBundle.getMessage(this.getClass(), "RAImageIngestModule.process.errMsg.errsEncountered"));
             for (String msg : errors) {
-                errorMessage.append("<li>").append(msg).append("</li>\n");
+                errorMessage.append("<li>").append(msg).append("</li>\n"); //NON-NLS
             }
-            errorMessage.append("</ul>\n");
+            errorMessage.append("</ul>\n"); //NON-NLS
 
             if (errors.size() == 1) {
                 errorMsgSubject = NbBundle.getMessage(this.getClass(), "RAImageIngestModule.process.errMsgSub.oneErr");
@@ -146,13 +146,13 @@ public final class RAImageIngestModule extends IngestModuleAdapter implements Da
         historyMsg.append(
                 NbBundle.getMessage(this.getClass(), "RAImageIngestModule.process.histMsg.title", dataSource.getName()));
         for (Extract module : browserExtracters) {
-            historyMsg.append("<li>").append(module.getName());
+            historyMsg.append("<li>").append(module.getName()); //NON-NLS
             historyMsg.append(": ").append((module.foundData()) ? NbBundle
                     .getMessage(this.getClass(), "RAImageIngestModule.process.histMsg.found") : NbBundle
                     .getMessage(this.getClass(), "RAImageIngestModule.process.histMsg.notFnd"));
-            historyMsg.append("</li>");
+            historyMsg.append("</li>"); //NON-NLS
         }
-        historyMsg.append("</ul>");
+        historyMsg.append("</ul>"); //NON-NLS
         final IngestMessage inboxMsg = IngestMessage.createMessage(MessageType.INFO, RecentActivityExtracterModuleFactory.getModuleName(),
                                                                    NbBundle.getMessage(this.getClass(),
                                                                                        "RAImageIngestModule.process.ingestMsg.results",
@@ -175,7 +175,7 @@ public final class RAImageIngestModule extends IngestModuleAdapter implements Da
             try {
                 extracter.complete();
             } catch (Exception ex) {
-                logger.log(Level.SEVERE, "Exception occurred when completing " + extracter.getName(), ex);
+                logger.log(Level.SEVERE, "Exception occurred when completing " + extracter.getName(), ex); //NON-NLS
                 subCompleted.append(NbBundle.getMessage(this.getClass(), "RAImageIngestModule.complete.errMsg.failed",
                                                         extracter.getName()));
             }
@@ -187,10 +187,10 @@ public final class RAImageIngestModule extends IngestModuleAdapter implements Da
             try {
                 extracter.stop();
             } catch (Exception ex) {
-                logger.log(Level.SEVERE, "Exception during stop() of " + extracter.getName(), ex);
+                logger.log(Level.SEVERE, "Exception during stop() of " + extracter.getName(), ex); //NON-NLS
             }
         }
-        logger.log(Level.INFO, "Recent Activity processes has been shutdown.");
+        logger.log(Level.INFO, "Recent Activity processes has been shutdown."); //NON-NLS
     }
 
     /**
@@ -203,7 +203,7 @@ public final class RAImageIngestModule extends IngestModuleAdapter implements Da
      * @return Path to directory
      */
     protected static String getRATempPath(Case a_case, String mod) {
-        String tmpDir = a_case.getTempDirectory() + File.separator + "RecentActivity" + File.separator + mod;
+        String tmpDir = a_case.getTempDirectory() + File.separator + "RecentActivity" + File.separator + mod; //NON-NLS
         File dir = new File(tmpDir);
         if (dir.exists() == false) {
             dir.mkdirs();
@@ -221,7 +221,7 @@ public final class RAImageIngestModule extends IngestModuleAdapter implements Da
      * @return Path to directory
      */
     protected static String getRAOutputPath(Case a_case, String mod) {
-        String tmpDir = a_case.getModulesOutputDirAbsPath() + File.separator + "RecentActivity" + File.separator + mod;
+        String tmpDir = a_case.getModulesOutputDirAbsPath() + File.separator + "RecentActivity" + File.separator + mod; //NON-NLS
         File dir = new File(tmpDir);
         if (dir.exists() == false) {
             dir.mkdirs();
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentDocumentsByLnk.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentDocumentsByLnk.java
index bfa52c250a..7496e8a888 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentDocumentsByLnk.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentDocumentsByLnk.java
@@ -63,9 +63,9 @@ class RecentDocumentsByLnk extends Extract  {
         org.sleuthkit.autopsy.casemodule.services.FileManager fileManager = currentCase.getServices().getFileManager();
         List<AbstractFile> recentFiles;
         try {
-            recentFiles = fileManager.findFiles(dataSource, "%.lnk", "Recent");
+            recentFiles = fileManager.findFiles(dataSource, "%.lnk", "Recent"); //NON-NLS
         } catch (TskCoreException ex) {
-            logger.log(Level.WARNING, "Error searching for .lnk files.");
+            logger.log(Level.WARNING, "Error searching for .lnk files."); //NON-NLS
             this.addErrorMessage(
                     NbBundle.getMessage(this.getClass(), "RecentDocumentsByLnk.getRecDoc.errMsg.errGetLnkFiles",
                                         this.getName()));
@@ -73,7 +73,7 @@ class RecentDocumentsByLnk extends Extract  {
         }
 
         if (recentFiles.isEmpty()) {
-            logger.log(Level.INFO, "Didn't find any recent files.");
+            logger.log(Level.INFO, "Didn't find any recent files."); //NON-NLS
             return;
         }
         
@@ -95,7 +95,7 @@ class RecentDocumentsByLnk extends Extract  {
                 boolean unalloc = recentFile.isMetaFlagSet(TskData.TSK_FS_META_FLAG_ENUM.UNALLOC) 
                         || recentFile.isDirNameFlagSet(TskData.TSK_FS_NAME_FLAG_ENUM.UNALLOC);
                 if (unalloc == false) {
-                    logger.log(Level.SEVERE, "Error lnk parsing the file to get recent files" + recentFile, e);
+                    logger.log(Level.SEVERE, "Error lnk parsing the file to get recent files" + recentFile, e); //NON-NLS
                     this.addErrorMessage(
                             NbBundle.getMessage(this.getClass(), "RecentDocumentsByLnk.getRecDoc.errParsingFile",
                                                 this.getName(), recentFile.getName()));
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java
index ae79d56ad5..1d86d99a35 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java
@@ -63,8 +63,8 @@ import org.xml.sax.SAXException;
 class SearchEngineURLQueryAnalyzer extends Extract {
 
     private static final Logger logger = Logger.getLogger(SearchEngineURLQueryAnalyzer.class.getName());
-    private static final String XMLFILE = "SEUQAMappings.xml";
-    private static final String XSDFILE = "SearchEngineSchema.xsd";
+    private static final String XMLFILE = "SEUQAMappings.xml"; //NON-NLS
+    private static final String XSDFILE = "SearchEngineSchema.xsd"; //NON-NLS
     private static String[] searchEngineNames;
     private static SearchEngineURLQueryAnalyzer.SearchEngine[] engines;
     private static Document xmlinput;
@@ -124,19 +124,19 @@ class SearchEngineURLQueryAnalyzer extends Extract {
     }
 
     private void createEngines() {
-        NodeList nlist = xmlinput.getElementsByTagName("SearchEngine");
+        NodeList nlist = xmlinput.getElementsByTagName("SearchEngine"); //NON-NLS
         SearchEngineURLQueryAnalyzer.SearchEngine[] listEngines = new SearchEngineURLQueryAnalyzer.SearchEngine[nlist.getLength()];
         for (int i = 0; i < nlist.getLength(); i++) {
             NamedNodeMap nnm = nlist.item(i).getAttributes();
 
-            String EngineName = nnm.getNamedItem("engine").getNodeValue();
-            String EnginedomainSubstring = nnm.getNamedItem("domainSubstring").getNodeValue();
+            String EngineName = nnm.getNamedItem("engine").getNodeValue(); //NON-NLS
+            String EnginedomainSubstring = nnm.getNamedItem("domainSubstring").getNodeValue(); //NON-NLS
             Map<String, String> splits = new HashMap<>();
 
-            NodeList listSplits = xmlinput.getElementsByTagName("splitToken");
+            NodeList listSplits = xmlinput.getElementsByTagName("splitToken"); //NON-NLS
             for (int k = 0; k < listSplits.getLength(); k++) {
-                if (listSplits.item(k).getParentNode().getAttributes().getNamedItem("engine").getNodeValue().equals(EngineName)) {
-                    splits.put(listSplits.item(k).getAttributes().getNamedItem("plainToken").getNodeValue(), listSplits.item(k).getAttributes().getNamedItem("regexToken").getNodeValue());
+                if (listSplits.item(k).getParentNode().getAttributes().getNamedItem("engine").getNodeValue().equals(EngineName)) { //NON-NLS
+                    splits.put(listSplits.item(k).getAttributes().getNamedItem("plainToken").getNodeValue(), listSplits.item(k).getAttributes().getNamedItem("regexToken").getNodeValue()); //NON-NLS
                 }
             }
 
@@ -182,7 +182,7 @@ class SearchEngineURLQueryAnalyzer extends Extract {
      * @return The extracted search query.
      */
     private String extractSearchEngineQuery(String url) {
-        String x = "NoQuery";
+        String x = "NoQuery"; //NON-NLS
         SearchEngineURLQueryAnalyzer.SearchEngine eng = getSearchEngine(url);
         for (Map.Entry<String, String> kvp : eng.getSplits()) {
             if (url.contains(kvp.getKey())) {
@@ -191,10 +191,10 @@ class SearchEngineURLQueryAnalyzer extends Extract {
             }
         }
         try { //try to decode the url
-            String decoded = URLDecoder.decode(x, "UTF-8");
+            String decoded = URLDecoder.decode(x, "UTF-8"); //NON-NLS
             return decoded;
         } catch (UnsupportedEncodingException uee) { //if it fails, return the encoded string
-            logger.log(Level.FINE, "Error during URL decoding ", uee);
+            logger.log(Level.FINE, "Error during URL decoding ", uee); //NON-NLS
             return x;
         }
     }
@@ -209,7 +209,7 @@ class SearchEngineURLQueryAnalyzer extends Extract {
      *
      */
     private String split2(String url, String value) {
-        String basereturn = "NoQuery";
+        String basereturn = "NoQuery"; //NON-NLS
         String v = value;
         //Want to determine if string contains a string based on splitkey, but we want to split the string on splitKeyConverted due to regex
         if (value.contains("\\?")) {
@@ -230,9 +230,9 @@ class SearchEngineURLQueryAnalyzer extends Extract {
         int totalQueries = 0;
         try {
             //from blackboard_artifacts
-            Collection<BlackboardArtifact> listArtifacts = currentCase.getSleuthkitCase().getMatchingArtifacts("WHERE (`artifact_type_id` = '" + ARTIFACT_TYPE.TSK_WEB_BOOKMARK.getTypeID()
-                    + "' OR `artifact_type_id` = '" + ARTIFACT_TYPE.TSK_WEB_HISTORY.getTypeID() + "') ");  //List of every 'web_history' and 'bookmark' artifact
-            logger.log(Level.INFO, "Processing {0} blackboard artifacts.", listArtifacts.size());
+            Collection<BlackboardArtifact> listArtifacts = currentCase.getSleuthkitCase().getMatchingArtifacts("WHERE (`artifact_type_id` = '" + ARTIFACT_TYPE.TSK_WEB_BOOKMARK.getTypeID() //NON-NLS
+                    + "' OR `artifact_type_id` = '" + ARTIFACT_TYPE.TSK_WEB_HISTORY.getTypeID() + "') ");  //List of every 'web_history' and 'bookmark' artifact NON-NLS
+            logger.log(Level.INFO, "Processing {0} blackboard artifacts.", listArtifacts.size()); //NON-NLS
             getAll:
             for (BlackboardArtifact artifact : listArtifacts) {
                 //initializing default attributes
@@ -255,7 +255,7 @@ class SearchEngineURLQueryAnalyzer extends Extract {
 
                 SearchEngineURLQueryAnalyzer.SearchEngine se = NullEngine;
                 //from blackboard_attributes
-                Collection<BlackboardAttribute> listAttributes = currentCase.getSleuthkitCase().getMatchingAttributes("Where `artifact_id` = " + artifact.getArtifactID());
+                Collection<BlackboardAttribute> listAttributes = currentCase.getSleuthkitCase().getMatchingAttributes("Where `artifact_id` = " + artifact.getArtifactID()); //NON-NLS
                 getAttributes:
                 for (BlackboardAttribute attribute : listAttributes) {
                     if (context.isJobCancelled()) {
@@ -266,7 +266,7 @@ class SearchEngineURLQueryAnalyzer extends Extract {
                         se = getSearchEngine(urlString);
                         if (!se.equals(NullEngine)) {
                             query = extractSearchEngineQuery(attribute.getValueString());
-                            if (query.equals("NoQuery") || query.equals("")) {   //False positive match, artifact was not a query.
+                            if (query.equals("NoQuery") || query.equals("")) {   //False positive match, artifact was not a query. NON-NLS
                                 break getAttributes;
                             }
                         } else if (se.equals(NullEngine)) {
@@ -281,7 +281,7 @@ class SearchEngineURLQueryAnalyzer extends Extract {
                     }
                 }
 
-                if (!se.equals(NullEngine) && !query.equals("NoQuery") && !query.equals("")) {
+                if (!se.equals(NullEngine) && !query.equals("NoQuery") && !query.equals("")) { //NON-NLS
                     Collection<BlackboardAttribute> bbattributes = new ArrayList<>();
                     bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(),
                                                              NbBundle.getMessage(this.getClass(),
@@ -301,15 +301,15 @@ class SearchEngineURLQueryAnalyzer extends Extract {
                 }
             }
         } catch (TskException e) {
-            logger.log(Level.SEVERE, "Encountered error retrieving artifacts for search engine queries", e);
+            logger.log(Level.SEVERE, "Encountered error retrieving artifacts for search engine queries", e); //NON-NLS
         } finally {
             if (context.isJobCancelled()) {
-                logger.info("Operation terminated by user.");
+                logger.info("Operation terminated by user."); //NON-NLS
             }
             IngestServices.getInstance().fireModuleDataEvent(new ModuleDataEvent(
                     NbBundle.getMessage(this.getClass(), "SearchEngineURLQueryAnalyzer.parentModuleName.noSpace"),
                     BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_SEARCH_QUERY));
-            logger.log(Level.INFO, "Extracted {0} queries from the blackboard", totalQueries);
+            logger.log(Level.INFO, "Extracted {0} queries from the blackboard", totalQueries); //NON-NLS
         }
     }
 
@@ -329,7 +329,7 @@ class SearchEngineURLQueryAnalyzer extends Extract {
         this.dataSource = dataSource;
         this.context = context;
         this.getURLs();
-        logger.log(Level.INFO, "Search Engine stats: \n{0}", getTotals());
+        logger.log(Level.INFO, "Search Engine stats: \n{0}", getTotals()); //NON-NLS
     }
 
     @Override
@@ -338,7 +338,8 @@ class SearchEngineURLQueryAnalyzer extends Extract {
             PlatformUtil.extractResourceToUserConfigDir(SearchEngineURLQueryAnalyzer.class, XMLFILE, false);
             init2();
         } catch (IOException e) {
-            String message = "Unable to find " + XMLFILE;
+            String message = NbBundle
+                    .getMessage(this.getClass(), "SearchEngineURLQueryAnalyzer.init.exception.msg", XMLFILE);
             logger.log(Level.SEVERE, message, e);
             throw new IngestModuleException(message);
         }
@@ -348,33 +349,33 @@ class SearchEngineURLQueryAnalyzer extends Extract {
         try {
             String path = PlatformUtil.getUserConfigDirectory() + File.separator + XMLFILE;
             File f = new File(path);
-            logger.log(Level.INFO, "Load successful");
+            logger.log(Level.INFO, "Load successful"); //NON-NLS
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
             DocumentBuilder db = dbf.newDocumentBuilder();
             Document xml = db.parse(f);
             xmlinput = xml;
 
             if (!XMLUtil.xmlIsValid(xml, SearchEngineURLQueryAnalyzer.class, XSDFILE)) {
-                logger.log(Level.WARNING, "Error loading Search Engines: could not validate against [" + XSDFILE + "], results may not be accurate.");
+                logger.log(Level.WARNING, "Error loading Search Engines: could not validate against [" + XSDFILE + "], results may not be accurate."); //NON-NLS
             }
             createEngines();
             getSearchEngineNames();
         } catch (IOException e) {
-            logger.log(Level.SEVERE, "Was not able to load SEUQAMappings.xml", e);
+            logger.log(Level.SEVERE, "Was not able to load SEUQAMappings.xml", e); //NON-NLS
         } catch (ParserConfigurationException pce) {
-            logger.log(Level.SEVERE, "Unable to build XML parser", pce);
+            logger.log(Level.SEVERE, "Unable to build XML parser", pce); //NON-NLS
         } catch (SAXException sxe) {
-            logger.log(Level.SEVERE, "Unable to parse XML file", sxe);
+            logger.log(Level.SEVERE, "Unable to parse XML file", sxe); //NON-NLS
         }
     }
 
     @Override
     public void complete() {
-        logger.info("Search Engine URL Query Analyzer has completed.");
+        logger.info("Search Engine URL Query Analyzer has completed."); //NON-NLS
     }
 
     @Override
     public void stop() {
-        logger.info("Attempted to stop Search Engine URL Query Analyzer, but operation is not supported; skipping...");
+        logger.info("Attempted to stop Search Engine URL Query Analyzer, but operation is not supported; skipping..."); //NON-NLS
     }
 }
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/UsbDeviceIdMapper.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/UsbDeviceIdMapper.java
index b7b8abc56d..5f889d439e 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/UsbDeviceIdMapper.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/UsbDeviceIdMapper.java
@@ -42,16 +42,16 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 class UsbDeviceIdMapper {
     private static final Logger logger = Logger.getLogger(UsbDeviceIdMapper.class.getName());
     private HashMap<String, USBInfo> devices;
-    private static final String DataFile = "USB_DATA.txt";
+    private static final String DataFile = "USB_DATA.txt"; //NON-NLS
 
     public UsbDeviceIdMapper() {
         try {
             loadDeviceMap();
         } catch (FileNotFoundException ex) {
-            logger.log(Level.SEVERE, "Could not find file " + DataFile + ".", ex);
+            logger.log(Level.SEVERE, "Could not find file " + DataFile + ".", ex); //NON-NLS
             devices = null;
         } catch (IOException ex) {
-            logger.log(Level.SEVERE, "Unknown IO error occurred in method devices.", ex);
+            logger.log(Level.SEVERE, "Unknown IO error occurred in method devices.", ex); //NON-NLS
         }
     }
     
@@ -105,12 +105,12 @@ class UsbDeviceIdMapper {
                 }
                 
                 // stop once we've hitten the part of the file that starts to talk about class types
-                if (line.startsWith("C 00")) {
+                if (line.startsWith("C 00")) { //NON-NLS
                     return;
                 }
                 
                 String dvc = "";
-                String[] tokens = line.split("[\\t\\s]+");
+                String[] tokens = line.split("[\\t\\s]+"); //NON-NLS
                 String vID = tokens[0];
                 for (int n = 1; n < tokens.length; n++) {
                     dvc += tokens[n] + " ";
@@ -126,7 +126,7 @@ class UsbDeviceIdMapper {
                 line = dat.nextLine();
                 if (line.startsWith("\t")) {
                     while (dat.hasNext() && line.startsWith("\t")) {
-                        tokens = line.split("[\\t\\s]+");
+                        tokens = line.split("[\\t\\s]+"); //NON-NLS
 
                         // make key based on upper case version of vendor and product IDs
                         pID = vID + tokens[1];
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
index 9c6ea411ee..e84f653c6c 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
@@ -151,7 +151,7 @@ class Util {
 
     public static String getFileName(String value) {
         String filename = "";
-        String filematch = "^([a-zA-Z]\\:)(\\\\[^\\\\/:*?<>\"|]*(?<!\\[ \\]))*(\\.[a-zA-Z]{2,6})$";
+        String filematch = "^([a-zA-Z]\\:)(\\\\[^\\\\/:*?<>\"|]*(?<!\\[ \\]))*(\\.[a-zA-Z]{2,6})$"; //NON-NLS
 
         Pattern p = Pattern.compile(filematch, Pattern.CASE_INSENSITIVE | Pattern.DOTALL | Pattern.COMMENTS);
         Matcher m = p.matcher(value);
@@ -168,7 +168,7 @@ class Util {
         String path = "";
 
         //String drive ="([a-z]:\\\\(?:[-\\w\\.\\d]+\\\\)*(?:[-\\w\\.\\d]+)?)";	// Windows drive
-        String drive = "([a-z]:\\\\\\S.+)";
+        String drive = "([a-z]:\\\\\\S.+)"; //NON-NLS
         Pattern p = Pattern.compile(drive, Pattern.CASE_INSENSITIVE | Pattern.COMMENTS);
         Matcher m = p.matcher(txt);
         if (m.find()) {
@@ -176,7 +176,7 @@ class Util {
 
         } else {
 
-            String network = "(\\\\(?:\\\\[^:\\s?*\"<>|]+)+)";	// Windows network
+            String network = "(\\\\(?:\\\\[^:\\s?*\"<>|]+)+)";    // Windows network NON-NLS
 
             Pattern p2 = Pattern.compile(network, Pattern.CASE_INSENSITIVE | Pattern.DOTALL);
             Matcher m2 = p2.matcher(txt);
@@ -202,7 +202,7 @@ class Util {
         try {
             files = fileManager.findFiles(dataSource, name, parent_path);
         } catch (TskCoreException ex) {
-            logger.log(Level.WARNING, "Error fetching 'index.data' files for Internet Explorer history.");
+            logger.log(Level.WARNING, "Error fetching 'index.data' files for Internet Explorer history."); //NON-NLS
         }
         
         if (files == null || files.isEmpty()) {
@@ -212,19 +212,19 @@ class Util {
     }
 
     public static boolean checkColumn(String column, String tablename, String connection) {
-        String query = "PRAGMA table_info(" + tablename + ")";
+        String query = "PRAGMA table_info(" + tablename + ")"; //NON-NLS
         boolean found = false;
         ResultSet temprs;
         try {
-            SQLiteDBConnect tempdbconnect = new SQLiteDBConnect("org.sqlite.JDBC", "jdbc:sqlite:" + connection);
+            SQLiteDBConnect tempdbconnect = new SQLiteDBConnect("org.sqlite.JDBC", "jdbc:sqlite:" + connection); //NON-NLS
             temprs = tempdbconnect.executeQry(query);
             while (temprs.next()) {
-                if (temprs.getString("name") == null ? column == null : temprs.getString("name").equals(column)) {
+                if (temprs.getString("name") == null ? column == null : temprs.getString("name").equals(column)) { //NON-NLS
                     found = true;
                 }
             }
         } catch (Exception ex) {
-            logger.log(Level.WARNING, "Error while trying to get columns from sqlite db." + connection, ex);
+            logger.log(Level.WARNING, "Error while trying to get columns from sqlite db." + connection, ex); //NON-NLS
         }
         return found;
     }
@@ -232,11 +232,11 @@ class Util {
     public static ResultSet runQuery(String query, String connection) {
         ResultSet results = null;
         try {
-            SQLiteDBConnect tempdbconnect = new SQLiteDBConnect("org.sqlite.JDBC", "jdbc:sqlite:" + connection);
+            SQLiteDBConnect tempdbconnect = new SQLiteDBConnect("org.sqlite.JDBC", "jdbc:sqlite:" + connection); //NON-NLS
             results = tempdbconnect.executeQry(query);
             tempdbconnect.closeConnection();
         } catch (Exception ex) {
-            logger.log(Level.WARNING, "Error while trying to run sql query: " + query + " : " + connection, ex);
+            logger.log(Level.WARNING, "Error while trying to run sql query: " + query + " : " + connection, ex); //NON-NLS
         }
         return results;
     }
diff --git a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverIngestModule.java b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverIngestModule.java
index d85946a954..44d7e475f5 100644
--- a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverIngestModule.java
+++ b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverIngestModule.java
@@ -53,9 +53,9 @@ import org.sleuthkit.datamodel.Volume;
 class ScalpelCarverIngestModule extends IngestModuleAdapter implements FileIngestModule {
 
     private static final Logger logger = Logger.getLogger(ScalpelCarverIngestModule.class.getName());
-    private final String MODULE_OUTPUT_DIR_NAME = "ScalpelCarver";
+    private final String MODULE_OUTPUT_DIR_NAME = "ScalpelCarver"; //NON-NLS
     private String moduleOutputDirPath;
-    private final String configFileName = "scalpel.conf";
+    private final String configFileName = "scalpel.conf"; //NON-NLS
     private String configFilePath;
     private boolean initialized = false;
     private ScalpelCarver carver;
@@ -69,8 +69,8 @@ class ScalpelCarverIngestModule extends IngestModuleAdapter implements FileInges
         this.context = context;
 
         // make sure this is Windows
-        String os = System.getProperty("os.name");
-        if (!os.startsWith("Windows")) {
+        String os = System.getProperty("os.name"); //NON-NLS
+        if (!os.startsWith("Windows")) { //NON-NLS
             String message = NbBundle.getMessage(this.getClass(), "ScalpelCarverIngestModule.startUp.exception.msg1");
             logger.log(Level.SEVERE, message);
             throw new IngestModuleException(message);
@@ -132,7 +132,7 @@ class ScalpelCarverIngestModule extends IngestModuleAdapter implements FileInges
         File scalpelOutputDir = new File(scalpelOutputDirPath);
         if (!scalpelOutputDir.exists()) {
             if (!scalpelOutputDir.mkdir()) {
-                logger.log(Level.SEVERE, "Could not create Scalpel output directory: {0}", scalpelOutputDirPath);
+                logger.log(Level.SEVERE, "Could not create Scalpel output directory: {0}", scalpelOutputDirPath); //NON-NLS
                 return ProcessResult.OK;
             }
         }
@@ -143,7 +143,7 @@ class ScalpelCarverIngestModule extends IngestModuleAdapter implements FileInges
         try {
             parent = abstractFile.getParent();
         } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Exception while trying to get parent of AbstractFile.", ex);
+            logger.log(Level.SEVERE, "Exception while trying to get parent of AbstractFile.", ex); //NON-NLS
         }
         while (parent != null) {
             if (parent instanceof FileSystem
@@ -155,13 +155,13 @@ class ScalpelCarverIngestModule extends IngestModuleAdapter implements FileInges
             try {
                 parent = parent.getParent();
             } catch (TskCoreException ex) {
-                logger.log(Level.SEVERE, "Exception while trying to get parent of Content object.", ex);
+                logger.log(Level.SEVERE, "Exception while trying to get parent of Content object.", ex); //NON-NLS
             }
         }
 
         // make sure we have a valid systemID
         if (id == -1) {
-            logger.log(Level.SEVERE, "Could not get an ID for a FileSystem, Volume or Image for the given AbstractFile.");
+            logger.log(Level.SEVERE, "Could not get an ID for a FileSystem, Volume or Image for the given AbstractFile."); //NON-NLS
             return ProcessResult.OK;
         }
 
@@ -170,7 +170,7 @@ class ScalpelCarverIngestModule extends IngestModuleAdapter implements FileInges
         try {
             output = carver.carve(abstractFile, configFilePath, scalpelOutputDirPath);
         } catch (ScalpelException ex) {
-            logger.log(Level.SEVERE, "Error when attempting to carved data from AbstractFile with ID {0}", abstractFile.getId());
+            logger.log(Level.SEVERE, "Error when attempting to carved data from AbstractFile with ID {0}", abstractFile.getId()); //NON-NLS
             return ProcessResult.OK;
         }
 
@@ -184,7 +184,7 @@ class ScalpelCarverIngestModule extends IngestModuleAdapter implements FileInges
             try {
                 byteOffset = abstractFile.convertToImgOffset(carvedFileMeta.getByteStart());
             } catch (TskCoreException ex) {
-                logger.log(Level.SEVERE, "Could not calculate the image byte offset of AbstractFile ({0})", abstractFile.getName());
+                logger.log(Level.SEVERE, "Could not calculate the image byte offset of AbstractFile ({0})", abstractFile.getName()); //NON-NLS
                 break;
             }
 
@@ -199,7 +199,7 @@ class ScalpelCarverIngestModule extends IngestModuleAdapter implements FileInges
             try {
                 carvedFiles.add(db.addCarvedFile(carvedFileMeta.getFileName(), size, id, data));
             } catch (TskCoreException ex) {
-                logger.log(Level.SEVERE, "There was a problem while trying to add a carved file to the database.", ex);
+                logger.log(Level.SEVERE, "There was a problem while trying to add a carved file to the database.", ex); //NON-NLS
             }
         }
 
@@ -212,7 +212,7 @@ class ScalpelCarverIngestModule extends IngestModuleAdapter implements FileInges
             try {
                 carvedFileDir = carvedFiles.get(0).getParent();
             } catch (TskCoreException ex) {
-                logger.log(Level.SEVERE, "There was a problem while trying to obtain the carved files directory.", ex);
+                logger.log(Level.SEVERE, "There was a problem while trying to obtain the carved files directory.", ex); //NON-NLS
             }
         }
 
@@ -220,7 +220,7 @@ class ScalpelCarverIngestModule extends IngestModuleAdapter implements FileInges
         if (carvedFileDir != null) {
             is.fireModuleContentEvent(new ModuleContentEvent(carvedFileDir));
         } else {
-            logger.log(Level.SEVERE, "Could not obtain the carved files directory.");
+            logger.log(Level.SEVERE, "Could not obtain the carved files directory."); //NON-NLS
         }
 
         // reschedule carved files
diff --git a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/ScalpelCarver.java b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/ScalpelCarver.java
index 693681523c..e93803dd0c 100644
--- a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/ScalpelCarver.java
+++ b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/ScalpelCarver.java
@@ -37,8 +37,8 @@ import org.sleuthkit.datamodel.ReadContentInputStream;
  */
 public class ScalpelCarver {
 
-    private static final String SCALPEL_JNI_LIB = "libscalpel_jni";
-    private static final String SCALPEL_OUTPUT_FILE_NAME = "audit.txt";
+    private static final String SCALPEL_JNI_LIB = "libscalpel_jni"; //NON-NLS
+    private static final String SCALPEL_OUTPUT_FILE_NAME = "audit.txt"; //NON-NLS
     private static volatile boolean initialized = false;
     private static final Logger logger = Logger.getLogger(ScalpelCarver.class.getName());
 
@@ -53,16 +53,16 @@ public class ScalpelCarver {
             return true;
         }
         initialized = true;
-        for (String library : Arrays.asList("libtre-4", "pthreadGC2", SCALPEL_JNI_LIB)) {
+        for (String library : Arrays.asList("libtre-4", "pthreadGC2", SCALPEL_JNI_LIB)) { //NON-NLS
             if (!loadLib(library)) {
                 initialized = false;
-                logger.log(Level.SEVERE, "Failed initializing " + ScalpelCarver.class.getName() + " due to failure loading library: " + library);
+                logger.log(Level.SEVERE, "Failed initializing " + ScalpelCarver.class.getName() + " due to failure loading library: " + library); //NON-NLS
                 break;
             }
         }
         
         if (initialized) {
-            logger.log(Level.INFO, ScalpelCarver.class.getName() + " JNI initialized successfully. ");
+            logger.log(Level.INFO, ScalpelCarver.class.getName() + " JNI initialized successfully. "); //NON-NLS
         }
         
         return initialized;
@@ -147,14 +147,14 @@ public class ScalpelCarver {
             carveNat(carverInputId, carverInput, configFilePath, outputFolderPath);
         }
         catch (Exception e) {
-            logger.log(Level.SEVERE, "Error while caving file " + file, e);
+            logger.log(Level.SEVERE, "Error while caving file " + file, e); //NON-NLS
             throw new ScalpelException(e);
         }
         finally {
             try {
                 carverInput.close();
             } catch (IOException ex) {
-                logger.log(Level.SEVERE, "Error closing input stream after carving, file: " + file, ex);
+                logger.log(Level.SEVERE, "Error closing input stream after carving, file: " + file, ex); //NON-NLS
             }
         }
         
@@ -166,9 +166,9 @@ public class ScalpelCarver {
         try {
             output = ScalpelOutputParser.parse(outputFile);
         } catch (FileNotFoundException ex) {
-            logger.log(Level.SEVERE, "Could not find scalpel output file.", ex);
+            logger.log(Level.SEVERE, "Could not find scalpel output file.", ex); //NON-NLS
         } catch (IOException ex) {
-            logger.log(Level.SEVERE, "IOException while processing scalpel output file.", ex);
+            logger.log(Level.SEVERE, "IOException while processing scalpel output file.", ex); //NON-NLS
         }
         
         return output;
diff --git a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/ScalpelOutputParser.java b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/ScalpelOutputParser.java
index ac18bac6d6..51e7980d5b 100644
--- a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/ScalpelOutputParser.java
+++ b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/ScalpelOutputParser.java
@@ -96,7 +96,7 @@ public class ScalpelOutputParser {
         while (!line.isEmpty()) {
             
             // split the line into tokens
-            String[] fields = line.split("\\s+");
+            String[] fields = line.split("\\s+"); //NON-NLS
             
             // get the fields of interest
             String fileName = fields[0];
diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
index 7e57d709f8..28783ec7c0 100644
--- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
+++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
@@ -1,5 +1,5 @@
 #Updated by build script
-#Thu, 13 Mar 2014 18:09:42 -0400
+#Tue, 22 Apr 2014 16:06:14 -0400
 LBL_splash_window_title=Starting Autopsy
 SPLASH_HEIGHT=288
 SPLASH_WIDTH=538
@@ -8,4 +8,4 @@ SplashRunningTextBounds=5,266,530,17
 SplashRunningTextColor=0x0
 SplashRunningTextFontSize=18
 
-currentVersion=Autopsy 3.0.9
+currentVersion=Autopsy 3.1.0_Beta
diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
index 4bcee6a939..fe9124784d 100644
--- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
+++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
@@ -1,5 +1,5 @@
 #Updated by build script
-#Thu, 13 Mar 2014 18:09:42 -0400
+#Tue, 22 Apr 2014 16:06:14 -0400
 
-CTL_MainWindow_Title=Autopsy 3.0.9
-CTL_MainWindow_Title_No_Project=Autopsy 3.0.9
+CTL_MainWindow_Title=Autopsy 3.1.0_Beta
+CTL_MainWindow_Title_No_Project=Autopsy 3.1.0_Beta
diff --git a/test/script/tskdbdiff.py b/test/script/tskdbdiff.py
index c098a6a369..26b4fc643e 100644
--- a/test/script/tskdbdiff.py
+++ b/test/script/tskdbdiff.py
@@ -213,6 +213,9 @@ class TskDbDiff(object):
             raise TskDbDiffException("Unexpected error while dumping blackboard database: " + str(e))
         finally:
             database_log.close()
+            attribute_cursor.close()
+            artifact_cursor.close()
+            conn.close()
         
         # Now sort the file
         srtcmdlst = ["sort", unsorted_dump, "-o", bb_dump_file]
@@ -230,6 +233,7 @@ class TskDbDiff(object):
         backup_db_file = TskDbDiff._get_tmp_file("tsk_backup_db", ".db")
         shutil.copy(db_file, backup_db_file)
         conn = sqlite3.connect(backup_db_file)
+        id_path_table = build_id_table(conn.cursor())
         conn.text_factory = lambda x: x.decode("utf-8", "ignore")
         # Delete the blackboard tables
         conn.execute("DROP TABLE blackboard_artifacts")
@@ -238,9 +242,10 @@ class TskDbDiff(object):
         # Write to the database dump
         with codecs.open(dump_file, "wb", "utf_8") as db_log:
             for line in conn.iterdump():
-                line = remove_id(line)
+                line = replace_id(line, id_path_table)
                 db_log.write('%s\n' % line)
 
+        conn.close()
         # cleanup the backup
         os.remove(backup_db_file)
 
@@ -263,20 +268,37 @@ class TskDbDiff(object):
 class TskDbDiffException(Exception):
     pass
 
-def remove_id(line):
+def replace_id(line, table):
     """Remove the object id from a line.
 
     Args:
         line: a String, the line to remove the object id from.
+        table: a map from object ids to file paths.
     """
     index = line.find('INSERT INTO "tsk_files"')
     if (index != -1):
-        newLine = (line[:line.find('('):] + '(' + line[line.find(',') + 1:])
-        #print(newLine)
+        # take the portion of the string between the open parenthesis and the comma (ie, the object id)
+        obj_id = line[line.find('(') + 1 : line.find(',')]
+        # takes everything from the beginning of the string up to the opening
+        # parenthesis, the path associated with the object id, and everything after 
+        # the first comma, and concactenate it
+        newLine = (line[:line.find('('):] + '(' + table[int(obj_id)] + line[line.find(','):])
         return newLine
     else:
         return line
 
+def build_id_table(artifact_cursor):
+    """Build the map of object ids to file paths.
+
+    Args:
+        artifact_cursor: the database cursor
+    """
+    # for each row in the db, take the object id, parent path, and name, then create a tuple in the dictionary
+    # with the object id as the key and the full file path (parent + name) as the value
+    mapping = dict([(row[0], str(row[1]) + str(row[2])) for row in artifact_cursor.execute("SELECT obj_id, parent_path, name FROM tsk_files")])
+    return mapping
+
+     
 def main():
     try:
         sys.argv.pop(0)
diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java
index f2ab914821..d8da65c24e 100755
--- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java
+++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java
@@ -71,7 +71,7 @@ import org.sleuthkit.autopsy.ingest.IngestServices;
     /**
      * The mime type string for html text.
      */
-    private static final String HTML_TYPE = "text/html";
+    private static final String HTML_TYPE = "text/html"; //NON-NLS
     
     /**
      * The local path of the mbox file.
@@ -89,7 +89,7 @@ import org.sleuthkit.autopsy.ingest.IngestServices;
     }
     
     static boolean isValidMimeTypeMbox(byte[] buffer) {
-        return (new String(buffer)).startsWith("From ");
+        return (new String(buffer)).startsWith("From "); //NON-NLS
     }
     
     /**
@@ -115,7 +115,7 @@ import org.sleuthkit.autopsy.ingest.IngestServices;
             } catch (IllegalArgumentException ex) {
                 // Not the right encoder
             } catch (IOException ex) {
-                logger.log(Level.WARNING, "couldn't find mbox file.", ex);
+                logger.log(Level.WARNING, "couldn't find mbox file.", ex); //NON-NLS
                 addErrorMessage(NbBundle.getMessage(this.getClass(), "MboxParser.parse.errMsg.failedToReadFile"));
                 return new ArrayList<>();
             }
@@ -136,7 +136,7 @@ import org.sleuthkit.autopsy.ingest.IngestServices;
                 Message msg = messageBuilder.parseMessage(message.asInputStream(theEncoder.charset()));
                 emails.add(extractEmail(msg));
             } catch (IOException ex) {
-                logger.log(Level.WARNING, "Failed to get message from mbox: {0}", ex.getMessage());
+                logger.log(Level.WARNING, "Failed to get message from mbox: {0}", ex.getMessage()); //NON-NLS
                 failCount++;
             }
         }
@@ -236,7 +236,7 @@ import org.sleuthkit.autopsy.ingest.IngestServices;
                     break;
             }
         } catch (IOException ex) {
-            logger.log(Level.WARNING, "Error getting text body of mbox message", ex);
+            logger.log(Level.WARNING, "Error getting text body of mbox message", ex); //NON-NLS
         }
     }
     
@@ -259,7 +259,7 @@ import org.sleuthkit.autopsy.ingest.IngestServices;
             addErrorMessage(
                     NbBundle.getMessage(this.getClass(),
                                         "MboxParser.handleAttch.errMsg.failedToCreateOnDisk", filename));
-            logger.log(Level.INFO, "Failed to create file output stream for: " + outPath, ex);
+            logger.log(Level.INFO, "Failed to create file output stream for: " + outPath, ex); //NON-NLS
             return;
         }
         
@@ -272,14 +272,14 @@ import org.sleuthkit.autopsy.ingest.IngestServices;
                 // This could potentially be other types. Only seen this once.
             }
         } catch (IOException ex) {
-            logger.log(Level.INFO, "Failed to write mbox email attachment to disk.", ex);
+            logger.log(Level.INFO, "Failed to write mbox email attachment to disk.", ex); //NON-NLS
             addErrorMessage(NbBundle.getMessage(this.getClass(), "MboxParser.handleAttch.failedWriteToDisk", filename));
             return;
         } finally {
             try {
                 fos.close();
             } catch (IOException ex) {
-                logger.log(Level.INFO, "Failed to close file output stream", ex);
+                logger.log(Level.INFO, "Failed to close file output stream", ex); //NON-NLS
             }
         }
         
@@ -338,7 +338,7 @@ import org.sleuthkit.autopsy.ingest.IngestServices;
         try {
             is = new BufferedInputStream(new FileInputStream(mboxFile));
         } catch (FileNotFoundException ex) {
-            logger.log(Level.WARNING, "Failed to find mbox file while detecting charset");
+            logger.log(Level.WARNING, "Failed to find mbox file while detecting charset"); //NON-NLS
             return possibleEncoders;
         }
         
@@ -355,18 +355,18 @@ import org.sleuthkit.autopsy.ingest.IngestServices;
             }
             return possibleEncoders;
         } catch (IOException | IllegalArgumentException ex) {
-            logger.log(Level.WARNING, "Failed to detect charset of mbox file.", ex);
+            logger.log(Level.WARNING, "Failed to detect charset of mbox file.", ex); //NON-NLS
             return possibleEncoders;
         } finally {
             try {
                 is.close();
             } catch (IOException ex) {
-                logger.log(Level.INFO, "Failed to close input stream");
+                logger.log(Level.INFO, "Failed to close input stream"); //NON-NLS
             }
         }
     }
     
     private void addErrorMessage(String msg) {
-        errors.append("<li>").append(msg).append("</li>");
+        errors.append("<li>").append(msg).append("</li>"); //NON-NLS
     }
 }
diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java
index be37525a78..0933d8f221 100755
--- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java
+++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java
@@ -88,11 +88,11 @@ class PstParser {
             }
             return ParseResult.OK;
         } catch (PSTException | IOException ex) {
-            String msg = file.getName() + ": Failed to create internal java-libpst PST file to parse:\n" + ex.getMessage();
+            String msg = file.getName() + ": Failed to create internal java-libpst PST file to parse:\n" + ex.getMessage(); //NON-NLS
             logger.log(Level.WARNING, msg);
             return ParseResult.ERROR;
         } catch (IllegalArgumentException ex) {
-            logger.log(Level.INFO, "Found encrypted PST file.");
+            logger.log(Level.INFO, "Found encrypted PST file."); //NON-NLS
             return ParseResult.ENCRYPT;
         }
     }
@@ -130,7 +130,7 @@ class PstParser {
                 subFolders = folder.getSubFolders();
             } catch (PSTException | IOException ex) {
                 subFolders = new ArrayList<>();
-                logger.log(Level.INFO, "java-libpst exception while getting subfolders: {0}", ex.getMessage());
+                logger.log(Level.INFO, "java-libpst exception while getting subfolders: {0}", ex.getMessage()); //NON-NLS
             }
 
             for (PSTFolder f : subFolders) {
@@ -147,7 +147,7 @@ class PstParser {
                 }
             } catch (PSTException | IOException ex) {
                 failCount++;
-                logger.log(Level.INFO, "java-libpst exception while getting emails from a folder: {0}", ex.getMessage());
+                logger.log(Level.INFO, "java-libpst exception while getting emails from a folder: {0}", ex.getMessage()); //NON-NLS
             }
         }
 
@@ -174,7 +174,7 @@ class PstParser {
         try {
             rtf = msg.getRTFBody();
         } catch (PSTException | IOException ex) {
-            logger.log(Level.INFO, "Failed to get RTF content from pst email.");
+            logger.log(Level.INFO, "Failed to get RTF content from pst email."); //NON-NLS
         }
         email.setRtfBody(rtf);
         email.setLocalPath(localPath);
@@ -229,7 +229,7 @@ class PstParser {
                 addErrorMessage(
                         NbBundle.getMessage(this.getClass(), "PstParser.extractAttch.errMsg.failedToExtractToDisk",
                         filename));
-                logger.log(Level.WARNING, "Failed to extract attachment from pst file.", ex);
+                logger.log(Level.WARNING, "Failed to extract attachment from pst file.", ex); //NON-NLS
             }
         }
     }
@@ -294,12 +294,12 @@ class PstParser {
             ByteBuffer bb = ByteBuffer.wrap(buffer);
             return bb.getInt() == PST_HEADER;
         } catch (TskCoreException ex) {
-            logger.log(Level.WARNING, "Exception while detecting if a file is a pst file.");
+            logger.log(Level.WARNING, "Exception while detecting if a file is a pst file."); //NON-NLS
             return false;
         }
     }
 
     private void addErrorMessage(String msg) {
-        errors.append("<li>").append(msg).append("</li>");
+        errors.append("<li>").append(msg).append("</li>"); //NON-NLS
     }
 }
diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
index 289f1fa5a0..933bf4fb4a 100644
--- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
+++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
@@ -120,7 +120,7 @@ public final class ThunderbirdMboxFileIngestModule extends IngestModuleAdapter i
         File file = new File(fileName);
 
         if (abstractFile.getSize() >= services.getFreeDiskSpace()) {
-            logger.log(Level.WARNING, "Not enough disk space to write file to disk.");
+            logger.log(Level.WARNING, "Not enough disk space to write file to disk."); //NON-NLS
             IngestMessage msg = IngestMessage.createErrorMessage(EmailParserModuleFactory.getModuleName(), EmailParserModuleFactory.getModuleName(),
                     NbBundle.getMessage(this.getClass(),
                     "ThunderbirdMboxFileIngestModule.processPst.errMsg.outOfDiskSpace",
@@ -132,7 +132,7 @@ public final class ThunderbirdMboxFileIngestModule extends IngestModuleAdapter i
         try {
             ContentUtils.writeToFile(abstractFile, file);
         } catch (IOException ex) {
-            logger.log(Level.WARNING, "Failed writing pst file to disk.", ex);
+            logger.log(Level.WARNING, "Failed writing pst file to disk.", ex); //NON-NLS
             return ProcessResult.OK;
         }
 
@@ -150,7 +150,7 @@ public final class ThunderbirdMboxFileIngestModule extends IngestModuleAdapter i
                         EmailParserModuleFactory.getModuleName(),
                         NbBundle.getMessage(this.getClass(), "ThunderbirdMboxFileIngestModule.encryptionFileLevel")));
             } catch (TskCoreException ex) {
-                logger.log(Level.INFO, "Failed to add encryption attribute to file: {0}", abstractFile.getName());
+                logger.log(Level.INFO, "Failed to add encryption attribute to file: {0}", abstractFile.getName()); //NON-NLS
             }
         } else {
             // parsing error: log message
@@ -159,12 +159,12 @@ public final class ThunderbirdMboxFileIngestModule extends IngestModuleAdapter i
                     abstractFile.getName()),
                     NbBundle.getMessage(this.getClass(),
                     "ThunderbirdMboxFileIngestModule.processPst.errProcFile.details"));
-            logger.log(Level.INFO, "PSTParser failed to parse {0}", abstractFile.getName());
+            logger.log(Level.INFO, "PSTParser failed to parse {0}", abstractFile.getName()); //NON-NLS
             return ProcessResult.ERROR;
         }
 
         if (file.delete() == false) {
-            logger.log(Level.INFO, "Failed to delete temp file: {0}", file.getName());
+            logger.log(Level.INFO, "Failed to delete temp file: {0}", file.getName()); //NON-NLS
         }
 
         String errors = parser.getErrors();
@@ -190,20 +190,20 @@ public final class ThunderbirdMboxFileIngestModule extends IngestModuleAdapter i
         // use the local path to determine the e-mail folder structure
         String emailFolder = "";
         // email folder is everything after "Mail" or ImapMail
-        if (mboxParentDir.contains("/Mail/")) {
-            emailFolder = mboxParentDir.substring(mboxParentDir.indexOf("/Mail/") + 5);
-        } else if (mboxParentDir.contains("/ImapMail/")) {
-            emailFolder = mboxParentDir.substring(mboxParentDir.indexOf("/ImapMail/") + 9);
+        if (mboxParentDir.contains("/Mail/")) { //NON-NLS
+            emailFolder = mboxParentDir.substring(mboxParentDir.indexOf("/Mail/") + 5); //NON-NLS
+        } else if (mboxParentDir.contains("/ImapMail/")) { //NON-NLS
+            emailFolder = mboxParentDir.substring(mboxParentDir.indexOf("/ImapMail/") + 9); //NON-NLS
         }
         emailFolder = emailFolder + mboxFileName;
-        emailFolder = emailFolder.replaceAll(".sbd", "");
+        emailFolder = emailFolder.replaceAll(".sbd", ""); //NON-NLS
 
         String fileName = getTempPath() + File.separator + abstractFile.getName()
                 + "-" + String.valueOf(abstractFile.getId());
         File file = new File(fileName);
 
         if (abstractFile.getSize() >= services.getFreeDiskSpace()) {
-            logger.log(Level.WARNING, "Not enough disk space to write file to disk.");
+            logger.log(Level.WARNING, "Not enough disk space to write file to disk."); //NON-NLS
             postErrorMessage(
                     NbBundle.getMessage(this.getClass(), "ThunderbirdMboxFileIngestModule.processMBox.errProcFile.msg",
                     abstractFile.getName()),
@@ -215,7 +215,7 @@ public final class ThunderbirdMboxFileIngestModule extends IngestModuleAdapter i
         try {
             ContentUtils.writeToFile(abstractFile, file);
         } catch (IOException ex) {
-            logger.log(Level.WARNING, "Failed writing mbox file to disk.", ex);
+            logger.log(Level.WARNING, "Failed writing mbox file to disk.", ex); //NON-NLS
             return ProcessResult.OK;
         }
 
@@ -225,7 +225,7 @@ public final class ThunderbirdMboxFileIngestModule extends IngestModuleAdapter i
         processEmails(emails, abstractFile);
 
         if (file.delete() == false) {
-            logger.log(Level.INFO, "Failed to delete temp file: {0}", file.getName());
+            logger.log(Level.INFO, "Failed to delete temp file: {0}", file.getName()); //NON-NLS
         }
 
         String errors = parser.getErrors();
@@ -245,7 +245,7 @@ public final class ThunderbirdMboxFileIngestModule extends IngestModuleAdapter i
      */
     public static String getTempPath() {
         String tmpDir = Case.getCurrentCase().getTempDirectory() + File.separator
-                + "EmailParser";
+                + "EmailParser"; //NON-NLS
         File dir = new File(tmpDir);
         if (dir.exists() == false) {
             dir.mkdirs();
@@ -383,7 +383,7 @@ public final class ThunderbirdMboxFileIngestModule extends IngestModuleAdapter i
         if (localPath.isEmpty() == false) {
             bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH.getTypeID(), EmailParserModuleFactory.getModuleName(), localPath));
         } else {
-            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH.getTypeID(), EmailParserModuleFactory.getModuleName(), "/foo/bar"));
+            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH.getTypeID(), EmailParserModuleFactory.getModuleName(), "/foo/bar")); //NON-NLS
         }
 
         try {