diff --git a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties b/Core/src/org/sleuthkit/autopsy/core/Bundle.properties
index 913f6d8c82..8ba6b8f14e 100644
--- a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/core/Bundle.properties
@@ -23,4 +23,9 @@ ServicesMonitor.unknownServiceName.excepton.txt=Requested service name {0} is un
 TextConverter.convert.exception.txt=Unable to convert text {0} to hex text
 TextConverter.convertFromHex.exception.txt=Unable to convert hex text to text
 ServicesMonitor.KeywordSearchNull=Cannot find Keyword Search service
-ServicesMonitor.InvalidPortNumber=Invalid port number.
\ No newline at end of file
+ServicesMonitor.InvalidPortNumber=Invalid port number.
+ServicesMonitor.remoteCaseDatabase.displayName.text=Multi-user case database service
+ServicesMonitor.remoteKeywordSearch.displayName.text=Multi-user keyword search service
+ServicesMonitor.messaging.displayName.text=Messaging service
+ServicesMonitor.databaseConnectionInfo.error.msg=Error accessing case database connection info
+ServicesMonitor.messagingService.connErr.text=Error accessing messaging service connection info
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/core/Installer.java b/Core/src/org/sleuthkit/autopsy/core/Installer.java
index 2c5493d38d..8809bb549f 100644
--- a/Core/src/org/sleuthkit/autopsy/core/Installer.java
+++ b/Core/src/org/sleuthkit/autopsy/core/Installer.java
@@ -123,9 +123,9 @@ public class Installer extends ModuleInstall {
             }
 
             // This library name is different in 32-bit versus 64-bit
-            String libintlName = "libintl-8";
+            String libintlName = "libintl-8"; //NON-NLS
             if (PlatformUtil.is64BitJVM() == false) {
-                libintlName = "intl";
+                libintlName = "intl"; //NON-NLS
             }
             try {
                 System.loadLibrary(libintlName); //NON-NLS
diff --git a/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java b/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java
index 4c1fb92989..70857146d4 100644
--- a/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java
+++ b/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java
@@ -52,7 +52,7 @@ public class ServicesMonitor {
     private static final Logger logger = Logger.getLogger(ServicesMonitor.class.getName());
     private final ScheduledThreadPoolExecutor periodicTasksExecutor;
 
-    private static final String PERIODIC_TASK_THREAD_NAME = "services-monitor-periodic-task-%d";
+    private static final String PERIODIC_TASK_THREAD_NAME = "services-monitor-periodic-task-%d"; //NON-NLS
     private static final int NUMBER_OF_PERIODIC_TASK_THREADS = 1;
     private static final long CRASH_DETECTION_INTERVAL_MINUTES = 2;
 
@@ -84,18 +84,18 @@ public class ServicesMonitor {
          * changes. New value is set to updated ServiceStatus, old value is
          * null.
          */
-        REMOTE_CASE_DATABASE("Multi-user case database service"),
+        REMOTE_CASE_DATABASE(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.remoteCaseDatabase.displayName.text")),
         /**
          * Property change event fired when remote keyword search service status
          * changes. New value is set to updated ServiceStatus, old value is
          * null.
          */
-        REMOTE_KEYWORD_SEARCH("Multi-user keyword search service"),
+        REMOTE_KEYWORD_SEARCH(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.remoteKeywordSearch.displayName.text")),
         /**
          * Property change event fired when messaging service status changes.
          * New value is set to updated ServiceStatus, old value is null.
          */
-        MESSAGING("Messaging service");
+        MESSAGING(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.messaging.displayName.text"));
 
         private final String displayName;
 
@@ -244,7 +244,7 @@ public class ServicesMonitor {
             info = UserPreferences.getDatabaseConnectionInfo();
         } catch (UserPreferencesException ex) {
             logger.log(Level.SEVERE, "Error accessing case database connection info", ex); //NON-NLS
-            setServiceStatus(Service.REMOTE_CASE_DATABASE.toString(), ServiceStatus.DOWN.toString(), "Error accessing case database connection info");
+            setServiceStatus(Service.REMOTE_CASE_DATABASE.toString(), ServiceStatus.DOWN.toString(), NbBundle.getMessage(this.getClass(), "ServicesMonitor.databaseConnectionInfo.error.msg"));
             return;
         }
         try {
@@ -289,7 +289,7 @@ public class ServicesMonitor {
             info = UserPreferences.getMessageServiceConnectionInfo();
         } catch (UserPreferencesException ex) {
             logger.log(Level.SEVERE, "Error accessing messaging service connection info", ex); //NON-NLS
-            setServiceStatus(Service.MESSAGING.toString(), ServiceStatus.DOWN.toString(), "Error accessing messaging service connection info");
+            setServiceStatus(Service.MESSAGING.toString(), ServiceStatus.DOWN.toString(), NbBundle.getMessage(this.getClass(), "ServicesMonitor.messagingService.connErr.text"));
             return;
         }
 
diff --git a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
index 03c97a0479..0cfaddf97b 100755
--- a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
+++ b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
@@ -147,7 +147,7 @@ public final class UserPreferences {
     public static CaseDbConnectionInfo getDatabaseConnectionInfo() throws UserPreferencesException {
         DbType dbType;
         try {
-            dbType = DbType.valueOf(preferences.get(EXTERNAL_DATABASE_TYPE, "POSTGRESQL"));
+            dbType = DbType.valueOf(preferences.get(EXTERNAL_DATABASE_TYPE, "POSTGRESQL")); //NON-NLS
         } catch (Exception ex) {
             dbType = DbType.SQLITE;
         }
@@ -290,7 +290,7 @@ public final class UserPreferences {
      */
     static final class TextConverter {
 
-        private static final char[] TMP = "hgleri21auty84fwe".toCharArray();
+        private static final char[] TMP = "hgleri21auty84fwe".toCharArray(); //NON-NLS
         private static final byte[] SALT = {
             (byte) 0xde, (byte) 0x33, (byte) 0x10, (byte) 0x12,
             (byte) 0xde, (byte) 0x33, (byte) 0x10, (byte) 0x12,};
@@ -306,9 +306,9 @@ public final class UserPreferences {
          */
         static String convertTextToHexText(String property) throws UserPreferencesException {
             try {
-                SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("PBEWithMD5AndDES");
+                SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("PBEWithMD5AndDES"); //NON-NLS
                 SecretKey key = keyFactory.generateSecret(new PBEKeySpec(TMP));
-                Cipher pbeCipher = Cipher.getInstance("PBEWithMD5AndDES");
+                Cipher pbeCipher = Cipher.getInstance("PBEWithMD5AndDES"); //NON-NLS
                 pbeCipher.init(Cipher.ENCRYPT_MODE, key, new PBEParameterSpec(SALT, 20));
                 return base64Encode(pbeCipher.doFinal(property.getBytes("UTF-8")));
             } catch (Exception ex) {
@@ -332,9 +332,9 @@ public final class UserPreferences {
          */
         static String convertHexTextToText(String property) throws UserPreferencesException {
             try {
-                SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("PBEWithMD5AndDES");
+                SecretKeyFactory keyFactory = SecretKeyFactory.getInstance("PBEWithMD5AndDES"); //NON-NLS
                 SecretKey key = keyFactory.generateSecret(new PBEKeySpec(TMP));
-                Cipher pbeCipher = Cipher.getInstance("PBEWithMD5AndDES");
+                Cipher pbeCipher = Cipher.getInstance("PBEWithMD5AndDES"); //NON-NLS
                 pbeCipher.init(Cipher.DECRYPT_MODE, key, new PBEParameterSpec(SALT, 20));
                 return new String(pbeCipher.doFinal(base64Decode(property)), "UTF-8");
             } catch (Exception ex) {