diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
index 215138f6d3..6d0aca0f6e 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
@@ -370,7 +370,7 @@ public class Case implements SleuthkitCase.ErrorObserver {
                     eventPublisher.openRemoteEventChannel(String.format(EVENT_CHANNEL_NAME, newCase.getTextIndexName()));
                     currentCase.collaborationMonitor = new CollaborationMonitor();
                 } catch (AutopsyEventException | CollaborationMonitor.CollaborationMonitorException ex) {
-                    logger.log(Level.SEVERE, "Failed to setup for collaboration", ex);
+                    logger.log(Level.SEVERE, "Failed to setup for collaboration", ex); //NON-NLS
                     MessageNotifyUtil.Notify.error(NbBundle.getMessage(Case.class, "Case.CollaborationSetup.FailNotify.Title"), NbBundle.getMessage(Case.class, "Case.CollaborationSetup.FailNotify.ErrMsg"));
                 }
             }
@@ -544,13 +544,13 @@ public class Case implements SleuthkitCase.ErrorObserver {
         String result;
 
         // Remove all non-ASCII characters
-        result = caseName.replaceAll("[^\\p{ASCII}]", "_");
+        result = caseName.replaceAll("[^\\p{ASCII}]", "_"); //NON-NLS
 
         // Remove all control characters
-        result = result.replaceAll("[\\p{Cntrl}]", "_");
+        result = result.replaceAll("[\\p{Cntrl}]", "_"); //NON-NLS
 
         // Remove / \ : ? space ' "
-        result = result.replaceAll("[ /?:'\"\\\\]", "_");
+        result = result.replaceAll("[ /?:'\"\\\\]", "_"); //NON-NLS
 
         // Make it all lowercase
         result = result.toLowerCase();
@@ -566,7 +566,7 @@ public class Case implements SleuthkitCase.ErrorObserver {
         }
 
         if (result.isEmpty()) {
-            result = "case";
+            result = "case"; //NON-NLS
         }
 
         return result;
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java
index 99dcd8bfa2..89cbaad77a 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java
@@ -24,6 +24,7 @@
  */
 package org.sleuthkit.autopsy.casemodule;
 
+import java.awt.*;
 import java.nio.file.Paths;
 import java.awt.event.ActionListener;
 import java.io.File;
@@ -173,6 +174,8 @@ class CasePropertiesForm extends javax.swing.JPanel {
      */
     @SuppressWarnings("unchecked")
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    @NbBundle.Messages({"CasePropertiesForm.imagesTable.path=Path",
+            "CasePropertiesForm.imagesTable.remove=Remove"})
     private void initComponents() {
 
         jScrollPane1 = new javax.swing.JScrollPane();
@@ -205,7 +208,7 @@ class CasePropertiesForm extends javax.swing.JPanel {
         jTextArea1.setRows(5);
         jScrollPane1.setViewportView(jTextArea1);
 
-        casePropLabel.setFont(new java.awt.Font("Tahoma", 1, 24)); // NOI18N
+        casePropLabel.setFont(casePropLabel.getFont().deriveFont(Font.BOLD, 24));
         casePropLabel.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
         casePropLabel.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.casePropLabel.text")); // NOI18N
 
@@ -227,10 +230,10 @@ class CasePropertiesForm extends javax.swing.JPanel {
             }
         });
 
-        genInfoLabel.setFont(new java.awt.Font("Tahoma", 1, 14)); // NOI18N
+        genInfoLabel.setFont(genInfoLabel.getFont().deriveFont(Font.BOLD, 14));
         genInfoLabel.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.genInfoLabel.text")); // NOI18N
 
-        imgInfoLabel.setFont(new java.awt.Font("Tahoma", 1, 14)); // NOI18N
+        imgInfoLabel.setFont(imgInfoLabel.getFont().deriveFont(Font.BOLD, 14));
         imgInfoLabel.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.imgInfoLabel.text")); // NOI18N
 
         OKButton.setText(org.openide.util.NbBundle.getMessage(CasePropertiesForm.class, "CasePropertiesForm.OKButton.text")); // NOI18N
@@ -240,7 +243,8 @@ class CasePropertiesForm extends javax.swing.JPanel {
 
             },
             new String [] {
-                "Path", "Remove"
+                Bundle.CasePropertiesForm_imagesTable_path(),
+                Bundle.CasePropertiesForm_imagesTable_remove()
             }
         ) {
             boolean[] canEdit = new boolean [] {
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CollaborationMonitor.java b/Core/src/org/sleuthkit/autopsy/casemodule/CollaborationMonitor.java
index 4ea3463acc..0fb3601d88 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CollaborationMonitor.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CollaborationMonitor.java
@@ -56,11 +56,11 @@ import org.sleuthkit.autopsy.ingest.events.DataSourceAnalysisStartedEvent;
  */
 final class CollaborationMonitor {
 
-    private static final String EVENT_CHANNEL_NAME = "%s-Collaboration-Monitor-Events";
-    private static final String COLLABORATION_MONITOR_EVENT = "COLLABORATION_MONITOR_EVENT";
+    private static final String EVENT_CHANNEL_NAME = "%s-Collaboration-Monitor-Events"; //NON-NLS
+    private static final String COLLABORATION_MONITOR_EVENT = "COLLABORATION_MONITOR_EVENT"; //NON-NLS
     private static final Set<String> CASE_EVENTS_OF_INTEREST = new HashSet<>(Arrays.asList(new String[]{Case.Events.ADDING_DATA_SOURCE.toString(), Case.Events.DATA_SOURCE_ADDED.toString(), Case.Events.ADDING_DATA_SOURCE_FAILED.toString()}));
     private static final int NUMBER_OF_PERIODIC_TASK_THREADS = 2;
-    private static final String PERIODIC_TASK_THREAD_NAME = "collab-monitor-periodic-tasks-%d";
+    private static final String PERIODIC_TASK_THREAD_NAME = "collab-monitor-periodic-tasks-%d"; //NON-NLS
     private static final long HEARTBEAT_INTERVAL_MINUTES = 1;
     private static final long MAX_MISSED_HEARTBEATS = 5;
     private static final long STALE_TASKS_DETECTION_INTERVAL_MINUTES = 2;
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java
index 440d0b4d20..b409e42830 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java
@@ -18,9 +18,7 @@
  */
 package org.sleuthkit.autopsy.casemodule;
 
-import java.awt.Dialog;
-import java.awt.Dimension;
-import java.awt.Toolkit;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
@@ -79,10 +77,10 @@ public class CueBannerPanel extends javax.swing.JPanel {
         closeButton = new javax.swing.JButton();
         jSeparator1 = new javax.swing.JSeparator();
 
-        autopsyLogo.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/welcome_logo.png"))); // NOI18N
+        autopsyLogo.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/welcome_logo.png"))); // NOI18N NON-NLS
         autopsyLogo.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.autopsyLogo.text")); // NOI18N
 
-        newCaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/btn_icon_create_new_case.png"))); // NOI18N
+        newCaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/btn_icon_create_new_case.png"))); // NOI18N NON-NLS
         newCaseButton.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.newCaseButton.text")); // NOI18N
         newCaseButton.setBorder(null);
         newCaseButton.setBorderPainted(false);
@@ -94,7 +92,7 @@ public class CueBannerPanel extends javax.swing.JPanel {
             }
         });
 
-        openRecentButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/btn_icon_open_recent.png"))); // NOI18N
+        openRecentButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/btn_icon_open_recent.png"))); // NOI18N NON-NLS
         openRecentButton.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.openRecentButton.text")); // NOI18N
         openRecentButton.setBorder(null);
         openRecentButton.setBorderPainted(false);
@@ -106,13 +104,13 @@ public class CueBannerPanel extends javax.swing.JPanel {
             }
         });
 
-        createNewLabel.setFont(new java.awt.Font("Tahoma", 0, 13)); // NOI18N
+        createNewLabel.setFont(createNewLabel.getFont().deriveFont(Font.PLAIN, 13));
         createNewLabel.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.createNewLabel.text")); // NOI18N
 
-        openRecentLabel.setFont(new java.awt.Font("Tahoma", 0, 13)); // NOI18N
+        openRecentLabel.setFont(openRecentLabel.getFont().deriveFont(Font.PLAIN, 13));
         openRecentLabel.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.openRecentLabel.text")); // NOI18N
 
-        openCaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/btn_icon_open_existing.png"))); // NOI18N
+        openCaseButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/casemodule/btn_icon_open_existing.png"))); // NOI18N NON-NLS
         openCaseButton.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.openCaseButton.text")); // NOI18N
         openCaseButton.setBorder(null);
         openCaseButton.setBorderPainted(false);
@@ -125,7 +123,7 @@ public class CueBannerPanel extends javax.swing.JPanel {
             }
         });
 
-        openLabel.setFont(new java.awt.Font("Tahoma", 0, 13)); // NOI18N
+        openLabel.setFont(openLabel.getFont().deriveFont(Font.PLAIN, 13));
         openLabel.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.openLabel.text")); // NOI18N
 
         closeButton.setText(org.openide.util.NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.closeButton.text")); // NOI18N
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java b/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java
index d5e5e647e5..18b2c5b8e8 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java
@@ -192,7 +192,7 @@ class MissingImageDialog extends javax.swing.JDialog {
             }
         });
 
-        lbWarning.setFont(new java.awt.Font("Tahoma", 1, 12)); // NOI18N
+        lbWarning.setFont(lbWarning.getFont().deriveFont(Font.BOLD, 12));
         lbWarning.setForeground(new java.awt.Color(244, 0, 0));
         org.openide.awt.Mnemonics.setLocalizedText(lbWarning, org.openide.util.NbBundle.getMessage(MissingImageDialog.class, "MissingImageDialog.lbWarning.text")); // NOI18N
         lbWarning.setToolTipText(org.openide.util.NbBundle.getMessage(MissingImageDialog.class, "MissingImageDialog.lbWarning.toolTipText")); // NOI18N
@@ -223,7 +223,7 @@ class MissingImageDialog extends javax.swing.JDialog {
                 .addGap(18, 18, 18))
         );
 
-        titleLabel.setFont(new java.awt.Font("Tahoma", 1, 12)); // NOI18N
+        titleLabel.setFont(titleLabel.getFont().deriveFont(Font.BOLD, 12));
         org.openide.awt.Mnemonics.setLocalizedText(titleLabel, org.openide.util.NbBundle.getMessage(MissingImageDialog.class, "MissingImageDialog.titleLabel.text")); // NOI18N
 
         titleSeparator.setForeground(new java.awt.Color(102, 102, 102));
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
index 5694ba5c70..3dde0a0056 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
@@ -215,7 +215,7 @@ final class NewCaseVisualPanel1 extends JPanel implements DocumentListener {
         caseParentDirWarningLabel = new javax.swing.JLabel();
         caseTypeLabel = new javax.swing.JLabel();
 
-        jLabel1.setFont(new java.awt.Font("Tahoma", 1, 14)); // NOI18N
+        jLabel1.setFont(jLabel1.getFont().deriveFont(Font.BOLD, 14));
         org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(NewCaseVisualPanel1.class, "NewCaseVisualPanel1.jLabel1.text_1")); // NOI18N
 
         org.openide.awt.Mnemonics.setLocalizedText(caseNameLabel, org.openide.util.NbBundle.getMessage(NewCaseVisualPanel1.class, "NewCaseVisualPanel1.caseNameLabel.text_1")); // NOI18N
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
index afbba08a6c..4712f74fe0 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
@@ -170,8 +170,8 @@ class NewCaseWizardPanel2 implements WizardDescriptor.ValidatingPanel<WizardDesc
     @Override
     public void storeSettings(WizardDescriptor settings) {
         NewCaseVisualPanel2 currentComponent = getComponent();
-        settings.putProperty("caseNumber", currentComponent.getCaseNumber());
-        settings.putProperty("caseExaminer", currentComponent.getExaminer());
+        settings.putProperty("caseNumber", currentComponent.getCaseNumber()); //NON-NLS
+        settings.putProperty("caseExaminer", currentComponent.getExaminer()); //NON-NLS
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/SingleUserCaseConverter.java b/Core/src/org/sleuthkit/autopsy/casemodule/SingleUserCaseConverter.java
index 47d27c3ab9..2654a11c27 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/SingleUserCaseConverter.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/SingleUserCaseConverter.java
@@ -49,7 +49,7 @@ public class SingleUserCaseConverter {
     private static final String DOTAUT = ".aut"; //NON-NLS
     private static final String TIMELINE_FOLDER = "Timeline"; //NON-NLS
     private static final String TIMELINE_FILE = "events.db"; //NON-NLS
-    private static final String POSTGRES_DEFAULT_DB_NAME = "postgres";
+    private static final String POSTGRES_DEFAULT_DB_NAME = "postgres"; //NON-NLS
     private static final int MAX_DB_NAME_LENGTH = 63;
 
     public class ImportCaseData {
@@ -316,7 +316,7 @@ public class SingleUserCaseConverter {
                 Statement check = postgreSQLConnection.createStatement();
                 ResultSet checkResult = check.executeQuery("SELECT * FROM blackboard_artifact_types WHERE artifact_type_id=" + value + " AND type_name LIKE '" + inputResultSet.getString(2) + "' AND display_name LIKE '" + inputResultSet.getString(3) + "'"); //NON-NLS
                 if (!checkResult.isBeforeFirst()) { // only insert if it doesn't exist
-                    String sql = "INSERT INTO blackboard_artifact_types (artifact_type_id, type_name, display_name) VALUES ("
+                    String sql = "INSERT INTO blackboard_artifact_types (artifact_type_id, type_name, display_name) VALUES (" //NON-NLS
                             + value + ", '"
                             + SleuthkitCase.escapeSingleQuotes(inputResultSet.getString(2)) + "',"
                             + " ? )"; //NON-NLS
@@ -347,7 +347,7 @@ public class SingleUserCaseConverter {
                 Statement check = postgreSQLConnection.createStatement();
                 ResultSet checkResult = check.executeQuery("SELECT * FROM blackboard_attribute_types WHERE attribute_type_id=" + value + " AND type_name LIKE '" + inputResultSet.getString(2) + "' AND display_name LIKE '" + inputResultSet.getString(3) + "'"); //NON-NLS
                 if (!checkResult.isBeforeFirst()) { // only insert if it doesn't exist
-                    String sql = "INSERT INTO blackboard_attribute_types (attribute_type_id, type_name, display_name) VALUES ("
+                    String sql = "INSERT INTO blackboard_attribute_types (attribute_type_id, type_name, display_name) VALUES (" //NON-NLS
                             + value + ", '"
                             + SleuthkitCase.escapeSingleQuotes(inputResultSet.getString(2)) + "',"
                             + " ? )"; //NON-NLS
@@ -377,7 +377,7 @@ public class SingleUserCaseConverter {
                 if (value > biggestPK) {
                     biggestPK = value;
                 }
-                outputStatement.executeUpdate("INSERT INTO tsk_objects (obj_id, par_obj_id, type) VALUES ("
+                outputStatement.executeUpdate("INSERT INTO tsk_objects (obj_id, par_obj_id, type) VALUES (" //NON-NLS
                         + value + ","
                         + getNullableLong(inputResultSet, 2) + ","
                         + inputResultSet.getInt(3) + ")"); //NON-NLS
@@ -397,7 +397,7 @@ public class SingleUserCaseConverter {
         while (inputResultSet.next()) {
             outputStatement = postgreSQLConnection.createStatement();
             try {
-                outputStatement.executeUpdate("INSERT INTO tsk_image_names (obj_id, name, sequence) VALUES ("
+                outputStatement.executeUpdate("INSERT INTO tsk_image_names (obj_id, name, sequence) VALUES (" //NON-NLS
                         + inputResultSet.getLong(1) + ",'"
                         + inputResultSet.getString(2) + "',"
                         + inputResultSet.getInt(3) + ")"); //NON-NLS
@@ -419,7 +419,7 @@ public class SingleUserCaseConverter {
                 if (value > biggestPK) {
                     biggestPK = value;
                 }
-                String sql = "INSERT INTO tsk_image_info (obj_id, type, ssize, tzone, size, md5, display_name) VALUES ("
+                String sql = "INSERT INTO tsk_image_info (obj_id, type, ssize, tzone, size, md5, display_name) VALUES (" //NON-NLS
                         + value + ","
                         + getNullableInt(inputResultSet, 2) + ","
                         + getNullableInt(inputResultSet, 3) + ","
@@ -454,7 +454,7 @@ public class SingleUserCaseConverter {
                 if (value > biggestPK) {
                     biggestPK = value;
                 }
-                String sql = "INSERT INTO tsk_fs_info (obj_id, img_offset, fs_type, block_size, block_count, root_inum, first_inum, last_inum, display_name) VALUES ("
+                String sql = "INSERT INTO tsk_fs_info (obj_id, img_offset, fs_type, block_size, block_count, root_inum, first_inum, last_inum, display_name) VALUES (" //NON-NLS
                         + value + ","
                         + inputResultSet.getLong(2) + ","
                         + inputResultSet.getInt(3) + ","
@@ -490,7 +490,7 @@ public class SingleUserCaseConverter {
                 if (value > biggestPK) {
                     biggestPK = value;
                 }
-                outputStatement.executeUpdate("INSERT INTO tsk_files_path (obj_id, path) VALUES ("
+                outputStatement.executeUpdate("INSERT INTO tsk_files_path (obj_id, path) VALUES (" //NON-NLS
                         + value + ", '"
                         + SleuthkitCase.escapeSingleQuotes(inputResultSet.getString(2)) + "')"); //NON-NLS
             } catch (SQLException ex) {
@@ -513,7 +513,7 @@ public class SingleUserCaseConverter {
                 if (value > biggestPK) {
                     biggestPK = value;
                 }
-                String sql = "INSERT INTO tsk_files (obj_id, fs_obj_id, attr_type, attr_id, name, meta_addr, meta_seq, type, has_layout, has_path, dir_type, meta_type, dir_flags, meta_flags, size, ctime, crtime, atime, mtime, mode, uid, gid, md5, known, parent_path) VALUES ("
+                String sql = "INSERT INTO tsk_files (obj_id, fs_obj_id, attr_type, attr_id, name, meta_addr, meta_seq, type, has_layout, has_path, dir_type, meta_type, dir_flags, meta_flags, size, ctime, crtime, atime, mtime, mode, uid, gid, md5, known, parent_path) VALUES (" //NON-NLS
                         + value + ","
                         + getNullableLong(inputResultSet, 2) + ","
                         + getNullableInt(inputResultSet, 3) + ","
@@ -561,7 +561,7 @@ public class SingleUserCaseConverter {
         while (inputResultSet.next()) {
             outputStatement = postgreSQLConnection.createStatement();
             try {
-                outputStatement.executeUpdate("INSERT INTO tsk_file_layout (obj_id, byte_start, byte_len, sequence) VALUES ("
+                outputStatement.executeUpdate("INSERT INTO tsk_file_layout (obj_id, byte_start, byte_len, sequence) VALUES (" //NON-NLS
                         + inputResultSet.getLong(1) + ","
                         + inputResultSet.getLong(2) + ","
                         + inputResultSet.getLong(3) + ","
@@ -583,7 +583,7 @@ public class SingleUserCaseConverter {
                 Statement check = postgreSQLConnection.createStatement();
                 ResultSet checkResult = check.executeQuery("SELECT * FROM tsk_db_info WHERE schema_ver=" + inputResultSet.getInt(1) + " AND tsk_ver=" + inputResultSet.getInt(2)); //NON-NLS
                 if (!checkResult.isBeforeFirst()) { // only insert if it doesn't exist
-                    outputStatement.executeUpdate("INSERT INTO tsk_db_info (schema_ver, tsk_ver) VALUES ("
+                    outputStatement.executeUpdate("INSERT INTO tsk_db_info (schema_ver, tsk_ver) VALUES (" //NON-NLS
                             + getNullableInt(inputResultSet, 1) + ","
                             + getNullableInt(inputResultSet, 2) + ")"); //NON-NLS
                 }
@@ -605,7 +605,7 @@ public class SingleUserCaseConverter {
                 if (value > biggestPK) {
                     biggestPK = value;
                 }
-                String sql = "INSERT INTO tag_names (tag_name_id, display_name, description, color) VALUES ("
+                String sql = "INSERT INTO tag_names (tag_name_id, display_name, description, color) VALUES (" //NON-NLS
                         + value + ","
                         + " ? ,'"
                         + SleuthkitCase.escapeSingleQuotes(inputResultSet.getString(3)) + "','"
@@ -636,7 +636,7 @@ public class SingleUserCaseConverter {
                 if (value > biggestPK) {
                     biggestPK = value;
                 }
-                outputStatement.executeUpdate("INSERT INTO reports (report_id, path, crtime, src_module_name, report_name) VALUES ("
+                outputStatement.executeUpdate("INSERT INTO reports (report_id, path, crtime, src_module_name, report_name) VALUES (" //NON-NLS
                         + value + ", '"
                         + SleuthkitCase.escapeSingleQuotes(inputResultSet.getString(2)) + "',"
                         + inputResultSet.getInt(3) + ",'"
@@ -664,7 +664,7 @@ public class SingleUserCaseConverter {
                 if (value > biggestPK) {
                     biggestPK = value;
                 }
-                outputStatement.executeUpdate("INSERT INTO blackboard_artifacts (artifact_id, obj_id, artifact_type_id) VALUES ("
+                outputStatement.executeUpdate("INSERT INTO blackboard_artifacts (artifact_id, obj_id, artifact_type_id) VALUES (" //NON-NLS
                         + value + ","
                         + inputResultSet.getLong(2) + ","
                         + inputResultSet.getLong(3) + ")"); //NON-NLS
@@ -684,7 +684,7 @@ public class SingleUserCaseConverter {
 
         while (inputResultSet.next()) {
             try {
-                String sql = "INSERT INTO blackboard_attributes (artifact_id, artifact_type_id, source, context, attribute_type_id, value_type, value_byte, value_text, value_int32, value_int64, value_double) VALUES ("
+                String sql = "INSERT INTO blackboard_attributes (artifact_id, artifact_type_id, source, context, attribute_type_id, value_type, value_byte, value_text, value_int32, value_int64, value_double) VALUES (" //NON-NLS
                         + inputResultSet.getLong(1) + ","
                         + inputResultSet.getLong(2) + ","
                         + " ? ,"
@@ -722,7 +722,7 @@ public class SingleUserCaseConverter {
                 if (value > biggestPK) {
                     biggestPK = value;
                 }
-                String sql = "INSERT INTO tsk_vs_parts (obj_id, addr, start, length, descr, flags) VALUES ("
+                String sql = "INSERT INTO tsk_vs_parts (obj_id, addr, start, length, descr, flags) VALUES (" //NON-NLS
                         + value + ","
                         + inputResultSet.getLong(2) + ","
                         + inputResultSet.getLong(3) + ","
@@ -754,7 +754,7 @@ public class SingleUserCaseConverter {
                 if (value > biggestPK) {
                     biggestPK = value;
                 }
-                outputStatement.executeUpdate("INSERT INTO tsk_vs_info (obj_id, vs_type, img_offset, block_size) VALUES ("
+                outputStatement.executeUpdate("INSERT INTO tsk_vs_info (obj_id, vs_type, img_offset, block_size) VALUES (" //NON-NLS
                         + value + ","
                         + inputResultSet.getInt(2) + ","
                         + inputResultSet.getLong(3) + ","
@@ -780,7 +780,7 @@ public class SingleUserCaseConverter {
                 if (value > biggestPK) {
                     biggestPK = value;
                 }
-                String sql = "INSERT INTO tsk_files_derived (obj_id, derived_id, rederive) VALUES ("
+                String sql = "INSERT INTO tsk_files_derived (obj_id, derived_id, rederive) VALUES (" //NON-NLS
                         + value + ","
                         + inputResultSet.getLong(2) + ","
                         + " ? )"; //NON-NLS
@@ -808,7 +808,7 @@ public class SingleUserCaseConverter {
                 if (value > biggestPK) {
                     biggestPK = value;
                 }
-                String sql = "INSERT INTO tsk_files_derived_method (derived_id, tool_name, tool_version, other) VALUES ("
+                String sql = "INSERT INTO tsk_files_derived_method (derived_id, tool_name, tool_version, other) VALUES (" //NON-NLS
                         + value + ", '"
                         + inputResultSet.getString(2) + "','"
                         + inputResultSet.getString(3) + "',"
@@ -838,7 +838,7 @@ public class SingleUserCaseConverter {
                 if (value > biggestPK) {
                     biggestPK = value;
                 }
-                outputStatement.executeUpdate("INSERT INTO content_tags (tag_id, obj_id, tag_name_id, comment, begin_byte_offset, end_byte_offset) VALUES ("
+                outputStatement.executeUpdate("INSERT INTO content_tags (tag_id, obj_id, tag_name_id, comment, begin_byte_offset, end_byte_offset) VALUES (" //NON-NLS
                         + value + ","
                         + inputResultSet.getLong(2) + ","
                         + inputResultSet.getLong(3) + ",'"
@@ -867,7 +867,7 @@ public class SingleUserCaseConverter {
                 if (value > biggestPK) {
                     biggestPK = value;
                 }
-                outputStatement.executeUpdate("INSERT INTO blackboard_artifact_tags (tag_id, artifact_id, tag_name_id, comment) VALUES ("
+                outputStatement.executeUpdate("INSERT INTO blackboard_artifact_tags (tag_id, artifact_id, tag_name_id, comment) VALUES (" //NON-NLS
                         + value + ","
                         + inputResultSet.getLong(2) + ","
                         + inputResultSet.getLong(3) + ",'"
@@ -1140,7 +1140,7 @@ public class SingleUserCaseConverter {
      * @throws SQLException if unable to open
      */
     private static Connection getPostgreSQLConnection(ImportCaseData icd, String dbName) throws SQLException {
-        return DriverManager.getConnection("jdbc:postgresql://"
+        return DriverManager.getConnection("jdbc:postgresql://" //NON-NLS
                 + icd.getDb().getHost() + ":"
                 + icd.getDb().getPort() + "/"
                 + dbName,
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/events/DataSourceAddedEvent.java b/Core/src/org/sleuthkit/autopsy/casemodule/events/DataSourceAddedEvent.java
index bba2fba8c3..7eff327f14 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/events/DataSourceAddedEvent.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/events/DataSourceAddedEvent.java
@@ -81,7 +81,7 @@ public final class DataSourceAddedEvent extends AutopsyEvent implements Serializ
             dataSource = Case.getCurrentCase().getSleuthkitCase().getContentById(id);
             return dataSource;
         } catch (IllegalStateException | TskCoreException ex) {
-            logger.log(Level.SEVERE, "Error doing lazy load for remote event", ex);
+            logger.log(Level.SEVERE, "Error doing lazy load for remote event", ex); //NON-NLS
             return null;
         }
     }
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/events/ReportAddedEvent.java b/Core/src/org/sleuthkit/autopsy/casemodule/events/ReportAddedEvent.java
index 84121ad2de..534f6b646a 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/events/ReportAddedEvent.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/events/ReportAddedEvent.java
@@ -78,7 +78,7 @@ public final class ReportAddedEvent extends AutopsyEvent implements Serializable
             }
             return report;
         } catch (IllegalStateException | TskCoreException ex) {
-            logger.log(Level.SEVERE, "Error doing lazy load for remote event", ex);
+            logger.log(Level.SEVERE, "Error doing lazy load for remote event", ex); //NON-NLS
             return null;
         }
     }
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/events/TagAddedEvent.java b/Core/src/org/sleuthkit/autopsy/casemodule/events/TagAddedEvent.java
index 88cbd023bb..365a3c0ff8 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/events/TagAddedEvent.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/events/TagAddedEvent.java
@@ -85,7 +85,7 @@ abstract class TagAddedEvent<T extends Tag> extends AutopsyEvent implements Seri
             tag = getTagByID();
             return tag;
         } catch (IllegalStateException | TskCoreException ex) {
-            Logger.getLogger(TagAddedEvent.class.getName()).log(Level.SEVERE, "Error doing lazy load for remote event", ex);
+            Logger.getLogger(TagAddedEvent.class.getName()).log(Level.SEVERE, "Error doing lazy load for remote event", ex); //NON-NLS
             return null;
         }
     }