diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java
index e19be18a5c..03e1108f1f 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java
@@ -34,6 +34,8 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.ReadContentInputStream;
@@ -130,12 +132,16 @@ class AbstractFileTikaTextExtract implements AbstractFileExtract {
             try {
                 future.get(Ingester.getTimeout(sourceFile.getSize()), TimeUnit.SECONDS);
             } catch (TimeoutException te) {
-                final String msg = "Exception: Tika parse timeout for content: " + sourceFile.getId() + ", " + sourceFile.getName();
+                final String msg = NbBundle.getMessage(this.getClass(),
+                                                       "AbstractFileTikaTextExtract.index.tikaParseTimeout.text",
+                                                       sourceFile.getId(), sourceFile.getName());
                 KeywordSearch.getTikaLogger().log(Level.WARNING, msg, te);
                 logger.log(Level.WARNING, msg);
                 throw new IngesterException(msg);
             } catch (Exception ex) {
-                final String msg = "Exception: Unexpected exception from Tika parse task execution for file: " + sourceFile.getId() + ", " + sourceFile.getName();
+                final String msg = NbBundle.getMessage(this.getClass(),
+                                                       "AbstractFileTikaTextExtract.index.exception.tikaParse.msg",
+                                                       sourceFile.getId(), sourceFile.getName());
                 KeywordSearch.getTikaLogger().log(Level.WARNING, msg, ex);
                 logger.log(Level.WARNING, msg);
                 throw new IngesterException(msg);
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
index a608ce590f..a8e317e5d5 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
@@ -9,8 +9,6 @@ OptionsCategory_Name_KeywordSearchOptions=Keyword Search
 OptionsCategory_Keywords_KeywordSearchOptions=Keyword Search
 ListBundleName=Keyword Lists
 ListBundleConfig=Keyword List Configuration
-IndexProgressPanel.statusText.text=Status text
-IndexProgressPanel.cancelButton.text=Cancel
 ExtractedContentPanel.hitLabel.text=Matches on page:
 ExtractedContentPanel.hitCountLabel.text=-
 ExtractedContentPanel.hitOfLabel.text=of
@@ -114,7 +112,7 @@ KeywordSearchIngestModule.init.onlyIdxKwSkipMsg=Only indexing will be done and a
 KeywordSearchIngestModule.doInBackGround.displayName=Keyword Search
 KeywordSearchIngestModule.doInBackGround.finalizeMsg= - Finalizing
 KeywordSearchIngestModule.doInBackGround.pendingMsg= (Pending)
-KeywordSearchIngestModule.doInBackGround.cancelMsg= (Cancelling...)
+SearchRunner.doInBackGround.cancelMsg= (Cancelling...)
 KeywordSearchIngestModule.postIndexSummary.knowFileHeaderLbl=Files with known types
 KeywordSearchIngestModule.postIndexSummary.fileGenStringsHead=Files with general strings extracted
 KeywordSearchIngestModule.postIndexSummary.mdOnlyLbl=Metadata only was indexed
@@ -146,7 +144,6 @@ KeywordSearch.importOwConflict=Import list conflict
 KeywordSearch.kwListFailImportMsg=Keyword list not imported
 KeywordSearchListsManagementPanel.fileExtensionFilterLbl=Keyword List File
 KeywordSearch.listImportFeatureTitle=Keyword List Import
-KeywordSearchIngestModule.hashDbModuleName=Hash Lookup
 KeywordSearchIngestModule.moduleName=Keyword Search
 KeywordSearchIngestModule.moduleDescription=Performs file indexing and periodic search using keywords and regular expressions in lists.
 DropdownSearchPanel.keywordTextField.text=
@@ -198,12 +195,10 @@ KeywordSearchListsEncase.save2.exception.msg=Not supported yet.
 KeywordSearchListsEncase.encaseMetaType.exception.msg=Unsupported EncaseMetaType\: {0}
 KeywordSearchListsManagementPanel.getColName.text=Name
 KeywordSearchListsManagementPanel.setValueAt.exception.msg=Editing of cells is not supported
-KeywordSearchListsViewerPanel.isLuceneQuerySel.exception.msg=Not supported for multi-word queries.
 KeywordSearchListsViewerPanel.getQueryText.exception.msg=Not supported for multi-word queries.
 KeywordSearchOptionsPanelController.moduleErr=Module Error
 KeywordSearchOptionsPanelController.moduleErr.msg1=A module caused an error listening to KeywordSearchOptionsPanelController updates. See log to determine which module. Some data could be incomplete.
 KeywordSearchOptionsPanelController.moduleErr.msg2=A module caused an error listening to KeywordSearchOptionsPanelController updates. See log to determine which module. Some data could be incomplete.
-KeywordSearchPanel.getQueryList.exception.msg=No list for single-keyword search
 KeywordSearchQueryManager.pathText.text=Keyword search
 KeywordSearchResultFactory.progress.saving=Saving results\: {0}
 KeywordSearchSettings.moduleName.text=KeywordSearch
@@ -270,3 +265,11 @@ KeywordSearchIngestModule.previewThLbl=Preview
 KeywordSearchIngestModule.fileThLbl=File
 KeywordSearchIngestModule.listThLbl=List
 KeywordSearchIngestModule.regExThLbl=Reg Ex
+AbstractFileTikaTextExtract.index.tikaParseTimeout.text=Exception\: Tika parse timeout for content\: {0}, {1}
+AbstractFileTikaTextExtract.index.exception.tikaParse.msg=Exception\: Unexpected exception from Tika parse task execution for file\: {0}, {1}
+KeywordSearchEditListPanel.exportButtonAction.featureName.text=Keyword List Export
+KeywordSearchGlobalListSettingsPanel.component.featureName.text=Save Keyword List
+KeywordSearchListsAbstract.moduleErr=Module Error
+KeywordSearchListsAbstract.addList.errMsg1.msg=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
+KeywordSearchListsAbstract.addList.errMsg2.msg=A module caused an error listening to KeywordSearchListsAbstract updates. See log to determine which module. Some data could be incomplete.
+SearchRunner.updateTimer.title.text=SearchRunner update timer
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties
index 7810f857ff..3793846daf 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties
@@ -6,8 +6,6 @@ OpenIDE-Module-Long-Description=\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22\u30e2
 OpenIDE-Module-Name=\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22
 ListBundleName=\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8
 ListBundleConfig=\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u8a2d\u5b9a
-IndexProgressPanel.statusText.text=\u30b9\u30c6\u30fc\u30bf\u30b9\u30c6\u30ad\u30b9\u30c8
-IndexProgressPanel.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
 ExtractedContentPanel.hitLabel.text=\u30da\u30fc\u30b8\u5185\u306e\u4e00\u81f4\uff1a
 ExtractedContentPanel.hitCountLabel.text=-
 ExtractedContentPanel.hitOfLabel.text=of
@@ -27,15 +25,9 @@ KeywordSearchEditListPanel.exportButton.text=\u30ea\u30b9\u30c8\u3092\u30a8\u30a
 KeywordSearchEditListPanel.deleteListButton.text=\u30ea\u30b9\u30c8\u3092\u524a\u9664
 KeywordSearchListsManagementPanel.newListButton.text=\u65b0\u898f\u30ea\u30b9\u30c8
 KeywordSearchListsManagementPanel.importButton.text=\u30ea\u30b9\u30c8\u3092\u30a4\u30f3\u30dd\u30fc\u30c8
-KeywordSearchPanel.searchBox.text=\u691c\u7d22...
-KeywordSearchPanel.regExCheckboxMenuItem.text=\u6b63\u898f\u8868\u73fe\u3092\u4f7f\u7528
 KeywordSearchListsViewerPanel.searchAddButton.text=\u691c\u7d22
 KeywordSearchListsViewerPanel.manageListsButton.text=\u30ea\u30b9\u30c8\u3092\u7ba1\u7406
 KeywordSearchListsViewerPanel.ingestIndexLabel.text=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\uff1a
-KeywordSearchPanel.cutMenuItem.text=\u30ab\u30c3\u30c8
-KeywordSearchPanel.copyMenuItem.text=\u30b3\u30d4\u30fc
-KeywordSearchPanel.pasteMenuItem.text=\u8cbc\u308a\u4ed8\u3051
-KeywordSearchPanel.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629e
 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
@@ -134,7 +126,6 @@ KeywordSearch.importOwConflict=\u30ea\u30b9\u30c8\u30a4\u30f3\u30dd\u30fc\u30c8\
 KeywordSearch.kwListFailImportMsg=\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u304c\u30a4\u30f3\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093
 KeywordSearchListsManagementPanel.fileExtensionFilterLbl=\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u30d5\u30a1\u30a4\u30eb
 KeywordSearch.listImportFeatureTitle=\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u30a4\u30f3\u30dd\u30fc\u30c8
-KeywordSearchIngestModule.hashDbModuleName=\u30cf\u30c3\u30b7\u30e5\u30eb\u30c3\u30af\u30a2\u30c3\u30d7
 KeywordSearchIngestModule.moduleName=\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22
 DropdownSearchPanel.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629e
 DropdownSearchPanel.pasteMenuItem.text=\u8cbc\u308a\u4ed8\u3051
@@ -185,12 +176,10 @@ KeywordSearchListsEncase.save2.exception.msg=\u307e\u3060\u30b5\u30dd\u30fc\u30c
 KeywordSearchListsEncase.encaseMetaType.exception.msg=\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u306a\u3044EncaseMetaType\uff1a{0}
 KeywordSearchListsManagementPanel.getColName.text=\u540d\u79f0
 KeywordSearchListsManagementPanel.setValueAt.exception.msg=\u30bb\u30eb\u306e\u7de8\u96c6\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-KeywordSearchListsViewerPanel.isLuceneQuerySel.exception.msg=\u30de\u30eb\u30c1\u30ef\u30fc\u30c9\u30af\u30a8\u30ea\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 KeywordSearchListsViewerPanel.getQueryText.exception.msg=\u30de\u30eb\u30c1\u30ef\u30fc\u30c9\u30af\u30a8\u30ea\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 KeywordSearchOptionsPanelController.moduleErr=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a8\u30e9\u30fc
 KeywordSearchOptionsPanelController.moduleErr.msg1=KeywordSearchOptionsPanelController\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
 KeywordSearchOptionsPanelController.moduleErr.msg2=KeywordSearchOptionsPanelController\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
-KeywordSearchPanel.getQueryList.exception.msg=\u30b7\u30f3\u30b0\u30eb\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22\u306e\u30ea\u30b9\u30c8\u304c\u3042\u308a\u307e\u305b\u3093
 KeywordSearchQueryManager.pathText.text=\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22
 KeywordSearchResultFactory.progress.saving=\u7d50\u679c\u3092\u4fdd\u5b58\u4e2d\uff1a{0}
 KeywordSearchSettings.moduleName.text=\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22
@@ -223,7 +212,7 @@ Server.solrServerNoPortException.msg=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\
 KeywordSearchIngestModule.doInBackGround.displayName=\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22
 KeywordSearchIngestModule.doInBackGround.finalizeMsg=-\u3000\u6700\u7d42\u51e6\u7406\u4e2d
 KeywordSearchIngestModule.doInBackGround.pendingMsg=\uff08\u30da\u30f3\u30c7\u30a3\u30f3\u30b0\uff09
-KeywordSearchIngestModule.doInBackGround.cancelMsg=\uff08\u30ad\u30e3\u30f3\u30bb\u30eb\u4e2d\u2026\uff09
+SearchRunner.doInBackGround.cancelMsg=\uff08\u30ad\u30e3\u30f3\u30bb\u30eb\u4e2d\u2026\uff09
 Server.addDoc.exception.msg2=\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u30cf\u30f3\u30c9\u30e9\u30fc\u3092\u4f7f\u7528\u3057\u307e\u3057\u305f\u304c\u3001\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306b\u4e0b\u8a18\u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\uff1a{0}
 ExtractedContentViewer.getSolrContent.txtBodyItal=<span style\=''font-style\:italic''>{0}</span>
 Keyword.toString.text=Keyword'{'query\={0}, isLiteral\={1}, keywordType\={2}'}'
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
index 27ba1933e5..359ee87d4f 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchEditListPanel.java
@@ -438,7 +438,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.exportButtonAction.featureName.text");
 
         JFileChooser chooser = new JFileChooser();
         final String EXTENSION = "xml";
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalListSettingsPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalListSettingsPanel.java
index ac8e74212d..b17ea121b5 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalListSettingsPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalListSettingsPanel.java
@@ -56,7 +56,8 @@ final class KeywordSearchGlobalListSettingsPanel extends javax.swing.JPanel impl
         editListPanel.addSaveButtonActionPerformed(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                final String FEATURE_NAME = "Save Keyword List";
+                final String FEATURE_NAME = NbBundle.getMessage(this.getClass(),
+                                                                "KeywordSearchGlobalListSettingsPanel.component.featureName.text");
                 KeywordList currentKeywordList = editListPanel.getCurrentKeywordList();
 
                 List<Keyword> keywords = currentKeywordList.getKeywords();
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsAbstract.java
index b4b11b0ae9..7dc2ce0547 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.datamodel.BlackboardAttribute;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
@@ -286,7 +288,10 @@ abstract class KeywordSearchListsAbstract {
                 changeSupport.firePropertyChange(ListsEvt.LIST_ADDED.toString(), null, name);
             } 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.addList.errMsg1.msg"),
+                        MessageNotifyUtil.MessageType.ERROR);
             }
         } else {
             theLists.put(name, new KeywordList(name, curList.getDateCreated(), now, useForIngest, ingestMessages, newList, locked));
@@ -296,7 +301,10 @@ abstract class KeywordSearchListsAbstract {
                 changeSupport.firePropertyChange(ListsEvt.LIST_UPDATED.toString(), null, name);
             } 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.addList.errMsg2.msg"),
+                        MessageNotifyUtil.MessageType.ERROR);
             }
         }
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java
index 813c0fd8dd..fb36b66fb3 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java
@@ -64,7 +64,7 @@ public final class SearchRunner {
     
     SearchRunner() {
         ingester = Server.getIngester();       
-        updateTimer = new Timer("SearchRunner update timer", true); // run as a daemon
+        updateTimer = new Timer(NbBundle.getMessage(this.getClass(), "SearchRunner.updateTimer.title.text"), true); // run as a daemon
     }
     
     /**