diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
index 406c98509a..8ca9c4db8a 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
@@ -264,3 +264,13 @@ Server.close.exception.msg=Cannot close Core
 Server.close.exception.msg2=Cannot close Core
 Server.solrServerNoPortException.msg=Indexing server could not bind to port {0}, port is not available, consider change the default {1} port.
 KeywordSearchConfigurationPanel2.showSnippetsCB.text=Show Keyword Preview in Keyword Search Results (will result in longer search times)
+KeywordSearchConfigurationPanel1.saveKeywordList.title=Save Keyword List
+KeywordSearchEditListPanel.exportButtonActionPerformed.featureName=Keyword List Export
+KeywordSearchListsAbstract.moduleErr=Module Error
+KeywordSearchListsAbstract.errMsg.listenerException=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
+KeywordSearchListsAbstract.errMsg.listenerException2=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
+KeywordSearchListsAbstract.errMsg.listenerException3=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
+KeywordSearchListsAbstract.errMsg.listenerException4=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
+KeywordSearchListsAbstract.errMsg.listenerException5=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
+KeywordSearchListsAbstract.errMsg.listenerException6=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
+KeywordSearchListsAbstract.errMsg.listenerException7=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java
index 34bb43a679..ef1ec34268 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel1.java
@@ -78,7 +78,8 @@ class KeywordSearchConfigurationPanel1 extends javax.swing.JPanel implements Opt
            
             @Override
             public void actionPerformed(ActionEvent e) {
-                final String FEATURE_NAME = "Save Keyword List";
+                final String FEATURE_NAME = NbBundle
+                        .getMessage(this.getClass(), "KeywordSearchConfigurationPanel1.saveKeywordList.title");
                 KeywordSearchListsXML writer = KeywordSearchListsXML.getCurrent();
                 KeywordSearchListsAbstract.KeywordSearchList currentKeywordList = editListPanel.getCurrentKeywordList();
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
index 2cf89f27c5..324b249418 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
@@ -538,7 +538,8 @@ class KeywordSearchEditListPanel extends javax.swing.JPanel implements ListSelec
 
     private void exportButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_exportButtonActionPerformed
 
-        final String FEATURE_NAME = "Keyword List Export";
+        final String FEATURE_NAME = NbBundle
+                .getMessage(this.getClass(), "KeywordSearchEditListPanel.exportButtonActionPerformed.featureName");
 
         JFileChooser chooser = new JFileChooser();
         final String EXTENSION = "xml";
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java
index aeaac5bf89..110dcc4153 100755
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java
@@ -26,6 +26,8 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 import org.sleuthkit.datamodel.BlackboardAttribute;
@@ -309,7 +311,10 @@ public abstract class KeywordSearchListsAbstract {
             }
             catch (Exception e) {
                 logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e);
-                MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                MessageNotifyUtil.Notify.show(
+                        NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.moduleErr"),
+                        NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.errMsg.listenerException"),
+                        MessageNotifyUtil.MessageType.ERROR);
             }
         } else {
             theLists.put(name, new KeywordSearchList(name, curList.getDateCreated(), now, useForIngest, ingestMessages, newList, locked));
@@ -323,7 +328,10 @@ public abstract class KeywordSearchListsAbstract {
             }
             catch (Exception e) {
                 logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e);
-                MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                MessageNotifyUtil.Notify.show(
+                        NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.moduleErr"),
+                        NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.errMsg.listenerException2"),
+                        MessageNotifyUtil.MessageType.ERROR);
             }
         }
         
@@ -372,7 +380,10 @@ public abstract class KeywordSearchListsAbstract {
                 }
                 catch (Exception e) {
                     logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e);
-                    MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                    MessageNotifyUtil.Notify.show(
+                            NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.moduleErr"),
+                            NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.errMsg.listenerException3"),
+                            MessageNotifyUtil.MessageType.ERROR);
                 }
             }
             for (KeywordSearchList over : overwritten) {
@@ -381,7 +392,10 @@ public abstract class KeywordSearchListsAbstract {
                 }
                 catch (Exception e) {
                     logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e);
-                    MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                    MessageNotifyUtil.Notify.show(
+                            NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.moduleErr"),
+                            NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.errMsg.listenerException4"),
+                            MessageNotifyUtil.MessageType.ERROR);
                 }
             }
         }
@@ -416,8 +430,11 @@ public abstract class KeywordSearchListsAbstract {
                  changeSupport.firePropertyChange(ListsEvt.LIST_ADDED.toString(), null, list.getName());  
             }
             catch (Exception e) {
-                logger.log(Level.SEVERE, "KeywordSearchListsAbstractr listener threw exception", e);
-                MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e);
+                MessageNotifyUtil.Notify.show(
+                        NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.moduleErr"),
+                        NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.errMsg.listenerException5"),
+                        MessageNotifyUtil.MessageType.ERROR);
             }
         }
         for (KeywordSearchList over : overwritten) {
@@ -427,7 +444,10 @@ public abstract class KeywordSearchListsAbstract {
             }
             catch (Exception e) {
                 logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e);
-                MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                MessageNotifyUtil.Notify.show(
+                        NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.moduleErr"),
+                        NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.errMsg.listenerException6"),
+                        MessageNotifyUtil.MessageType.ERROR);
             }
         }
 
@@ -453,7 +473,10 @@ public abstract class KeywordSearchListsAbstract {
             }
             catch (Exception e) {
                 logger.log(Level.SEVERE, "KeywordSearchListsAbstract listener threw exception", e);
-                MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                MessageNotifyUtil.Notify.show(
+                        NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.moduleErr"),
+                        NbBundle.getMessage(this.getClass(), "KeywordSearchListsAbstract.errMsg.listenerException7"),
+                        MessageNotifyUtil.MessageType.ERROR);
             }
         return true;