diff --git a/Core/manifest.mf b/Core/manifest.mf
index 7aa34c46dc..9c9ba77918 100644
--- a/Core/manifest.mf
+++ b/Core/manifest.mf
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.sleuthkit.autopsy.core/9
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/core/Bundle.properties
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/core/layer.xml
-OpenIDE-Module-Implementation-Version: 9
+OpenIDE-Module-Implementation-Version: 10
 OpenIDE-Module-Requires: org.openide.windows.WindowManager, org.netbeans.api.javahelp.Help
 AutoUpdate-Show-In-Client: true
 AutoUpdate-Essential-Module: true
diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties
index 377812104d..69d3afa92d 100644
--- a/Core/nbproject/project.properties
+++ b/Core/nbproject/project.properties
@@ -6,5 +6,5 @@ license.file=../LICENSE-2.0.txt
 nbm.homepage=http://www.sleuthkit.org/
 nbm.module.author=Brian Carrier
 nbm.needs.restart=true
-spec.version.base=7.0
+spec.version.base=7.1
 
diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index d5eb8a4d96..fb2fb85e48 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -194,6 +194,7 @@
                 <package>org.sleuthkit.autopsy.actions</package>
                 <package>org.sleuthkit.autopsy.casemodule</package>
                 <package>org.sleuthkit.autopsy.casemodule.services</package>
+                <package>org.sleuthkit.autopsy.contentviewers</package>
                 <package>org.sleuthkit.autopsy.core</package>
                 <package>org.sleuthkit.autopsy.corecomponentinterfaces</package>
                 <package>org.sleuthkit.autopsy.corecomponents</package>
diff --git a/Core/src/org/sleuthkit/autopsy/actions/AddBlackboardArtifactTagAction.java b/Core/src/org/sleuthkit/autopsy/actions/AddBlackboardArtifactTagAction.java
index 4e3efcad87..8cdef4af84 100755
--- a/Core/src/org/sleuthkit/autopsy/actions/AddBlackboardArtifactTagAction.java
+++ b/Core/src/org/sleuthkit/autopsy/actions/AddBlackboardArtifactTagAction.java
@@ -21,6 +21,8 @@ package org.sleuthkit.autopsy.actions;
 import java.util.Collection;
 import java.util.logging.Level;
 import javax.swing.JOptionPane;
+
+import org.openide.util.NbBundle;
 import org.openide.util.Utilities;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -50,7 +52,11 @@ public class AddBlackboardArtifactTagAction extends AddTagAction {
                 
     @Override
     protected String getActionDisplayName() {
-        return Utilities.actionsGlobalContext().lookupAll(BlackboardArtifact.class).size() > 1 ? "Tag Results" : "Tag Result";
+        String singularTagResult = NbBundle.getMessage(this.getClass(),
+                                                       "AddBlackboardArtifactTagAction.singularTagResult");
+        String pluralTagResult = NbBundle.getMessage(this.getClass(),
+                                                     "AddBlackboardArtifactTagAction.pluralTagResult");
+        return Utilities.actionsGlobalContext().lookupAll(BlackboardArtifact.class).size() > 1 ? pluralTagResult : singularTagResult;
     }
 
     @Override
@@ -62,7 +68,13 @@ public class AddBlackboardArtifactTagAction extends AddTagAction {
             }
             catch (TskCoreException ex) {                        
                 Logger.getLogger(AddBlackboardArtifactTagAction.class.getName()).log(Level.SEVERE, "Error tagging result", ex);                
-                JOptionPane.showMessageDialog(null, "Unable to tag " + artifact.getDisplayName() + ".", "Tagging Error", JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(null,
+                                              NbBundle.getMessage(this.getClass(),
+                                                                  "AddBlackboardArtifactTagAction.unableToTag.msg",
+                                                                  artifact.getDisplayName()),
+                                              NbBundle.getMessage(this.getClass(),
+                                                                  "AddBlackboardArtifactTagAction.taggingErr"),
+                                              JOptionPane.ERROR_MESSAGE);
             }                    
         }                                     
     }        
diff --git a/Core/src/org/sleuthkit/autopsy/actions/AddContentTagAction.java b/Core/src/org/sleuthkit/autopsy/actions/AddContentTagAction.java
index 8760ed364f..5d7f7d16bf 100755
--- a/Core/src/org/sleuthkit/autopsy/actions/AddContentTagAction.java
+++ b/Core/src/org/sleuthkit/autopsy/actions/AddContentTagAction.java
@@ -21,6 +21,8 @@ package org.sleuthkit.autopsy.actions;
 import java.util.Collection;
 import java.util.logging.Level;
 import javax.swing.JOptionPane;
+
+import org.openide.util.NbBundle;
 import org.openide.util.Utilities;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -51,7 +53,9 @@ public class AddContentTagAction extends AddTagAction {
                        
     @Override
     protected String getActionDisplayName() {
-        return Utilities.actionsGlobalContext().lookupAll(AbstractFile.class).size() > 1 ? "Tag Files" : "Tag File";
+        String singularTagFile = NbBundle.getMessage(this.getClass(), "AddContentTagAction.singularTagFile");
+        String pluralTagFile = NbBundle.getMessage(this.getClass(), "AddContentTagAction.pluralTagFile");
+        return Utilities.actionsGlobalContext().lookupAll(AbstractFile.class).size() > 1 ? pluralTagFile : singularTagFile;
     }
 
     @Override
@@ -66,7 +70,13 @@ public class AddContentTagAction extends AddTagAction {
                         file = (AbstractFile)parentFile;
                     }
                     else {
-                        JOptionPane.showMessageDialog(null, "Unable to tag " + parentFile.getName() + ", not a regular file.", "Cannot Apply Tag", JOptionPane.WARNING_MESSAGE);
+                        JOptionPane.showMessageDialog(null,
+                                                      NbBundle.getMessage(this.getClass(),
+                                                                          "AddContentTagAction.unableToTag.msg",
+                                                                          parentFile.getName()),
+                                                      NbBundle.getMessage(this.getClass(),
+                                                                          "AddContentTagAction.cannotApplyTagErr"),
+                                                      JOptionPane.WARNING_MESSAGE);
                         continue;
                     }
                 }
@@ -78,12 +88,24 @@ public class AddContentTagAction extends AddTagAction {
                             file = (AbstractFile)parentFile;
                         }
                         else {
-                            JOptionPane.showMessageDialog(null, "Unable to tag " + parentFile.getName() + ", not a regular file.", "Cannot Apply Tag", JOptionPane.WARNING_MESSAGE);
+                            JOptionPane.showMessageDialog(null,
+                                                          NbBundle.getMessage(this.getClass(),
+                                                                              "AddContentTagAction.unableToTag.msg",
+                                                                              parentFile.getName()),
+                                                          NbBundle.getMessage(this.getClass(),
+                                                                              "AddContentTagAction.cannotApplyTagErr"),
+                                                          JOptionPane.WARNING_MESSAGE);
                             continue;
                         }
                     }
                     else {
-                        JOptionPane.showMessageDialog(null, "Unable to tag " + parentFile.getName() + ", not a regular file.", "Cannot Apply Tag", JOptionPane.WARNING_MESSAGE);
+                        JOptionPane.showMessageDialog(null,
+                                                      NbBundle.getMessage(this.getClass(),
+                                                                          "AddContentTagAction.unableToTag.msg",
+                                                                          parentFile.getName()),
+                                                      NbBundle.getMessage(this.getClass(),
+                                                                          "AddContentTagAction.cannotApplyTagErr"),
+                                                      JOptionPane.WARNING_MESSAGE);
                         continue;
                     }                    
                 }
@@ -92,7 +114,12 @@ public class AddContentTagAction extends AddTagAction {
             }
             catch (TskCoreException ex) {                        
                 Logger.getLogger(AddContentTagAction.class.getName()).log(Level.SEVERE, "Error tagging result", ex);                
-                JOptionPane.showMessageDialog(null, "Unable to tag " + file.getName() + ".", "Tagging Error", JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(null,
+                                              NbBundle.getMessage(this.getClass(),
+                                                                  "AddContentTagAction.unableToTag.msg2",
+                                                                  file.getName()),
+                                              NbBundle.getMessage(this.getClass(), "AddContentTagAction.taggingErr"),
+                                              JOptionPane.ERROR_MESSAGE);
             }                    
         }                             
     }
diff --git a/Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java b/Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java
index 65f6a5e589..6d5c91d074 100755
--- a/Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java
+++ b/Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java
@@ -24,6 +24,8 @@ import java.util.List;
 import java.util.logging.Level;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
+
+import org.openide.util.NbBundle;
 import org.openide.util.actions.Presenter;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.services.TagsManager;
@@ -85,7 +87,7 @@ abstract class AddTagAction extends TagAction implements Presenter.Popup {
             }
                         
             // Create a "Quick Tag" sub-menu.
-            JMenu quickTagMenu = new JMenu("Quick Tag");
+            JMenu quickTagMenu = new JMenu(NbBundle.getMessage(this.getClass(), "AddTagAction.quickTag"));
             add(quickTagMenu);    
             
             // Each tag name in the current set of tags gets its own menu item in
@@ -105,7 +107,7 @@ abstract class AddTagAction extends TagAction implements Presenter.Popup {
                 }
             }
             else {
-                JMenuItem empty = new JMenuItem("No tags");
+                JMenuItem empty = new JMenuItem(NbBundle.getMessage(this.getClass(), "AddTagAction.noTags"));
                 empty.setEnabled(false);
                 quickTagMenu.add(empty);                
             }
@@ -115,7 +117,7 @@ abstract class AddTagAction extends TagAction implements Presenter.Popup {
             // The "Quick Tag" menu also gets an "Choose Tag..." menu item.
             // Selecting this item initiates a dialog that can be used to create
             // or select a tag name and adds a tag with the resulting name.
-            JMenuItem newTagMenuItem = new JMenuItem("New Tag...");
+            JMenuItem newTagMenuItem = new JMenuItem(NbBundle.getMessage(this.getClass(), "AddTagAction.newTag"));
             newTagMenuItem.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent e) {
@@ -131,7 +133,8 @@ abstract class AddTagAction extends TagAction implements Presenter.Popup {
             // Create a "Choose Tag and Comment..." menu item. Selecting this item initiates
             // a dialog that can be used to create or select a tag name with an 
             // optional comment and adds a tag with the resulting name.
-            JMenuItem tagAndCommentItem = new JMenuItem("Tag and Comment...");
+            JMenuItem tagAndCommentItem = new JMenuItem(
+                    NbBundle.getMessage(this.getClass(), "AddTagAction.tagAndComment"));
             tagAndCommentItem.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent e) {
diff --git a/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties b/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties
index ad0c347ecb..2151fafa49 100755
--- a/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/actions/Bundle.properties
@@ -14,3 +14,37 @@ GetTagNameAndCommentDialog.commentLabel.text=Comment:
 GetTagNameAndCommentDialog.cancelButton.text=Cancel
 GetTagNameAndCommentDialog.tagCombo.toolTipText=Select tag to use
 GetTagNameAndCommentDialog.tagLabel.text=Tag:
+AddBlackboardArtifactTagAction.singularTagResult=Tag Result
+AddBlackboardArtifactTagAction.pluralTagResult=Tag Results
+AddBlackboardArtifactTagAction.unableToTag.msg=Unable to tag {0}.
+AddBlackboardArtifactTagAction.taggingErr=Tagging Error
+AddContentTagAction.singularTagFile=Tag File
+AddContentTagAction.pluralTagFile=Tag Files
+AddContentTagAction.unableToTag.msg=Unable to tag {0}, not a regular file.
+AddContentTagAction.cannotApplyTagErr=Cannot Apply Tag
+AddContentTagAction.unableToTag.msg2=Unable to tag {0}.
+AddContentTagAction.taggingErr=Tagging Error
+AddTagAction.quickTag=Quick Tag
+AddTagAction.noTags=No tags
+AddTagAction.newTag=New Tag...
+AddTagAction.tagAndComment=Tag and Comment...
+DeleteBlackboardArtifactTagAction.deleteTags=Delete Tag(s)
+DeleteBlackboardArtifactTagAction.unableToDelTag.msg=Unable to delete tag {0}.
+DeleteBlackboardArtifactTagAction.tagDelErr=Tag Deletion Error
+DeleteContentTagAction.deleteTags=Delete Tag(s)
+DeleteContentTagAction.unableToDelTag.msg=Unable to delete tag {0}.
+DeleteContentTagAction.tagDelErr=Tag Deletion Error
+GetTagNameAndCommentDialog.noTags=No Tags
+GetTagNameAndCommentDialog.createTag=Create Tag
+GetTagNameAndCommentDialog.cancelName=cancel
+GetTagNameDialog.createTag=Create Tag
+GetTagNameDialog.cancelName=Cancel
+GetTagNameDialog.mustSupplyTtagName.msg=Must supply a tag name to continue.
+GetTagNameDialog.tagNameErr=Tag Name
+GetTagNameDialog.illegalChars.msg=The tag name contains illegal characters.\
+Cannot contain any of the following symbols\: \\ \: * ? " < > |
+GetTagNameDialog.illegalCharsErr=Illegal Characters
+GetTagNameDialog.unableToAddTagNameToCase.msg=Unable to add the {0} tag name to the case.
+GetTagNameDialog.taggingErr=Tagging Error
+GetTagNameDialog.tagNameAlreadyDef.msg=A {0} tag name has already been defined.
+GetTagNameDialog.dupTagErr=Duplicate Tag Error
diff --git a/Core/src/org/sleuthkit/autopsy/actions/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/actions/Bundle_ja.properties
new file mode 100644
index 0000000000..0cf5a8be40
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/actions/Bundle_ja.properties
@@ -0,0 +1,46 @@
+GetTagNameDialog.cancelButton.text=\u30AD\u30E3\u30F3\u30BB\u30EB
+GetTagNameDialog.okButton.text=OK
+GetTagNameDialog.preexistingLabel.text=\u65E2\u5B58\u30BF\u30B0\uFF1A
+GetTagNameDialog.newTagPanel.border.title=\u65B0\u898F\u30BF\u30B0
+GetTagNameDialog.tagNameLabel.text=\u30BF\u30B0\u540D\uFF1A
+GetTagNameAndCommentDialog.newTagButton.text=\u65B0\u898F\u30BF\u30B0
+GetTagNameAndCommentDialog.okButton.text=OK
+GetTagNameAndCommentDialog.commentText.toolTipText=\u30BF\u30B0\u306E\u30B3\u30E1\u30F3\u30C8\u3092\u5165\u529B\u307E\u305F\u306F\u7A7A\u6B04\u306B\u3057\u3066\u304F\u3060\u3055\u3044
+GetTagNameAndCommentDialog.commentLabel.text=\u30B3\u30E1\u30F3\u30C8\uFF1A
+GetTagNameAndCommentDialog.cancelButton.text=\u30AD\u30E3\u30F3\u30BB\u30EB
+GetTagNameAndCommentDialog.tagCombo.toolTipText=\u4F7F\u7528\u3059\u308B\u30BF\u30B0\u3092\u9078\u629E
+GetTagNameAndCommentDialog.tagLabel.text=\u30BF\u30B0\uFF1A
+AddBlackboardArtifactTagAction.singularTagResult=\u7D50\u679C\u306B\u30BF\u30B0\u3092\u8FFD\u52A0
+AddBlackboardArtifactTagAction.pluralTagResult=\u7D50\u679C\u306B\u30BF\u30B0\u3092\u8FFD\u52A0
+AddBlackboardArtifactTagAction.unableToTag.msg={0}\u306B\u30BF\u30B0\u3092\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093\u3002
+AddBlackboardArtifactTagAction.taggingErr=\u30BF\u30B0\u4ED8\u3051\u30A8\u30E9\u30FC
+AddContentTagAction.singularTagFile=\u30D5\u30A1\u30A4\u30EB\u306B\u30BF\u30B0\u3092\u8FFD\u52A0
+AddContentTagAction.pluralTagFile=\u30D5\u30A1\u30A4\u30EB\u306B\u30BF\u30B0\u3092\u8FFD\u52A0
+AddContentTagAction.unableToTag.msg={0}\u306B\u30BF\u30B0\u3092\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093\u3002\u901A\u5E38\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
+AddContentTagAction.unableToTag.msg2={0}\u306B\u30BF\u30B0\u3092\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093\u3002
+AddContentTagAction.taggingErr=\u30BF\u30B0\u4ED8\u3051\u30A8\u30E9\u30FC
+AddTagAction.quickTag=\u30AF\u30A4\u30C3\u30AF\u30BF\u30B0
+AddTagAction.noTags=\u30BF\u30B0\u7121\u3057
+AddTagAction.newTag=\u65B0\u898F\u30BF\u30B0\u2026
+AddTagAction.tagAndComment=\u30BF\u30B0\u3068\u30B3\u30E1\u30F3\u30C8\u3092\u8FFD\u52A0\u2026
+DeleteBlackboardArtifactTagAction.deleteTags=\u30BF\u30B0\u3092\u524A\u9664
+DeleteBlackboardArtifactTagAction.unableToDelTag.msg=\u30BF\u30B0{0}\u306E\u524A\u9664\u304C\u3067\u304D\u307E\u305B\u3093\u3002
+DeleteBlackboardArtifactTagAction.tagDelErr=\u30BF\u30B0\u524A\u9664\u30A8\u30E9\u30FC
+DeleteContentTagAction.deleteTags=\u30BF\u30B0\u3092\u524A\u9664
+DeleteContentTagAction.unableToDelTag.msg=\u30BF\u30B0{0}\u306E\u524A\u9664\u304C\u3067\u304D\u307E\u305B\u3093\u3002
+DeleteContentTagAction.tagDelErr=\u30BF\u30B0\u524A\u9664\u30A8\u30E9\u30FC
+GetTagNameAndCommentDialog.noTags=\u30BF\u30B0\u7121\u3057
+GetTagNameAndCommentDialog.createTag=\u30BF\u30B0\u3092\u4F5C\u6210
+GetTagNameAndCommentDialog.cancelName=\u30AD\u30E3\u30F3\u30BB\u30EB
+GetTagNameDialog.createTag=\u30BF\u30B0\u3092\u4F5C\u6210
+GetTagNameDialog.cancelName=\u30AD\u30E3\u30F3\u30BB\u30EB
+GetTagNameDialog.mustSupplyTtagName.msg=\u30BF\u30B0\u540D\u3092\u6307\u5B9A\u3057\u306A\u3051\u308C\u3070\u3001\u5148\u306B\u9032\u3081\u307E\u305B\u3093\u3002
+GetTagNameDialog.tagNameErr=\u30BF\u30B0\u540D
+GetTagNameDialog.illegalChars.msg=\u4E0D\u6B63\u306A\u6587\u5B57\u304C\u30BF\u30B0\u540D\u306B\u542B\u307E\u308C\u3066\u3044\u307E\u3059\u3002\
+\u6B21\u306E\u6587\u5B57\u306F\u4F7F\u3048\u307E\u305B\u3093\uFF1A \\ \: * ? " < > |
+GetTagNameDialog.illegalCharsErr=\u4E0D\u6B63\u306A\u6587\u5B57
+GetTagNameDialog.unableToAddTagNameToCase.msg=\u30BF\u30B0\u540D{0}\u3092\u30B1\u30FC\u30B9\u306B\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+GetTagNameDialog.taggingErr=\u30BF\u30B0\u4ED8\u3051\u30A8\u30E9\u30FC
+GetTagNameDialog.tagNameAlreadyDef.msg=\u30BF\u30B0\u540D{0}\u306F\u65E2\u306B\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u3059\u3002
+GetTagNameDialog.dupTagErr=\u91CD\u8907\u30BF\u30B0\u306E\u30A8\u30E9\u30FC
+AddContentTagAction.cannotApplyTagErr=\u30BF\u30B0\u3092\u9069\u7528\u3067\u304D\u307E\u305B\u3093
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/actions/DeleteBlackboardArtifactTagAction.java b/Core/src/org/sleuthkit/autopsy/actions/DeleteBlackboardArtifactTagAction.java
index 3899b09c82..db19ad6f6f 100755
--- a/Core/src/org/sleuthkit/autopsy/actions/DeleteBlackboardArtifactTagAction.java
+++ b/Core/src/org/sleuthkit/autopsy/actions/DeleteBlackboardArtifactTagAction.java
@@ -23,6 +23,8 @@ import java.util.Collection;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.JOptionPane;
+
+import org.openide.util.NbBundle;
 import org.openide.util.Utilities;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.datamodel.BlackboardArtifactTag;
@@ -32,7 +34,8 @@ import org.sleuthkit.datamodel.TskCoreException;
  * Instances of this Action allow users to delete tags applied to blackboard artifacts.  
  */
 public class DeleteBlackboardArtifactTagAction extends TagAction {
-    private static final String MENU_TEXT = "Delete Tag(s)";
+    private static final String MENU_TEXT = NbBundle.getMessage(DeleteBlackboardArtifactTagAction.class,
+                                                                "DeleteBlackboardArtifactTagAction.deleteTags");
     
     // This class is a singleton to support multi-selection of nodes, since 
     // org.openide.nodes.NodeOp.findActions(Node[] nodes) will only pick up an Action if every 
@@ -59,7 +62,13 @@ public class DeleteBlackboardArtifactTagAction extends TagAction {
             }
             catch (TskCoreException ex) {                        
                 Logger.getLogger(AddContentTagAction.class.getName()).log(Level.SEVERE, "Error deleting tag", ex);                
-                JOptionPane.showMessageDialog(null, "Unable to delete tag " + tag.getName() + ".", "Tag Deletion Error", JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(null,
+                                              NbBundle.getMessage(this.getClass(),
+                                                                  "DeleteBlackboardArtifactTagAction.unableToDelTag.msg",
+                                                                  tag.getName()),
+                                              NbBundle.getMessage(this.getClass(),
+                                                                  "DeleteBlackboardArtifactTagAction.tagDelErr"),
+                                              JOptionPane.ERROR_MESSAGE);
             }                    
         }                             
     }    
diff --git a/Core/src/org/sleuthkit/autopsy/actions/DeleteContentTagAction.java b/Core/src/org/sleuthkit/autopsy/actions/DeleteContentTagAction.java
index 6f4bfd42a1..b8bd85e321 100755
--- a/Core/src/org/sleuthkit/autopsy/actions/DeleteContentTagAction.java
+++ b/Core/src/org/sleuthkit/autopsy/actions/DeleteContentTagAction.java
@@ -23,6 +23,8 @@ import java.util.Collection;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.JOptionPane;
+
+import org.openide.util.NbBundle;
 import org.openide.util.Utilities;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.datamodel.ContentTag;
@@ -32,7 +34,8 @@ import org.sleuthkit.datamodel.TskCoreException;
  * Instances of this Action allow users to delete tags applied to content.  
  */
 public class DeleteContentTagAction extends TagAction {
-    private static final String MENU_TEXT = "Delete Tag(s)";
+    private static final String MENU_TEXT = NbBundle.getMessage(DeleteContentTagAction.class,
+                                                                "DeleteContentTagAction.deleteTags");
         
     // This class is a singleton to support multi-selection of nodes, since 
     // org.openide.nodes.NodeOp.findActions(Node[] nodes) will only pick up an Action if every 
@@ -59,7 +62,12 @@ public class DeleteContentTagAction extends TagAction {
             }
             catch (TskCoreException ex) {                        
                 Logger.getLogger(AddContentTagAction.class.getName()).log(Level.SEVERE, "Error deleting tag", ex);                
-                JOptionPane.showMessageDialog(null, "Unable to delete tag " + tag.getName() + ".", "Tag Deletion Error", JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(null,
+                                              NbBundle.getMessage(this.getClass(),
+                                                                  "DeleteContentTagAction.unableToDelTag.msg",
+                                                                  tag.getName()),
+                                              NbBundle.getMessage(this.getClass(), "DeleteContentTagAction.tagDelErr"),
+                                              JOptionPane.ERROR_MESSAGE);
             }                    
         }                             
     }    
diff --git a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.form b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.form
index cbbdaebb26..47ff059281 100644
--- a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.form
+++ b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.form
@@ -109,6 +109,7 @@
       </Properties>
       <AuxValues>
         <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new javax.swing.JComboBox&lt;String&gt;()"/>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
       </AuxValues>
     </Component>
     <Component class="javax.swing.JLabel" name="tagLabel">
diff --git a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java
index e953694d90..68c38b6114 100644
--- a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java
@@ -30,6 +30,8 @@ import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.KeyStroke;
+
+import org.openide.util.NbBundle;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.services.TagsManager;
@@ -38,7 +40,8 @@ import org.sleuthkit.datamodel.TagName;
 import org.sleuthkit.datamodel.TskCoreException;
 
 public class GetTagNameAndCommentDialog extends JDialog {
-    private static final String NO_TAG_NAMES_MESSAGE = "No Tags";
+    private static final String NO_TAG_NAMES_MESSAGE = NbBundle.getMessage(GetTagNameAndCommentDialog.class,
+                                                                           "GetTagNameAndCommentDialog.noTags");
     private final HashMap<String, TagName> tagNames = new HashMap<>();
     private TagNameAndComment tagNameAndComment = null;
 
@@ -66,11 +69,13 @@ public class GetTagNameAndCommentDialog extends JDialog {
     }
     
     private GetTagNameAndCommentDialog() {
-        super((JFrame)WindowManager.getDefault().getMainWindow(), "Create Tag", true);   
+        super((JFrame)WindowManager.getDefault().getMainWindow(),
+              NbBundle.getMessage(GetTagNameAndCommentDialog.class, "GetTagNameAndCommentDialog.createTag"),
+              true);
         initComponents();
 
         // Set up the dialog to close when Esc is pressed.
-        String cancelName = "cancel";
+        String cancelName = NbBundle.getMessage(this.getClass(), "GetTagNameAndCommentDialog.cancelName");
         InputMap inputMap = getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
         inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), cancelName);
         ActionMap actionMap = getRootPane().getActionMap();
@@ -240,7 +245,7 @@ public class GetTagNameAndCommentDialog extends JDialog {
     private javax.swing.JTextField commentText;
     private javax.swing.JButton newTagButton;
     private javax.swing.JButton okButton;
-    private javax.swing.JComboBox tagCombo;
+    private javax.swing.JComboBox<String> tagCombo;
     private javax.swing.JLabel tagLabel;
     // End of variables declaration//GEN-END:variables
 }
diff --git a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java
index fb0d50ddc4..f74ddd38e8 100644
--- a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameDialog.java
@@ -34,6 +34,7 @@ import javax.swing.JOptionPane;
 import javax.swing.KeyStroke;
 import javax.swing.table.AbstractTableModel;
 import org.openide.util.ImageUtilities;
+import org.openide.util.NbBundle;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.services.TagsManager;
@@ -52,12 +53,14 @@ public class GetTagNameDialog extends JDialog {
     }    
     
     private GetTagNameDialog() {
-        super((JFrame)WindowManager.getDefault().getMainWindow(), "Create Tag", true);   
+        super((JFrame)WindowManager.getDefault().getMainWindow(),
+              NbBundle.getMessage(GetTagNameDialog.class, "GetTagNameDialog.createTag"),
+              true);
         setIconImage(ImageUtilities.loadImage(TAG_ICON_PATH));
         initComponents();
         
         // Set up the dialog to close when Esc is pressed.
-        String cancelName = "cancel";
+        String cancelName = NbBundle.getMessage(this.getClass(), "GetTagNameDialog.cancelName");
         InputMap inputMap = getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
         inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), cancelName);
         ActionMap actionMap = getRootPane().getActionMap();
@@ -276,10 +279,17 @@ public class GetTagNameDialog extends JDialog {
     private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed
         String tagDisplayName = tagNameField.getText();
         if (tagDisplayName.isEmpty()) {
-            JOptionPane.showMessageDialog(null, "Must supply a tag name to continue.", "Tag Name", JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null,
+                                          NbBundle.getMessage(this.getClass(),
+                                                              "GetTagNameDialog.mustSupplyTtagName.msg"),
+                                          NbBundle.getMessage(this.getClass(), "GetTagNameDialog.tagNameErr"),
+                                          JOptionPane.ERROR_MESSAGE);
         } 
         else if (containsIllegalCharacters(tagDisplayName)) {
-            JOptionPane.showMessageDialog(null, "The tag name contains illegal characters.\nCannot contain any of the following symbols: \\ : * ? \" < > |", "Illegal Characters", JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null,
+                                          NbBundle.getMessage(this.getClass(), "GetTagNameDialog.illegalChars.msg"),
+                                          NbBundle.getMessage(this.getClass(), "GetTagNameDialog.illegalCharsErr"),
+                                          JOptionPane.ERROR_MESSAGE);
         } 
         else {
             tagName = tagNames.get(tagDisplayName);
@@ -290,12 +300,22 @@ public class GetTagNameDialog extends JDialog {
                 }
                 catch (TskCoreException ex) {
                     Logger.getLogger(AddTagAction.class.getName()).log(Level.SEVERE, "Error adding " + tagDisplayName + " tag name", ex);
-                    JOptionPane.showMessageDialog(null, "Unable to add the " + tagDisplayName + " tag name to the case.", "Tagging Error", JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(null,
+                                                  NbBundle.getMessage(this.getClass(),
+                                                                      "GetTagNameDialog.unableToAddTagNameToCase.msg",
+                                                                      tagDisplayName),
+                                                  NbBundle.getMessage(this.getClass(), "GetTagNameDialog.taggingErr"),
+                                                  JOptionPane.ERROR_MESSAGE);
                     tagName = null;
                 }        
                 catch (TagsManager.TagNameAlreadyExistsException ex) {
                     Logger.getLogger(AddTagAction.class.getName()).log(Level.SEVERE, "Error adding " + tagDisplayName + " tag name", ex);
-                    JOptionPane.showMessageDialog(null, "A " + tagDisplayName + " tag name has already been defined.", "Duplicate Tag Error", JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(null,
+                                                  NbBundle.getMessage(this.getClass(),
+                                                                      "GetTagNameDialog.tagNameAlreadyDef.msg",
+                                                                      tagDisplayName),
+                                                  NbBundle.getMessage(this.getClass(), "GetTagNameDialog.dupTagErr"),
+                                                  JOptionPane.ERROR_MESSAGE);
                     tagName = null;
                 }
             }
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageAction.java
index 469b600ac2..a769194ed3 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageAction.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageAction.java
@@ -111,15 +111,18 @@ public final class AddImageAction extends CallableSystemAction implements Presen
         
         final IngestConfigurator ingestConfig = Lookup.getDefault().lookup(IngestConfigurator.class);
         if (null != ingestConfig && ingestConfig.isIngestRunning()) {
-            final String msg = "<html>Ingest is ongoing on another data source. Adding a new source now might slow down the current ingest.<br />Do you want to proceed and add a new data source now?</html>";
-            if (JOptionPane.showConfirmDialog(null, msg, "Ingest in progress", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.NO_OPTION) {
+            final String msg = NbBundle.getMessage(this.getClass(), "AddImageAction.ingestConfig.ongoingIngest.msg");
+            if (JOptionPane.showConfirmDialog(null, msg,
+                                              NbBundle.getMessage(this.getClass(),
+                                                                  "AddImageAction.ingestConfig.ongoingIngest.title"),
+                                              JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE) == JOptionPane.NO_OPTION) {
                 return;
             }
         }
 
         iterator = new AddImageWizardIterator(this);
         wizardDescriptor = new WizardDescriptor(iterator);
-        wizardDescriptor.setTitle("Add Data Source");
+        wizardDescriptor.setTitle(NbBundle.getMessage(this.getClass(), "AddImageAction.wizard.title"));
         wizardDescriptor.putProperty(NAME, e);
 
         if (dialog != null) {
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java
index 0057aa689f..1aecf44f31 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageTask.java
@@ -24,6 +24,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorProgressMonitor;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -97,7 +99,9 @@ import org.sleuthkit.datamodel.TskException;
                         String currDir = process.currentDirectory();
                         if (currDir != null) {
                             if (!currDir.isEmpty() ) {
-                                progressMonitor.setProgressText("Adding: " + currDir);
+                                progressMonitor.setProgressText(
+                                        NbBundle.getMessage(this.getClass(), "AddImageTask.run.progress.adding",
+                                                            currDir));
                             }
                         }
                         // this sleep here prevents the UI from locking up 
@@ -298,7 +302,7 @@ import org.sleuthkit.datamodel.TskException;
                 logger.log(Level.INFO, "interrupt() add image process");
                 addImageProcess.stop();  //it might take time to truly stop processing and writing to db
             } catch (TskCoreException ex) {
-                throw new Exception("Error stopping add-image process.", ex);
+                throw new Exception(NbBundle.getMessage(this.getClass(), "AddImageTask.interrupt.exception.msg"), ex);
             }
         }
 
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java
index 951d60c834..14920f7183 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java
@@ -29,6 +29,7 @@ import javax.swing.event.ChangeListener;
 import org.openide.WizardDescriptor;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorProgressMonitor;
 
 /**
@@ -136,7 +137,8 @@ class AddImageWizardAddingProgressPanel implements WizardDescriptor.FinishablePa
     public boolean isValid() {
         // set the focus to the next button of the wizard dialog if it's enabled
         if (imgAdded) {
-            Lookup.getDefault().lookup(AddImageAction.class).requestFocusButton("Next >");
+            Lookup.getDefault().lookup(AddImageAction.class).requestFocusButton(
+                    NbBundle.getMessage(this.getClass(), "AddImageWizardAddingProgressPanel.isValid.focusNext"));
         }
 
         return imgAdded;
@@ -147,7 +149,8 @@ class AddImageWizardAddingProgressPanel implements WizardDescriptor.FinishablePa
      */
     void setStateStarted() {
         component.getProgressBar().setIndeterminate(true);
-        component.setProgressBarTextAndColor("*This process may take some time for large data sources.", 0, Color.black);
+        component.setProgressBarTextAndColor(
+                NbBundle.getMessage(this.getClass(), "AddImageWizardAddingProgressPanel.stateStarted.progressBarText"), 0, Color.black);
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java
index a7be36a1d7..afd5ec7281 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressVisual.java
@@ -23,6 +23,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import javax.swing.JProgressBar;
 import org.openide.WizardDescriptor;
+import org.openide.util.NbBundle;
 
 /**
  * visual component to display progress bar and status updates while adding an
@@ -30,7 +31,8 @@ import org.openide.WizardDescriptor;
  */
  class AddImageWizardAddingProgressVisual extends javax.swing.JPanel {
 
-    private static final String ADDING_DATA_SOURCE_COMPLETE = "Adding Data Source - Complete";
+    private static final String ADDING_DATA_SOURCE_COMPLETE = NbBundle
+            .getMessage(AddImageWizardAddingProgressVisual.class, "AddImageWizardAddingProgressVisual.addingDsComplete.text");
     private String errorLog = "";
     private boolean hasCriticalErrors = false;
 
@@ -42,7 +44,7 @@ import org.openide.WizardDescriptor;
      */
     @Override
     public String getName() {
-        return "Add Data Source";
+        return NbBundle.getMessage(this.getClass(), "AddImageWizardAddingProgressVisual.getName.text");
     }
 
     /**
@@ -115,10 +117,12 @@ import org.openide.WizardDescriptor;
         //progressBar.setValue(100); //always invoked when process completed
         if (hasCriticalErrors) {
             statusLabel.setForeground(Color.RED);
-            statusLabel.setText("*Failed to add data source (critical errors encountered). Click below to view the log.");
+            statusLabel.setText(
+                    NbBundle.getMessage(this.getClass(), "AddImageWizardAddingProgressVisual.showErrors.critText"));
         } else {
             statusLabel.setForeground(Color.BLACK);
-            statusLabel.setText("*Data Source added (non-critical errors encountered). Click below to view the log.");
+            statusLabel.setText(
+                    NbBundle.getMessage(this.getClass(), "AddImageWizardAddingProgressVisual.showErrors.nonCritText"));
         }
 
         errorLog += errors + "\n";
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourcePanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourcePanel.java
index d662439f3b..9f595e92d3 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourcePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourcePanel.java
@@ -25,6 +25,8 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -106,7 +108,8 @@ class AddImageWizardChooseDataSourcePanel implements WizardDescriptor.Panel<Wiza
     void moveFocusToNext() {
         // set the focus to the next button of the wizard dialog if it's enabled
         if (isNextEnable) {
-            Lookup.getDefault().lookup(AddImageAction.class).requestFocusButton("Next >");
+            Lookup.getDefault().lookup(AddImageAction.class).requestFocusButton(
+                    NbBundle.getMessage(this.getClass(), "AddImageWizardChooseDataSourcePanel.moveFocusNext"));
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourceVisual.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourceVisual.java
index 65a97761dd..7cd8f412ba 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourceVisual.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardChooseDataSourceVisual.java
@@ -18,7 +18,6 @@
  */
 package org.sleuthkit.autopsy.casemodule;
 
-
 import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -37,25 +36,22 @@ import javax.swing.JSeparator;
 import javax.swing.event.DocumentEvent;
 import javax.swing.ListCellRenderer;
 import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor;
 
 /**
- * visual component for the first panel of add image wizard. 
- * Allows the user to choose the data source type and then select the data source
+ * visual component for the first panel of add image wizard. Allows the user to
+ * choose the data source type and then select the data source
  *
  */
 final class AddImageWizardChooseDataSourceVisual extends JPanel {
 
     static final Logger logger = Logger.getLogger(AddImageWizardChooseDataSourceVisual.class.getName());
-    
     private AddImageWizardChooseDataSourcePanel wizPanel;
-    
     private JPanel currentPanel;
-    private Map<String, DataSourceProcessor> datasourceProcessorsMap = new HashMap<String, DataSourceProcessor>();
-          
-
-     List<String> coreDSPTypes = new ArrayList<String>();
+    private Map<String, DataSourceProcessor> datasourceProcessorsMap = new HashMap<>();
+    List<String> coreDSPTypes = new ArrayList<>();
 
     /**
      * Creates new form AddImageVisualPanel1
@@ -65,46 +61,45 @@ final class AddImageWizardChooseDataSourceVisual extends JPanel {
     AddImageWizardChooseDataSourceVisual(AddImageWizardChooseDataSourcePanel wizPanel) {
         initComponents();
         this.wizPanel = wizPanel;
-        
+
         customInit();
     }
 
     private void customInit() {
-      
+
         typePanel.setLayout(new BorderLayout());
-        
+
         discoverDataSourceProcessors();
-         
+
         // set up the DSP type combobox
         typeComboBox.removeAllItems();
-        
+
         Set<String> dspTypes = datasourceProcessorsMap.keySet();
-        
+
         // make a list of core DSPs
         // ensure that the core DSPs are at the top and in a fixed order
         coreDSPTypes.add(ImageDSProcessor.getType());
         coreDSPTypes.add(LocalDiskDSProcessor.getType());
         coreDSPTypes.add(LocalFilesDSProcessor.getType());
-          
-        for(String dspType:coreDSPTypes){
+
+        for (String dspType : coreDSPTypes) {
             typeComboBox.addItem(dspType);
         }
-        
+
         // now add any addtional DSPs that haven't already been added
-        for(String dspType:dspTypes){
+        for (String dspType : dspTypes) {
             if (!coreDSPTypes.contains(dspType)) {
                 typeComboBox.addItem(dspType);
             }
         }
-        
-        // set a custom renderer that draws a separator at the end of the core DSPs in the combobox
-        typeComboBox.setRenderer(new ComboboxSeparatorRenderer(typeComboBox.getRenderer()){   
+
+        typeComboBox.setRenderer(new ComboboxSeparatorRenderer(typeComboBox.getRenderer()) {
             @Override
-            protected boolean addSeparatorAfter(JList list, Object value, int index){ 
-                return (index == coreDSPTypes.size() - 1);          
-            }                                                                            
-        });   
-        
+            protected boolean addSeparatorAfter(JList list, Object value, int index) {
+                return (index == coreDSPTypes.size() - 1);
+            }
+        });
+
         //add actionlistner to listen for change
         ActionListener cbActionListener = new ActionListener() {
             @Override
@@ -117,24 +112,23 @@ final class AddImageWizardChooseDataSourceVisual extends JPanel {
     }
 
     private void discoverDataSourceProcessors() {
-      
-        for (DataSourceProcessor dsProcessor: Lookup.getDefault().lookupAll(DataSourceProcessor.class)) {
-           
-            if (!datasourceProcessorsMap.containsKey(dsProcessor.getDataSourceType()) ) {
-                datasourceProcessorsMap.put(dsProcessor.getDataSourceType(), dsProcessor);
-            }
-            else {
-                logger.log(Level.SEVERE, "discoverDataSourceProcessors(): A DataSourceProcessor already exists for type = " + dsProcessor.getDataSourceType() );
-            }      
-        }
-     } 
 
-     private void dspSelectionChanged() {
-         // update the current panel to selection
-         currentPanel = getCurrentDSProcessor().getPanel();
-         updateCurrentPanel(currentPanel);
+        for (DataSourceProcessor dsProcessor : Lookup.getDefault().lookupAll(DataSourceProcessor.class)) {
+
+            if (!datasourceProcessorsMap.containsKey(dsProcessor.getDataSourceType())) {
+                datasourceProcessorsMap.put(dsProcessor.getDataSourceType(), dsProcessor);
+            } else {
+                logger.log(Level.SEVERE, "discoverDataSourceProcessors(): A DataSourceProcessor already exists for type = {0}", dsProcessor.getDataSourceType());
+            }
+        }
     }
-     
+
+    private void dspSelectionChanged() {
+        // update the current panel to selection
+        currentPanel = getCurrentDSProcessor().getPanel();
+        updateCurrentPanel(currentPanel);
+    }
+
     /**
      * Changes the current panel to the given panel.
      *
@@ -143,7 +137,7 @@ final class AddImageWizardChooseDataSourceVisual extends JPanel {
     private void updateCurrentPanel(JPanel panel) {
         currentPanel = panel;
         typePanel.removeAll();
-        typePanel.add((JPanel) currentPanel, BorderLayout.CENTER);
+        typePanel.add(currentPanel, BorderLayout.CENTER);
         typePanel.validate();
         typePanel.repaint();
         currentPanel.addPropertyChangeListener(new PropertyChangeListener() {
@@ -157,24 +151,26 @@ final class AddImageWizardChooseDataSourceVisual extends JPanel {
                 }
             }
         });
-      
+
         updateUI(null);
     }
 
-     /**
+    /**
      * Returns the currently selected DS Processor
-     * @return DataSourceProcessor the DataSourceProcessor corresponding to the data source type selected in the combobox
+     *
+     * @return DataSourceProcessor the DataSourceProcessor corresponding to the
+     * data source type selected in the combobox
      */
     protected DataSourceProcessor getCurrentDSProcessor() {
         // get the type of the currently selected panel and then look up 
         // the correspodning DS Handler in the map
         String dsType = (String) typeComboBox.getSelectedItem();
         DataSourceProcessor dsProcessor = datasourceProcessorsMap.get(dsType);
-        
+
         return dsProcessor;
-        
+
     }
-            
+
     /**
      * Returns the name of the this panel. This name will be shown on the left
      * panel of the "Add Image" wizard panel.
@@ -183,10 +179,9 @@ final class AddImageWizardChooseDataSourceVisual extends JPanel {
      */
     @Override
     public String getName() {
-        return "Enter Data Source Information";
+        return NbBundle.getMessage(this.getClass(), "AddImageWizardChooseDataSourceVisual.getName.text");
     }
 
-
     /**
      * This method is called from within the constructor to initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is always
@@ -309,25 +304,27 @@ final class AddImageWizardChooseDataSourceVisual extends JPanel {
         this.wizPanel.enableNextButton(getCurrentDSProcessor().isPanelValid());
     }
 
-    
-   public abstract class ComboboxSeparatorRenderer implements ListCellRenderer{
+    public abstract class ComboboxSeparatorRenderer implements ListCellRenderer {
+
         private ListCellRenderer delegate;
         private JPanel separatorPanel = new JPanel(new BorderLayout());
         private JSeparator separator = new JSeparator();
 
-        public ComboboxSeparatorRenderer(ListCellRenderer delegate){
-             this.delegate = delegate;
+        public ComboboxSeparatorRenderer(ListCellRenderer delegate) {
+            this.delegate = delegate;
         }
 
-        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus){
+        @Override
+        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
             Component comp = delegate.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-            if(index!=-1 && addSeparatorAfter(list, value, index)){
+            if (index != -1 && addSeparatorAfter(list, value, index)) {
                 separatorPanel.removeAll();
                 separatorPanel.add(comp, BorderLayout.CENTER);
                 separatorPanel.add(separator, BorderLayout.SOUTH);
                 return separatorPanel;
-            }else
+            } else {
                 return comp;
+            }
         }
 
         protected abstract boolean addSeparatorAfter(JList list, Object value, int index);
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
index c4c2f6d4dd..0e0726480b 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
@@ -19,6 +19,7 @@
 package org.sleuthkit.autopsy.casemodule;
 
 
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.ingest.IngestConfigurator;
 import java.awt.Color;
 import java.awt.Component;
@@ -275,9 +276,11 @@ class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel<WizardDe
       
         //check the result and display to user
         if (result == DataSourceProcessorCallback.DataSourceProcessorResult.NO_ERRORS)
-            progressPanel.getComponent().setProgressBarTextAndColor("*Data Source added.", 100, Color.black);
+            progressPanel.getComponent().setProgressBarTextAndColor(
+                    NbBundle.getMessage(this.getClass(), "AddImageWizardIngestConfigPanel.dsProcDone.noErrs.text"), 100, Color.black);
         else 
-            progressPanel.getComponent().setProgressBarTextAndColor("*Errors encountered in adding Data Source.", 100, Color.red);
+            progressPanel.getComponent().setProgressBarTextAndColor(
+                    NbBundle.getMessage(this.getClass(), "AddImageWizardIngestConfigPanel.dsProcDone.errs.text"), 100, Color.red);
        
         
         //if errors, display them on the progress panel
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigVisual.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigVisual.java
index 07aebf2484..5b2f22f9dd 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigVisual.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigVisual.java
@@ -18,6 +18,8 @@
  */
 package org.sleuthkit.autopsy.casemodule;
 
+import org.openide.util.NbBundle;
+
 import java.awt.BorderLayout;
 import javax.swing.JPanel;
 
@@ -55,7 +57,7 @@ import javax.swing.JPanel;
      */
     @Override
     public String getName() {
-        return "Configure Ingest Modules";
+        return NbBundle.getMessage(this.getClass(), "AddImageWizardIngestConfigVisual.getName.text");
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIterator.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIterator.java
index b786b5b171..2961f6bf11 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIterator.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIterator.java
@@ -26,6 +26,7 @@ import java.util.NoSuchElementException;
 import javax.swing.JComponent;
 import javax.swing.event.ChangeListener;
 import org.openide.WizardDescriptor;
+import org.openide.util.NbBundle;
 
 /**
  * The iterator class for the "Add Image" wizard panel. This class is used to
@@ -112,7 +113,8 @@ class AddImageWizardIterator implements WizardDescriptor.Iterator<WizardDescript
      */
     @Override
     public String name() {
-        return "Step " + Integer.toString(index + 1) + " of " + getPanels().size();
+        return NbBundle.getMessage(this.getClass(), "AddImageWizardIterator.stepXofN", Integer.toString(index + 1),
+                                   getPanels().size());
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java
index c3a8efc2f4..32e259293c 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddLocalFilesTask.java
@@ -23,6 +23,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorProgressMonitor;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -180,7 +182,9 @@ import org.sleuthkit.datamodel.TskCoreException;
         @Override
         public void fileAdded(final AbstractFile newFile) {
             if (count++ % 10 == 0) {  
-                progressMonitor.setProgressText("Adding: " + newFile.getParentPath() + "/" + newFile.getName()); 
+                progressMonitor.setProgressText(
+                        NbBundle.getMessage(this.getClass(), "AddLocalFilesTask.localFileAdd.progress.text",
+                                            newFile.getParentPath(), newFile.getName()));
             }
         }
     }
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
index 60d1f4e228..fa2a8cfcd8 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties
@@ -1,61 +1,11 @@
 CTL_AddImage=Add Data Source...
 CTL_AddImageButton=Add Data Source
-CTL_CaseAction=Case
 CTL_CaseCloseAct=Close Case
 CTL_CaseNewAction=New Case...
-#CTL_CaseOpenActionOld=Open Case(old)...
 CTL_CasePropertiesAction=Case Properties...
-CTL_CaseTopComponent=Case Window
-#CTL_NewCaseAct=New Case(Old)...
 CTL_OpenAction=Open Case...
-CTL_RecentCases=Recent Cases
 CTL_CaseDeleteAction=Delete Case
-CTL_SaveCaseAction=Save Case
-CTL_testAction=test
-CTL_testTopComponent=test Window
-HINT_CaseTopComponent=This is a Case window
-HINT_testTopComponent=This is a test window
-Menu/File/org-sleuthkit-autopsy-casemodule-CaseCloseAct.shadow=
-Menu/File/org-sleuthkit-autopsy-casemodule-OpenAction.shadow=Open Case
 OpenIDE-Module-Name=Case
-CaseVisualPanel1.jLabel1.text=Name
-CaseVisualPanel1.jLabel2.text=Image Path:
-CaseVisualPanel1.jLabel3.text=Database Path:
-CaseTopComponent.jLabel1.text=Name
-CaseVisualPanel1.NameField.text=
-CaseVisualPanel1.ImgPath.text=
-CaseVisualPanel1.DbPath.text=
-CaseTopComponent.jLabel2.text=Image Path
-CaseTopComponent.jLabel3.text=DB Path
-CaseVisualPanel1.ImgPathBrowserButton.text=Browse
-CaseVisualPanel1.DbPathBrowserButton.text=Browse
-NewCaseVisualPanel1.jLabel1.text=Name
-NewCaseVisualPanel1.jTextField1.text=
-NewCaseVisualPanel1.jLabel2.text=Image Type:
-NewCaseVisualPanel1.jRadioButton1.text=Raw Single .img .dd
-NewCaseVisualPanel1.jRadioButton2.text=Raw Split .001 .002 etc
-NewCaseVisualPanel1.jRadioButton3.text=Encase .e01
-NewCaseVisualPanel1.nameLabel.text_1=Name
-NewCaseVisualPanel1.NameField.text_1=
-NewCaseVisualPanel1.TypeLabel.text_1=Image Type:
-NewCaseVisualPanel1.rawSingleRadio.text_1=Raw Single .img .dd
-NewCaseVisualPanel1.rawSplitRadio.text_1=Raw Split .001 .002 etc
-NewCaseVisualPanel1.encaseRadio.text_1=EnCase .e01
-NewCaseVisualPanel2.jLabel1.text=Image Path:
-NewCaseVisualPanel2.jLabel2.text=DataBase Path:
-NewCaseVisualPanel2.descriptionText.text=variable text
-NewCaseVisualPanel2.ImgBrowserButton.text=Browse
-NewCaseVisualPanel2.DcBrowserButton.text=Browse
-NewCaseVisualPanel2.ImagePathField.text=
-NewCaseVisualPanel2.DbPathField.text=
-CaseVisualPanel1.jLabel4.text=Image Type:
-CaseVisualPanel1.rawSingle.text=Raw Single .img .dd
-CaseVisualPanel1.rawSplit.text=Raw Split .001 .002 etc
-CaseVisualPanel1.encase.text=EnCase .e01 .e02 etc
-CaseVisualPanel1.multipleSelectLabel.text=Single Image: Multiple Select Disabled
-CaseVisualPanel1.jLabel5.text=If a database has not already been loaded / created for the chosen image use this button: (could take a few minutes)
-CaseVisualPanel1.ProgressLabel.text=
-CaseVisualPanel1.createDbButton.text=Create Database
 NewCaseVisualPanel1.jLabel1.text_1=Enter New Case Information:
 NewCaseVisualPanel1.caseNameLabel.text_1=Case Name:
 NewCaseVisualPanel1.caseDirLabel.text=Base Directory:
@@ -77,8 +27,6 @@ CasePropertiesForm.OKButton.text=OK
 CasePropertiesForm.deleteCaseButton.text=Delete Case
 CueBannerPanel.autopsyLogo.text=
 CueBannerPanel.createNewLabel.text=Create New Case
-CueBannerPanel.autopsyLabel.text=Autopsy
-CueBannerPanel.welcomeLabel.text=Welcome to
 CueBannerPanel.openLabel.text=Open Existing Case
 CueBannerPanel.closeButton.text=Close
 CueBannerPanel.openRecentLabel.text=Open Recent Case
@@ -87,13 +35,6 @@ CueBannerPanel.openCaseButton.text=
 CueBannerPanel.openRecentButton.text=
 OpenRecentCasePanel.cancelButton.text=Cancel
 OpenRecentCasePanel.jLabel1.text=Recent Cases
-NewJPanel.jLabel1.text=
-NewJPanel.jLabel2.text=NSRL Index
-NewJPanel.jLabel5.text=The NSRL index is used to idenify "known" files.
-NewJPanel.jFormattedTextField1.text=jFormattedTextField1
-NewJPanel.jButton1.text=Rename
-NewJPanel.jLabel4.text=Database:
-AddImageVisualPanel2.indexImageCheckBox.text=Index image for keyword search
 CasePropertiesForm.caseNumberLabel.text=Case Number:
 CasePropertiesForm.examinerLabel.text=Examiner:
 CasePropertiesForm.caseNumberTextField.text=
@@ -108,7 +49,6 @@ AddImageErrorsDialog.copyButton.toolTipText=Copy errors to clipboard
 AddImageErrorsDialog.copyButton.text=Copy
 AddImageErrorsDialog.closeButton.toolTipText=Close this window
 AddImageErrorsDialog.closeButton.text=Close
-AddImageVisualPanel4.jLabel2.text=You can add another image or click Finish to return to the case and view results. 
 OpenRecentCasePanel.openButton.text=Open
 ImageFilePanel.pathLabel.text=Browse for an image file:
 ImageFilePanel.browseButton.text=Browse
@@ -118,8 +58,6 @@ MissingImageDialog.selectButton.text=Select Image
 MissingImageDialog.titleLabel.text=Search for missing image
 MissingImageDialog.cancelButton.text=Cancel
 LocalDiskPanel.errorLabel.text=Error Label
-AddImageDonePanel.statusLabel.text=File system has been added to the local database. Files are being analyzed.
-AddImageDonePanel.crDbLabel.text=Adding Data Source - Complete
 LocalFilesPanel.infoLabel.text=Add local files and folders:
 LocalFilesPanel.selectButton.text=Add
 LocalFilesPanel.localFileChooser.dialogTitle=Select Local Files or Folders
@@ -152,3 +90,142 @@ LocalDiskPanel.descLabel.text=(faster results, although some data will not be se
 MissingImageDialog.browseButton.text=Browse
 MissingImageDialog.pathNameTextField.text=
 AddImageWizardAddingProgressVisual.progressTextArea.border.title=Status
+AddImageAction.wizard.title=Add Data Source
+AddImageAction.ingestConfig.ongoingIngest.msg=<html>Ingest is ongoing on another data source. Adding a new source now might slow down the current ingest.<br />Do you want to proceed and add a new data source now?</html>
+AddImageAction.ingestConfig.ongoingIngest.title=Ingest in progress
+AddImageTask.run.progress.adding=Adding\: {0}
+AddImageTask.interrupt.exception.msg=Error stopping add-image process.
+AddImageWizardAddingProgressPanel.isValid.focusNext=Next >
+AddImageWizardAddingProgressPanel.stateStarted.progressBarText=*This process may take some time for large data sources.
+AddImageWizardAddingProgressVisual.addingDsComplete.text=Adding Data Source - Complete
+AddImageWizardAddingProgressVisual.getName.text=Add Data Source
+AddImageWizardAddingProgressVisual.showErrors.critText=*Failed to add data source (critical errors encountered). Click below to view the log.
+AddImageWizardAddingProgressVisual.showErrors.nonCritText=*Data Source added (non-critical errors encountered). Click below to view the log.
+AddImageWizardChooseDataSourcePanel.moveFocusNext=Next >
+AddImageWizardChooseDataSourceVisual.getName.text=Enter Data Source Information
+AddImageWizardIngestConfigPanel.dsProcDone.noErrs.text=*Data Source added.
+AddImageWizardIngestConfigPanel.dsProcDone.errs.text=*Errors encountered in adding Data Source.
+AddImageWizardIngestConfigVisual.getName.text=Configure Ingest Modules
+AddImageWizardIterator.stepXofN=Step {0} of {1}
+AddLocalFilesTask.localFileAdd.progress.text=Adding\: {0}/{1}
+Case.getCurCase.exception.noneOpen=Can't get the current case; there is no case open\!
+Case.moduleErr=Module Error
+Case.changeCase.errListenToCaseUpdates.msg=A module caused an error listening to Case updates. See log to determine which module. Some data could be incomplete.
+Case.create.exception.msg=Error creating a case\: {0} in dir {1}
+Case.open.exception.blankCase.msg=Case name is blank.
+Case.open.msgDlg.updated.msg=Updated case database schema.\
+A backup copy of the database with the following path has been made\:\
+ {0}
+Case.open.msgDlg.updated.title=Case Database Schema Update
+Case.open.exception.checkFile.msg=Check that you selected the correct case file (usually with {0} extension)
+Case.open.exception.gen.msg=Error opening the case
+Case.checkImgExist.confDlg.doesntExist.msg={0} has detected that one of the images associated with \
+this case are missing. Would you like to search for them now?\
+Previously, the image was located at\:\
+{1}\
+Please note that you will still be able to browse directories and generate reports\
+if you choose No, but you will not be able to view file content or run the ingest process.
+Case.checkImgExist.confDlg.doesntExist.title=Missing Image
+Case.addImg.exception.msg=Error adding image to the case
+Case.closeCase.exception.msg=Error while trying to close the current case.
+Case.deleteCase.exception.msg=Error deleting the case dir\: {0}
+Case.deleteCase.exception.msg2=Error deleting the case dir\: {0}
+Case.updateCaseName.exception.msg=Error while trying to update the case name.
+Case.updateExaminer.exception.msg=Error while trying to update the examiner.
+Case.updateCaseNum.exception.msg=Error while trying to update the case number.
+Case.exception.errGetRootObj=Error getting root objects.
+Case.createCaseDir.exception.existNotDir=Cannot create case dir, already exists and is not a directory\: {0}
+Case.createCaseDir.exception.existCantRW=Cannot create case dir, already exists and cannot read/write\: {0}
+Case.createCaseDir.exception.cantCreate=Cannot create case dir\: {0}
+Case.createCaseDir.exception.cantCreateCaseDir=Could not create case directory\: {0}
+Case.createCaseDir.exception.cantCreateModDir=Could not create modules output directory\: {0}
+Case.createCaseDir.exception.gen=Could not create case directory\: {0}
+CaseDeleteAction.closeConfMsg.text=Are you sure want to close and delete this case? \
+     Case Name\: {0}\
+     Case Directory\: {1}
+CaseDeleteAction.closeConfMsg.title=Warning\: Closing the Current Case
+CaseDeleteAction.msgDlg.fileInUse.msg=The delete action can't be fully completed because the folder or file in it is open by another program.\
+ \
+Close the folder and file and try again or you can delete the case manually.
+CaseDeleteAction.msgDlg.fileInUse.title=Error\: Folder In Use
+CaseDeleteAction.msgDlg.caseDelete.msg=Case {0} has been deleted.
+CaseOpenAction.autFilter.title={0} Case File ( {1})
+CaseOpenAction.msgDlg.fileNotExist.msg=Error\: File doesn't exist.
+CaseOpenAction.msgDlg.fileNotExist.title=Error
+CaseOpenAction.msgDlg.cantOpenCase.msg=Error\: could not open the case in folder {0}\: {1}
+CaseOpenAction.msgDlg.cantOpenCase.title=Error
+CasePropertiesAction.window.title=Case Properties
+CasePropertiesForm.updateCaseName.msgDlg.empty.msg=The caseName cannot be empty.
+CasePropertiesForm.updateCaseName.msgDlg.empty.title=Error
+CasePropertiesForm.updateCaseName.msgDlg.invalidSymbols.msg=The Case Name cannot contain any of this following symbol\: \\ / \: * ? " < > |
+CasePropertiesForm.updateCaseName.msgDlg.invalidSymbols.title=Error
+CasePropertiesForm.updateCaseName.confMsg.msg=Are you sure want to update the case name from "{0}" to "{1}"?
+CasePropertiesForm.updateCaseName.confMsg.title=Create directory
+CueBannerPanel.title.text=Open Recent Case
+GeneralFilter.rawImageDesc.text=Raw Images (*.img, *.dd, *.001, *.aa, *.raw, *.bin)
+GeneralFilter.encaseImageDesc.text=Encase Images (*.e01)
+ImageDSProcessor.dsType.text=Image File
+ImageDSProcessor.allDesc.text=All Supported Types
+ImageFilePanel.moduleErr=Module Error
+ImageFilePanel.moduleErr.msg=A module caused an error listening to ImageFilePanel updates. See log to determine which module. Some data could be incomplete.
+LocalDiskDSProcessor.dsType.text=Local Disk
+LocalDiskPanel.localDiskModel.loading.msg=Loading local disks...
+LocalDiskPanel.moduleErr=Module Error
+LocalDiskPanel.moduleErr.msg=A module caused an error listening to LocalDiskPanel updates. See log to determine which module. Some data could be incomplete.
+LocalDiskPanel.errLabel.disksNotDetected.text=Disks were not detected. On some systems it requires admin privileges (or "Run as administrator").
+LocalDiskPanel.errLabel.disksNotDetected.toolTipText=Disks were not detected. On some systems it requires admin privileges (or "Run as administrator").
+LocalDiskPanel.errLabel.drivesNotDetected.text=Local drives were not detected. Auto-detection not supported on this OS  or admin privileges required
+LocalDiskPanel.errLabel.drivesNotDetected.toolTipText=Local drives were not detected. Auto-detection not supported on this OS  or admin privileges required
+LocalDiskPanel.errLabel.someDisksNotDetected.text=Some disks were not detected. On some systems it requires admin privileges (or "Run as administrator").
+LocalDiskPanel.errLabel.someDisksNotDetected.toolTipText=Some disks were not detected. On some systems it requires admin privileges (or "Run as administrator").
+LocalFilesDSProcessor.dsType=Logical Files
+LocalFilesDSProcessor.toString.text=Logical Files
+LocalFilesPanel.contentType.text=LOCAL
+LocalFilesPanel.moduleErr=Module Error
+LocalFilesPanel.moduleErr.msg=A module caused an error listening to LocalFilesPanel updates. See log to determine which module. Some data could be incomplete.
+MissingImageDialog.allDesc.text=All Supported Types
+MissingImageDialog.display.title=Search for Missing Image
+MissingImageDialog.confDlg.noFileSel.msg=No image file has been selected, are you sure you\
+would like to exit without finding the image.
+MissingImageDialog.confDlg.noFileSel.title=Missing Image
+NewCaseVisualPanel1.getName.text=Case Info
+NewCaseVisualPanel1.caseDirBrowse.selectButton.text=Select
+NewCaseVisualPanel2.getName.text=Additional Information
+NewCaseWizardAction.closeCurCase.confMsg.msg=Do you want to save and close this case and proceed with the new case creation?
+NewCaseWizardAction.closeCurCase.confMsg.title=Warning\: Closing the Current Case
+NewCaseWizardAction.newCase.windowTitle.text=New Case Information
+NewCaseWizardAction.getName.text=New Case Wizard
+NewCaseWizardPanel1.validate.errMsg.invalidSymbols=The Case Name cannot contain any of the following symbols\: \\ / \: * ? " < > |
+NewCaseWizardPanel1.validate.errMsg.dirExists=Case directory ''{0}'' already exists.
+NewCaseWizardPanel1.validate.confMsg.createDir.msg=The base directory ''{0}'' doesn''t exist. \
+ \
+ Do you want to create that directory?
+NewCaseWizardPanel1.validate.confMsg.createDir.title=Create directory
+NewCaseWizardPanel1.validate.errMsg.cantCreateParDir.msg=Error\: Couldn''t create case parent directory {0}
+NewCaseWizardPanel1.validate.errMsg.prevCreateBaseDir.msg=Prevented from creating base directory {0}
+NewCaseWizardPanel1.validate.errMsg.cantCreateDir=Error\: Couldn't create directory.
+NewCaseWizardPanel1.validate.errMsg.invalidBaseDir.msg=ERROR\: The Base Directory that you entered is not valid.\
+Please enter a valid Base Directory.
+NewCaseWizardPanel1.createDir.errMsg.cantCreateDir.msg=ERROR\: Could not create the case directory. \
+Please enter a valid Case Name and Directory.
+NewCaseWizardPanel2.validate.errCreateCase.msg=Error creating case
+OpenRecentCasePanel.openCase.msgDlg.caseDoesntExist.msg=Error\: Case {0} doesn''t exist.
+OpenRecentCasePanel.openCase.msgDlg.err=Error
+OpenRecentCasePanel.colName.caseName=Case Name
+OpenRecentCasePanel.colName.path=Path
+RecentCases.exception.caseIdxOutOfRange.msg=Recent case index {0} is out of range.
+RecentCases.getName.text=Clear Recent Cases
+RecentItems.openRecentCase.msgDlg.text=Error\: Case {0} doesn''t exist.
+RecentItems.openRecentCase.msgDlg.err=Error
+StartupWindow.title.text=Welcome
+UpdateRecentCases.menuItem.clearRecentCases.text=Clear Recent Cases
+UpdateRecentCases.menuItem.empty=-Empty-
+XMLCaseManagement.create.exception.msg=Error setting up Case XML file,
+XMLCaseManagement.writeFile.exception.noCase.msg=No set case to write management file for.
+XMLCaseManagement.writeFile.exception.errWriteToFile.msg=Error writing to case file
+XMLCaseManagement.open.exception.errReadXMLFile.msg=Error reading case XML file\: {0}
+XMLCaseManagement.open.msgDlg.notAutCase.msg=Error\: This is not an Autopsy config file ("{0}").\
+ \
+Detail\: \
+Cannot open a non-Autopsy config file (at {1}).
+XMLCaseManagement.open.msgDlg.notAutCase.title=Error
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle_ja.properties
new file mode 100644
index 0000000000..333bd7367c
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Bundle_ja.properties
@@ -0,0 +1,90 @@
+CTL_AddImage=データソース追加...
+CTL_AddImageButton=データソース追加
+CTL_CaseCloseAct=ケースを閉じる
+CTL_CaseNewAction=New Case...
+CTL_CaseOpenActionOld=Open Case(old)...
+CTL_CasePropertiesAction=Case Properties...
+CTL_OpenAction=Open Case...
+CTL_CaseDeleteAction=ケース削除
+OpenIDE-Module-Name=Case
+NewCaseVisualPanel1.jLabel1.text_1=新規ケース情報を入力：
+#Nick: Does this mean info on new case or new info on existing case?
+NewCaseVisualPanel1.caseNameLabel.text_1=ケース名
+NewCaseVisualPanel1.caseDirLabel.text=ベースディレクトリ：
+NewCaseVisualPanel1.caseDirBrowseButton.text=閲覧
+NewCaseVisualPanel1.caseNameTextField.text_1=
+NewCaseVisualPanel1.jLabel2.text_1=ケースデータは下記のディレクトリに保存されます：
+#Nick: is "case data" and "case information" the same?
+NewCaseVisualPanel1.caseParentDirTextField.text=
+NewCaseVisualPanel1.caseDirTextField.text_1=
+CasePropertiesForm.caseDirLabel.text=ケースディレクトリ：
+CasePropertiesForm.crDateLabel.text=作成日：
+CasePropertiesForm.caseNameLabel.text=ケース名：
+CasePropertiesForm.crDateTextField.text=
+CasePropertiesForm.caseNameTextField.text=
+CasePropertiesForm.updateCaseNameButton.text=アップデート
+CasePropertiesForm.casePropLabel.text=ケース情報
+CasePropertiesForm.genInfoLabel.text=一般情報
+CasePropertiesForm.imgInfoLabel.text=画像情報
+CasePropertiesForm.OKButton.text=OK
+CasePropertiesForm.deleteCaseButton.text=ケース削除
+CueBannerPanel.autopsyLogo.text=
+CueBannerPanel.createNewLabel.text=新規ケース作成
+CueBannerPanel.openLabel.text=既存ケースを開く
+##オープンは日本語にするべき？
+CueBannerPanel.closeButton.text=閉じる
+CueBannerPanel.openRecentLabel.text=最近開いたケースを開く
+CueBannerPanel.newCaseButton.text=
+CueBannerPanel.openCaseButton.text=
+CueBannerPanel.openRecentButton.text=
+OpenRecentCasePanel.cancelButton.text=キャンセル
+OpenRecentCasePanel.jLabel1.text=最近開いたファイル
+CasePropertiesForm.caseNumberLabel.text=ケース番号：
+CasePropertiesForm.examinerLabel.text=Examiner:
+#審査官？カタカナ？
+CasePropertiesForm.caseNumberTextField.text=
+CasePropertiesForm.examinerTextField.text=
+NewCaseVisualPanel2.caseNumberTextField.text=
+NewCaseVisualPanel2.examinerLabel.text=Examiner:
+#審査官？カタカナ？
+NewCaseVisualPanel2.caseNumberLabel.text=ケース番号：
+NewCaseVisualPanel2.examinerTextField.text=
+NewCaseVisualPanel2.optionalLabel.text=オプショナル：ケース番号及び審査官を設定
+#審査官？カタカナ？
+AddImageErrorsDialog.title=イメージログ追加
+AddImageErrorsDialog.copyButton.toolTipText=エラーをクリップボードにコピーします
+AddImageErrorsDialog.copyButton.text=コピー
+AddImageErrorsDialog.closeButton.toolTipText=このウィンドウを閉じます
+AddImageErrorsDialog.closeButton.text=閉じる
+OpenRecentCasePanel.openButton.text=開く
+ImageFilePanel.pathLabel.text=画像ファイルを閲覧：
+ImageFilePanel.browseButton.text=閲覧
+ImageFilePanel.pathTextField.text=
+LocalDiskPanel.diskLabel.text=ローカルディスクを選択：
+MissingImageDialog.selectButton.text=画像選択
+MissingImageDialog.titleLabel.text=欠落した画像の検索
+MissingImageDialog.cancelButton.text=キャンセル
+LocalDiskPanel.errorLabel.text=エラーラベル
+LocalFilesPanel.infoLabel.text=ローカルファイル及びフォルダーを追加：
+LocalFilesPanel.selectButton.text=追加
+LocalFilesPanel.localFileChooser.dialogTitle=ローカルファイル又はフォルダーを選択
+LocalFilesPanel.selectButton.toolTipText=ローカルファイル及びフォルダーをロジカルファイルとして追加します
+LocalFilesPanel.clearButton.text=クリアー
+LocalFilesPanel.clearButton.toolTipText=現在選択されているローカルファイルパスがクリアされます
+LocalFilesPanel.selectedPaths.toolTipText=
+LocalFilesPanel.localFileChooser.approveButtonText=選択
+LocalFilesPanel.localFileChooser.approveButtonToolTipText=
+LocalFilesPanel.selectButton.actionCommand=追加
+AddImageWizardIngestConfigVisual.subtitleLabel.text=このデータソースに対して実行したい追加モジュール群を設定します
+#Nick: Does ingest module mean a module you added?
+AddImageWizardIngestConfigVisual.titleLabel.text=追加モジュール設定
+AddImageWizardAddingProgressVisual.statusLabel.text=ファイルシステムがローカルデータベースに追加されました。ファイルを解析中です。
+AddImageWizardChooseDataSourceVisual.typeTabel.text=追加するソースタイプを選択：
+AddImageWizardChooseDataSourceVisual.jLabel2.text=jLabel2
+AddImageWizardChooseDataSourceVisual.nextLabel.text=<html> 「次へ」をクリックして、インプットデータを解析、ボリューム及びファイルシステムデータを抽出、ローカルデータベースにデータを投入。</html>
+#Nick: Do I leave the <html> and </html> as is?
+AddImageWizardChooseDataSourceVisual.imgInfoLabel.text=データソース情報を入力：
+AddImageWizardAddingProgressVisual.progressLabel.text=＜進捗状況＞
+AddImageWizardAddingProgressVisual.viewLogButton.text=ログ閲覧
+AddImageWizardAddingProgressVisual.titleLabel.text=データソース追加中
+AddImageWizardAddingProgressVisual.subTitle1Label.text=ローカルデータベースにファイルシステム情報を追加中です。こちらが完了次第、ファイル解析が始まります。
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
index 29c5a2bae1..b04fc9aedf 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
@@ -37,8 +37,9 @@ import java.util.TimeZone;
 import java.util.logging.Level;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
-import org.openide.util.Exceptions;
+
 import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 import org.openide.util.actions.SystemAction;
 import org.openide.windows.WindowManager;
@@ -159,7 +160,7 @@ public class Case implements SleuthkitCase.ErrorObserver {
         if (currentCase != null) {
             return currentCase;
         } else {
-            throw new IllegalStateException("Can't get the current case; there is no case open!");
+            throw new IllegalStateException(NbBundle.getMessage(Case.class, "Case.getCurCase.exception.noneOpen"));
         }
     }
 
@@ -192,7 +193,10 @@ public class Case implements SleuthkitCase.ErrorObserver {
             }
             catch (Exception e) {
                 logger.log(Level.SEVERE, "Case listener threw exception", e);
-                MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to Case updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                MessageNotifyUtil.Notify.show(NbBundle.getMessage(Case.class, "Case.moduleErr"),
+                                              NbBundle.getMessage(Case.class,
+                                                                  "Case.changeCase.errListenToCaseUpdates.msg"),
+                                              MessageNotifyUtil.MessageType.ERROR);
             }
             doCaseNameChange("");
             
@@ -201,7 +205,10 @@ public class Case implements SleuthkitCase.ErrorObserver {
             }
             catch (Exception e) {
                 logger.log(Level.SEVERE, "Case listener threw exception", e);
-                MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to Case updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                MessageNotifyUtil.Notify.show(NbBundle.getMessage(Case.class, "Case.moduleErr"),
+                                              NbBundle.getMessage(Case.class,
+                                                                  "Case.changeCase.errListenToCaseUpdates.msg"),
+                                              MessageNotifyUtil.MessageType.ERROR);
             }
         }
 
@@ -214,7 +221,10 @@ public class Case implements SleuthkitCase.ErrorObserver {
             }
             catch (Exception e) {
                 logger.log(Level.SEVERE, "Case listener threw exception", e);
-                MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to Case updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                MessageNotifyUtil.Notify.show(NbBundle.getMessage(Case.class, "Case.moduleErr"),
+                                              NbBundle.getMessage(Case.class,
+                                                                  "Case.changeCase.errListenToCaseUpdates.msg"),
+                                              MessageNotifyUtil.MessageType.ERROR);
             }
             doCaseChange(currentCase);
 
@@ -224,7 +234,10 @@ public class Case implements SleuthkitCase.ErrorObserver {
             }
             catch (Exception e) {
                 logger.log(Level.SEVERE, "Case threw exception", e);
-                MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to Case updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                MessageNotifyUtil.Notify.show(NbBundle.getMessage(Case.class, "Case.moduleErr"),
+                                              NbBundle.getMessage(Case.class,
+                                                                  "Case.changeCase.errListenToCaseUpdates.msg"),
+                                              MessageNotifyUtil.MessageType.ERROR);
             }
             doCaseNameChange(currentCase.name);
 
@@ -267,7 +280,8 @@ public class Case implements SleuthkitCase.ErrorObserver {
             db = SleuthkitCase.newCase(dbPath);
         } catch (TskCoreException ex) {
             logger.log(Level.SEVERE, "Error creating a case: " + caseName + " in dir " + caseDir, ex);
-            throw new CaseActionException("Error creating a case: " + caseName + " in dir " + caseDir, ex);
+            throw new CaseActionException(
+                    NbBundle.getMessage(Case.class, "Case.create.exception.msg", caseName, caseDir), ex);
         }
 
         Case newCase = new Case(caseName, caseNumber, examiner, configFilePath, xmlcm, db);
@@ -296,14 +310,18 @@ public class Case implements SleuthkitCase.ErrorObserver {
             String examiner = xmlcm.getCaseExaminer();
             // if the caseName is "", case / config file can't be opened
             if (caseName.equals("")) {
-                throw new CaseActionException("Case name is blank.");
+                throw new CaseActionException(NbBundle.getMessage(Case.class, "Case.open.exception.blankCase.msg"));
             }
 
             String caseDir = xmlcm.getCaseDirectory();
             String dbPath = caseDir + File.separator + "autopsy.db";
             SleuthkitCase db = SleuthkitCase.openCase(dbPath);
             if (null != db.getBackupDatabasePath()) {
-                JOptionPane.showMessageDialog(null, "Updated case database schema.\nA backup copy of the database with the following path has been made:\n " + db.getBackupDatabasePath(), "Case Database Schema Update", JOptionPane.INFORMATION_MESSAGE);                
+                JOptionPane.showMessageDialog(null,
+                                              NbBundle.getMessage(Case.class, "Case.open.msgDlg.updated.msg",
+                                                                        db.getBackupDatabasePath()),
+                                              NbBundle.getMessage(Case.class, "Case.open.msgDlg.updated.title"),
+                                              JOptionPane.INFORMATION_MESSAGE);
             }
             
             checkImagesExist(db);
@@ -318,10 +336,10 @@ public class Case implements SleuthkitCase.ErrorObserver {
             CaseCloseAction closeCase = SystemAction.get(CaseCloseAction.class);
             closeCase.actionPerformed(null);
             if (!configFilePath.endsWith(CASE_DOT_EXTENSION)) {
-                throw new CaseActionException("Check that you selected the correct case file (usually with "
-                        + CASE_DOT_EXTENSION + " extension)", ex);
+                throw new CaseActionException(
+                        NbBundle.getMessage(Case.class, "Case.open.exception.checkFile.msg", CASE_DOT_EXTENSION), ex);
             } else {
-                throw new CaseActionException("Error opening the case", ex);
+                throw new CaseActionException(NbBundle.getMessage(Case.class, "Case.open.exception.gen.msg"), ex);
             }
         }
     }
@@ -352,11 +370,13 @@ public class Case implements SleuthkitCase.ErrorObserver {
             boolean fileExists = (pathExists(path)
                     || driveExists(path));
             if (!fileExists) {
-                int ret = JOptionPane.showConfirmDialog(null, appName + " has detected that one of the images associated with \n"
-                        + "this case are missing. Would you like to search for them now?\n"
-                        + "Previously, the image was located at:\n" + path
-                        + "\nPlease note that you will still be able to browse directories and generate reports\n"
-                        + "if you choose No, but you will not be able to view file content or run the ingest process.", "Missing Image", JOptionPane.YES_NO_OPTION);
+                int ret = JOptionPane.showConfirmDialog(null,
+                                                        NbBundle.getMessage(Case.class,
+                                                                            "Case.checkImgExist.confDlg.doesntExist.msg",
+                                                                            appName, path),
+                                                        NbBundle.getMessage(Case.class,
+                                                                            "Case.checkImgExist.confDlg.doesntExist.title"),
+                                                        JOptionPane.YES_NO_OPTION);
                 if (ret == JOptionPane.YES_OPTION) {
                    
                     MissingImageDialog.makeDialog(obj_id, db);
@@ -389,12 +409,15 @@ public class Case implements SleuthkitCase.ErrorObserver {
                     }
                     catch (Exception e) {
                         logger.log(Level.SEVERE, "Case listener threw exception", e);
-                        MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to Case updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                        MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "Case.moduleErr"),
+                                                      NbBundle.getMessage(this.getClass(),
+                                                                          "Case.changeCase.errListenToCaseUpdates.msg"),
+                                                      MessageNotifyUtil.MessageType.ERROR);
                     }
             CoreComponentControl.openCoreWindows();
             return newImage;
         } catch (Exception ex) {
-            throw new CaseActionException("Error adding image to the case", ex);
+            throw new CaseActionException(NbBundle.getMessage(this.getClass(), "Case.addImg.exception.msg"), ex);
         }
     }
 
@@ -423,7 +446,10 @@ public class Case implements SleuthkitCase.ErrorObserver {
         }
         catch (Exception e) {
             logger.log(Level.SEVERE, "Case threw exception", e);
-            MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to Case updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+            MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "Case.moduleErr"),
+                                          NbBundle.getMessage(this.getClass(),
+                                                              "Case.changeCase.errListenToCaseUpdates.msg"),
+                                          MessageNotifyUtil.MessageType.ERROR);
         }
         CoreComponentControl.openCoreWindows();
     }
@@ -456,7 +482,7 @@ public class Case implements SleuthkitCase.ErrorObserver {
             this.xmlcm.close(); // close the xmlcm
             this.db.close();
         } catch (Exception e) {
-            throw new CaseActionException("Error while trying to close the current case.", e);
+            throw new CaseActionException(NbBundle.getMessage(this.getClass(), "Case.closeCase.exception.msg"), e);
         }
     }
 
@@ -478,11 +504,13 @@ public class Case implements SleuthkitCase.ErrorObserver {
             RecentCases.getInstance().removeRecentCase(this.name, this.configFilePath); // remove it from the recent case
             Case.changeCase(null);
             if (result == false) {
-                throw new CaseActionException("Error deleting the case dir: " + caseDir);
+                throw new CaseActionException(
+                        NbBundle.getMessage(this.getClass(), "Case.deleteCase.exception.msg", caseDir));
             }
         } catch (Exception ex) {
             logger.log(Level.SEVERE, "Error deleting the current case dir: " + caseDir, ex);
-            throw new CaseActionException("Error deleting the case dir: " + caseDir, ex);
+            throw new CaseActionException(
+                    NbBundle.getMessage(this.getClass(), "Case.deleteCase.exception.msg2", caseDir), ex);
         }
     }
 
@@ -504,12 +532,15 @@ public class Case implements SleuthkitCase.ErrorObserver {
             }
             catch (Exception e) {
                 logger.log(Level.SEVERE, "Case listener threw exception", e);
-                MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to Case updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "Case.moduleErr"),
+                                              NbBundle.getMessage(this.getClass(),
+                                                                  "Case.changeCase.errListenToCaseUpdates.msg"),
+                                              MessageNotifyUtil.MessageType.ERROR);
             }
             doCaseNameChange(newCaseName);
 
         } catch (Exception e) {
-            throw new CaseActionException("Error while trying to update the case name.", e);
+            throw new CaseActionException(NbBundle.getMessage(this.getClass(), "Case.updateCaseName.exception.msg"), e);
         }
     }
 
@@ -528,10 +559,13 @@ public class Case implements SleuthkitCase.ErrorObserver {
             }
             catch (Exception e) {
                 logger.log(Level.SEVERE, "Case listener threw exception", e);
-                MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to Case updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "Case.moduleErr"),
+                                              NbBundle.getMessage(this.getClass(),
+                                                                  "Case.changeCase.errListenToCaseUpdates.msg"),
+                                              MessageNotifyUtil.MessageType.ERROR);
             }
         } catch (Exception e) {
-            throw new CaseActionException("Error while trying to update the examiner.", e);
+            throw new CaseActionException(NbBundle.getMessage(this.getClass(), "Case.updateExaminer.exception.msg"), e);
         }
     }
 
@@ -551,10 +585,13 @@ public class Case implements SleuthkitCase.ErrorObserver {
             }
             catch (Exception e) {
                 logger.log(Level.SEVERE, "Case listener threw exception", e);
-                MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to Case updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "Case.moduleErr"),
+                                              NbBundle.getMessage(this.getClass(),
+                                                                  "Case.changeCase.errListenToCaseUpdates.msg"),
+                                              MessageNotifyUtil.MessageType.ERROR);
             }
         } catch (Exception e) {
-            throw new CaseActionException("Error while trying to update the case number.", e);
+            throw new CaseActionException(NbBundle.getMessage(this.getClass(), "Case.updateCaseNum.exception.msg"), e);
         }
     }
 
@@ -764,7 +801,7 @@ public class Case implements SleuthkitCase.ErrorObserver {
         try {
             return db.getRootObjects();
         } catch (TskException ex) {
-            throw new RuntimeException("Error getting root objects.", ex);
+            throw new RuntimeException(NbBundle.getMessage(this.getClass(), "Case.exception.errGetRootObj"), ex);
         }
     }
 
@@ -919,16 +956,19 @@ public class Case implements SleuthkitCase.ErrorObserver {
         File caseDirF = new File(caseDir);
         if (caseDirF.exists()) {
             if (caseDirF.isFile()) {
-                throw new CaseActionException("Cannot create case dir, already exists and is not a directory: " + caseDir);
+                throw new CaseActionException(
+                        NbBundle.getMessage(Case.class, "Case.createCaseDir.exception.existNotDir", caseDir));
             } else if (!caseDirF.canRead() || !caseDirF.canWrite()) {
-                throw new CaseActionException("Cannot create case dir, already exists and cannot read/write: " + caseDir);
+                throw new CaseActionException(
+                        NbBundle.getMessage(Case.class, "Case.createCaseDir.exception.existCantRW", caseDir));
             }
         }
 
         try {
             boolean result = (caseDirF).mkdirs(); // create root case Directory
             if (result == false) {
-                throw new CaseActionException("Cannot create case dir: " + caseDir);
+                throw new CaseActionException(
+                        NbBundle.getMessage(Case.class, "Case.createCaseDir.exception.cantCreate", caseDir));
             }
 
             // create the folders inside the case directory
@@ -938,17 +978,21 @@ public class Case implements SleuthkitCase.ErrorObserver {
                     && (new File(caseDir + File.separator + XMLCaseManagement.CACHE_FOLDER_RELPATH)).mkdir();
 
             if (result == false) {
-                throw new CaseActionException("Could not create case directory: " + caseDir);
+                throw new CaseActionException(
+                        NbBundle.getMessage(Case.class, "Case.createCaseDir.exception.cantCreateCaseDir", caseDir));
             }
 
             final String modulesOutDir = caseDir + File.separator + getModulesOutputDirRelPath();
             result = new File(modulesOutDir).mkdir();
             if (result == false) {
-                throw new CaseActionException("Could not create modules output directory: " + modulesOutDir);
+                throw new CaseActionException(
+                        NbBundle.getMessage(Case.class, "Case.createCaseDir.exception.cantCreateModDir",
+                                            modulesOutDir));
             }
 
         } catch (Exception e) {
-            throw new CaseActionException("Could not create case directory: " + caseDir, e);
+            throw new CaseActionException(
+                    NbBundle.getMessage(Case.class, "Case.createCaseDir.exception.gen", caseDir), e);
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java
index 72ed22351b..229bbe2ca9 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseDeleteAction.java
@@ -99,8 +99,11 @@ import org.openide.util.actions.CallableSystemAction;
         }
         else{
             // show the confirmation first to close the current case and open the "New Case" wizard panel
-            String closeCurrentCase = "Are you sure want to close and delete this case? \n     Case Name: " + caseName + "\n     Case Directory: "+ caseFolder.getPath();
-            NotifyDescriptor d = new NotifyDescriptor.Confirmation(closeCurrentCase, "Warning: Closing the Current Case", NotifyDescriptor.YES_NO_OPTION, NotifyDescriptor.WARNING_MESSAGE);
+            String closeCurrentCase = NbBundle.getMessage(this.getClass(), "CaseDeleteAction.closeConfMsg.text",                                                          caseName, caseFolder.getPath());
+            NotifyDescriptor d = new NotifyDescriptor.Confirmation(closeCurrentCase,
+                                                                   NbBundle.getMessage(this.getClass(),
+                                                                                       "CaseDeleteAction.closeConfMsg.title"),
+                                                                   NotifyDescriptor.YES_NO_OPTION, NotifyDescriptor.WARNING_MESSAGE);
             d.setValue(NotifyDescriptor.NO_OPTION);
 
             Object res = DialogDisplayer.getDefault().notify(d);
@@ -116,11 +119,18 @@ import org.openide.util.actions.CallableSystemAction;
 
                 // show notification whether the case has been deleted or it failed to delete...
                 if(!success){
-                    JOptionPane.showMessageDialog(caller, "The delete action can't be fully completed because the folder or file in it is open by another program.\n \nClose the folder and file and try again or you can delete the case manually.", "Error: Folder In Use", JOptionPane.ERROR_MESSAGE); // throw an error
+                    JOptionPane.showMessageDialog(caller,
+                                                  NbBundle.getMessage(this.getClass(),
+                                                                      "CaseDeleteAction.msgDlg.fileInUse.msg"),
+                                                  NbBundle.getMessage(this.getClass(),
+                                                                      "CaseDeleteAction.msgDlg.fileInUse.title"),
+                                                  JOptionPane.ERROR_MESSAGE); // throw an error
                 }
                 else{
                     CasePropertiesAction.closeCasePropertiesWindow(); // because the "Delete Case" button is in the "CaseProperties" window, we have to close that window when we delete the case.
-                    JOptionPane.showMessageDialog(caller, "Case " + caseName + " has been deleted.");
+                    JOptionPane.showMessageDialog(caller, NbBundle.getMessage(this.getClass(),
+                                                                              "CaseDeleteAction.msgDlg.caseDelete.msg",
+                                                                              caseName));
                 }
             }
         }
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CaseOpenAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CaseOpenAction.java
index 26dfb3b821..6c2ac4c0e6 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CaseOpenAction.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CaseOpenAction.java
@@ -22,15 +22,17 @@ import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
-import java.util.Collections;
 import java.util.logging.Level;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.filechooser.FileFilter;
 import javax.swing.filechooser.FileNameExtensionFilter;
+
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.coreutils.Version;
 
 /**
  * The action to open a existing case. This class is always enabled.
@@ -47,8 +49,9 @@ public final class CaseOpenAction implements ActionListener {
      * The constructor
      */
     public CaseOpenAction() {
-        autFilter = new FileNameExtensionFilter(org.sleuthkit.autopsy.coreutils.Version.getName() 
-                + " Case File ( " + Case.CASE_DOT_EXTENSION + ")", 
+        autFilter = new FileNameExtensionFilter(
+                NbBundle.getMessage(CaseOpenAction.class, "CaseOpenAction.autFilter.title", Version.getName(),
+                                    Case.CASE_DOT_EXTENSION),
                 Case.CASE_EXTENSION);
         fc.setDragEnabled(false);
         fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
@@ -80,7 +83,12 @@ public final class CaseOpenAction implements ActionListener {
             ModuleSettings.setConfigSetting(ModuleSettings.MAIN_SETTINGS, PROP_BASECASE, dirPath.substring(0, dirPath.lastIndexOf(File.separator)));
             // check if the file exists
             if (!new File(path).exists()) {
-                JOptionPane.showMessageDialog(null, "Error: File doesn't exist.", "Error", JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(null,
+                                              NbBundle.getMessage(this.getClass(),
+                                                                  "CaseOpenAction.msgDlg.fileNotExist.msg"),
+                                              NbBundle.getMessage(this.getClass(),
+                                                                  "CaseOpenAction.msgDlg.fileNotExist.title"),
+                                              JOptionPane.ERROR_MESSAGE);
                 this.actionPerformed(e); // show the dialog box again
             } else {
                 // try to close Startup window if there's one
@@ -93,8 +101,13 @@ public final class CaseOpenAction implements ActionListener {
                 try {
                     Case.open(path); // open the case
                 } catch (CaseActionException ex) {
-                    JOptionPane.showMessageDialog(null, "Error: could not open the case in folder " + path
-                            + ": " + ex.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(null,
+                                                  NbBundle.getMessage(this.getClass(),
+                                                                      "CaseOpenAction.msgDlg.cantOpenCase.msg", path,
+                                                                      ex.getMessage()),
+                                                  NbBundle.getMessage(this.getClass(),
+                                                                      "CaseOpenAction.msgDlg.cantOpenCase.title"),
+                                                  JOptionPane.ERROR_MESSAGE);
                     logger.log(Level.WARNING, "Error opening case in folder " + path, ex);
 
                     StartupWindowProvider.getInstance().open();
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java
index 76ff941278..26f86db61a 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesAction.java
@@ -62,7 +62,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
         
         try {
             // create the popUp window for it
-            String title = "Case Properties";
+            String title = NbBundle.getMessage(this.getClass(), "CasePropertiesAction.window.title");
             final JFrame frame = new JFrame(title);
             popUpWindow = new JDialog(frame, title, true); // to make the popUp Window to be modal
 
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java
index 5ff08adcad..6da501f08f 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CasePropertiesForm.java
@@ -27,9 +27,10 @@ package org.sleuthkit.autopsy.casemodule;
 
 import java.awt.event.ActionListener;
 import java.io.File;
-import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -365,7 +366,12 @@ class CasePropertiesForm extends javax.swing.JPanel{
 
             // check if the case name is empty
             if(newCaseName.trim().equals("")){
-                JOptionPane.showMessageDialog(caller, "The caseName cannot be empty.", "Error", JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(caller,
+                                              NbBundle.getMessage(this.getClass(),
+                                                                  "CasePropertiesForm.updateCaseName.msgDlg.empty.msg"),
+                                              NbBundle.getMessage(this.getClass(),
+                                                                  "CasePropertiesForm.updateCaseName.msgDlg.empty.title"),
+                                              JOptionPane.ERROR_MESSAGE);
             }
             else{
                 // check if case Name contain one of this following symbol:
@@ -373,13 +379,22 @@ class CasePropertiesForm extends javax.swing.JPanel{
                 if(newCaseName.contains("\\") || newCaseName.contains("/") || newCaseName.contains(":") ||
                    newCaseName.contains("*") || newCaseName.contains("?") || newCaseName.contains("\"") ||
                    newCaseName.contains("<") || newCaseName.contains(">") || newCaseName.contains("|")){
-                    String errorMsg = "The Case Name cannot contain any of this following symbol: \\ / : * ? \" < > |";
-                    JOptionPane.showMessageDialog(caller, errorMsg, "Error", JOptionPane.ERROR_MESSAGE);
+                    String errorMsg = NbBundle
+                            .getMessage(this.getClass(), "CasePropertiesForm.updateCaseName.msgDlg.invalidSymbols.msg");
+                    JOptionPane.showMessageDialog(caller, errorMsg,
+                                                  NbBundle.getMessage(this.getClass(),
+                                                                      "CasePropertiesForm.updateCaseName.msgDlg.invalidSymbols.title"),
+                                                  JOptionPane.ERROR_MESSAGE);
                 }
                 else{
                     // ask for the confirmation first
-                    String confMsg = "Are you sure want to update the case name from \"" + oldCaseName + "\" to \"" + newCaseName + "\"?";
-                    NotifyDescriptor d = new NotifyDescriptor.Confirmation(confMsg, "Create directory", NotifyDescriptor.YES_NO_OPTION, NotifyDescriptor.WARNING_MESSAGE);
+                    String confMsg = NbBundle
+                            .getMessage(this.getClass(), "CasePropertiesForm.updateCaseName.confMsg.msg", oldCaseName,
+                                        newCaseName);
+                    NotifyDescriptor d = new NotifyDescriptor.Confirmation(confMsg,
+                                                                           NbBundle.getMessage(this.getClass(),
+                                                                                               "CasePropertiesForm.updateCaseName.confMsg.title"),
+                                                                           NotifyDescriptor.YES_NO_OPTION, NotifyDescriptor.WARNING_MESSAGE);
                     d.setValue(NotifyDescriptor.NO_OPTION);
 
                     Object res = DialogDisplayer.getDefault().notify(d);
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java
index 49c5b313a0..0d9f33cd89 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/CueBannerPanel.java
@@ -29,13 +29,14 @@ import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
 
 /**
  *
  */
 public class CueBannerPanel extends javax.swing.JPanel {
 
-    final private static String title = "Open Recent Case";
+    final private static String title = NbBundle.getMessage(CueBannerPanel.class, "CueBannerPanel.title.text");
     final private static JFrame frame = new JFrame(title);
     final static JDialog recentCasesWindow = new JDialog(frame, title, true); // to make the popUp Window to be modal
 
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java b/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java
index 9b9a091466..4d972958c9 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/GeneralFilter.java
@@ -19,6 +19,8 @@
 
 package org.sleuthkit.autopsy.casemodule;
 
+import org.openide.util.NbBundle;
+
 import java.io.File;
 import java.util.List;
 import java.util.Arrays;
@@ -32,10 +34,10 @@ public class GeneralFilter extends FileFilter{
     
     // Extensions & Descriptions for commonly used filters
     public static final List<String> RAW_IMAGE_EXTS = Arrays.asList(new String[]{".img", ".dd", ".001", ".aa", ".raw", ".bin"});
-    public static final String RAW_IMAGE_DESC = "Raw Images (*.img, *.dd, *.001, *.aa, *.raw, *.bin)";
+    public static final String RAW_IMAGE_DESC = NbBundle.getMessage(GeneralFilter.class, "GeneralFilter.rawImageDesc.text");
     
     public static final List<String> ENCASE_IMAGE_EXTS = Arrays.asList(new String[]{".e01"});
-    public static final String ENCASE_IMAGE_DESC = "Encase Images (*.e01)";
+    public static final String ENCASE_IMAGE_DESC = NbBundle.getMessage(GeneralFilter.class,                                                                       "GeneralFilter.encaseImageDesc.text");
     
    
   
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
index b22b94f300..d8c4b31de6 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
@@ -22,6 +22,8 @@ import javax.swing.JPanel;
 import java.util.ArrayList;
 import java.util.List;
 import javax.swing.filechooser.FileFilter;
+
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorProgressMonitor;
@@ -41,7 +43,7 @@ public class ImageDSProcessor implements DataSourceProcessor {
     static final Logger logger = Logger.getLogger(ImageDSProcessor.class.getName());
     
     // Data source type handled by this processor
-    private final static String dsType = "Image File";
+    private final static String dsType = NbBundle.getMessage(ImageDSProcessor.class, "ImageDSProcessor.dsType.text");
     
     // The Config UI panel that plugins into the Choose Data Source Wizard
     private final ImageFilePanel imageFilePanel;
@@ -70,7 +72,7 @@ public class ImageDSProcessor implements DataSourceProcessor {
         allExt.addAll(GeneralFilter.RAW_IMAGE_EXTS);
         allExt.addAll(GeneralFilter.ENCASE_IMAGE_EXTS);
     }
-    static final String allDesc = "All Supported Types";
+    static final String allDesc = NbBundle.getMessage(ImageDSProcessor.class, "ImageDSProcessor.allDesc.text");
     static final GeneralFilter allFilter = new GeneralFilter(allExt, allDesc);
     
     static final List<FileFilter> filtersList = new ArrayList<>();
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java
index 52ccfd5c9d..1369745a57 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java
@@ -21,8 +21,6 @@ package org.sleuthkit.autopsy.casemodule;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
 import java.util.SimpleTimeZone;
@@ -32,6 +30,8 @@ import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.JPanel;
 import javax.swing.filechooser.FileFilter;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor;
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
@@ -202,7 +202,9 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
         }
         catch (Exception e) {
             logger.log(Level.SEVERE, "ImageFilePanel listener threw exception", e);
-            MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to ImageFilePanel updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+            MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "ImageFilePanel.moduleErr"),
+                                          NbBundle.getMessage(this.getClass(), "ImageFilePanel.moduleErr.msg"),
+                                          MessageNotifyUtil.MessageType.ERROR);
         }
     }//GEN-LAST:event_browseButtonActionPerformed
 
@@ -330,7 +332,9 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
         }
         catch (Exception ee) {
             logger.log(Level.SEVERE, "ImageFilePanel listener threw exception", ee);
-            MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to ImageFilePanel updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+            MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "ImageFilePanel.moduleErr"),
+                                          NbBundle.getMessage(this.getClass(), "ImageFilePanel.moduleErr.msg"),
+                                          MessageNotifyUtil.MessageType.ERROR);
         }
     }
 
@@ -341,7 +345,9 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
         }
         catch (Exception ee) {
             logger.log(Level.SEVERE, "ImageFilePanel listener threw exception", ee);
-            MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to ImageFilePanel updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+            MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "ImageFilePanel.moduleErr"),
+                                          NbBundle.getMessage(this.getClass(), "ImageFilePanel.moduleErr.msg"),
+                                          MessageNotifyUtil.MessageType.ERROR);
         }
     }
 
@@ -353,7 +359,9 @@ public class ImageFilePanel extends JPanel implements DocumentListener {
         }
         catch (Exception ee) {
             logger.log(Level.SEVERE, "ImageFilePanel listener threw exception", ee);
-            MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to ImageFilePanel updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+            MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "ImageFilePanel.moduleErr"),
+                                          NbBundle.getMessage(this.getClass(), "ImageFilePanel.moduleErr.msg"),
+                                          MessageNotifyUtil.MessageType.ERROR);
         }
     }
     
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java
index 5a74b31a7c..997e69348b 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskDSProcessor.java
@@ -20,6 +20,8 @@
 package org.sleuthkit.autopsy.casemodule;
 
 import javax.swing.JPanel;
+
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorProgressMonitor;
@@ -33,7 +35,7 @@ public class LocalDiskDSProcessor  implements DataSourceProcessor {
     static final Logger logger = Logger.getLogger(ImageDSProcessor.class.getName());
     
     // Data source type handled by this processor
-    private static  final String dsType = "Local Disk";
+    private static  final String dsType = NbBundle.getMessage(LocalDiskDSProcessor.class, "LocalDiskDSProcessor.dsType.text");
     
     // The Config UI panel that plugins into the Choose Data Source Wizard
     private final LocalDiskPanel localDiskPanel;
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.form b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.form
index 58e493e793..55707d9f0c 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.form
@@ -80,6 +80,10 @@
           <StringArray count="0"/>
         </Property>
       </Properties>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new javax.swing.JComboBox&lt;&gt;()"/>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;LocalDisk&gt;"/>
+      </AuxValues>
     </Component>
     <Component class="javax.swing.JLabel" name="errorLabel">
       <Properties>
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
index b85ec86e4f..3a5bcc8ab7 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
@@ -41,6 +41,8 @@ import javax.swing.ListCellRenderer;
 import javax.swing.SwingWorker;
 import javax.swing.border.EmptyBorder;
 import javax.swing.event.ListDataListener;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
@@ -48,12 +50,12 @@ import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 /**
  * ImageTypePanel for adding a local disk or partition such as PhysicalDrive0 or  C:.
  */
- class LocalDiskPanel extends JPanel  {
+ final class LocalDiskPanel extends JPanel  {
     private static final Logger logger = Logger.getLogger(LocalDiskPanel.class.getName());
     
     private static LocalDiskPanel instance;
     private PropertyChangeSupport pcs = null;
-    private List<LocalDisk> disks = new ArrayList<LocalDisk>();
+    private List<LocalDisk> disks;
     private LocalDiskModel model;
     private boolean enableNext = false;
 
@@ -61,6 +63,7 @@ import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
      * Creates new form LocalDiskPanel
      */
     public LocalDiskPanel() {
+        this.disks = new ArrayList<>();
         initComponents();
         customInit();
         
@@ -99,7 +102,7 @@ import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
     private void initComponents() {
 
         diskLabel = new javax.swing.JLabel();
-        diskComboBox = new javax.swing.JComboBox();
+        diskComboBox = new javax.swing.JComboBox<>();
         errorLabel = new javax.swing.JLabel();
         timeZoneLabel = new javax.swing.JLabel();
         timeZoneComboBox = new javax.swing.JComboBox<String>();
@@ -163,7 +166,7 @@ import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
     }// </editor-fold>//GEN-END:initComponents
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JLabel descLabel;
-    private javax.swing.JComboBox diskComboBox;
+    private javax.swing.JComboBox<LocalDisk> diskComboBox;
     private javax.swing.JLabel diskLabel;
     private javax.swing.JLabel errorLabel;
     private javax.swing.JCheckBox noFatOrphansCheckbox;
@@ -294,14 +297,13 @@ import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
         private Object selected;
         private boolean ready = false;
         private volatile boolean loadingDisks = false;
-        List<LocalDisk> physical = new ArrayList<LocalDisk>();
-        List<LocalDisk> partitions = new ArrayList<LocalDisk>();
+        List<LocalDisk> physical = new ArrayList<>();
+        List<LocalDisk> partitions = new ArrayList<>();
         
         //private String SELECT = "Select a local disk:";
-        private String LOADING = "Loading local disks...";
+        private String LOADING = NbBundle.getMessage(this.getClass(), "LocalDiskPanel.localDiskModel.loading.msg");
         LocalDiskThread worker = null;
         
-        
         private void loadDisks() {
            
             // if there is a worker already building the lists, then cancel it first.
@@ -311,9 +313,9 @@ import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
             
             // Clear the lists
             errorLabel.setText("");
-            disks = new ArrayList<LocalDisk>();
-            physical = new ArrayList<LocalDisk>();
-            partitions = new ArrayList<LocalDisk>();
+            disks = new ArrayList<>();
+            physical = new ArrayList<>();
+            partitions = new ArrayList<>();
             diskComboBox.setEnabled(false);
             ready = false;
             enableNext = false;
@@ -328,7 +330,7 @@ import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
         @Override
         public void setSelectedItem(Object anItem) {
             if(ready) {
-                selected = anItem;
+                selected = (LocalDisk) anItem;
                 enableNext = true;
                 
                 try {
@@ -336,7 +338,9 @@ import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
                 }
                 catch (Exception e) {
                     logger.log(Level.SEVERE, "LocalDiskPanel listener threw exception", e);
-                    MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to LocalDiskPanel updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                    MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "LocalDiskPanel.moduleErr"),
+                                                  NbBundle.getMessage(this.getClass(), "LocalDiskPanel.moduleErr.msg"),
+                                                  MessageNotifyUtil.MessageType.ERROR);
                 }
             }
         }
@@ -380,13 +384,14 @@ import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
                 label.setForeground(list.getForeground());
             }
             
-            if(value !=null && value.equals(LOADING)) {
+            String localDiskString = value.toString();
+            if(localDiskString.equals(LOADING)) {
                 Font font = new Font(label.getFont().getName(), Font.ITALIC, label.getFont().getSize()); 
                 label.setText(LOADING);
                 label.setFont(font);
                 label.setBackground(Color.GRAY);
             } else {
-                label.setText(value != null ? value.toString() : "");
+                label.setText(value.toString());
             }
             label.setOpaque(true);
             label.setBorder(new EmptyBorder(2, 2, 2, 2));
@@ -410,16 +415,22 @@ import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
             private void displayErrors() {
                 if(physical.isEmpty() && partitions.isEmpty()) {
                     if(PlatformUtil.isWindowsOS()) {
-                        errorLabel.setText("Disks were not detected. On some systems it requires admin privileges (or \"Run as administrator\").");
-                        errorLabel.setToolTipText("Disks were not detected. On some systems it requires admin privileges (or \"Run as administrator\").");
+                        errorLabel.setText(
+                                NbBundle.getMessage(this.getClass(), "LocalDiskPanel.errLabel.disksNotDetected.text"));
+                        errorLabel.setToolTipText(NbBundle.getMessage(this.getClass(),
+                                                                      "LocalDiskPanel.errLabel.disksNotDetected.toolTipText"));
                     } else {
-                        errorLabel.setText("Local drives were not detected. Auto-detection not supported on this OS  or admin privileges required");
-                        errorLabel.setToolTipText("Local drives were not detected. Auto-detection not supported on this OS  or admin privileges required");
+                        errorLabel.setText(
+                                NbBundle.getMessage(this.getClass(), "LocalDiskPanel.errLabel.drivesNotDetected.text"));
+                        errorLabel.setToolTipText(NbBundle.getMessage(this.getClass(),
+                                                                      "LocalDiskPanel.errLabel.drivesNotDetected.toolTipText"));
                     }
                     diskComboBox.setEnabled(false);
                 } else if(physical.isEmpty()) {
-                    errorLabel.setText("Some disks were not detected. On some systems it requires admin privileges (or \"Run as administrator\").");
-                    errorLabel.setToolTipText("Some disks were not detected. On some systems it requires admin privileges (or \"Run as administrator\").");
+                    errorLabel.setText(
+                            NbBundle.getMessage(this.getClass(), "LocalDiskPanel.errLabel.someDisksNotDetected.text"));
+                    errorLabel.setToolTipText(NbBundle.getMessage(this.getClass(),
+                                                                  "LocalDiskPanel.errLabel.someDisksNotDetected.toolTipText"));
                 }
             }
         
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesDSProcessor.java
index 7ff306ae9a..898e414e8f 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesDSProcessor.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesDSProcessor.java
@@ -20,6 +20,8 @@
 package org.sleuthkit.autopsy.casemodule;
 
 import javax.swing.JPanel;
+
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorProgressMonitor;
@@ -32,7 +34,7 @@ public class LocalFilesDSProcessor implements DataSourceProcessor {
     static final Logger logger = Logger.getLogger(LocalFilesDSProcessor.class.getName());
     
     // Data source type handled by this processor
-    private static final String dsType = "Logical Files";
+    private static final String dsType = NbBundle.getMessage(LocalFilesDSProcessor.class, "LocalFilesDSProcessor.dsType");
     
     // The Config UI panel that plugins into the Choose Data Source Wizard
     private final LocalFilesPanel localFilesPanel;
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java
index 863e3b2610..c03c293c1a 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java
@@ -25,6 +25,8 @@ import java.util.Set;
 import java.util.TreeSet;
 import javax.swing.JFileChooser;
 import javax.swing.JPanel;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessor;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import java.util.logging.Level;
@@ -84,7 +86,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
     
     //@Override
     public String getContentType() {
-        return "LOCAL";
+        return NbBundle.getMessage(this.getClass(), "LocalFilesPanel.contentType.text");
     }
 
     //@Override
@@ -127,7 +129,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 
     @Override
     public String toString() {
-        return "Logical Files";
+        return NbBundle.getMessage(this.getClass(), "LocalFilesDSProcessor.toString.text");
     }
 
     /**
@@ -242,7 +244,9 @@ import org.sleuthkit.autopsy.coreutils.Logger;
         }
         catch (Exception e) {
             logger.log(Level.SEVERE, "LocalFilesPanel listener threw exception", e);
-            MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to LocalFilesPanel updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+            MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "LocalFilesPanel.moduleErr"),
+                                          NbBundle.getMessage(this.getClass(), "LocalFilesPanel.moduleErr.msg"),
+                                          MessageNotifyUtil.MessageType.ERROR);
         }
     }//GEN-LAST:event_selectButtonActionPerformed
 
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java b/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java
index d2d865aa0c..4fa8224fc1 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2012 Basis Technology Corp.
+ * Copyright 2012-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,6 @@
  */
 package org.sleuthkit.autopsy.casemodule;
 
-
 import java.awt.Dimension;
 import java.awt.Toolkit;
 import java.awt.event.WindowAdapter;
@@ -31,52 +30,46 @@ import java.io.File;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
-import  org.sleuthkit.autopsy.casemodule.GeneralFilter;
-
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskCoreException;
 
+class MissingImageDialog extends javax.swing.JDialog {
 
- 
- class MissingImageDialog extends javax.swing.JDialog {
     private static final Logger logger = Logger.getLogger(MissingImageDialog.class.getName());
     long obj_id;
     SleuthkitCase db;
-    
-    
-   
     static final GeneralFilter rawFilter = new GeneralFilter(GeneralFilter.RAW_IMAGE_EXTS, GeneralFilter.RAW_IMAGE_DESC);
     static final GeneralFilter encaseFilter = new GeneralFilter(GeneralFilter.ENCASE_IMAGE_EXTS, GeneralFilter.ENCASE_IMAGE_DESC);
-
     static final List<String> allExt = new ArrayList<String>();
+
     static {
         allExt.addAll(GeneralFilter.RAW_IMAGE_EXTS);
         allExt.addAll(GeneralFilter.ENCASE_IMAGE_EXTS);
     }
-    static final String allDesc = "All Supported Types";
+    static final String allDesc = NbBundle.getMessage(MissingImageDialog.class, "MissingImageDialog.allDesc.text");
     static final GeneralFilter allFilter = new GeneralFilter(allExt, allDesc);
-    
     private JFileChooser fc = new JFileChooser();
-    
+
     private MissingImageDialog(long obj_id, SleuthkitCase db) {
         super(new JFrame(), true);
         this.obj_id = obj_id;
         this.db = db;
         initComponents();
-        
+
         fc.setDragEnabled(false);
         fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
         fc.setMultiSelectionEnabled(false);
-        
+
         fc.addChoosableFileFilter(rawFilter);
         fc.addChoosableFileFilter(encaseFilter);
         fc.setFileFilter(allFilter);
-        
-        
+
+
         customInit();
     }
-    
+
 //    
 //     * Client call to create a MissingImageDialog.
 //     * 
@@ -89,45 +82,45 @@ import org.sleuthkit.datamodel.TskCoreException;
             @Override
             public void windowClosing(WindowEvent e) {
                 dialog.cancel();
-            }            
+            }
         });
         dialog.display();
     }
-    
+
     private void customInit() {
-      
-       selectButton.setEnabled(false);
+
+        selectButton.setEnabled(false);
     }
-    
+
     private void display() {
-        this.setTitle("Search for Missing Image");
+        this.setTitle(NbBundle.getMessage(this.getClass(), "MissingImageDialog.display.title"));
         Dimension screenDimension = Toolkit.getDefaultToolkit().getScreenSize();
         // set the popUp window / JFrame
         int w = this.getSize().width;
         int h = this.getSize().height;
         // set the location of the popUp Window on the center of the screen
         setLocation((screenDimension.width - w) / 2, (screenDimension.height - h) / 2);
-        
+
         this.setVisible(true);
     }
-    
+
 //    
 //     * Focuses the select button for easy enter-pressing access.
 //     
     private void moveFocusToSelect() {
         this.selectButton.requestFocusInWindow();
     }
-    
+
 //    
 //     * Enables/disables the select button based off the current panel.
 //     
     private void updateSelectButton() {
-        
+
         // Enable this based on whether there is a valid path
         if (!pathNameTextField.getText().isEmpty()) {
             String filePath = pathNameTextField.getText();
             boolean isExist = Case.pathExists(filePath) || Case.driveExists(filePath);
-            selectButton.setEnabled(isExist);   
+            selectButton.setEnabled(isExist);
         }
     }
 
@@ -274,16 +267,14 @@ import org.sleuthkit.datamodel.TskCoreException;
 
     private void pathNameTextFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_pathNameTextFieldActionPerformed
         // TODO add your handling code here:
-        
-         updateSelectButton();
+
+        updateSelectButton();
     }//GEN-LAST:event_pathNameTextFieldActionPerformed
 
     private void browseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browseButtonActionPerformed
-        
-        
-       
+
         String oldText = pathNameTextField.getText();
-        
+
         // set the current directory of the FileChooser if the ImagePath Field is valid
         File currentDir = new File(oldText);
         if (currentDir.exists()) {
@@ -296,10 +287,9 @@ import org.sleuthkit.datamodel.TskCoreException;
             pathNameTextField.setText(path);
         }
         //pcs.firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.FOCUS_NEXT.toString(), false, true);
-        
-         updateSelectButton();
-    }//GEN-LAST:event_browseButtonActionPerformed
 
+        updateSelectButton();
+    }//GEN-LAST:event_browseButtonActionPerformed
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton browseButton;
     private javax.swing.JPanel buttonPanel;
@@ -310,19 +300,19 @@ import org.sleuthkit.datamodel.TskCoreException;
     private javax.swing.JLabel titleLabel;
     private javax.swing.JSeparator titleSeparator;
     // End of variables declaration//GEN-END:variables
-    
+
 //    
 //     * Verify the user wants to cancel searching for the image.
 //     
     void cancel() {
         int ret = JOptionPane.showConfirmDialog(null,
-                "No image file has been selected, are you sure you\n" + 
-                "would like to exit without finding the image.",
-                "Missing Image", JOptionPane.YES_NO_OPTION);
+                NbBundle.getMessage(this.getClass(),
+                "MissingImageDialog.confDlg.noFileSel.msg"),
+                NbBundle.getMessage(this.getClass(),
+                "MissingImageDialog.confDlg.noFileSel.title"),
+                JOptionPane.YES_NO_OPTION);
         if (ret == JOptionPane.YES_OPTION) {
             this.dispose();
         }
     }
-    
-
-}
\ No newline at end of file
+}
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
index 3c4dd72bcf..d1faa81e7d 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java
@@ -19,6 +19,8 @@
 
 package org.sleuthkit.autopsy.casemodule;
 
+import org.openide.util.NbBundle;
+
 import java.awt.Component;
 import java.io.File;
 import javax.swing.JFileChooser;
@@ -52,7 +54,7 @@ final class NewCaseVisualPanel1 extends JPanel implements DocumentListener{
      */
     @Override
     public String getName() {
-        return "Case Info";
+        return NbBundle.getMessage(this.getClass(), "NewCaseVisualPanel1.getName.text");
     }
 
     /**
@@ -179,7 +181,8 @@ final class NewCaseVisualPanel1 extends JPanel implements DocumentListener{
         //fc.setSelectedFile(new File("C:\\Program Files\\"));
         //disableTextField(fc); // disable all the text field on the file chooser
 
-        int returnValue = fc.showDialog((Component)evt.getSource(), "Select");
+        int returnValue = fc.showDialog((Component)evt.getSource(), NbBundle.getMessage(this.getClass(),
+                                                                                        "NewCaseVisualPanel1.caseDirBrowse.selectButton.text"));
         if(returnValue == JFileChooser.APPROVE_OPTION){
             String path = fc.getSelectedFile().getPath();
             caseParentDirTextField.setText(path); // put the path to the textfield
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java
index 5232f17835..d5180fdcce 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel2.java
@@ -24,6 +24,8 @@
  */
 package org.sleuthkit.autopsy.casemodule;
 
+import org.openide.util.NbBundle;
+
 /**
  *
  * @author dfickling
@@ -43,7 +45,7 @@ package org.sleuthkit.autopsy.casemodule;
      */
     @Override
     public String getName() {
-        return "Additional Information";
+        return NbBundle.getMessage(this.getClass(), "NewCaseVisualPanel2.getName.text");
     }
 
     /** This method is called from within the constructor to
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java
index 63f4ad5c56..a5093c5230 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardAction.java
@@ -31,6 +31,7 @@ import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.WizardDescriptor;
 import org.openide.util.HelpCtx;
+import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 import org.openide.util.actions.SystemAction;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -52,8 +53,12 @@ import org.sleuthkit.autopsy.coreutils.Logger;
         // there's a case open
         if (Case.existsCurrentCase()) {
             // show the confirmation first to close the current case and open the "New Case" wizard panel
-            String closeCurrentCase = "Do you want to save and close this case and proceed with the new case creation?";
-            NotifyDescriptor d = new NotifyDescriptor.Confirmation(closeCurrentCase, "Warning: Closing the Current Case", NotifyDescriptor.YES_NO_OPTION, NotifyDescriptor.WARNING_MESSAGE);
+            String closeCurrentCase = NbBundle
+                    .getMessage(this.getClass(), "NewCaseWizardAction.closeCurCase.confMsg.msg");
+            NotifyDescriptor d = new NotifyDescriptor.Confirmation(closeCurrentCase,
+                                                                   NbBundle.getMessage(this.getClass(),
+                                                                                       "NewCaseWizardAction.closeCurCase.confMsg.title"),
+                                                                   NotifyDescriptor.YES_NO_OPTION, NotifyDescriptor.WARNING_MESSAGE);
             d.setValue(NotifyDescriptor.NO_OPTION);
 
             Object res = DialogDisplayer.getDefault().notify(d);
@@ -77,7 +82,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
         WizardDescriptor wizardDescriptor = new WizardDescriptor(getPanels());
         // {0} will be replaced by WizardDesriptor.Panel.getComponent().getName()
         wizardDescriptor.setTitleFormat(new MessageFormat("{0}"));
-        wizardDescriptor.setTitle("New Case Information");
+        wizardDescriptor.setTitle(NbBundle.getMessage(this.getClass(), "NewCaseWizardAction.newCase.windowTitle.text"));
         Dialog dialog = DialogDisplayer.getDefault().createDialog(wizardDescriptor);
         dialog.setVisible(true);
         dialog.toFront();
@@ -115,7 +120,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
      * Initialize panels representing individual wizard's steps and sets
      * various properties for them influencing wizard appearance.
      */
-    @SuppressWarnings({"unchecked"})
+    @SuppressWarnings({"unchecked", "rawtypes"})
     private WizardDescriptor.Panel<WizardDescriptor>[] getPanels() {
         if (panels == null) {
             panels = new WizardDescriptor.Panel[]{
@@ -149,7 +154,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 
     @Override
     public String getName() {
-        return "New Case Wizard";
+        return NbBundle.getMessage(this.getClass(), "NewCaseWizardAction.getName.text");
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel1.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel1.java
index 52be7a1a7d..8bbc242059 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel1.java
@@ -23,6 +23,8 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -205,13 +207,15 @@ class NewCaseWizardPanel1 implements WizardDescriptor.ValidatingPanel<WizardDesc
         // check if case Name contain one of this following symbol:
         //  \ / : * ? " < > |
         if (!Case.isValidName(caseName)) {
-            String errorMsg = "The Case Name cannot contain any of the following symbols: \\ / : * ? \" < > |";
+            String errorMsg = NbBundle
+                    .getMessage(this.getClass(), "NewCaseWizardPanel1.validate.errMsg.invalidSymbols");
             validationError(errorMsg);
         } else {
             // check if the directory exist
             if (new File(caseDirPath).exists()) {
                 // throw a warning to enter new data or delete the existing directory
-                String errorMsg = "Case directory '" + caseDirPath + "' already exists.";
+                String errorMsg = NbBundle
+                        .getMessage(this.getClass(), "NewCaseWizardPanel1.validate.errMsg.dirExists", caseDirPath);
                 validationError(errorMsg);
             } else {
                 // check if the "base" directory path is absolute
@@ -220,8 +224,13 @@ class NewCaseWizardPanel1 implements WizardDescriptor.ValidatingPanel<WizardDesc
                     // when the base directory doesn't exist
                     if (!baseDir.exists()) {
                         // get confirmation to create directory
-                        String confMsg = "The base directory \'" + caseParentDir + "\' doesn't exist. \n \n Do you want to create that directory?";
-                        NotifyDescriptor d2 = new NotifyDescriptor.Confirmation(confMsg, "Create directory", NotifyDescriptor.YES_NO_OPTION, NotifyDescriptor.WARNING_MESSAGE);
+                        String confMsg = NbBundle
+                                .getMessage(this.getClass(), "NewCaseWizardPanel1.validate.confMsg.createDir.msg",
+                                            caseParentDir);
+                        NotifyDescriptor d2 = new NotifyDescriptor.Confirmation(confMsg,
+                                                                                NbBundle.getMessage(this.getClass(),
+                                                                                                    "NewCaseWizardPanel1.validate.confMsg.createDir.title"),
+                                                                                NotifyDescriptor.YES_NO_OPTION, NotifyDescriptor.WARNING_MESSAGE);
                         d2.setValue(NotifyDescriptor.NO_OPTION);
 
                         Object res2 = DialogDisplayer.getDefault().notify(d2);
@@ -230,27 +239,33 @@ class NewCaseWizardPanel1 implements WizardDescriptor.ValidatingPanel<WizardDesc
                             try {
                                 createDirectory(caseDirPath);
                             } catch (Exception ex) {
-                                String errorMsg = "Error: Couldn't create case parent directory " + caseParentDir;
+                                String errorMsg = NbBundle.getMessage(this.getClass(),
+                                                                      "NewCaseWizardPanel1.validate.errMsg.cantCreateParDir.msg",
+                                                                      caseParentDir);
                                 logger.log(Level.WARNING, errorMsg, ex);
                                 validationError(errorMsg);
                             }
                         }
                         if (res2 != null && res2 == DialogDescriptor.NO_OPTION) {
                             // if user say no
-                            validationError("Prevented from creating base directory " + caseDirPath );
+                            validationError(NbBundle.getMessage(this.getClass(),
+                                                                "NewCaseWizardPanel1.validate.errMsg.prevCreateBaseDir.msg",
+                                                                caseDirPath) );
                         }
                     } else {
                         try {
                             createDirectory(caseDirPath);
                         } catch (Exception ex) {
-                            String errorMsg = "Error: Couldn't create directory.";
+                            String errorMsg = NbBundle
+                                    .getMessage(this.getClass(), "NewCaseWizardPanel1.validate.errMsg.cantCreateDir");
                             logger.log(Level.WARNING, errorMsg, ex);
                             validationError(errorMsg);
                         }
                     }
                 } else {
                     // throw a notification
-                    String errorMsg = "ERROR: The Base Directory that you entered is not valid.\nPlease enter a valid Base Directory.";
+                    String errorMsg = NbBundle
+                            .getMessage(this.getClass(), "NewCaseWizardPanel1.validate.errMsg.invalidBaseDir.msg");
                     validationError(errorMsg);
                 }
             }
@@ -282,7 +297,8 @@ class NewCaseWizardPanel1 implements WizardDescriptor.ValidatingPanel<WizardDesc
                 Case.deleteCaseDirectory(new File(caseDirPath));
             }
 
-            String errorMsg = "ERROR: Could not create the case directory. \nPlease enter a valid Case Name and Directory.";
+            String errorMsg = NbBundle.getMessage(this.getClass(),
+                                                  "NewCaseWizardPanel1.createDir.errMsg.cantCreateDir.msg");
             
             validationError(errorMsg);
             
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
index 7efdc4c8d5..7b71a98049 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseWizardPanel2.java
@@ -29,6 +29,7 @@ import org.openide.WizardDescriptor;
 import org.openide.WizardValidationException;
 import org.openide.util.Exceptions;
 import org.openide.util.HelpCtx;
+import org.openide.util.NbBundle;
 
 /**
  * The "New Case" wizard panel with a component on it. This class represents 
@@ -190,7 +191,10 @@ class NewCaseWizardPanel2 implements WizardDescriptor.ValidatingPanel<WizardDesc
         
             //Case.create(createdDirectory, caseName, caseNumber, examiner);
         } catch(Exception ex) {
-            throw new WizardValidationException(this.getComponent(), "Error creating case", null);
+            throw new WizardValidationException(this.getComponent(),
+                                                NbBundle.getMessage(this.getClass(),
+                                                                    "NewCaseWizardPanel2.validate.errCreateCase.msg"),
+                                                null);
         }
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java
index e7d5fc2b11..f433f825f6 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/OpenRecentCasePanel.java
@@ -28,6 +28,8 @@ import java.util.logging.Level;
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
 import javax.swing.table.AbstractTableModel;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
 /**
@@ -198,7 +200,13 @@ class OpenRecentCasePanel extends javax.swing.JPanel {
             // Open the recent cases
             try {
                 if (caseName.equals("") || casePath.equals("") || (!new File(casePath).exists())) {
-                    JOptionPane.showMessageDialog(null, "Error: Case " + caseName + " doesn't exist.", "Error", JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(null,
+                                                  NbBundle.getMessage(this.getClass(),
+                                                                      "OpenRecentCasePanel.openCase.msgDlg.caseDoesntExist.msg",
+                                                                      caseName),
+                                                  NbBundle.getMessage(this.getClass(),
+                                                                      "OpenRecentCasePanel.openCase.msgDlg.err"),
+                                                  JOptionPane.ERROR_MESSAGE);
                     RecentCases.getInstance().removeRecentCase(caseName, casePath); // remove the recent case if it doesn't exist anymore
 
                      //if case is not opened, open the start window
@@ -258,10 +266,10 @@ class OpenRecentCasePanel extends javax.swing.JPanel {
 
             switch (column) {
                 case 0:
-                    colName = "Case Name";
+                    colName = NbBundle.getMessage(this.getClass(), "OpenRecentCasePanel.colName.caseName");
                     break;
                 case 1:
-                    colName = "Path";
+                    colName = NbBundle.getMessage(this.getClass(), "OpenRecentCasePanel.colName.path");
                     break;
                 default:
                     ;
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java b/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java
index 670b83144e..8fcb6d4b32 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/RecentCases.java
@@ -31,6 +31,7 @@ import java.util.List;
 import java.util.logging.Level;
 import javax.swing.JMenuItem;
 import org.openide.util.HelpCtx;
+import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 import org.openide.util.actions.Presenter;
 import org.openide.filesystems.FileUtil;
@@ -96,7 +97,8 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 
     private static void validateCaseIndex(int i) {
         if (i < 0 || i >= LENGTH) {
-            throw new IllegalArgumentException("Recent case index " + i + " is out of range.");
+            throw new IllegalArgumentException(
+                    NbBundle.getMessage(RecentCases.class, "RecentCases.exception.caseIdxOutOfRange.msg", i));
         }
     }
 
@@ -419,7 +421,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
     @Override
     public String getName() {
         //return NbBundle.getMessage(RecentCases.class, "CTL_RecentCases");
-        return "Clear Recent Cases";
+        return NbBundle.getMessage(this.getClass(), "RecentCases.getName.text");
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/RecentItems.java b/Core/src/org/sleuthkit/autopsy/casemodule/RecentItems.java
index d8f5fcaca7..d7d66095e7 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/RecentItems.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/RecentItems.java
@@ -26,6 +26,8 @@ import java.io.File;
 import java.util.logging.Level;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
 /**
@@ -56,7 +58,11 @@ class RecentItems implements ActionListener {
         // check if the file exists
         if(caseName.equals("") || casePath.equals("") || (!new File(casePath).exists())){
             // throw an error here
-            JOptionPane.showMessageDialog(caller, "Error: Case " + caseName + " doesn't exist.", "Error", JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(caller,
+                                          NbBundle.getMessage(this.getClass(), "RecentItems.openRecentCase.msgDlg.text",
+                                                              caseName),
+                                          NbBundle.getMessage(this.getClass(), "RecentItems.openRecentCase.msgDlg.err"),
+                                          JOptionPane.ERROR_MESSAGE);
             RecentCases.getInstance().removeRecentCase(caseName, casePath); // remove the recent case if it doesn't exist anymore
             
             //if case is not opened, open the start window
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindow.java b/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindow.java
index f100123479..4c99d4f582 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindow.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/StartupWindow.java
@@ -26,6 +26,8 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
+
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
 
 /**
@@ -35,7 +37,7 @@ import org.openide.util.lookup.ServiceProvider;
 public final class StartupWindow extends JDialog implements StartupWindowInterface {
 
     private static StartupWindow instance;
-    private static final String TITLE = "Welcome";
+    private static final String TITLE = NbBundle.getMessage(StartupWindow.class, "StartupWindow.title.text");
     private static Dimension DIMENSIONS = new Dimension(750, 400);
 
     public StartupWindow() {
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java b/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java
index 9667768397..0355fc20fe 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/UpdateRecentCases.java
@@ -23,6 +23,7 @@ import javax.swing.JComponent;
 import javax.swing.JMenuItem;
 import javax.swing.JSeparator;
 import org.openide.awt.DynamicMenuContent;
+import org.openide.util.NbBundle;
 import org.openide.util.actions.SystemAction;
 
 /**
@@ -66,14 +67,15 @@ import org.openide.util.actions.SystemAction;
         // if it has recent case, create clear menu
         if(hasRecentCase){
             comps[length] = new JSeparator();
-            JMenuItem clearMenu = new JMenuItem("Clear Recent Cases");
+            JMenuItem clearMenu = new JMenuItem(
+                    NbBundle.getMessage(this.getClass(), "UpdateRecentCases.menuItem.clearRecentCases.text"));
             clearMenu.addActionListener(SystemAction.get(RecentCases.class));
             comps[length+1] = clearMenu;
         }
         // otherwise, just create a disabled empty menu
         else{
             comps = new JComponent[1];
-            JMenuItem emptyMenu = new JMenuItem("-Empty-");
+            JMenuItem emptyMenu = new JMenuItem(NbBundle.getMessage(this.getClass(), "UpdateRecentCases.menuItem.empty"));
             emptyMenu.addActionListener(new RecentItems("", ""));
             comps[0] = emptyMenu;
             comps[0].setEnabled(false);
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/XMLCaseManagement.java b/Core/src/org/sleuthkit/autopsy/casemodule/XMLCaseManagement.java
index 45d8ac4784..7fc760463c 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/XMLCaseManagement.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/XMLCaseManagement.java
@@ -30,6 +30,7 @@ import javax.xml.transform.*;
 import javax.xml.transform.dom.*;
 import javax.xml.transform.stream.*;
 import org.openide.util.Exceptions;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.XMLUtil;
 import org.w3c.dom.*;
@@ -458,7 +459,8 @@ import org.xml.sax.SAXException;
             docBuilder = docFactory.newDocumentBuilder();
         } catch (ParserConfigurationException ex) {
             clear();
-            throw new CaseActionException("Error setting up Case XML file, ", ex);
+            throw new CaseActionException(
+                    NbBundle.getMessage(this.getClass(), "XMLCaseManagement.create.exception.msg"), ex);
         }
 
         doc = docBuilder.newDocument();
@@ -531,7 +533,8 @@ import org.xml.sax.SAXException;
     @Override
     public void writeFile() throws CaseActionException {
         if (doc == null || caseName.equals("")) {
-            throw new CaseActionException("No set case to write management file for.");
+            throw new CaseActionException(
+                    NbBundle.getMessage(this.getClass(), "XMLCaseManagement.writeFile.exception.noCase.msg"));
         }
 
         // Prepare the DOM document for writing
@@ -549,7 +552,8 @@ import org.xml.sax.SAXException;
             xformer = tfactory.newTransformer();
         } catch (TransformerConfigurationException ex) {
             logger.log(Level.SEVERE, "Could not setup tranformer and write case file");
-            throw new CaseActionException("Error writing to case file", ex);
+            throw new CaseActionException(
+                    NbBundle.getMessage(this.getClass(), "XMLCaseManagement.writeFile.exception.errWriteToFile.msg"), ex);
         }
 
         //Setup indenting to "pretty print"
@@ -560,7 +564,8 @@ import org.xml.sax.SAXException;
             xformer.transform(source, result);
         } catch (TransformerException ex) {
             logger.log(Level.SEVERE, "Could not run tranformer and write case file");
-            throw new CaseActionException("Error writing to case file", ex);
+            throw new CaseActionException(
+                    NbBundle.getMessage(this.getClass(), "XMLCaseManagement.writeFile.exception.errWriteToFile.msg"), ex);
         }
 
         // preparing the output file
@@ -597,11 +602,17 @@ import org.xml.sax.SAXException;
             db = dbf.newDocumentBuilder();
             doc = db.parse(file);
         } catch (ParserConfigurationException ex) {
-            throw new CaseActionException("Error reading case XML file: " + conFilePath, ex);
+            throw new CaseActionException(
+                    NbBundle.getMessage(this.getClass(), "XMLCaseManagement.open.exception.errReadXMLFile.msg",
+                                        conFilePath), ex);
         } catch (SAXException ex) {
-            throw new CaseActionException("Error reading case XML file: " + conFilePath, ex);
+            throw new CaseActionException(
+                    NbBundle.getMessage(this.getClass(), "XMLCaseManagement.open.exception.errReadXMLFile.msg",
+                                        conFilePath), ex);
         } catch (IOException ex) {
-            throw new CaseActionException("Error reading case XML file: " + conFilePath, ex);
+            throw new CaseActionException(
+                    NbBundle.getMessage(this.getClass(), "XMLCaseManagement.open.exception.errReadXMLFile.msg",
+                                        conFilePath), ex);
         }
 
 
@@ -619,7 +630,13 @@ import org.xml.sax.SAXException;
         if (!rootName.equals(TOP_ROOT_NAME)) {
             // throw an error ...
             clear();
-            JOptionPane.showMessageDialog(caller, "Error: This is not an Autopsy config file (\"" + file.getName() + "\").\n \nDetail: \nCannot open a non-Autopsy config file (at " + className + ").", "Error", JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(caller,
+                                          NbBundle.getMessage(this.getClass(),
+                                                              "XMLCaseManagement.open.msgDlg.notAutCase.msg",
+                                                              file.getName(), className),
+                                          NbBundle.getMessage(this.getClass(),
+                                                              "XMLCaseManagement.open.msgDlg.notAutCase.title"),
+                                          JOptionPane.ERROR_MESSAGE);
         } else {
             /* Autopsy Created Version */
             String createdVersion = getCreatedVersion(); // get the created version
diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties
new file mode 100644
index 0000000000..a8565de787
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties
@@ -0,0 +1,16 @@
+Metadata.tableRowTitle.name=Name
+Metadata.tableRowTitle.size=Size
+Metadata.tableRowTitle.fileNameAlloc=File Name Allocation
+Metadata.tableRowTitle.metadataAlloc=Metadata Allocation
+Metadata.tableRowTitle.modified=Modified
+Metadata.tableRowTitle.accessed=Accessed
+Metadata.tableRowTitle.created=Created
+Metadata.tableRowTitle.changed=Changed
+Metadata.tableRowContent.md5notCalc=Not calculated
+Metadata.tableRowTitle.md5=MD5
+Metadata.tableRowTitle.hashLookupResults=Hash Lookup Results
+Metadata.tableRowTitle.internalid=Internal ID
+Metadata.tableRowTitle.localPath=Local Path
+Metadata.title=Metadata
+Metadata.toolTip=Displays metadata about the file.
+Metadata.nodeText.nonFilePassedIn=Non-file passed in
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle_ja.properties
new file mode 100644
index 0000000000..b3db39fbc1
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle_ja.properties
@@ -0,0 +1,16 @@
+Metadata.tableRowTitle.name=\u540D\u79F0
+Metadata.tableRowTitle.size=\u30B5\u30A4\u30BA
+Metadata.tableRowTitle.fileNameAlloc=\u30D5\u30A1\u30A4\u30EB\u30A2\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u72B6\u614B
+Metadata.tableRowTitle.metadataAlloc=\u30E1\u30BF\u30C7\u30FC\u30BF\u30A2\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u72B6\u614B
+Metadata.tableRowTitle.modified=\u4FEE\u6B63\u6E08\u307F
+Metadata.tableRowTitle.accessed=\u30A2\u30AF\u30BB\u30B9\u6E08\u307F
+Metadata.tableRowTitle.created=\u4F5C\u6210\u6E08\u307F
+Metadata.tableRowTitle.changed=\u5909\u66F4\u6E08\u307F
+Metadata.tableRowContent.md5notCalc=\u672A\u8A08\u7B97
+Metadata.tableRowTitle.md5=MD5
+Metadata.tableRowTitle.hashLookupResults=\u30CF\u30C3\u30B7\u30E5\u30EB\u30C3\u30AF\u30A2\u30C3\u30D7\u7D50\u679C
+Metadata.tableRowTitle.internalid=\u5185\u90E8ID
+Metadata.tableRowTitle.localPath=\u30ED\u30FC\u30AB\u30EB\u30D1\u30B9
+Metadata.title=\u30E1\u30BF\u30C7\u30FC\u30BF
+Metadata.toolTip=\u30D5\u30A1\u30A4\u30EB\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u3092\u8868\u793A\u3057\u307E\u3059\u3002
+Metadata.nodeText.nonFilePassedIn=\u51E6\u7406\u4E2D\u306E\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8\u306F\u30D5\u30A1\u30A4\u30EB\u3067\u306F\u3042\u308A\u307E\u305B\u3093
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.java b/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.java
index 20de49affd..ab29df1d2b 100755
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.java
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/Metadata.java
@@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.contentviewers;
 
 import java.awt.Component;
 import org.openide.nodes.Node;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataContentViewer;
 import org.sleuthkit.autopsy.datamodel.AbstractAbstractFileNode;
@@ -122,7 +123,7 @@ public class Metadata extends javax.swing.JPanel implements DataContentViewer
     public void setNode(Node node) {
         AbstractFile file = node.getLookup().lookup(AbstractFile.class);
         if (file == null) {
-            setText("Non-file passed in");
+            setText(NbBundle.getMessage(this.getClass(), "Metadata.nodeText.nonFilePassedIn"));
             return;
         }
         
@@ -130,29 +131,29 @@ public class Metadata extends javax.swing.JPanel implements DataContentViewer
         startTable(sb);
         
         try {
-            addRow(sb, "Name", file.getUniquePath());
+            addRow(sb, NbBundle.getMessage(this.getClass(), "Metadata.tableRowTitle.name"), file.getUniquePath());
         } catch (TskCoreException ex) {
-            addRow(sb, "Name", file.getParentPath() + "/" + file.getName());
+            addRow(sb, NbBundle.getMessage(this.getClass(), "Metadata.tableRowTitle.name"), file.getParentPath() + "/" + file.getName());
         }
         
-        addRow(sb, "Size", new Long(file.getSize()).toString() );
-        addRow(sb, "File Name Allocation", file.getDirFlagAsString());
-        addRow(sb, "Metadata Allocation", file.getMetaFlagsAsString());
-        addRow(sb, "Modified", ContentUtils.getStringTime(file.getMtime(), file));
-        addRow(sb, "Accessed", ContentUtils.getStringTime(file.getAtime(), file));
-        addRow(sb, "Created",  ContentUtils.getStringTime(file.getCrtime(), file));
-        addRow(sb, "Changed",  ContentUtils.getStringTime(file.getCtime(), file));
+        addRow(sb, NbBundle.getMessage(this.getClass(), "Metadata.tableRowTitle.size"), new Long(file.getSize()).toString() );
+        addRow(sb, NbBundle.getMessage(this.getClass(), "Metadata.tableRowTitle.fileNameAlloc"), file.getDirFlagAsString());
+        addRow(sb, NbBundle.getMessage(this.getClass(), "Metadata.tableRowTitle.metadataAlloc"), file.getMetaFlagsAsString());
+        addRow(sb, NbBundle.getMessage(this.getClass(), "Metadata.tableRowTitle.modified"), ContentUtils.getStringTime(file.getMtime(), file));
+        addRow(sb, NbBundle.getMessage(this.getClass(), "Metadata.tableRowTitle.accessed"), ContentUtils.getStringTime(file.getAtime(), file));
+        addRow(sb, NbBundle.getMessage(this.getClass(), "Metadata.tableRowTitle.created"),  ContentUtils.getStringTime(file.getCrtime(), file));
+        addRow(sb, NbBundle.getMessage(this.getClass(), "Metadata.tableRowTitle.changed"),  ContentUtils.getStringTime(file.getCtime(), file));
        
         String md5 = file.getMd5Hash();
         if (md5 == null) {
-            md5 = "Not calculated";
+            md5 = NbBundle.getMessage(this.getClass(), "Metadata.tableRowContent.md5notCalc");
         }
-        addRow(sb, "MD5", md5);
-        addRow(sb, "Hash Lookup Results", file.getKnown().toString());
+        addRow(sb, NbBundle.getMessage(this.getClass(), "Metadata.tableRowTitle.md5"), md5);
+        addRow(sb, NbBundle.getMessage(this.getClass(), "Metadata.tableRowTitle.hashLookupResults"), file.getKnown().toString());
         
-        addRow(sb, "Internal ID", new Long(file.getId()).toString());
+        addRow(sb, NbBundle.getMessage(this.getClass(), "Metadata.tableRowTitle.internalid"), new Long(file.getId()).toString());
         if (file.getType().compareTo(TSK_DB_FILES_TYPE_ENUM.LOCAL) == 0) {
-            addRow(sb, "Local Path", file.getLocalAbsPath());
+            addRow(sb, NbBundle.getMessage(this.getClass(), "Metadata.tableRowTitle.localPath"), file.getLocalAbsPath());
         }
         
         endTable(sb);
@@ -161,12 +162,12 @@ public class Metadata extends javax.swing.JPanel implements DataContentViewer
 
     @Override
     public String getTitle() {
-        return "Metadata";
+        return NbBundle.getMessage(this.getClass(), "Metadata.title");
     }
 
     @Override
     public String getToolTip() {
-        return "Displays metadata about the file.";
+        return NbBundle.getMessage(this.getClass(), "Metadata.toolTip");
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/Utilities.java b/Core/src/org/sleuthkit/autopsy/contentviewers/Utilities.java
index 188fe2822d..152034d174 100755
--- a/Core/src/org/sleuthkit/autopsy/contentviewers/Utilities.java
+++ b/Core/src/org/sleuthkit/autopsy/contentviewers/Utilities.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2013 Basis Technology Corp.
+ * Copyright 2013-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,8 +21,6 @@ package org.sleuthkit.autopsy.contentviewers;
 import javax.swing.JTextPane;
 import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.text.html.StyleSheet;
-import org.sleuthkit.datamodel.AbstractFile;
-import org.sleuthkit.datamodel.TskCoreException;
 
 /**
  *
diff --git a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties b/Core/src/org/sleuthkit/autopsy/core/Bundle.properties
index 1bc91ef607..ff08a90d89 100644
--- a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/core/Bundle.properties
@@ -10,3 +10,5 @@ OpenIDE-Module-Name=Autopsy-Core
 OpenIDE-Module-Short-Description=Autopsy Core Module
 org_sleuthkit_autopsy_core_update_center=http://sleuthkit.org/autopsy/updates.xml
 Services/AutoupdateType/org_sleuthkit_autopsy_core_update_center.settings=Autopsy Update Center
+Installer.errorInitJavafx.msg=Error initializing JavaFX.
+Installer.errorInitJavafx.details=\ Some features will not be available.  Check that you have the right JRE installed (Oracle JRE > 1.7.10).
diff --git a/Core/src/org/sleuthkit/autopsy/core/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/core/Bundle_ja.properties
new file mode 100644
index 0000000000..4acb349e27
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/core/Bundle_ja.properties
@@ -0,0 +1,14 @@
+OpenIDE-Module-Display-Category=\u57FA\u76E4
+OpenIDE-Module-Long-Description=\
+    Autopsy\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u30B3\u30A2\u3067\u3059\u3002\n\n\
+    \u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u307F\u3067\u5B9F\u884C\u3059\u308B\u306E\u306B\u5FC5\u8981\u306A\u4E3B\u8981\u306A\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u3059\uFF1ARCP\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3001\u30A6\u30A3\u30F3\u30C9\u30A6\u30A4\u30F3\u30B0GUI\u3001Sleuth Kit\u30D0\u30A4\u30F3\u30C7\u30A3\u30F3\u30B0\u3001\u30C7\u30FC\u30BF\u30E2\u30C7\u30EB\uFF0F\u30B9\u30C8\u30EC\u30FC\u30B8\u3001\u30A8\u30AF\u30B9\u30D7\u30ED\u30FC\u30E9\u3001\u7D50\u679C\u30D3\u30E5\u30FC\u30A2\u30FC\u3001\u30B3\u30F3\u30C6\u30F3\u30C4\u30D3\u30E5\u30FC\u30A2\u30FC\u3001\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u7528\u30D5\u30EC\u30FC\u30E0\u30EF\u30FC\u30AF\u3001\u30EC\u30DD\u30FC\u30C8\u751F\u6210\u3001\u30D5\u30A1\u30A4\u30EB\u691C\u7D22\u7B49\u306E\u4E3B\u8981\u30C4\u30FC\u30EB\u3002\n\n\
+    \u30E2\u30B8\u30E5\u30FC\u30EB\u5185\u306E\u30D5\u30EC\u30FC\u30E0\u30EF\u30FC\u30AF\u306B\u306F\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3001\u30D3\u30E5\u30FC\u30A2\u30FC\u3001\u30EC\u30DD\u30FC\u30C8\u751F\u6210\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u958B\u767A\u7528\u306EAPI\u304C\u542B\u307E\u308C\u307E\u3059\u3002\
+    \u30E2\u30B8\u30E5\u30FC\u30EB\u306FAutopsy\u30D7\u30E9\u30B0\u30A4\u30F3\u30A4\u30F3\u30B9\u30C8\u30FC\u30E9\u30FC\u3092\u4F7F\u7528\u3057\u3001\u30D7\u30E9\u30B0\u30A4\u30F3\u3068\u3057\u3066\u5B9F\u88C5\u3067\u304D\u307E\u3059\u3002\n\
+    \u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306F\u30A2\u30F3\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u3066\u306F\u3044\u3051\u307E\u305B\u3093\u3002\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u3066\u3044\u306A\u3051\u308C\u3070\u3001Autopsy\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\n\n\
+    \u8A73\u7D30\u306F\u4E0B\u8A18\u3092\u3054\u89A7\u4E0B\u3055\u3044\u3002http\://www.sleuthkit.org/autopsy/
+OpenIDE-Module-Name=Autopsy-\u30B3\u30A2
+OpenIDE-Module-Short-Description=Autopsy\u30B3\u30A2\u30E2\u30B8\u30E5\u30FC\u30EB
+org_sleuthkit_autopsy_core_update_center=http\://sleuthkit.org/autopsy/updates.xml
+Services/AutoupdateType/org_sleuthkit_autopsy_core_update_center.settings=Autopsy\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u30BB\u30F3\u30BF\u30FC
+Installer.errorInitJavafx.msg=JavaFX\u521D\u671F\u5316\u30A8\u30E9\u30FC
+Installer.errorInitJavafx.details=\u4E00\u90E8\u306E\u6A5F\u80FD\u304C\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u6B63\u3057\u3044JRE\u304C\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3055\u308C\u3066\u3044\u308B\u306E\u3092\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002\uFF08Oracle JRE > 1.7.10\uFF09
\ 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 38f6862352..66a132114b 100644
--- a/Core/src/org/sleuthkit/autopsy/core/Installer.java
+++ b/Core/src/org/sleuthkit/autopsy/core/Installer.java
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.logging.Level;
 import javafx.application.Platform;
 import javafx.embed.swing.JFXPanel;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.openide.modules.ModuleInstall;
 import org.openide.windows.WindowManager;
@@ -113,9 +114,8 @@ public class Installer extends ModuleInstall {
             javaFxInit = true;
         } catch (UnsatisfiedLinkError | NoClassDefFoundError | Exception e) {
             //in case javafx not present
-            final String msg = "Error initializing JavaFX.  ";
-            final String details = " Some features will not be available. "
-                    + " Check that you have the right JRE installed (Oracle JRE > 1.7.10). ";
+            final String msg = NbBundle.getMessage(Installer.class, "Installer.errorInitJavafx.msg");
+            final String details = NbBundle.getMessage(Installer.class, "Installer.errorInitJavafx.details");
             logger.log(Level.SEVERE, msg
 		       + details, e);
 
diff --git a/Core/src/org/sleuthkit/autopsy/core/layer.xml b/Core/src/org/sleuthkit/autopsy/core/layer.xml
index 54bec76816..6796ad9d91 100644
--- a/Core/src/org/sleuthkit/autopsy/core/layer.xml
+++ b/Core/src/org/sleuthkit/autopsy/core/layer.xml
@@ -13,7 +13,8 @@
     <attr name="Menu\File\Separator4.instance_hidden\position" intvalue="400"/>-->
 
     <folder name="OptionsDialog"> 
-        <folder name="General.instance_hidden"/>
+        <!--<folder name="General.instance_hidden"/>-->
+        <file name="General.instance"/>
         <folder name="Keymaps.instance_hidden"/> <!-- Keymap -->
         <folder name="Java.instance_hidden"/>
         <folder name="Advanced.instance_hidden"/> <!-- Miscellaneous -->
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/Bundle.properties b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/Bundle.properties
index 1468238a77..a1c78ba931 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/Bundle.properties
@@ -1 +1,3 @@
 OpenIDE-Module-Name=CoreComponentInterfaces
+CoreComponentControl.CTL_DirectoryTreeTopComponent=Directory Tree
+CoreComponentControl.CTL_FavoritesTopComponent=Favorites
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/Bundle_ja.properties
new file mode 100644
index 0000000000..8e2fd233f8
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/Bundle_ja.properties
@@ -0,0 +1,3 @@
+OpenIDE-Module-Name=\u4E3B\u8981\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30A4\u30B9
+CoreComponentControl.CTL_DirectoryTreeTopComponent=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u30C4\u30EA\u30FC
+CoreComponentControl.CTL_FavoritesTopComponent=\u304A\u6C17\u306B\u5165\u308A
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/CoreComponentControl.java b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/CoreComponentControl.java
index 2ada97d001..43b3c63629 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/CoreComponentControl.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/CoreComponentControl.java
@@ -22,6 +22,8 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.openide.util.Lookup;
 import org.openide.windows.Mode;
@@ -37,6 +39,10 @@ import org.sleuthkit.autopsy.corecomponents.DataContentTopComponent;
 public class CoreComponentControl {
 
     private static final Logger logger = Logger.getLogger(CoreComponentControl.class.getName());
+    private static final String DIRECTORY_TREE = NbBundle.getMessage(CoreComponentControl.class,
+                                                                     "CoreComponentControl.CTL_DirectoryTreeTopComponent");
+    private static final String FAVORITES = NbBundle.getMessage(CoreComponentControl.class,
+                                                                "CoreComponentControl.CTL_FavoritesTopComponent");
 
     /**
      * Opens all TopComponent windows that are needed ({@link DataExplorer}, {@link DataResult}, and
@@ -83,6 +89,7 @@ public class CoreComponentControl {
         Set<? extends Mode> modes = wm.getModes();
         Iterator<? extends Mode> iter = wm.getModes().iterator();
 
+
         TopComponent directoryTree = null;
         TopComponent favorites = null;
         String tcName = "";
@@ -94,16 +101,13 @@ public class CoreComponentControl {
                     logger.log(Level.INFO, "tcName was null");
                     tcName = "";
                 }
-                switch (tcName) {
-                    case "Directory Tree":
-                        directoryTree = tc;
-                        break;
-                    case "Favorites":
-                        favorites = tc;
-                        break;
-                    default:
-                        tc.close();
-                        break;
+                // switch requires constant strings, so converted to if/else.
+                if (DIRECTORY_TREE.equals(tcName)) {
+                    directoryTree = tc;
+                } else if (FAVORITES.equals(tcName)) {
+                    favorites = tc;
+                } else {
+                    tc.close();
                 }
             }
         }
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
index 1cefe19010..7edfe2053c 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties
@@ -1,38 +1,15 @@
 CTL_DataContentAction=DataContent
 CTL_DataContentTopComponent=Data Content
-CTL_NodeTableAction=NodeTable
-CTL_NodeTableTopComponent=NodeTable Window
-CTL_HexViewAction=HexView
-CTL_HexViewTopComponent=Hex View
-CTL_StringViewAction=StringView
-CTL_StringViewTopComponent=String View
 CTL_CustomAboutAction=About
+OptionsCategory_Name_General=Display
+OptionsCategory_Keywords_General=display
 HINT_DataContentTopComponent=This is a DataContent window
 HINT_NodeTableTopComponent=This is a DataResult window
-HINT_HexViewTopComponent=This is a HexView window
-HINT_StringViewTopComponent=This is a StringView window
 OpenIDE-Module-Name=CoreComponents
-OutputViewPanel.prevPageButton.text=Previous Page
-OutputViewPanel.totalPageLabel.text=100
-OutputViewPanel.ofLabel.text=of
-OutputViewPanel.currentPageLabel.text=1
-OutputViewPanel.pageLabel.text=Page:
-OutputViewPanel.filePathLabel.text=FilePath
-OutputViewPanel.nextPageButton.text=Next Page
-DataContentViewerHex.filePathLabel.text=FilePath
-DataContentViewerHex.pageLabel.text=Page:
-DataContentViewerHex.currentPageLabel.text=1
-DataContentViewerHex.ofLabel.text=of
-DataContentViewerHex.totalPageLabel.text=100
 DataContentViewerHex.prevPageButton.text=
 DataContentViewerHex.nextPageButton.text=
-DataContentViewerString.totalPageLabel.text=100
 DataContentViewerString.prevPageButton.text=
 DataContentViewerString.nextPageButton.text=
-DataContentViewerString.filePathLabel.text=FilePath
-DataContentViewerString.pageLabel.text=Page:
-DataContentViewerString.currentPageLabel.text=1
-DataContentViewerString.ofLabel.text=of
 DataContentViewerHex.pageLabel.text_1=Page:
 DataContentViewerHex.currentPageLabel.text_1=1
 DataContentViewerHex.ofLabel.text_1=of
@@ -41,7 +18,6 @@ DataContentViewerString.pageLabel.text_1=Page:
 DataContentViewerString.currentPageLabel.text_1=1
 DataContentViewerString.ofLabel.text_1=of
 DataContentViewerString.totalPageLabel.text_1=100
-DataContentViewerPicture.picLabel.text=[Picture goes Here]
 DataContentViewerHex.pageLabel2.text=Page
 DataContentViewerString.pageLabel2.text=Page
 
@@ -54,13 +30,13 @@ URL_ON_IMG=http://www.sleuthkit.org/
 
 
 #SwingBrowser
-LBL_SwingBrowserDescription=Simple HTML Browser based on a Swing component
-MSG_cannot_create_browser=Cannot create Swing HTML Browser.
-Services/Browsers/SwingBrowser.settings=Swing HTML Browser
+#LBL_SwingBrowserDescription=Simple HTML Browser based on a Swing component
+#MSG_cannot_create_browser=Cannot create Swing HTML Browser.
+#Services/Browsers/SwingBrowser.settings=Swing HTML Browser
 LBL_Close=Close
-MNE_Close=C
-ACSN_Close=Close
-ACSD_Close=Close
+#MNE_Close=C
+#ACSN_Close=Close
+#ACSD_Close=Close
 DataContentViewerString.copyMenuItem.text=Copy
 DataContentViewerHex.copyMenuItem.text=Copy
 DataContentViewerString.selectAllMenuItem.text=Select All
@@ -107,8 +83,60 @@ MediaViewVideoPanel.progressLabel.text=00:00
 DataContentViewerMedia.AccessibleContext.accessibleDescription=
 MediaViewVideoPanel.infoLabel.text=info
 GeneralPanel.jLabel2.text=When displaying times:
-GeneralPanel.useLocalTimeRB.text=Use local timezone
+GeneralPanel.useLocalTimeRB.text=Use local time zone
 GeneralPanel.useGMTTimeRB.text=Use GMT
-GeneralPanel.jLabel3.text=Hide known files in the Directory Listing when:
-GeneralPanel.viewsHideKnownCB.text=Selecting under Views
-GeneralPanel.dataSourcesHideKnownCB.text=Selecting under Data Sources
+GeneralPanel.jLabel3.text=Hide known files (i.e. those in the NIST NSRL) in the:
+GeneralPanel.viewsHideKnownCB.text= Views area
+GeneralPanel.dataSourcesHideKnownCB.text=Data Sources area (the directory hierarchy)
+DataContentViewerArtifact.waitText=Retrieving and preparing data, please wait...
+DataContentViewerArtifact.errorText=Error retrieving result
+DataContentViewerArtifact.title=Results
+DataContentViewerArtifact.toolTip=Displays Results associated with the file
+DataContentViewerHex.goToPageTextField.msgDlg=Please enter a valid page number between 1 and {0}
+DataContentViewerHex.goToPageTextField.err=Invalid page number
+DataContentViewerHex.setDataView.errorText=(offset {0}-{1} could not be read)
+DataContentViewerHex.title=Hex
+DataContentViewerHex.toolTip=Displays the binary contents of a file as hexidecimal, with bytes that are displayable as ASCII characters on the right.
+DataContentViewerMedia.title=Media
+DataContentViewerMedia.toolTip=Displays supported multimedia files (images, videos, audio)
+DataContentViewerString.goToPageTextField.msgDlg=Please enter a valid page number between 1 and {0}
+DataContentViewerString.goToPageTextField.err=Invalid page number
+DataContentViewerString.setDataView.errorText=(offset {0}-{1} could not be read)
+DataContentViewerString.setDataView.errorNoText=(offset {0}-{1} contains no text)
+DataContentViewerString.title=Strings
+DataContentViewerString.toolTip=Displays ASCII and Unicode strings extracted from the file.
+DataResultPanel.dummyNodeDisplayName=Please Wait...
+DataResultViewerTable.firstColLbl=Name
+DataResultViewerTable.illegalArgExc.noChildFromParent=Couldn't get a child Node from the given parent.
+DataResultViewerTable.illegalArgExc.childWithoutPropertySet=Child Node doesn't have the regular PropertySet.
+DataResultViewerTable.title=Table
+DataResultViewerTable.dummyNodeDisplayName=Please Wait...
+DataResultViewerThumbnail.title=Thumbnail
+DataResultViewerThumbnail.goToPageTextField.msgDlg=Please enter a valid page number between 1 and {0}
+DataResultViewerThumbnail.goToPageTextField.err=Invalid page number
+DataResultViewerThumbnail.genThumbs=Generating Thumbnails...
+DataResultViewerThumbnail.pageNumbers.curOfTotal={0} of {1}
+FXVideoPanel.mediaPane.infoLabel=Playback of deleted videos is not supported, use an external player.
+FXVideoPanel.progress.bufferingFile=Buffering {0}
+FXVideoPanel.progressLabel.buffering=Buffering...
+FXVideoPanel.media.unsupportedFormat=Unsupported Format.
+GeneralOptionsPanelController.moduleErr=Module Error
+GeneralOptionsPanelController.moduleErr.msg=A module caused an error listening to GeneralOptionsPanelController updates. See log to determine which module. Some data could be incomplete.
+GstVideoPanel.cannotProcFile.err=The media player cannot process this file.
+GstVideoPanel.initGst.gstException.msg=Error initializing gstreamer for audio/video viewing and frame extraction capabilities.  Video and audio viewing will be disabled.
+GstVideoPanel.initGst.otherException.msg=Error initializing gstreamer for audio/video viewing frame extraction capabilities.  Video and audio viewing will be disabled.
+GstVideoPanel.setupVideo.infoLabel.text=Playback of deleted videos is not supported, use an external player.
+GstVideoPanel.exception.problemFile.msg=Cannot capture frames from this file ({0}).
+GstVideoPanel.exception.problemPlay.msg=Problem with video file; problem when attempting to play while obtaining duration.
+GstVideoPanel.exception.problemPause.msg=Problem with video file; problem when attempting to pause while obtaining duration.
+GstVideoPanel.exception.problemPauseCaptFrame.msg=Problem with video file; problem when attempting to pause while capturing a frame.
+GstVideoPanel.exception.problemPlayCaptFrame.msg=Problem with video file; problem when attempting to play while capturing a frame.
+GstVideoPanel.exception.problemStopCaptFrame.msg=Problem with video file; problem when attempting to stop while capturing a frame.
+GstVideoPanel.progress.buffering=Buffering...
+GstVideoPanel.progressLabel.bufferingErr=Error buffering file
+MediaViewImagePanel.imgFileTooLarge.msg=Could not load image file (too large)\: {0}
+ProductInformationPanel.actVerboseLogging.text=Activate verbose logging
+ProductInformationPanel.verbLoggingEnabled.text=Verbose logging enabled
+ProductInformationPanel.propertyUnknown.text=unknown
+ProductInformationPanel.getVMValue.text={0} {1}
+TableFilterNode.displayName.text=Name
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle_ja.properties
new file mode 100644
index 0000000000..19e5b3b3c7
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle_ja.properties
@@ -0,0 +1,115 @@
+CTL_DataContentTopComponent=\u30C7\u30FC\u30BF\u30B3\u30F3\u30C6\u30F3\u30C4
+HINT_DataContentTopComponent=\u3053\u308C\u306F\u30C7\u30FC\u30BF\u30B3\u30F3\u30C6\u30F3\u30C4\u306E\u30A6\u30A3\u30F3\u30C9\u30A6\u3067\u3059
+HINT_NodeTableTopComponent=\u3053\u308C\u306F\u30C7\u30FC\u30BF\u7D50\u679C\u306E\u30A6\u30A3\u30F3\u30C9\u30A6\u3067\u3059
+OpenIDE-Module-Name=\u4E3B\u8981\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8
+DataContentViewerHex.pageLabel.text_1=\u30DA\u30FC\u30B8\uFF1A
+DataContentViewerHex.currentPageLabel.text_1=1
+DataContentViewerHex.totalPageLabel.text_1=100
+DataContentViewerString.pageLabel.text_1=\u30DA\u30FC\u30B8\uFF1A
+DataContentViewerString.currentPageLabel.text_1=1
+DataContentViewerString.totalPageLabel.text_1=100
+DataContentViewerHex.pageLabel2.text=\u30DA\u30FC\u30B8
+DataContentViewerString.pageLabel2.text=\u30DA\u30FC\u30B8
+Format_OperatingSystem_Value={0} \u30D0\u30FC\u30B8\u30E7\u30F3 {1} \u30A2\u30FC\u30AD\u30C6\u30AF\u30C1\u30E3\u3000{2}
+URL_ON_IMG=http\://www.sleuthkit.org/
+LBL_Close=\u9589\u3058\u308B
+DataContentViewerString.copyMenuItem.text=\u30B3\u30D4\u30FC
+DataContentViewerHex.copyMenuItem.text=\u30B3\u30D4\u30FC
+DataContentViewerString.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629E
+DataContentViewerHex.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629E
+DataContentViewerArtifact.totalPageLabel.text=100
+DataContentViewerArtifact.pageLabel2.text=\u7D50\u679C
+DataContentViewerArtifact.currentPageLabel.text=1
+DataContentViewerArtifact.copyMenuItem.text=\u30B3\u30D4\u30FC
+DataContentViewerArtifact.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629E
+DataContentViewerArtifact.pageLabel.text=\u7D50\u679C\uFF1A
+AdvancedConfigurationDialog.applyButton.text=OK
+DataContentViewerString.goToPageLabel.text=\u4E0B\u8A18\u306E\u30DA\u30FC\u30B8\u3078\u79FB\u52D5\uFF1A
+DataContentViewerHex.goToPageLabel.text=\u4E0B\u8A18\u306E\u30DA\u30FC\u30B8\u3078\u79FB\u52D5\uFF1A
+DataContentViewerString.languageLabel.text=\u30B9\u30AF\u30EA\u30D7\u30C8\uFF1A
+DataContentViewerString.languageCombo.toolTipText=\u30D0\u30A4\u30CA\u30EA\u30B9\u30C8\u30EA\u30F3\u30B0\u306E\u51E6\u7406\uFF08\u62BD\u51FA\u304A\u3088\u3073\u30C7\u30B3\u30FC\u30C9\uFF09\u306E\u969B\u306B\u4F7F\u7528\u3059\u308B\u8A00\u8A9E
+DataResultViewerThumbnail.pageLabel.text=\u30DA\u30FC\u30B8\uFF1A
+DataResultViewerThumbnail.pagesLabel.text=\u30DA\u30FC\u30B8\uFF1A
+DataResultViewerThumbnail.imagesLabel.text=\u30A4\u30E1\u30FC\u30B8\uFF1A
+DataResultViewerThumbnail.imagesRangeLabel.text=-
+DataResultViewerThumbnail.pageNumLabel.text=-
+DataResultViewerThumbnail.goToPageLabel.text=\u4E0B\u8A18\u306E\u30DA\u30FC\u30B8\u306B\u79FB\u52D5\uFF1A
+GeneralPanel.jLabel1.text=\u30D5\u30A1\u30A4\u30EB\u3092\u9078\u629E\u3059\u308B\u969B\uFF1A
+GeneralPanel.useBestViewerRB.text=\u6700\u3082\u5C02\u9580\u7684\u306A\u30D5\u30A1\u30A4\u30EB\u30D3\u30E5\u30FC\u30A2\u306B\u5909\u66F4
+GeneralPanel.keepCurrentViewerRB.text=\u305D\u306E\u307E\u307E\u540C\u3058\u30D5\u30A1\u30A4\u30EB\u30D3\u30E5\u30FC\u30A2\u3092\u4F7F\u7528
+GeneralPanel.useBestViewerRB.toolTipText=\u4F8B\u3048\u3070\u3001JPEG\u304C\u9078\u629E\u3055\u308C\u305F\u969B\u306B\u306FHEX\u304B\u3089\u30E1\u30C7\u30A3\u30A2\u306B\u5909\u66F4\u3059\u308B\u3002
+GeneralPanel.keepCurrentViewerRB.toolTipText=\u4F8B\u3048\u3070\u3001JPEG\u304C\u9078\u629E\u3055\u308C\u305F\u969B\u306B\u305D\u306E\u307E\u307EHEX\u30D3\u30E5\u30FC\u3092\u4F7F\u7528\u3002
+AdvancedConfigurationDialog.cancelButton.text=\u30AD\u30E3\u30F3\u30BB\u30EB
+DataResultPanel.directoryTablePath.text=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30D1\u30B9
+DataResultPanel.numberMatchLabel.text=0
+DataResultPanel.matchLabel.text=\u7D50\u679C
+MediaViewVideoPanel.pauseButton.text=\u25BA
+MediaViewVideoPanel.progressLabel.text=00\:00
+MediaViewVideoPanel.infoLabel.text=\u60C5\u5831
+GeneralPanel.jLabel2.text=\u30A2\u30A4\u30C6\u30E0\u3092\u8868\u793A\u3059\u308B\u969B\uFF1A
+GeneralPanel.useLocalTimeRB.text=\u30ED\u30FC\u30AB\u30EB\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\u3092\u4F7F\u7528
+GeneralPanel.useGMTTimeRB.text=GMT\u3092\u4F7F\u7528
+GeneralPanel.jLabel3.text=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30EA\u30B9\u30C6\u30A3\u30F3\u30B0\u5185\u306E\u65E2\u77E5\u30D5\u30A1\u30A4\u30EB\u306F\u4E0B\u8A18\u306E\u5834\u5408\u306B\u96A0\u3059\uFF1A
+GeneralPanel.viewsHideKnownCB.text=\u30D3\u30E5\u30FC\u304B\u3089\u9078\u629E\u3057\u3066\u3044\u308B\u5834\u5408
+GeneralPanel.dataSourcesHideKnownCB.text=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9\u304B\u3089\u9078\u629E\u3057\u3066\u3044\u308B\u5834\u5408
+DataContentViewerArtifact.waitText=\u30C7\u30FC\u30BF\u3092\u53D6\u8FBC\u307F\u304A\u3088\u3073\u6E96\u5099\u4E2D\u3002\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u4E0B\u3055\u3044\u2026
+DataContentViewerArtifact.errorText=\u7D50\u679C\u306E\u53D6\u8FBC\u307F\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+DataContentViewerArtifact.title=\u7D50\u679C
+DataContentViewerArtifact.toolTip=\u30D5\u30A1\u30A4\u30EB\u306B\u95A2\u9023\u3059\u308B\u7D50\u679C\u3092\u8868\u793A\u3057\u307E\u3059
+DataContentViewerHex.goToPageTextField.msgDlg=\uFF11\u304B\u3089 {0}\u306E\u9593\u306E\u6709\u52B9\u306A\u30DA\u30FC\u30B8\u6570\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044
+DataContentViewerHex.goToPageTextField.err=\u7121\u52B9\u306A\u30DA\u30FC\u30B8\u6570
+DataContentViewerHex.setDataView.errorText=\uFF08\u30AA\u30D5\u30BB\u30C3\u30C8{0}-{1}\u306F\u8AAD\u307F\u53D6\u308C\u307E\u305B\u3093\u3067\u3057\u305F\uFF09
+DataContentViewerHex.title=HEX
+DataContentViewerHex.toolTip=\u30D0\u30A4\u30CA\u30EA\u30B3\u30F3\u30C6\u30F3\u30C4\u3092HEX\u30D5\u30A1\u30A4\u30EB\u3068\u3057\u3066\u8868\u793A\u3057\u3001ASCII\u3068\u3057\u3066\u8868\u793A\u3067\u304D\u308B\u30D0\u30A4\u30C8\u306F\u53F3\u5074\u306B\u8868\u793A\u3057\u307E\u3059\u3002
+DataContentViewerMedia.title=\u30E1\u30C7\u30A3\u30A2
+DataContentViewerMedia.toolTip=\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u308B\u30DE\u30EB\u30C1\u30E1\u30C7\u30A3\u30A2\u30D5\u30A1\u30A4\u30EB\uFF08\u753B\u50CF\u3001\u30D3\u30C7\u30AA\u3001\u30AA\u30FC\u30C7\u30A3\u30AA\uFF09\u3092\u8868\u793A\u3057\u307E\u3059\u3002
+DataContentViewerString.goToPageTextField.msgDlg=\uFF11\u304B\u3089{0}\u306E\u9593\u306E\u6709\u52B9\u306A\u30DA\u30FC\u30B8\u6570\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044
+DataContentViewerString.goToPageTextField.err=\u7121\u52B9\u306A\u30DA\u30FC\u30B8\u6570
+DataContentViewerString.setDataView.errorText=\uFF08\u30AA\u30D5\u30BB\u30C3\u30C8{0}-{1}\u306F\u8AAD\u307F\u53D6\u308C\u307E\u305B\u3093\u3067\u3057\u305F\uFF09\
+DataContentViewerString.setDataView.errorNoText=\uFF08\u30AA\u30D5\u30BB\u30C3\u30C8{0}-{1}\u306B\u306F\u30C6\u30AD\u30B9\u30C8\u304C\u3042\u308A\u307E\u305B\u3093\uFF09
+DataContentViewerString.title=\u30B9\u30C8\u30EA\u30F3\u30B0
+DataContentViewerString.toolTip=\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u62BD\u51FA\u3055\u308C\u305FASCII\u304A\u3088\u3073\u30E6\u30CB\u30B3\u30FC\u30C9\u306E\u30B9\u30C8\u30EA\u30F3\u30B0\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+DataResultPanel.dummyNodeDisplayName=\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u2026
+DataResultViewerTable.firstColLbl=\u540D\u79F0
+DataResultViewerTable.illegalArgExc.noChildFromParent=\u6307\u5B9A\u3055\u308C\u305F\u30DA\u30A2\u30EC\u30F3\u30C8\u304B\u3089\u30C1\u30E3\u30A4\u30EB\u30C9\u30CE\u30FC\u30C9\u3092\u5165\u624B\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+DataResultViewerTable.illegalArgExc.childWithoutPropertySet=\u30C1\u30E3\u30A4\u30EB\u30C9\u30CE\u30FC\u30C9\u306F\u901A\u5E38\u306EPropertySet\u3092\u6301\u3063\u3066\u3044\u307E\u305B\u3093\u3002
+DataResultViewerTable.title=\u30C6\u30FC\u30D6\u30EB
+DataResultViewerTable.dummyNodeDisplayName=\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044\u2026
+DataResultViewerThumbnail.title=\u30B5\u30E0\u30CD\u30A4\u30EB
+DataResultViewerThumbnail.goToPageTextField.msgDlg=\uFF11\u304B\u3089{0}\u306E\u9593\u306E\u6709\u52B9\u306A\u30DA\u30FC\u30B8\u6570\u3092\u5165\u529B\u3057\u3066\u4E0B\u3055\u3044
+DataResultViewerThumbnail.goToPageTextField.err=\u7121\u52B9\u306A\u30DA\u30FC\u30B8\u6570
+DataResultViewerThumbnail.genThumbs=\u30B5\u30E0\u30CD\u30A4\u30EB\u3092\u4F5C\u6210\u4E2D\u2026
+DataResultViewerThumbnail.pageNumbers.curOfTotal={0}\uFF0F{1}\u3064\u76EE
+FXVideoPanel.mediaPane.infoLabel=\u524A\u9664\u3055\u308C\u305F\u30D3\u30C7\u30AA\u306E\u518D\u751F\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u5916\u90E8\u30D7\u30EC\u30FC\u30E4\u30FC\u3092\u4F7F\u7528\u3057\u3066\u4E0B\u3055\u3044\u3002
+FXVideoPanel.progress.bufferingFile={0}\u3092\u30D0\u30C3\u30D5\u30A1\u30EA\u30F3\u30B0
+FXVideoPanel.progressLabel.buffering=\u30D0\u30C3\u30D5\u30A1\u30EA\u30F3\u30B0\u4E2D\u2026
+FXVideoPanel.media.unsupportedFormat=\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u306A\u3044\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3067\u3059\u3002
+GeneralOptionsPanelController.moduleErr=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
+GeneralOptionsPanelController.moduleErr.msg=GeneralOptionsPanelController\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
+GstVideoPanel.cannotProcFile.err=\u30E1\u30C7\u30A4\u30A2\u30D7\u30EC\u30FC\u30E4\u30FC\u304C\u3053\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u51E6\u7406\u3067\u304D\u307E\u305B\u3093\u3002
+GstVideoPanel.initGst.gstException.msg=\u30AA\u30FC\u30C7\u30A3\u30AA\uFF0F\u30D3\u30C7\u30AA\u306E\u518D\u751F\u304A\u3088\u3073\u30D5\u30EC\u30FC\u30E0\u306E\u62BD\u51FA\u306B\u4F7F\u7528\u3059\u308BGStreamer\u306E\u521D\u671F\u5316\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30D3\u30C7\u30AA\u304A\u3088\u3073\u30AA\u30FC\u30C7\u30A3\u30AA\u518D\u751F\u304C\u7121\u52B9\u5316\u3055\u308C\u307E\u3059\u3002
+GstVideoPanel.initGst.otherException.msg=\u30AA\u30FC\u30C7\u30A3\u30AA\uFF0F\u30D3\u30C7\u30AA\u306E\u518D\u751F\u304A\u3088\u3073\u30D5\u30EC\u30FC\u30E0\u306E\u62BD\u51FA\u306B\u4F7F\u7528\u3059\u308BGStreamer\u306E\u521D\u671F\u5316\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30D3\u30C7\u30AA\u304A\u3088\u3073\u30AA\u30FC\u30C7\u30A3\u30AA\u518D\u751F\u304C\u7121\u52B9\u5316\u3055\u308C\u307E\u3059\u3002
+GstVideoPanel.setupVideo.infoLabel.text=\u524A\u9664\u3055\u308C\u305F\u30D3\u30C7\u30AA\u306E\u518D\u751F\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u5916\u90E8\u30D7\u30EC\u30FC\u30E4\u30FC\u3092\u4F7F\u7528\u3057\u3066\u4E0B\u3055\u3044\u3002
+GstVideoPanel.exception.problemFile.msg=\u30D5\u30A1\u30A4\u30EB({0})\u304B\u3089\u306F\u30D5\u30EC\u30FC\u30E0\u3092\u62BD\u51FA\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+GstVideoPanel.exception.problemPlay.msg=\u30D3\u30C7\u30AA\u30D5\u30A1\u30A4\u30EB\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\uFF1B\u9577\u3055\u3092\u78BA\u8A8D\u4E2D\u306B\u518D\u751F\u3092\u3057\u3088\u3046\u3068\u3057\u305F\u969B\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+LBL_Description=<div style\="font-size\: 12pt; font-family\: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif;">\n    <b>\u88FD\u54C1\u30D0\u30FC\u30B8\u30E7\u30F3\uFF1A</b> {0} ({9}) <br><b>Sleuth Kit\u30D0\u30FC\u30B8\u30E7\u30F3\uFF1A</b> {7} <br><b>Netbeans RCP\u30D3\u30EB\u30C9\:</b> {8} <br> <b>Java\:</b> {1}; {2}<br> <b>\u30B7\u30B9\u30C6\u30E0\uFF1A</b> {3}; {4}; {5}<br><b>\u30E6\u30FC\u30B6\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u540D</b> {6}</div>
+LBL_Copyright=<div style\="font-size\: 12pt; font-family\: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif; ">Autopsy&trade;\u306FSleuth Kit&trade;\u3084\u305D\u306E\u4ED6\u30C4\u30FC\u30EB\u3092\u57FA\u306B\u3057\u305F\u30C7\u30B8\u30BF\u30EB\u30FB\u30D5\u30A9\u30EC\u30F3\u30B8\u30C3\u30AF\u30FB\u30D7\u30E9\u30C3\u30C8\u30D5\u30A9\u30FC\u30E0\u3067\u3059\u3002<br> <br>Copyright &copy; 2003-2013. \u8A73\u7D30\u306F\u4E0B\u8A18\u3092\u3054\u89A7\u4E0B\u3055\u3044\u3002 <a style\="color\: \#1E2A60;" href\="http\://www.sleuthkit.org">http\://www.sleuthkit.org</a>. </div>
+GstVideoPanel.exception.problemPause.msg=\u30D3\u30C7\u30AA\u30D5\u30A1\u30A4\u30EB\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u9577\u3055\u3092\u78BA\u8A8D\u4E2D\u306B\u4E00\u6642\u505C\u6B62\u3092\u3057\u3088\u3046\u3068\u3057\u305F\u969B\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+GstVideoPanel.exception.problemPauseCaptFrame.msg=\u30D3\u30C7\u30AA\u30D5\u30A1\u30A4\u30EB\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30D5\u30EC\u30FC\u30E0\u306E\u62BD\u51FA\u4E2D\u306B\u4E00\u6642\u505C\u6B62\u3092\u3057\u3088\u3046\u3068\u3057\u305F\u969B\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+GstVideoPanel.exception.problemPlayCaptFrame.msg=\u30D3\u30C7\u30AA\u30D5\u30A1\u30A4\u30EB\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30D5\u30EC\u30FC\u30E0\u306E\u62BD\u51FA\u4E2D\u306B\u518D\u751F\u3057\u3088\u3046\u3068\u3057\u305F\u969B\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+GstVideoPanel.exception.problemStopCaptFrame.msg=\u30D3\u30C7\u30AA\u30D5\u30A1\u30A4\u30EB\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30D5\u30EC\u30FC\u30E0\u306E\u62BD\u51FA\u4E2D\u306B\u505C\u6B62\u3057\u3088\u3046\u3068\u3057\u305F\u969B\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
+GstVideoPanel.progress.buffering=\u30D0\u30C3\u30D5\u30A1\u30EA\u30F3\u30B0\u4E2D\u2026
+GstVideoPanel.progressLabel.bufferingErr=\u30D5\u30A1\u30A4\u30EB\u306E\u30D0\u30C3\u30D5\u30A1\u30EA\u30F3\u30B0\u30A8\u30E9\u30FC
+MediaViewImagePanel.imgFileTooLarge.msg=\u753B\u50CF\u30D5\u30A1\u30A4\u30EB\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093\u3067\u3057\u305F\uFF08\u5927\u304D\u3059\u304E\u3067\u3059\uFF09\uFF1A {0}
+ProductInformationPanel.actVerboseLogging.text=Verbose\u30ED\u30B0\u3092\u6709\u52B9\u5316
+ProductInformationPanel.verbLoggingEnabled.text=Verbose\u30ED\u30B0\u304C\u6709\u52B9\u3067\u3059
+ProductInformationPanel.propertyUnknown.text=\u4E0D\u660E
+ProductInformationPanel.getVMValue.text={0} {1}
+TableFilterNode.displayName.text=\u540D\u79F0
+CTL_DataContentAction=\u30C7\u30FC\u30BF\u30B3\u30F3\u30C6\u30F3\u30C4
+OptionsCategory_Name_General=\u4E00\u822C
+OptionsCategory_Keywords_General=\u4E00\u822C
+CTL_CustomAboutAction=Autopsy\u306B\u3064\u3044\u3066
+DataContentViewerHex.ofLabel.text_1=of
+DataContentViewerString.ofLabel.text_1=of
+DataContentViewerArtifact.ofLabel.text=of
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java b/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java
index 37d21e2748..8fd75651e5 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/CustomAboutAction.java
@@ -37,7 +37,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
         ProductInformationPanel pip = new ProductInformationPanel();
         DialogDescriptor descriptor = new DialogDescriptor(
                 pip,
-                NbBundle.getMessage(AboutAction.class, "About_title"),
+                NbBundle.getMessage(CustomAboutAction.class, "CTL_CustomAboutAction"),
                 true,
                 new Object[0],
                 null,
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java
index f979f74688..4cc0e394a6 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java
@@ -27,6 +27,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.JMenuItem;
 import javax.swing.JTextPane;
@@ -53,8 +55,8 @@ import org.sleuthkit.datamodel.TskCoreException;
 public class DataContentViewerArtifact extends javax.swing.JPanel implements DataContentViewer{
     
     private final static Logger logger = Logger.getLogger(DataContentViewerArtifact.class.getName());
-    private final static String WAIT_TEXT = "Retrieving and preparing data, please wait...";
-    private final static String ERROR_TEXT = "Error retrieving result";
+    private final static String WAIT_TEXT = NbBundle.getMessage(DataContentViewerArtifact.class, "DataContentViewerArtifact.waitText");
+    private final static String ERROR_TEXT = NbBundle.getMessage(DataContentViewerArtifact.class, "DataContentViewerArtifact.errorText");
     private Node currentNode; // @@@ Remove this when the redundant setNode() calls problem is fixed. 
     private int currentPage = 1;
     private final Object lock = new Object();
@@ -288,12 +290,12 @@ public class DataContentViewerArtifact extends javax.swing.JPanel implements Dat
 
     @Override
     public String getTitle() {
-        return "Results";
+        return NbBundle.getMessage(this.getClass(), "DataContentViewerArtifact.title");
     }
 
     @Override
     public String getToolTip() {
-        return "Displays Results associated with the file";
+        return NbBundle.getMessage(this.getClass(), "DataContentViewerArtifact.toolTip");
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java
index 0e28a337f8..fbf63346fb 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerHex.java
@@ -23,6 +23,8 @@ import java.awt.Cursor;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
@@ -257,8 +259,13 @@ public class DataContentViewerHex extends javax.swing.JPanel implements DataCont
             pageNumber = totalPages + 1;
         }
         if (pageNumber > totalPages || pageNumber < 1) {
-            JOptionPane.showMessageDialog(this, "Please enter a valid page number between 1 and " + totalPages,
-                    "Invalid page number", JOptionPane.WARNING_MESSAGE);
+            JOptionPane.showMessageDialog(this,
+                                          NbBundle.getMessage(this.getClass(),
+                                                              "DataContentViewerHex.goToPageTextField.msgDlg",
+                                                              totalPages),
+                                          NbBundle.getMessage(this.getClass(),
+                                                              "DataContentViewerHex.goToPageTextField.err"),
+                                          JOptionPane.WARNING_MESSAGE);
             return;
         }
         setDataView(pageNumber);
@@ -309,16 +316,16 @@ public class DataContentViewerHex extends javax.swing.JPanel implements DataCont
             try {
                 bytesRead = dataSource.read(data, offset, pageLength); // read the data
             } catch (TskException ex) {
-                errorText = "(offset " + offset + "-" + (offset + pageLength)
-                    + " could not be read)";
+                errorText = NbBundle.getMessage(this.getClass(), "DataContentViewerHex.setDataView.errorText", offset,
+                                                offset + pageLength);
                 logger.log(Level.WARNING, "Error while trying to show the hex content.", ex);
             }
         }
 
         // set the data on the bottom and show it
         if (bytesRead <= 0) {
-            errorText = "(offset " + offset + "-" + (offset + pageLength)
-                    + " could not be read)";
+            errorText = NbBundle.getMessage(this.getClass(), "DataContentViewerHex.setDataView.errorText", offset,
+                                            offset + pageLength);
         }
         
 
@@ -378,13 +385,12 @@ public class DataContentViewerHex extends javax.swing.JPanel implements DataCont
 
     @Override
     public String getTitle() {
-        return "Hex";
+        return NbBundle.getMessage(this.getClass(), "DataContentViewerHex.title");
     }
 
     @Override
     public String getToolTip() {
-        return "Displays the binary contents of a file as hexidecimal, with "
-                + "bytes that are displayable as ASCII characters on the right.";
+        return NbBundle.getMessage(this.getClass(), "DataContentViewerHex.toolTip");
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
index 7bd6c0d1cd..d7a2c63814 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerMedia.java
@@ -24,6 +24,8 @@ import java.awt.Dimension;
 import java.util.Arrays;
 import java.util.logging.Level;
 import javax.imageio.ImageIO;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.openide.nodes.Node;
 import org.openide.util.lookup.ServiceProvider;
@@ -164,12 +166,12 @@ public class DataContentViewerMedia extends javax.swing.JPanel implements DataCo
 
     @Override
     public String getTitle() {
-        return "Media";
+        return NbBundle.getMessage(this.getClass(), "DataContentViewerMedia.title");
     }
 
     @Override
     public String getToolTip() {
-        return "Displays supported multimedia files (images, videos, audio)";
+        return NbBundle.getMessage(this.getClass(), "DataContentViewerMedia.toolTip");
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.form b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.form
index c837f5efc8..c2df92ded6 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.form
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.form
@@ -284,6 +284,10 @@
           <Events>
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="languageComboActionPerformed"/>
           </Events>
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new javax.swing.JComboBox&lt;&gt;()"/>
+            <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;SCRIPT&gt;"/>
+          </AuxValues>
         </Component>
         <Component class="javax.swing.JLabel" name="languageLabel">
           <Properties>
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java
index 5223f61920..975be800e7 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerString.java
@@ -24,6 +24,8 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.List;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
@@ -114,7 +116,7 @@ public class DataContentViewerString extends javax.swing.JPanel implements DataC
         prevPageButton = new javax.swing.JButton();
         goToPageLabel = new javax.swing.JLabel();
         goToPageTextField = new javax.swing.JTextField();
-        languageCombo = new javax.swing.JComboBox();
+        languageCombo = new javax.swing.JComboBox<>();
         languageLabel = new javax.swing.JLabel();
 
         copyMenuItem.setText(org.openide.util.NbBundle.getMessage(DataContentViewerString.class, "DataContentViewerString.copyMenuItem.text")); // NOI18N
@@ -286,8 +288,13 @@ public class DataContentViewerString extends javax.swing.JPanel implements DataC
             pageNumber = maxPage + 1;
         }
         if (pageNumber > maxPage || pageNumber < 1) {
-            JOptionPane.showMessageDialog(this, "Please enter a valid page number between 1 and " + maxPage,
-                    "Invalid page number", JOptionPane.WARNING_MESSAGE);
+            JOptionPane.showMessageDialog(this,
+                                          NbBundle.getMessage(this.getClass(),
+                                                              "DataContentViewerString.goToPageTextField.msgDlg",
+                                                              maxPage),
+                                          NbBundle.getMessage(this.getClass(),
+                                                              "DataContentViewerString.goToPageTextField.err"),
+                                          JOptionPane.WARNING_MESSAGE);
             return;
         }
         currentOffset = (pageNumber - 1) * pageLength;
@@ -309,7 +316,7 @@ public class DataContentViewerString extends javax.swing.JPanel implements DataC
     private javax.swing.JTextField goToPageTextField;
     private javax.swing.JPanel jPanel1;
     private javax.swing.JScrollPane jScrollPane1;
-    private javax.swing.JComboBox languageCombo;
+    private javax.swing.JComboBox<SCRIPT> languageCombo;
     private javax.swing.JLabel languageLabel;
     private javax.swing.JButton nextPageButton;
     private javax.swing.JLabel ofLabel;
@@ -346,8 +353,9 @@ public class DataContentViewerString extends javax.swing.JPanel implements DataC
             try {
                 bytesRead = dataSource.read(data, offset, pageLength); // read the data
             } catch (TskException ex) {
-                text = "(offset " + currentOffset + "-" + (currentOffset + pageLength)
-                        + " could not be read)";
+                text = NbBundle.getMessage(this.getClass(),
+                                           "DataContentViewerString.setDataView.errorText", currentOffset,
+                                           currentOffset + pageLength);
                 logger.log(Level.WARNING, "Error while trying to show the String content.", ex);
             }
         }
@@ -359,12 +367,13 @@ public class DataContentViewerString extends javax.swing.JPanel implements DataC
             StringExtractResult res = stringExtract.extract(data, bytesRead, 0);
             text = res.getText();
             if (text.trim().isEmpty()) {
-                text = "(offset " + currentOffset + "-" + (currentOffset + pageLength)
-                        + " contains no text)";
+                text = NbBundle.getMessage(this.getClass(),
+                                           "DataContentViewerString.setDataView.errorNoText", currentOffset,
+                                           currentOffset + pageLength);
             }
         } else {
-            text = "(offset " + currentOffset + "-" + (currentOffset + pageLength)
-                    + " could not be read)";
+            text = NbBundle.getMessage(this.getClass(), "DataContentViewerString.setDataView.errorText", currentOffset,
+                                       currentOffset + pageLength);
         }
 
         // disable or enable the next button
@@ -459,12 +468,12 @@ public class DataContentViewerString extends javax.swing.JPanel implements DataC
 
     @Override
     public String getTitle() {
-        return "Strings";
+        return NbBundle.getMessage(this.getClass(), "DataContentViewerString.title");
     }
 
     @Override
     public String getToolTip() {
-        return "Displays ASCII and Unicode strings extracted from the file.";
+        return NbBundle.getMessage(this.getClass(), "DataContentViewerString.toolTip");
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
index eb5ecf409b..9bd06d8718 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java
@@ -36,6 +36,7 @@ import org.openide.nodes.NodeListener;
 import org.openide.nodes.NodeMemberEvent;
 import org.openide.nodes.NodeReorderEvent;
 import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataContent;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataResult;
@@ -67,8 +68,9 @@ public class DataResultPanel extends javax.swing.JPanel implements DataResult, C
     private final DummyNodeListener dummyNodeListener = new DummyNodeListener();
     
     private static final Logger logger = Logger.getLogger(DataResultPanel.class.getName() );
-    private boolean listeningToTabbedPane = false;    
-
+    private boolean listeningToTabbedPane = false;
+    private static final String DUMMY_NODE_DISPLAY_NAME = NbBundle.getMessage(DataResultPanel.class,
+                                                                              "DataResultPanel.dummyNodeDisplayName");
     /**
      * Creates new DataResultPanel
      * Default constructor, needed mostly  for the palette/UI builder
@@ -619,7 +621,7 @@ public class DataResultPanel extends javax.swing.JPanel implements DataResult, C
     }
     
     private class DummyNodeListener implements NodeListener {
-        private static final String DUMMY_NODE_DISPLAY_NAME = "Please Wait...";
+
         private volatile boolean load = true;
         
         public void reset() {
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
index eac9dd763a..decef8b14e 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2013 Basis Technology Corp.
+ * Copyright 2013-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,6 +29,8 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
@@ -55,28 +57,28 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
 // service provider when DataResultViewers can be made compatible with node 
 // multiple selection actions.
 //@ServiceProvider(service = DataResultViewer.class)
- public class DataResultViewerTable extends AbstractDataResultViewer {
+public class DataResultViewerTable extends AbstractDataResultViewer {
 
-    private String firstColumnLabel = "Name";
+    private String firstColumnLabel = NbBundle.getMessage(DataResultViewerTable.class, "DataResultViewerTable.firstColLbl");
     private Set<Property> propertiesAcc = new LinkedHashSet<>();
-    private static final Logger logger = Logger.getLogger(DataResultViewerTable.class.getName());
     private final DummyNodeListener dummyNodeListener = new DummyNodeListener();
+    private static final String DUMMY_NODE_DISPLAY_NAME = NbBundle.getMessage(DataResultViewerTable.class, "DataResultViewerTable.dummyNodeDisplayName");
 
     /**
-     * Creates a DataResultViewerTable object that is compatible with node 
+     * Creates a DataResultViewerTable object that is compatible with node
      * multiple selection actions.
      */
     public DataResultViewerTable(ExplorerManager explorerManager) {
         super(explorerManager);
         initialize();
     }
-    
+
     /**
-     * Creates a DataResultViewerTable object that is NOT compatible with node 
+     * Creates a DataResultViewerTable object that is NOT compatible with node
      * multiple selection actions.
      */
     public DataResultViewerTable() {
-        initialize();        
+        initialize();
     }
 
     private void initialize() {
@@ -90,9 +92,9 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
 
         // don't show the root node
         ov.getOutline().setRootVisible(false);
-        ov.getOutline().setDragEnabled(false);        
+        ov.getOutline().setDragEnabled(false);
     }
-    
+
     /**
      * Expand node
      *
@@ -154,7 +156,8 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
         Node firstChild = parent.getChildren().getNodeAt(0);
 
         if (firstChild == null) {
-            throw new IllegalArgumentException("Couldn't get a child Node from the given parent.");
+            throw new IllegalArgumentException(
+                    NbBundle.getMessage(this.getClass(), "DataResultViewerTable.illegalArgExc.noChildFromParent"));
         } else {
             for (PropertySet ps : firstChild.getPropertySets()) {
                 if (ps.getName().equals(Sheet.PROPERTIES)) {
@@ -162,7 +165,8 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
                 }
             }
 
-            throw new IllegalArgumentException("Child Node doesn't have the regular PropertySet.");
+            throw new IllegalArgumentException(
+                    NbBundle.getMessage(this.getClass(), "DataResultViewerTable.illegalArgExc.childWithoutPropertySet"));
         }
     }
 
@@ -174,13 +178,15 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
      * @param parent Node with at least one child to get properties from
      * @return Properties,
      */
+    @SuppressWarnings("rawtypes")
     private Node.Property[] getAllChildPropertyHeaders(Node parent) {
         Node firstChild = parent.getChildren().getNodeAt(0);
 
         Property[] properties = null;
 
         if (firstChild == null) {
-            throw new IllegalArgumentException("Couldn't get a child Node from the given parent.");
+            throw new IllegalArgumentException(
+                    NbBundle.getMessage(this.getClass(), "DataResultViewerTable.illegalArgExc.noChildFromParent"));
         } else {
             Set<Property> allProperties = new LinkedHashSet<Property>();
             while (firstChild != null) {
@@ -216,7 +222,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
     private void getAllChildPropertyHeadersRec(Node parent, int rows) {
         Children children = parent.getChildren();
         int childCount = 0;
-        for (Node child : children.getNodes()) {            
+        for (Node child : children.getNodes()) {
             if (++childCount > rows) {
                 break;
             }
@@ -237,8 +243,10 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
     }
 
     /**
-     * Thread note: Make sure to run this in the EDT as it causes GUI operations.
-     * @param selectedNode 
+     * Thread note: Make sure to run this in the EDT as it causes GUI
+     * operations.
+     *
+     * @param selectedNode
      */
     @Override
     public void setNode(Node selectedNode) {
@@ -246,7 +254,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
         this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
         try {
             boolean hasChildren = false;
-            
+
             if (selectedNode != null) {
                 hasChildren = selectedNode.getChildren().getNodesCount() > 0;
             }
@@ -255,7 +263,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
             if (oldNode != null) {
                 oldNode.removeNodeListener(dummyNodeListener);
             }
-            
+
             // if there's no selection node, do nothing
             if (hasChildren) {
                 Node root = selectedNode;
@@ -273,11 +281,11 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
             this.setCursor(null);
         }
     }
-    
+
     /**
      * Create Column Headers based on the Content represented by the Nodes in
      * the table.
-     * 
+     *
      * @param root The parent Node of the ContentNodes
      */
     private void setupTable(final Node root) {
@@ -296,11 +304,11 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
         if (ov == null) {
             return;
         }
-        
-	propertiesAcc.clear();
+
+        propertiesAcc.clear();
 
         DataResultViewerTable.this.getAllChildPropertyHeadersRec(root, 100);
-        List<Node.Property> props = new ArrayList<Node.Property>(propertiesAcc);
+        List<Node.Property> props = new ArrayList<>(propertiesAcc);
         if (props.size() > 0) {
             Node.Property prop = props.remove(0);
             ((DefaultOutlineModel) ov.getOutline().getOutlineModel()).setNodesColumnLabel(prop.getDisplayName());
@@ -339,15 +347,15 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
         // show the horizontal scroll panel and show all the content & header
 
         int totalColumns = props.size();
-	
-	//int scrollWidth = ttv.getWidth();
-       	int margin = 4;
-       	int startColumn = 1;
-                
-       	// If there is only one column (which was removed from props above)
-       	// Just let the table resize itself.
-       	ov.getOutline().setAutoResizeMode((props.size() > 0) ? JTable.AUTO_RESIZE_OFF : JTable.AUTO_RESIZE_ALL_COLUMNS);
-                
+
+        //int scrollWidth = ttv.getWidth();
+        int margin = 4;
+        int startColumn = 1;
+
+        // If there is only one column (which was removed from props above)
+        // Just let the table resize itself.
+        ov.getOutline().setAutoResizeMode((props.size() > 0) ? JTable.AUTO_RESIZE_OFF : JTable.AUTO_RESIZE_ALL_COLUMNS);
+
 
 
         // get first 100 rows values for the table
@@ -383,34 +391,32 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
     // Populate a two-dimensional array with rows of property values for up 
     // to maxRows children of the node passed in. 
     private static Object[][] getRowValues(Node node, int maxRows) {
-        Object[][] rowValues = new Object[Math.min(maxRows, node.getChildren().getNodesCount())][];        
+        Object[][] rowValues = new Object[Math.min(maxRows, node.getChildren().getNodesCount())][];
         int rowCount = 0;
         for (Node child : node.getChildren().getNodes()) {
             if (rowCount >= maxRows) {
                 break;
-            }                
+            }
             PropertySet[] propertySets = child.getPropertySets();
-            if (propertySets.length > 0)
-            {
+            if (propertySets.length > 0) {
                 Property[] properties = propertySets[0].getProperties();
                 rowValues[rowCount] = new Object[properties.length];
                 for (int j = 0; j < properties.length; ++j) {
                     try {
                         rowValues[rowCount][j] = properties[j].getValue();
-                    } 
-                    catch (IllegalAccessException | InvocationTargetException ignore) {
+                    } catch (IllegalAccessException | InvocationTargetException ignore) {
                         rowValues[rowCount][j] = "n/a";
                     }
                 }
-            }                        
+            }
             ++rowCount;
-        }        
+        }
         return rowValues;
     }
 
     @Override
     public String getTitle() {
-        return "Table";
+        return NbBundle.getMessage(this.getClass(), "DataResultViewerTable.title");
     }
 
     @Override
@@ -429,6 +435,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
      * @param table the object table
      * @return max the maximum width of the column
      */
+    @SuppressWarnings("rawtypes")
     private int getMaxColumnWidth(int index, FontMetrics metrics, int margin, int padding, List<Node.Property> header, Object[][] table) {
         // set the tree (the node / names column) width
         String headerName = header.get(index - 1).getDisplayName();
@@ -479,15 +486,15 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
 
         super.clearComponent();
     }
-    
+
     private class DummyNodeListener implements NodeListener {
-        private static final String DUMMY_NODE_DISPLAY_NAME = "Please Wait...";
+
         private volatile boolean load = true;
-        
+
         public void reset() {
             load = true;
         }
-        
+
         @Override
         public void childrenAdded(final NodeMemberEvent nme) {
             Node[] delta = nme.getDelta();
@@ -505,7 +512,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
                 }
             }
         }
-        
+
         private boolean containsReal(Node[] delta) {
             for (Node n : delta) {
                 if (!n.getDisplayName().equals(DUMMY_NODE_DISPLAY_NAME)) {
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.form b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.form
index 14aac889e5..0f9063922e 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.form
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.form
@@ -16,7 +16,7 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="thumbnailScrollPanel" max="32767" attributes="0"/>
+          <Component id="thumbnailScrollPanel" pref="642" max="32767" attributes="0"/>
           <Group type="102" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
@@ -201,18 +201,17 @@
     </Component>
     <Component class="javax.swing.JComboBox" name="thumbnailSizeComboBox">
       <Properties>
-        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-          <StringArray count="3">
-            <StringItem index="0" value="Small Thumbnails"/>
-            <StringItem index="1" value="Medium Thumbnails"/>
-            <StringItem index="2" value="Large Thumbnails"/>
-          </StringArray>
+        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+          <Connection code="new javax.swing.DefaultComboBoxModel&lt;String&gt;(new String[] { &quot;Small Thumbnails&quot;, &quot;Medium Thumbnails&quot;, &quot;Large Thumbnails&quot; })" type="code"/>
         </Property>
-        <Property name="selectedIndex" type="int" value="1"/>
       </Properties>
       <Events>
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="thumbnailSizeComboBoxActionPerformed"/>
       </Events>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new javax.swing.JComboBox&lt;&gt;()"/>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
+      </AuxValues>
     </Component>
   </SubComponents>
 </Form>
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java
index 4788a15a38..90f5ffa8e4 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerThumbnail.java
@@ -27,6 +27,8 @@ import java.util.Arrays;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
 import javax.swing.JOptionPane;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingWorker;
@@ -119,7 +121,7 @@ import org.sleuthkit.datamodel.TskCoreException;
         filePathLabel = new javax.swing.JLabel();
         goToPageLabel = new javax.swing.JLabel();
         goToPageField = new javax.swing.JTextField();
-        thumbnailSizeComboBox = new javax.swing.JComboBox();
+        thumbnailSizeComboBox = new javax.swing.JComboBox<>();
 
         thumbnailScrollPanel.setPreferredSize(new java.awt.Dimension(582, 348));
 
@@ -169,8 +171,7 @@ import org.sleuthkit.datamodel.TskCoreException;
             }
         });
 
-        thumbnailSizeComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Small Thumbnails", "Medium Thumbnails", "Large Thumbnails" }));
-        thumbnailSizeComboBox.setSelectedIndex(1);
+        thumbnailSizeComboBox.setModel(new javax.swing.DefaultComboBoxModel<String>(new String[] { "Small Thumbnails", "Medium Thumbnails", "Large Thumbnails" }));
         thumbnailSizeComboBox.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 thumbnailSizeComboBoxActionPerformed(evt);
@@ -181,7 +182,7 @@ import org.sleuthkit.datamodel.TskCoreException;
         this.setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(thumbnailScrollPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+            .addComponent(thumbnailScrollPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 642, Short.MAX_VALUE)
             .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -287,7 +288,7 @@ import org.sleuthkit.datamodel.TskCoreException;
     private javax.swing.JButton pagePrevButton;
     private javax.swing.JLabel pagesLabel;
     private javax.swing.JScrollPane thumbnailScrollPanel;
-    private javax.swing.JComboBox thumbnailSizeComboBox;
+    private javax.swing.JComboBox<String> thumbnailSizeComboBox;
     // End of variables declaration//GEN-END:variables
 
     @Override
@@ -331,7 +332,7 @@ import org.sleuthkit.datamodel.TskCoreException;
     
     @Override
     public String getTitle() {
-        return "Thumbnail";
+        return NbBundle.getMessage(this.getClass(), "DataResultViewerThumbnail.title");
     }
 
     @Override
@@ -384,8 +385,13 @@ import org.sleuthkit.datamodel.TskCoreException;
         }
         
         if (newPage > totalPages || newPage < 1) {
-            JOptionPane.showMessageDialog(this, "Please enter a valid page number between 1 and " + totalPages,
-                    "Invalid page number", JOptionPane.WARNING_MESSAGE);
+            JOptionPane.showMessageDialog(this,
+                                          NbBundle.getMessage(this.getClass(),
+                                                              "DataResultViewerThumbnail.goToPageTextField.msgDlg",
+                                                              totalPages),
+                                          NbBundle.getMessage(this.getClass(),
+                                                              "DataResultViewerThumbnail.goToPageTextField.err"),
+                                          JOptionPane.WARNING_MESSAGE);
             return;
         }
         
@@ -411,7 +417,8 @@ import org.sleuthkit.datamodel.TskCoreException;
                 pagePrevButton.setEnabled(false);
                 pageNextButton.setEnabled(false);
                 goToPageField.setEnabled(false);
-                progress = ProgressHandleFactory.createHandle("Generating Thumbnails...");
+                progress = ProgressHandleFactory.createHandle(
+                        NbBundle.getMessage(this.getClass(), "DataResultViewerThumbnail.genThumbs"));
                 progress.start();
                 progress.switchToIndeterminate();
                 Node root = em.getRootContext();
@@ -449,7 +456,9 @@ import org.sleuthkit.datamodel.TskCoreException;
             pageNumLabel.setText("");
             imagesRangeLabel.setText("");
         } else {
-            pageNumLabel.setText(Integer.toString(curPage) + " of " + Integer.toString(totalPages));
+            pageNumLabel.setText(
+                    NbBundle.getMessage(this.getClass(), "DataResultViewerThumbnail.pageNumbers.curOfTotal",
+                                        Integer.toString(curPage), Integer.toString(totalPages)));
             final int imagesFrom = (curPage - 1) * ThumbnailViewChildren.IMAGES_PER_PAGE + 1;
             final int imagesTo = curPageImages + (curPage - 1) * ThumbnailViewChildren.IMAGES_PER_PAGE;
             imagesRangeLabel.setText(imagesFrom + "-" + imagesTo);
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/FXVideoPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/FXVideoPanel.java
index 584b140934..12156aad2c 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/FXVideoPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/FXVideoPanel.java
@@ -62,6 +62,7 @@ import javax.swing.SwingWorker;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.util.Cancellable;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
 import org.openide.util.lookup.ServiceProviders;
 import org.sleuthkit.autopsy.casemodule.Case;
@@ -139,7 +140,7 @@ public class FXVideoPanel extends MediaViewVideoPanel {
         currentFile = file;
         final boolean deleted = file.isDirNameFlagSet(TskData.TSK_FS_NAME_FLAG_ENUM.UNALLOC);
         if (deleted) {
-            mediaPane.setInfoLabelText("Playback of deleted videos is not supported, use an external player.");
+            mediaPane.setInfoLabelText(NbBundle.getMessage(this.getClass(), "FXVideoPanel.mediaPane.infoLabel"));
             removeAll();
             return;
         }
@@ -242,13 +243,15 @@ public class FXVideoPanel extends MediaViewVideoPanel {
         @Override
         protected Object doInBackground() throws Exception {
             success = false;
-            progress = ProgressHandleFactory.createHandle("Buffering " + sFile.getName(), new Cancellable() {
+            progress = ProgressHandleFactory.createHandle(
+                    NbBundle.getMessage(this.getClass(), "FXVideoPanel.progress.bufferingFile", sFile.getName()),
+                                                          new Cancellable() {
                 @Override
                 public boolean cancel() {
                     return ExtractMedia.this.cancel(true);
                 }
             });
-            mediaPane.setProgressLabelText("Buffering...  ");
+            mediaPane.setProgressLabelText(NbBundle.getMessage(this.getClass(), "FXVideoPanel.progressLabel.buffering"));
             progress.start();
             progress.switchToDeterminate(100);
             try {
@@ -394,7 +397,7 @@ public class FXVideoPanel extends MediaViewVideoPanel {
                 mediaView.setMediaPlayer(mediaPlayer);
             } catch (MediaException ex) {
                 this.setProgressLabelText("");
-                this.setInfoLabelText("Unsupported Format.");
+                this.setInfoLabelText(NbBundle.getMessage(this.getClass(), "FXVideoPanel.media.unsupportedFormat"));
             }
         }
         
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java b/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java
index f416403114..2486554c22 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/FrameCapture.java
@@ -1,3 +1,21 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2013 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.sleuthkit.autopsy.corecomponents;
 
 import java.io.File;
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralOptionsPanelController.java b/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralOptionsPanelController.java
index 14b8ffec3f..127fd1c0da 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralOptionsPanelController.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/GeneralOptionsPanelController.java
@@ -1,6 +1,20 @@
 /*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2013-2014 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.sleuthkit.autopsy.corecomponents;
 
@@ -10,57 +24,65 @@ import javax.swing.JComponent;
 import org.netbeans.spi.options.OptionsPanelController;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
-@OptionsPanelController.TopLevelRegistration(
-    categoryName = "#OptionsCategory_Name_General",
-iconBase = "org/sleuthkit/autopsy/corecomponents/general-options.png",
-position = 1,
-keywords = "#OptionsCategory_Keywords_General",
-keywordsCategory = "General")
-@org.openide.util.NbBundle.Messages({"OptionsCategory_Name_General=General", "OptionsCategory_Keywords_General=general"})
+@OptionsPanelController.TopLevelRegistration(categoryName = "#OptionsCategory_Name_General",
+        iconBase = "org/sleuthkit/autopsy/corecomponents/display-options.png",
+        position = 1,
+        keywords = "#OptionsCategory_Keywords_General",
+        keywordsCategory = "General")
 public final class GeneralOptionsPanelController extends OptionsPanelController {
 
     private GeneralPanel panel;
     private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
     private boolean changed;
     private static final Logger logger = Logger.getLogger(GeneralOptionsPanelController.class.getName());
+
+    @Override
     public void update() {
         getPanel().load();
         changed = false;
     }
 
+    @Override
     public void applyChanges() {
         getPanel().store();
         changed = false;
     }
 
+    @Override
     public void cancel() {
-        // need not do anything special, if no changes have been persisted yet
     }
 
+    @Override
     public boolean isValid() {
         return getPanel().valid();
     }
 
+    @Override
     public boolean isChanged() {
         return changed;
     }
 
+    @Override
     public HelpCtx getHelpCtx() {
-        return null; // new HelpCtx("...ID") if you have a help set
+        return null;
     }
 
+    @Override
     public JComponent getComponent(Lookup masterLookup) {
         return getPanel();
     }
 
+    @Override
     public void addPropertyChangeListener(PropertyChangeListener l) {
         pcs.addPropertyChangeListener(l);
     }
 
+    @Override
     public void removePropertyChangeListener(PropertyChangeListener l) {
         pcs.removePropertyChangeListener(l);
     }
@@ -75,22 +97,26 @@ public final class GeneralOptionsPanelController extends OptionsPanelController
     void changed() {
         if (!changed) {
             changed = true;
-            
+
             try {
                 pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, false, true);
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
                 logger.log(Level.SEVERE, "GeneralOptionsPanelController listener threw exception", e);
-                MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to GeneralOptionsPanelController updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                MessageNotifyUtil.Notify.show(
+                        NbBundle.getMessage(this.getClass(), "GeneralOptionsPanelController.moduleErr"),
+                        NbBundle.getMessage(this.getClass(), "GeneralOptionsPanelController.moduleErr.msg"),
+                        MessageNotifyUtil.MessageType.ERROR);
             }
         }
-        
-            try {
-                 pcs.firePropertyChange(OptionsPanelController.PROP_VALID, null, null);
-            }
-            catch (Exception e) {
-                logger.log(Level.SEVERE, "GeneralOptionsPanelController listener threw exception", e);
-                MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to GeneralOptionsPanelController updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
-            }
+
+        try {
+            pcs.firePropertyChange(OptionsPanelController.PROP_VALID, null, null);
+        } catch (Exception e) {
+            logger.log(Level.SEVERE, "GeneralOptionsPanelController listener threw exception", e);
+            MessageNotifyUtil.Notify.show(
+                    NbBundle.getMessage(this.getClass(), "GeneralOptionsPanelController.moduleErr"),
+                    NbBundle.getMessage(this.getClass(), "GeneralOptionsPanelController.moduleErr.msg"),
+                    MessageNotifyUtil.MessageType.ERROR);
+        }
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/GstVideoPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/GstVideoPanel.java
index b28ba880f2..2dafec9ec0 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/GstVideoPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/GstVideoPanel.java
@@ -54,6 +54,7 @@ import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.util.Cancellable;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
 import org.openide.util.lookup.ServiceProviders;
 import org.sleuthkit.autopsy.casemodule.Case;
@@ -76,7 +77,7 @@ public class GstVideoPanel extends MediaViewVideoPanel {
     private boolean gstInited;
     private static final long MIN_FRAME_INTERVAL_MILLIS = 500;
     private static final long FRAME_CAPTURE_TIMEOUT_MILLIS = 1000;
-    private static final String MEDIA_PLAYER_ERROR_STRING = "The media player cannot process this file.";
+    private static final String MEDIA_PLAYER_ERROR_STRING = NbBundle.getMessage(GstVideoPanel.class, "GstVideoPanel.cannotProcFile.err");
     //playback
     private long durationMillis = 0;
     private VideoProgressWorker videoProgressWorker;
@@ -166,15 +167,15 @@ public class GstVideoPanel extends MediaViewVideoPanel {
         } catch (GstException e) {
             gstInited = false;
             logger.log(Level.SEVERE, "Error initializing gstreamer for audio/video viewing and frame extraction capabilities", e);
-            MessageNotifyUtil.Notify.error("Error initializing gstreamer for audio/video viewing and frame extraction capabilities. "
-                    + " Video and audio viewing will be disabled. ",
+            MessageNotifyUtil.Notify.error(
+                    NbBundle.getMessage(this.getClass(), "GstVideoPanel.initGst.gstException.msg"),
                     e.getMessage());
             return false;
         } catch (UnsatisfiedLinkError | NoClassDefFoundError | Exception e) {
             gstInited = false;
             logger.log(Level.SEVERE, "Error initializing gstreamer for audio/video viewing and extraction capabilities", e);
-            MessageNotifyUtil.Notify.error("Error initializing gstreamer for audio/video viewing frame extraction capabilities. "
-                    + " Video and audio viewing will be disabled. ",
+            MessageNotifyUtil.Notify.error(
+                    NbBundle.getMessage(this.getClass(), "GstVideoPanel.initGst.otherException.msg"),
                     e.getMessage());
             return false;
         }
@@ -189,7 +190,7 @@ public class GstVideoPanel extends MediaViewVideoPanel {
         currentFile = file;
         final boolean deleted = file.isDirNameFlagSet(TskData.TSK_FS_NAME_FLAG_ENUM.UNALLOC);
         if (deleted) {
-            infoLabel.setText("Playback of deleted videos is not supported, use an external player.");
+            infoLabel.setText(NbBundle.getMessage(this.getClass(), "GstVideoPanel.setupVideo.infoLabel.text"));
             videoPanel.removeAll();
             pauseButton.setEnabled(false);
             progressSlider.setEnabled(false);
@@ -318,7 +319,8 @@ public class GstVideoPanel extends MediaViewVideoPanel {
         
         // throw exception if this file is known to be problematic
         if (badVideoFiles.contains(file.getName())) {
-            throw new Exception("Cannot capture frames from this file (" + file.getName() + ").");
+            throw new Exception(
+                    NbBundle.getMessage(this.getClass(), "GstVideoPanel.exception.problemFile.msg", file.getName()));
         }
 
         // set up a PlayBin2 object
@@ -332,13 +334,13 @@ public class GstVideoPanel extends MediaViewVideoPanel {
         if (ret == StateChangeReturn.FAILURE) {
             // add this file to the set of known bad ones
             badVideoFiles.add(file.getName());
-            throw new Exception("Problem with video file; problem when attempting to play while obtaining duration.");
+            throw new Exception(NbBundle.getMessage(this.getClass(), "GstVideoPanel.exception.problemPlay.msg"));
         }
         ret = playbin.pause();
         if (ret == StateChangeReturn.FAILURE) {
             // add this file to the set of known bad ones
             badVideoFiles.add(file.getName());
-            throw new Exception("Problem with video file; problem when attempting to pause while obtaining duration.");
+            throw new Exception(NbBundle.getMessage(this.getClass(), "GstVideoPanel.exception.problemPause.msg"));
         }
         playbin.getState();
 
@@ -364,7 +366,8 @@ public class GstVideoPanel extends MediaViewVideoPanel {
             if (ret == StateChangeReturn.FAILURE) {
                 // add this file to the set of known bad ones
                 badVideoFiles.add(file.getName());
-                throw new Exception("Problem with video file; problem when attempting to pause while capturing a frame.");
+                throw new Exception(
+                        NbBundle.getMessage(this.getClass(), "GstVideoPanel.exception.problemPauseCaptFrame.msg"));
             }
             playbin.getState();
 
@@ -377,7 +380,8 @@ public class GstVideoPanel extends MediaViewVideoPanel {
             if (ret == StateChangeReturn.FAILURE) {
                 // add this file to the set of known bad ones
                 badVideoFiles.add(file.getName());
-                throw new Exception("Problem with video file; problem when attempting to play while capturing a frame.");
+                throw new Exception(
+                        NbBundle.getMessage(this.getClass(), "GstVideoPanel.exception.problemPlayCaptFrame.msg"));
             }
 
             // wait for FrameCaptureRGBListener to finish
@@ -394,7 +398,8 @@ public class GstVideoPanel extends MediaViewVideoPanel {
             if (ret == StateChangeReturn.FAILURE) {
                 // add this file to the set of known bad ones
                 badVideoFiles.add(file.getName());
-                throw new Exception("Problem with video file; problem when attempting to stop while capturing a frame.");
+                throw new Exception(
+                        NbBundle.getMessage(this.getClass(), "GstVideoPanel.exception.problemStopCaptFrame.msg"));
             }
             
             if (image == null) {
@@ -705,7 +710,7 @@ public class GstVideoPanel extends MediaViewVideoPanel {
                     return ExtractMedia.this.cancel(true);
                 }
             });
-            progressLabel.setText("Buffering...  ");
+            progressLabel.setText(NbBundle.getMessage(this.getClass(), "GstVideoPanel.progress.buffering"));
             progress.start();
             progress.switchToDeterminate(100);
             try {
@@ -738,7 +743,7 @@ public class GstVideoPanel extends MediaViewVideoPanel {
 
         void playMedia() {
             if (jFile == null || !jFile.exists()) {
-                progressLabel.setText("Error buffering file");
+                progressLabel.setText(NbBundle.getMessage(this.getClass(), "GstVideoPanel.progressLabel.bufferingErr"));
                 return;
             }
             ClockTime dur = null;
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/Installer.java b/Core/src/org/sleuthkit/autopsy/corecomponents/Installer.java
index 61b2bd2cb1..005d47ffd4 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/Installer.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Installer.java
@@ -107,7 +107,7 @@ public class Installer extends ModuleInstall {
         final String[] UI_MENU_ITEM_KEYS = new String[]{"MenuBarUI",
                                                         };
                 
-        Map<Object, Object> uiEntries = new TreeMap<Object, Object>();
+        Map<Object, Object> uiEntries = new TreeMap<>();
         
         // Store the keys that deal with menu items
         for(String key : UI_MENU_ITEM_KEYS) {
@@ -129,7 +129,7 @@ public class Installer extends ModuleInstall {
         }
         
         // Overwrite the Metal menu item keys to use the Aqua versions
-        for(Map.Entry entry : uiEntries.entrySet()) {
+        for(Map.Entry<Object,Object> entry : uiEntries.entrySet()) {
             UIManager.put(entry.getKey(), entry.getValue());
         }
         
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java
index e5acab4cb7..70505058bc 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java
@@ -33,6 +33,8 @@ import javafx.scene.image.ImageView;
 import javafx.scene.layout.BorderPane;
 import javax.imageio.ImageIO;
 import javax.swing.SwingUtilities;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.corelibs.ScalrWrapper;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -160,7 +162,9 @@ import org.sleuthkit.datamodel.ReadContentInputStream;
                     return;
                 } catch (OutOfMemoryError ex) {
                     logger.log(Level.WARNING, "Could not load image file into media view (too large): " + fileName, ex);
-                    MessageNotifyUtil.Notify.warn("Could not load image file (too large): " + file.getName(), ex.getMessage());
+                    MessageNotifyUtil.Notify.warn(
+                            NbBundle.getMessage(this.getClass(), "MediaViewImagePanel.imgFileTooLarge.msg", file.getName()),
+                            ex.getMessage());
                     return;
                 } finally {
                     try {
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java
index 0499404c42..81ad1dd840 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/ProductInformationPanel.java
@@ -109,7 +109,8 @@ public class ProductInformationPanel extends JPanel implements HyperlinkListener
         jScrollPane2.setViewportView(description);
 
         verboseLoggingButton.setBackground(new java.awt.Color(255, 255, 255));
-        verboseLoggingButton.setText("Activate verbose logging");
+        verboseLoggingButton.setText(
+                NbBundle.getMessage(this.getClass(), "ProductInformationPanel.actVerboseLogging.text"));
         verboseLoggingButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 activateVerboseLogging(evt);
@@ -196,7 +197,8 @@ private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:eve
 
     private void disableVerboseLoggingButton() {
         this.verboseLoggingButton.setEnabled(false);
-        this.verboseLoggingButton.setText("Verbose logging enabled");
+        this.verboseLoggingButton.setText(
+                NbBundle.getMessage(this.getClass(), "ProductInformationPanel.verbLoggingEnabled.text"));
     }
 
     private void closeDialog() {
@@ -225,17 +227,30 @@ private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:eve
 
     private static String getOperatingSystemValue() {
         return NbBundle.getMessage(ProductInformationPanel.class, "Format_OperatingSystem_Value",
-                System.getProperty("os.name", "unknown"),
-                System.getProperty("os.version", "unknown"),
-                System.getProperty("os.arch", "unknown"));
+                                   System.getProperty("os.name",
+                                                      NbBundle.getMessage(ProductInformationPanel.class,
+                                                                          "ProductInformationPanel.propertyUnknown.text")),
+                                   System.getProperty("os.version",
+                                                      NbBundle.getMessage(ProductInformationPanel.class,
+                                                                          "ProductInformationPanel.propertyUnknown.text")),
+                                   System.getProperty("os.arch",
+                                                      NbBundle.getMessage(ProductInformationPanel.class,
+                                                                          "ProductInformationPanel.propertyUnknown.text")));
     }
 
     private static String getJavaValue() {
-        return System.getProperty("java.version", "unknown");
+        return System.getProperty("java.version",
+                                  NbBundle.getMessage(ProductInformationPanel.class,
+                                                      "ProductInformationPanel.propertyUnknown.text"));
     }
 
     private static String getVMValue() {
-        return System.getProperty("java.vm.name", "unknown") + " " + System.getProperty("java.vm.version", "");
+        return NbBundle.getMessage(ProductInformationPanel.class,
+                                   "ProductInformationPanel.getVMValue.text",
+                                   System.getProperty("java.vm.name",
+                                                      NbBundle.getMessage(ProductInformationPanel.class,
+                                                                          "ProductInformationPanel.propertyUnknown.text")),
+                                   System.getProperty("java.vm.version", ""));
     }
 
     private static String getSystemLocaleValue() {
@@ -248,7 +263,8 @@ private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:eve
     }
 
     private static String getEncodingValue() {
-        return System.getProperty("file.encoding", "unknown");
+        return System.getProperty("file.encoding",
+                                  NbBundle.getMessage(ProductInformationPanel.class, "ProductInformationPanel.propertyUnknown.text"));
     }
     
     public void setCopyright(String text) {
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java b/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java
index 535d541a02..4715658265 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java
@@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.corecomponents;
 
 import org.openide.nodes.FilterNode;
 import org.openide.nodes.Node;
+import org.openide.util.NbBundle;
 
 /**
  * This class is used to filter the nodes that we want to show on the "TreeTableView".
@@ -46,7 +47,7 @@ public class TableFilterNode extends FilterNode {
     @Override
     public String getDisplayName() {
         if (createChild) {
-            return "Name";
+            return NbBundle.getMessage(this.getClass(), "TableFilterNode.displayName.text");
         } else {
             return super.getDisplayName();
         }
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/display-options.png b/Core/src/org/sleuthkit/autopsy/corecomponents/display-options.png
new file mode 100755
index 0000000000..8020d8d833
Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/corecomponents/display-options.png differ
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/Bundle.properties b/Core/src/org/sleuthkit/autopsy/coreutils/Bundle.properties
index 1c9c5c6495..771ee6d97f 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/Bundle.properties
@@ -1,2 +1,24 @@
 OpenIDE-Module-Name=CoreUtils
+JLNK.noPrefPath.text=No preferred path found
+PlatformUtil.nameUnknown=unknown
+PlatformUtil.verUnknown=unknown
+PlatformUtil.archUnknown=unknown
+PlatformUtil.jrePath.jreDir.msg=Embedded jre directory found in\: {0}
+PlatformUtil.jrePath.usingJavaPath.msg=Using java binary path\: {0}
+PlatformUtil.getPID.sigarNotInit.msg=Can't get PID, sigar not initialized
+PlatformUtil.getPID.gen.msg=Can't get PID,{0}
+PlatformUtil.getJavaPID.sigarNotInit.msg=Can't get PID of a java process, sigar not initialized
+PlatformUtil.getJavaPID.gen.msg=Can't get PID for query\: {0}, {1}
+PlatformUtil.getJavaPIDs.sigarNotInit=Can't get PIDs of a java process, sigar not initialized
+PlatformUtil.getJavaPIDs.gen.msg=Can't get PIDs for query\: {0}, {1}
+PlatformUtil.killProcess.sigarNotInit.msg=Can't kill process by pid, sigar not initialized.
+PlatformUtil.killProcess.gen.msg=Can't kill process\: {0}, {1}
+PlatformUtil.getProcVmUsed.sigarNotInit.msg=Can't get virt mem used, sigar not initialized.
+PlatformUtil.getProcVmUsed.gen.msg=Can't get virt mem used, {0}
+PlatformUtil.getJvmMemInfo.usageText=JVM heap usage\: {0}, JVM non-heap usage\: {1}
+PlatformUtil.getPhysicalMemInfo.usageText=Physical memory usage (max, total, free)\: {0}, {1}, {2}
+PlatformUtil.getAllMemUsageInfo.usageText={0}\
+{1}\
+Process Virtual Memory\: {2}
+StringExtract.illegalStateException.cannotInit.msg=Unicode table not properly initialized, cannot instantiate StringExtract
 
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/coreutils/Bundle_ja.properties
new file mode 100644
index 0000000000..dd15cb064c
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/Bundle_ja.properties
@@ -0,0 +1,23 @@
+OpenIDE-Module-Name=\u4E3B\u8981\u30E6\u30FC\u30C6\u30A3\u30EA\u30C6\u30A3
+JLNK.noPrefPath.text=\u512A\u5148\u7684\u306B\u4F7F\u7528\u3059\u308B\u30D1\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
+PlatformUtil.nameUnknown=\u4E0D\u660E
+PlatformUtil.verUnknown=\u4E0D\u660E
+PlatformUtil.archUnknown=\u4E0D\u660E
+PlatformUtil.jrePath.jreDir.msg=\u57CB\u3081\u8FBC\u307E\u308C\u305FJRE\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u304C\u4E0B\u8A18\u3067\u767A\u898B\u3055\u308C\u307E\u3057\u305F\uFF1A{0}
+PlatformUtil.jrePath.usingJavaPath.msg=JAVA\u30D0\u30A4\u30CA\u30EA\u30D1\u30B9\u3092\u4F7F\u7528\uFF1A{0}
+PlatformUtil.getPID.sigarNotInit.msg=PID\u3092\u5165\u624B\u3067\u304D\u307E\u305B\u3093\u3001Sigar\u304C\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+PlatformUtil.getPID.gen.msg=PID\u3092\u5165\u624B\u3067\u304D\u307E\u305B\u3093\u3001{0}
+PlatformUtil.getJavaPID.sigarNotInit.msg=JAVA\u30D7\u30ED\u30BB\u30B9\u306EPID\u304C\u5165\u624B\u3067\u304D\u307E\u305B\u3093\u3001Sigar\u304C\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+PlatformUtil.getJavaPID.gen.msg=\u30AF\u30A8\u30EA\u30FC\u306EPID\u304C\u5165\u624B\u3067\u304D\u307E\u305B\u3093\uFF1A{0}, {1}
+PlatformUtil.getJavaPIDs.sigarNotInit=JAVA\u30D7\u30ED\u30BB\u30B9\u306EPID\u304C\u5165\u624B\u3067\u304D\u307E\u305B\u3093\u3001Sigar\u304C\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+PlatformUtil.getJavaPIDs.gen.msg=\u30AF\u30A8\u30EA\u30FC\u306EPID\u304C\u5165\u624B\u3067\u304D\u307E\u305B\u3093\uFF1A{0}, {1}
+PlatformUtil.killProcess.sigarNotInit.msg=PID\u3092\u4F7F\u7528\u3057\u3066\u30D7\u30ED\u30BB\u30B9\u3092\u5F37\u5236\u4FEE\u4E86\u3067\u304D\u307E\u305B\u3093\u3001Sigar\u304C\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+PlatformUtil.killProcess.gen.msg=\u30D7\u30ED\u30BB\u30B9\u3092\u5F37\u5236\u4FEE\u4E86\u3067\u304D\u307E\u305B\u3093\uFF1A {0}, {1}
+PlatformUtil.getProcVmUsed.sigarNotInit.msg=\u4F7F\u7528\u4E2D\u306E\u4EEE\u60F3\u30E1\u30E2\u30EA\u91CF\u3092\u78BA\u8A8D\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3001Sigar\u304C\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
+PlatformUtil.getProcVmUsed.gen.msg=\u4F7F\u7528\u4E2D\u306E\u4EEE\u60F3\u30E1\u30E2\u30EA\u91CF\u3092\u78BA\u8A8D\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3001{0}
+PlatformUtil.getJvmMemInfo.usageText=JVM\u30D2\u30FC\u30D7\u4F7F\u7528\u72B6\u6CC1\uFF1A{0}\u3001JVM\u975E\u30D2\u30FC\u30D7\u4F7F\u7528\u72B6\u6CC1\uFF1A{1}
+PlatformUtil.getPhysicalMemInfo.usageText=\u7269\u7406\u30E1\u30E2\u30EA\u4F7F\u7528\u72B6\u6CC1\uFF08\u6700\u5927\u3001\u5408\u8A08\u3001\u5229\u7528\u53EF\u80FD\uFF09\uFF1A  {0}, {1}, {2}
+PlatformUtil.getAllMemUsageInfo.usageText={0}\
+{1}\
+\u30D7\u30ED\u30BB\u30B9\u4EEE\u60F3\u30E1\u30E2\u30EA\uFF1A{2}
+StringExtract.illegalStateException.cannotInit.msg=\u30E6\u30CB\u30B3\u30FC\u30C9\u30C6\u30FC\u30D6\u30EB\u304C\u6B63\u3057\u304F\u521D\u671F\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3001StringExtract\u3092\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u307E\u305B\u3093
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java b/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
index 37b042f358..8a9e3a0c67 100755
--- a/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
@@ -211,10 +211,7 @@ public class ImageUtils {
          * Check for the JPEG header. Since Java bytes are signed, we cast them
          * to an int first.
          */
-        if (((int) (fileHeaderBuffer[0] & 0xff) == 0xff) && ((int) (fileHeaderBuffer[1] & 0xff) == 0xd8)) {
-            return true;
-        }
-        return false;
+        return (((fileHeaderBuffer[0] & 0xff) == 0xff) && ((fileHeaderBuffer[1] & 0xff) == 0xd8));
     }
      private static Image generateVideoIcon(Content content, int iconSize) { 
         Image icon = null;
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/JLNK.java b/Core/src/org/sleuthkit/autopsy/coreutils/JLNK.java
index 3312ab7b06..ff9787c405 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/JLNK.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/JLNK.java
@@ -21,6 +21,8 @@ package org.sleuthkit.autopsy.coreutils;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.LnkEnums.CommonNetworkRelativeLinkFlags;
 import org.sleuthkit.autopsy.coreutils.LnkEnums.DriveType;
 import org.sleuthkit.autopsy.coreutils.LnkEnums.FileAttributesFlags;
@@ -294,7 +296,7 @@ import org.sleuthkit.autopsy.coreutils.LnkEnums.NetworkProviderType;
             }
             return ret;
         }
-        return "No preferred path found";
+        return NbBundle.getMessage(this.getClass(), "JLNK.noPrefPath.text");
     }
    
     public String getBestName() {
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/ModuleSettings.java b/Core/src/org/sleuthkit/autopsy/coreutils/ModuleSettings.java
index 15d5e3d7a3..e6d97afe0f 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/ModuleSettings.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/ModuleSettings.java
@@ -36,7 +36,7 @@ import java.util.logging.Level;
  */
 public class ModuleSettings {
 
-    // The directory where the properties file is lcoated
+    // The directory where the properties file is located
     private final static String moduleDirPath = PlatformUtil.getUserConfigDirectory();
     public static final String DEFAULT_CONTEXT = "GeneralContext";
     public static final String MAIN_SETTINGS = "Case";
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java
index 1ccc4132a4..d32234fa92 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java
@@ -37,6 +37,7 @@ import org.hyperic.sigar.Sigar;
 import org.hyperic.sigar.ptql.ProcessFinder;
 import org.openide.modules.InstalledFileLocator;
 import org.openide.modules.Places;
+import org.openide.util.NbBundle;
 import org.sleuthkit.datamodel.SleuthkitJNI;
 import org.sleuthkit.datamodel.TskCoreException;
 
@@ -47,9 +48,9 @@ import org.sleuthkit.datamodel.TskCoreException;
 public class PlatformUtil {
 
     private static String javaPath = null;
-    public static final String OS_NAME_UNKNOWN = "unknown";
-    public static final String OS_VERSION_UNKNOWN = "unknown";
-    public static final String OS_ARCH_UNKNOWN = "unknown";
+    public static final String OS_NAME_UNKNOWN = NbBundle.getMessage(PlatformUtil.class, "PlatformUtil.nameUnknown");
+    public static final String OS_VERSION_UNKNOWN = NbBundle.getMessage(PlatformUtil.class, "PlatformUtil.verUnknown");
+    public static final String OS_ARCH_UNKNOWN = NbBundle.getMessage(PlatformUtil.class, "PlatformUtil.archUnknown");
     private static volatile long pid = -1;
     private static volatile Sigar sigar = null;
     private static volatile MemoryMXBean memoryManager = null;
@@ -117,7 +118,10 @@ public class PlatformUtil {
         File jrePath = new File(getInstallPath() + File.separator + "jre");
 
         if (jrePath != null && jrePath.exists() && jrePath.isDirectory()) {
-            System.out.println("Embedded jre directory found in: " + jrePath.getAbsolutePath());
+            System.out.println(
+                    NbBundle.getMessage(PlatformUtil.class,
+                                        "PlatformUtil.jrePath.jreDir.msg",
+                                        jrePath.getAbsolutePath()));
             javaPath = jrePath.getAbsolutePath() + File.separator + "bin" + File.separator + "java";
         } else {
             //else use system installed java in PATH env variable
@@ -125,7 +129,7 @@ public class PlatformUtil {
 
         }
 
-        System.out.println("Using java binary path: " + javaPath);
+        System.out.println(NbBundle.getMessage(PlatformUtil.class, "PlatformUtil.jrePath.usingJavaPath.msg", javaPath));
 
 
         return javaPath;
@@ -204,7 +208,7 @@ public class PlatformUtil {
      * @throws IOException exception thrown if extract the file failed for IO
      * reasons
      */
-    public static boolean extractResourceToUserConfigDir(final Class resourceClass, final String resourceFile) throws IOException {
+    public static <T> boolean extractResourceToUserConfigDir(final Class<T> resourceClass, final String resourceFile) throws IOException {
         final File userDir = new File(getUserConfigDirectory());
 
         final File resourceFileF = new File(userDir + File.separator + resourceFile);
@@ -426,10 +430,10 @@ public class PlatformUtil {
             if (sigar != null) {
                 pid = sigar.getPid();
             } else {
-                System.out.println("Can't get PID, sigar not initialized");
+                System.out.println(NbBundle.getMessage(PlatformUtil.class, "PlatformUtil.getPID.sigarNotInit.msg"));
             }
         } catch (Exception e) {
-            System.out.println("Can't get PID," + e.toString());
+            System.out.println(NbBundle.getMessage(PlatformUtil.class, "PlatformUtil.getPID.gen.msg", e.toString()));
         }
         return pid;
 
@@ -456,10 +460,11 @@ public class PlatformUtil {
                 ProcessFinder finder = new ProcessFinder(sigar);
                 jpid = finder.findSingleProcess(sigarQuery);
             } else {
-                System.out.println("Can't get PID of a java process, sigar not initialized");
+                System.out.println(NbBundle.getMessage(PlatformUtil.class, "PlatformUtil.getJavaPID.sigarNotInit.msg"));
             }
         } catch (Exception e) {
-            System.out.println("Can't get PID for query: " + sigarQuery + ", " + e.toString());
+            System.out.println(
+                    NbBundle.getMessage(PlatformUtil.class, "PlatformUtil.getJavaPID.gen.msg", sigarQuery, e.toString()));
         }
         return jpid;
 
@@ -486,10 +491,11 @@ public class PlatformUtil {
                 ProcessFinder finder = new ProcessFinder(sigar);
                 jpids = finder.find(sigarQuery);
             } else {
-                System.out.println("Can't get PIDs of a java process, sigar not initialized");
+                System.out.println(NbBundle.getMessage(PlatformUtil.class, "PlatformUtil.getJavaPIDs.sigarNotInit"));
             }
         } catch (Exception e) {
-            System.out.println("Can't get PIDs for query: " + sigarQuery + ", " + e.toString());
+            System.out.println(
+                    NbBundle.getMessage(PlatformUtil.class, "PlatformUtil.getJavaPIDs.gen.msg", sigarQuery, e.toString()));
         }
         return jpids;
 
@@ -508,10 +514,11 @@ public class PlatformUtil {
             if (sigar != null) {
                 sigar.kill(pid, 9);
             } else {
-                System.out.println("Can't kill process by pid, sigar not initialized.");
+                System.out.println(NbBundle.getMessage(PlatformUtil.class, "PlatformUtil.killProcess.sigarNotInit.msg"));
             }
         } catch (Exception e) {
-            System.out.println("Can't kill process: " + pid + ", " + e.toString());
+            System.out.println(
+                    NbBundle.getMessage(PlatformUtil.class, "PlatformUtil.killProcess.gen.msg", pid, e.toString()));
         }
 
     }
@@ -531,12 +538,12 @@ public class PlatformUtil {
             }
 
             if (sigar == null || pid == -1) {
-                System.out.println("Can't get virt mem used, sigar not initialized. ");
+                System.out.println(NbBundle.getMessage(PlatformUtil.class, "PlatformUtil.getProcVmUsed.sigarNotInit.msg"));
                 return -1;
             }
             virtMem = sigar.getProcMem(pid).getSize();
         } catch (Exception e) {
-            System.out.println("Can't get virt mem used, " + e.toString());
+            System.out.println(NbBundle.getMessage(PlatformUtil.class, "PlatformUtil.getProcVmUsed.gen.msg", e.toString()));
         }
 
         return virtMem;
@@ -556,9 +563,9 @@ public class PlatformUtil {
         final MemoryUsage heap = memoryManager.getHeapMemoryUsage();
         final MemoryUsage nonHeap = memoryManager.getNonHeapMemoryUsage();
 
-        return "JVM heap usage: " + heap.toString() + ", JVM non-heap usage: " + nonHeap.toString();
-
-
+        return NbBundle.getMessage(PlatformUtil.class,
+                                   "PlatformUtil.getJvmMemInfo.usageText",
+                                   heap.toString(), nonHeap.toString());
     }
 
     /**
@@ -571,9 +578,9 @@ public class PlatformUtil {
         final long maxMemory = runTime.maxMemory();
         final long totalMemory = runTime.totalMemory();
         final long freeMemory = runTime.freeMemory();
-        return "Physical memory usage (max, total, free): "
-                + Long.toString(maxMemory) + ", " + Long.toString(totalMemory)
-                + ", " + Long.toString(freeMemory);
+        return NbBundle.getMessage(PlatformUtil.class,
+                                   "PlatformUtil.getPhysicalMemInfo.usageText",
+                                   Long.toString(maxMemory), Long.toString(totalMemory), Long.toString(freeMemory));
     }
 
     /**
@@ -582,10 +589,14 @@ public class PlatformUtil {
      * @return formatted string with all memory usage info
      */
     public static String getAllMemUsageInfo() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(PlatformUtil.getPhysicalMemInfo()).append("\n");
-        sb.append(PlatformUtil.getJvmMemInfo()).append("\n");
-        sb.append("Process Virtual Memory: ").append(PlatformUtil.getProcessVirtualMemoryUsed());
-        return sb.toString();
+//        StringBuilder sb = new StringBuilder();
+//        sb.append(PlatformUtil.getPhysicalMemInfo()).append("\n");
+//        sb.append(PlatformUtil.getJvmMemInfo()).append("\n");
+//        sb.append("Process Virtual Memory: ").append(PlatformUtil.getProcessVirtualMemoryUsed());
+//        return sb.toString();
+        return NbBundle.getMessage(PlatformUtil.class,
+                                   "PlatformUtil.getAllMemUsageInfo.usageText",
+                                   PlatformUtil.getPhysicalMemInfo(), PlatformUtil.getJvmMemInfo(),
+                                   PlatformUtil.getProcessVirtualMemoryUsed());
     }
 }
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SQLiteDBConnect.java b/Core/src/org/sleuthkit/autopsy/coreutils/SQLiteDBConnect.java
similarity index 98%
rename from RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SQLiteDBConnect.java
rename to Core/src/org/sleuthkit/autopsy/coreutils/SQLiteDBConnect.java
index 067145c5e6..d869459b75 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SQLiteDBConnect.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/SQLiteDBConnect.java
@@ -20,7 +20,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.recentactivity;
+package org.sleuthkit.autopsy.coreutils;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -32,7 +32,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 /**
  * Database connection class & utilities *
  */
-class SQLiteDBConnect {
+public class SQLiteDBConnect {
 
     public String sDriver = "";
     public String sUrl = null;
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/StringExtract.java b/Core/src/org/sleuthkit/autopsy/coreutils/StringExtract.java
index d6c43c24cc..5179859211 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/StringExtract.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/StringExtract.java
@@ -26,6 +26,8 @@ import java.util.List;
 import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.SCRIPT;
 
@@ -78,7 +80,8 @@ public class StringExtract {
         unicodeTable = StringExtractUnicodeTable.getInstance();
 
         if (unicodeTable == null) {
-            throw new IllegalStateException("Unicode table not properly initialized, cannot instantiate StringExtract");
+            throw new IllegalStateException(
+                    NbBundle.getMessage(StringExtract.class, "StringExtract.illegalStateException.cannotInit.msg"));
         }
 
         setEnabledScripts(SUPPORTED_SCRIPTS);
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java
index eab0f6cf60..2a19075913 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java
@@ -68,7 +68,7 @@ public class XMLUtil {
      * For example usages, please see KeywordSearchListsXML, HashDbXML, or IngestModuleLoader.
      * 
      */
-    public static boolean xmlIsValid(DOMSource xmlfile, Class clazz, String schemaFile) {
+    public static <T> boolean xmlIsValid(DOMSource xmlfile, Class<T> clazz, String schemaFile) {
       try{
         PlatformUtil.extractResourceToUserConfigDir(clazz, schemaFile);
         File schemaLoc = new File(PlatformUtil.getUserConfigDirectory() + File.separator + schemaFile);
@@ -103,7 +103,7 @@ public class XMLUtil {
      * For example usages, please see KeywordSearchListsXML, HashDbXML, or IngestModuleLoader.
      * 
      */
-    public static boolean xmlIsValid(Document doc, Class clazz, String type){
+    public static <T> boolean xmlIsValid(Document doc, Class<T> clazz, String type){
            DOMSource dms = new DOMSource(doc);
            return xmlIsValid(dms, clazz, type);
     }
@@ -118,7 +118,7 @@ public class XMLUtil {
      * @param xsdPath the full path to the file to validate against
      * 
      */
-    public static Document loadDoc(Class clazz, String xmlPath, String xsdPath) {
+    public static <T> Document loadDoc(Class<T> clazz, String xmlPath, String xsdPath) {
         DocumentBuilderFactory builderFactory =
                 DocumentBuilderFactory.newInstance();
         Document ret = null;
@@ -154,7 +154,7 @@ public class XMLUtil {
      * @param doc the document to save
      * 
      */
-    public static  boolean saveDoc(Class clazz, String xmlPath, String encoding, final Document doc) {
+    public static <T> boolean saveDoc(Class<T> clazz, String xmlPath, String encoding, final Document doc) {
         TransformerFactory xf = TransformerFactory.newInstance();
         xf.setAttribute("indent-number", new Integer(1));
         boolean success = false;
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
index e37bff7245..2a5ddb1793 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.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");
@@ -22,6 +22,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Map;
 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.BlackboardArtifact;
@@ -52,121 +54,123 @@ public abstract class AbstractAbstractFileNode<T extends AbstractFile> extends A
         NAME {
             @Override
             public String toString() {
-                return "Name";
+                return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.nameColLbl");
             }
         },
         LOCATION {
             @Override
             public String toString() {
-                return "Location";
+                return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.locationColLbl");
             }
         },
         MOD_TIME {
             @Override
             public String toString() {
-                return "Modified Time";
+                return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.modifiedTimeColLbl");
             }
         },
         CHANGED_TIME {
             @Override
             public String toString() {
-                return "Change Time";
+                return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.changeTimeColLbl");
             }
         },
         ACCESS_TIME {
             @Override
             public String toString() {
-                return "Access Time";
+                return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.accessTimeColLbl");
             }
         },
         CREATED_TIME {
             @Override
             public String toString() {
-                return "Created Time";
+                return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.createdTimeColLbl");
             }
         },
         SIZE {
             @Override
             public String toString() {
-                return "Size";
+                return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.sizeColLbl");
             }
         },
         FLAGS_DIR {
             @Override
             public String toString() {
-                return "Flags(Dir)";
+                return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.flagsDirColLbl");
             }
         },
         FLAGS_META {
             @Override
             public String toString() {
-                return "Flags(Meta)";
+                return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.flagsMetaColLbl");
             }
         },
         MODE {
             @Override
             public String toString() {
-                return "Mode";
+                return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.modeColLbl");
             }
         },
         USER_ID {
             @Override
             public String toString() {
-                return "UserID";
+                return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.useridColLbl");
             }
         },
         GROUP_ID {
             @Override
             public String toString() {
-                return "GroupID";
+                return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.groupidColLbl");
             }
         },
         META_ADDR {
             @Override
             public String toString() {
-                return "Meta Addr.";
+                return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.metaAddrColLbl");
             }
         },
         ATTR_ADDR {
             @Override
             public String toString() {
-                return "Attr. Addr.";
+                return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.attrAddrColLbl");
             }
         },
         TYPE_DIR {
             @Override
             public String toString() {
-                return "Type(Dir)";
+                return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.typeDirColLbl");
             }
         },
         TYPE_META {
             @Override
             public String toString() {
-                return "Type(Meta)";
+                return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.typeMetaColLbl");
             }
         },
         KNOWN {
             @Override
             public String toString() {
-                return "Known";
+                return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.knownColLbl");
             }
         },
         HASHSETS {
             @Override
             public String toString() {
-                return "In Hashsets";
+                return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.inHashsetsColLbl");
             }           
         },
         MD5HASH {
             @Override
             public String toString() {
-                return "MD5 Hash";
+
+                 return NbBundle.getMessage(this.getClass(), "AbstractAbstractFileNode.md5HashColLbl");
             }    
         },
         ObjectID {
             @Override
             public String toString() {
                 return "Object ID";
+
             }
         }, 
     }
@@ -185,7 +189,7 @@ public abstract class AbstractAbstractFileNode<T extends AbstractFile> extends A
         try {
             path = content.getUniquePath();
         } catch (TskCoreException ex) {
-            logger.log(Level.SEVERE, "Except while calling Content.getUniquePath() on " + content);
+            logger.log(Level.SEVERE, "Except while calling Content.getUniquePath() on {0}", content);
         }
         
         map.put(AbstractFilePropertyType.NAME.toString(), AbstractAbstractFileNode.getContentDisplayName(content));
@@ -213,10 +217,13 @@ public abstract class AbstractAbstractFileNode<T extends AbstractFile> extends A
 
     static String getContentDisplayName(AbstractFile file) {
         String name = file.getName();
-        if (name.equals("..")) {
-            name = DirectoryNode.DOTDOTDIR;
-        } else if (name.equals(".")) {
-            name = DirectoryNode.DOTDIR;
+        switch (name) {
+            case "..":
+                name = DirectoryNode.DOTDOTDIR;
+                break;
+            case ".":
+                name = DirectoryNode.DOTDIR;
+                break;
         }
         return name;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentChildren.java
index 87494f2e1f..539fb1e1fc 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentChildren.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentChildren.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");
@@ -21,7 +21,9 @@ package org.sleuthkit.autopsy.datamodel;
 import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children.Keys;
 import org.openide.nodes.Node;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.datamodel.KeywordHits.KeywordHitsRootNode;
+import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.DerivedFile;
 import org.sleuthkit.datamodel.Directory;
 import org.sleuthkit.datamodel.File;
@@ -62,51 +64,52 @@ abstract class AbstractContentChildren<T> extends Keys<T> {
     /**
      * Creates appropriate Node for each sub-class of Content
      */
-    public static class CreateSleuthkitNodeVisitor extends SleuthkitItemVisitor.Default<AbstractContentNode> {
+    public static class CreateSleuthkitNodeVisitor extends SleuthkitItemVisitor.Default<AbstractContentNode<? extends Content>> {
 
         @Override
-        public AbstractContentNode visit(Directory drctr) {
+        public AbstractContentNode<? extends Content> visit(Directory drctr) {
             return new DirectoryNode(drctr);
         }
 
         @Override
-        public AbstractContentNode visit(File file) {
+        public AbstractContentNode<? extends Content> visit(File file) {
             return new FileNode(file);
         }
 
         @Override
-        public AbstractContentNode visit(Image image) {
+        public AbstractContentNode<? extends Content> visit(Image image) {
             return new ImageNode(image);
         }
 
         @Override
-        public AbstractContentNode visit(Volume volume) {
+        public AbstractContentNode<? extends Content> visit(Volume volume) {
             return new VolumeNode(volume);
         }
 
         @Override
-        public AbstractContentNode visit(LayoutFile lf) {
+        public AbstractContentNode<? extends Content> visit(LayoutFile lf) {
             return new LayoutFileNode(lf);
         }
 
         @Override
-        public AbstractContentNode visit(DerivedFile df) {
+        public AbstractContentNode<? extends Content> visit(DerivedFile df) {
             return new LocalFileNode(df);
         }
 
         @Override
-        public AbstractContentNode visit(LocalFile lf) {
+        public AbstractContentNode<? extends Content> visit(LocalFile lf) {
             return new LocalFileNode(lf);
         }
 
         @Override
-        public AbstractContentNode visit(VirtualDirectory ld) {
+        public AbstractContentNode<? extends Content> visit(VirtualDirectory ld) {
             return new VirtualDirectoryNode(ld);
         }
 
         @Override
-        protected AbstractContentNode defaultVisit(SleuthkitVisitableItem di) {
-            throw new UnsupportedOperationException("No Node defined for the given SleuthkitItem");
+        protected AbstractContentNode<? extends Content> defaultVisit(SleuthkitVisitableItem di) {
+            throw new UnsupportedOperationException(NbBundle.getMessage(this.getClass(),
+                    "AbstractContentChildren.CreateTSKNodeVisitor.exception.noNodeMsg"));
         }
     }
 
@@ -149,12 +152,12 @@ abstract class AbstractContentChildren<T> extends Keys<T> {
         public AbstractNode visit(HashsetHits hh) {
             return hh.new HashsetHitsRootNode();
         }
-        
+
         @Override
         public AbstractNode visit(InterestingHits ih) {
             return ih.new InterestingHitsRootNode();
         }
-         
+
         @Override
         public AbstractNode visit(EmailExtracted ee) {
             return ee.new EmailExtractedRootNode();
@@ -186,7 +189,9 @@ abstract class AbstractContentChildren<T> extends Keys<T> {
 
         @Override
         protected AbstractNode defaultVisit(AutopsyVisitableItem di) {
-            throw new UnsupportedOperationException("No Node defined for the given DisplayableItem");
+            throw new UnsupportedOperationException(
+                    NbBundle.getMessage(this.getClass(),
+                    "AbstractContentChildren.createAutopsyNodeVisitor.exception.noNodeMsg"));
         }
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentNode.java
index cf16f2b07f..94d853c749 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractContentNode.java
@@ -20,6 +20,8 @@ package org.sleuthkit.autopsy.datamodel;
 
 import java.util.List;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.Content;
@@ -63,7 +65,8 @@ public abstract class AbstractContentNode<T extends Content> extends ContentNode
 
     @Override
     public void setName(String name) {
-        throw new UnsupportedOperationException("Can't change the system name.");
+        throw new UnsupportedOperationException(
+                NbBundle.getMessage(this.getClass(), "AbstractContentNode.exception.cannotChangeSysName.msg"));
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java
index 782541ca78..a93680cd79 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/AbstractFsContentNode.java
@@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.datamodel;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.AbstractFile;
 
@@ -73,14 +74,14 @@ public abstract class AbstractFsContentNode<T extends AbstractFile> extends Abst
 
         AbstractFilePropertyType[] fsTypes = AbstractFilePropertyType.values();
         final int FS_PROPS_LEN = fsTypes.length;
-        final String NO_DESCR = "no description";
+        final String NO_DESCR = NbBundle.getMessage(this.getClass(), "AbstractFsContentNode.noDesc.text");
         for (int i = 0; i < FS_PROPS_LEN; ++i) {
             final AbstractFilePropertyType propType = AbstractFilePropertyType.values()[i];
             final String propString = propType.toString();
-            ss.put(new NodeProperty(propString, propString, NO_DESCR, map.get(propString)));
+            ss.put(new NodeProperty<>(propString, propString, NO_DESCR, map.get(propString)));
         }
         if (directoryBrowseMode) {
-            ss.put(new NodeProperty(HIDE_PARENT, HIDE_PARENT, HIDE_PARENT, HIDE_PARENT));
+            ss.put(new NodeProperty<>(HIDE_PARENT, HIDE_PARENT, HIDE_PARENT, HIDE_PARENT));
         }
 
         return s;
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactStringContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactStringContent.java
index 12470453c1..088d18588b 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactStringContent.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactStringContent.java
@@ -22,6 +22,8 @@ import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.TimeZone;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardAttribute;
@@ -135,7 +137,9 @@ public class ArtifactStringContent implements StringContent {
                 //add file path
 
                 buffer.append("<tr>");
-                buffer.append("<td>Source File Path</td>");
+                buffer.append("<td>");
+                buffer.append(NbBundle.getMessage(this.getClass(), "ArtifactStringContent.getStr.srcFilePath.text"));
+                buffer.append("</td>");
                 buffer.append("<td>");
                 buffer.append(path);
                 buffer.append("</td>");
@@ -146,7 +150,7 @@ public class ArtifactStringContent implements StringContent {
                 
                 stringContent = buffer.toString();
             } catch (TskException ex) {
-                stringContent = "Error getting content";
+                stringContent = NbBundle.getMessage(this.getClass(), "ArtifactStringContent.getStr.err");
             }
         }
         
@@ -159,7 +163,7 @@ public class ArtifactStringContent implements StringContent {
         } catch (TskException ex) {
             logger.log(Level.WARNING, "Getting file failed", ex);
         }
-        throw new IllegalArgumentException("Couldn't get file from database");
+        throw new IllegalArgumentException(NbBundle.getMessage(ArtifactStringContent.class, "ArtifactStringContent.exception.msg"));
     }
 
     private static TimeZone getTimeZone(BlackboardArtifact artifact) {
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java
index f97fa2c6fc..960e0d6bd0 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ArtifactTypeNode.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");
@@ -18,10 +18,10 @@
  */
 package org.sleuthkit.autopsy.datamodel;
 
-import java.util.Map;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children;
 import org.openide.nodes.Sheet;
 import org.openide.util.lookup.Lookups;
@@ -30,8 +30,9 @@ import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskException;
 
 /**
- * Node encapsulating blackboard artifact type.  This is used on the left-hand navigation side of the Autopsy UI as the
- * parent node for all of the artifacts of a given type. Its children will be BlackboardArtifactNode objects. 
+ * Node encapsulating blackboard artifact type. This is used on the left-hand
+ * navigation side of the Autopsy UI as the parent node for all of the artifacts
+ * of a given type. Its children will be BlackboardArtifactNode objects.
  */
 public class ArtifactTypeNode extends DisplayableItemNode {
 
@@ -65,14 +66,14 @@ public class ArtifactTypeNode extends DisplayableItemNode {
             s.put(ss);
         }
 
-        ss.put(new NodeProperty("Artifact Type",
-                "Artifact Type",
-                "no description",
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ArtifactTypeNode.createSheet.artType.name"),
+                NbBundle.getMessage(this.getClass(), "ArtifactTypeNode.createSheet.artType.displayName"),
+                NbBundle.getMessage(this.getClass(), "ArtifactTypeNode.createSheet.artType.desc"),
                 type.getDisplayName()));
 
-        ss.put(new NodeProperty("Child Count",
-                "Child Count",
-                "no description",
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ArtifactTypeNode.createSheet.childCnt.name"),
+                NbBundle.getMessage(this.getClass(), "ArtifactTypeNode.createSheet.childCnt.displayName"),
+                NbBundle.getMessage(this.getClass(), "ArtifactTypeNode.createSheet.childCnt.desc"),
                 childCount));
 
         return s;
@@ -127,7 +128,7 @@ public class ArtifactTypeNode extends DisplayableItemNode {
             case TSK_ENCRYPTION_DETECTED:
                 return "encrypted-file.png";
             case TSK_EXT_MISMATCH_DETECTED:
-                return "mismatch-16.png";                
+                return "mismatch-16.png";
         }
         return "artifact-icon.png";
     }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
index 2178d3be0e..c03cfae66e 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.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,6 +24,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.openide.nodes.Children;
 import org.openide.nodes.Sheet;
@@ -46,7 +48,7 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
 
     private BlackboardArtifact artifact;
     private Content associated;
-    private List<NodeProperty> customProperties;
+    private List<NodeProperty<? extends Object>> customProperties;
     static final Logger logger = Logger.getLogger(BlackboardArtifactNode.class.getName());
     /**
      * Artifact types which should have the associated content's full unique path
@@ -103,18 +105,18 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
             ss = Sheet.createPropertiesSet();
             s.put(ss);
         }
-        final String NO_DESCR = "no description";
+        final String NO_DESCR = NbBundle.getMessage(this.getClass(), "BlackboardArtifactNode.noDesc.text");
 
-        Map<String, Object> map = new LinkedHashMap<String, Object>();
+        Map<String, Object> map = new LinkedHashMap<>();
         fillPropertyMap(map, artifact);
 
-        ss.put(new NodeProperty("Source File",
-                "Source File",
-                NO_DESCR,
-                associated.getName()));
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "BlackboardArtifactNode.createSheet.srcFile.name"),
+                                NbBundle.getMessage(this.getClass(), "BlackboardArtifactNode.createSheet.srcFile.displayName"),
+                                NO_DESCR,
+                                associated.getName()));
 
         for (Map.Entry<String, Object> entry : map.entrySet()) {
-            ss.put(new NodeProperty(entry.getKey(),
+            ss.put(new NodeProperty<>(entry.getKey(),
                     entry.getKey(),
                     NO_DESCR,
                     entry.getValue()));
@@ -122,7 +124,7 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
 
         //append custom node properties
         if (customProperties != null) {
-            for (NodeProperty np : customProperties) {
+            for (NodeProperty<? extends Object> np : customProperties) {
                 ss.put(np);
             }
         }
@@ -135,7 +137,10 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
                 AbstractFile af = (AbstractFile) associated;
                 ext = af.getNameExtension();
             }
-            ss.put(new NodeProperty("Extension", "Extension", NO_DESCR, ext));
+            ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "BlackboardArtifactNode.createSheet.ext.name"),
+                                    NbBundle.getMessage(this.getClass(), "BlackboardArtifactNode.createSheet.ext.displayName"),
+                                    NO_DESCR,
+                                    ext));
             
             try {
                 String actualMimeType = "";
@@ -151,7 +156,11 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
                 if (actualMimeType.isEmpty()) {
                     logger.log(Level.WARNING, "Could not find expected TSK_FILE_TYPE_SIG attribute.");
                 } else {
-                    ss.put(new NodeProperty("MIME Type", "MIME Type", NO_DESCR, actualMimeType));
+                    ss.put(new NodeProperty<>(
+                            NbBundle.getMessage(this.getClass(), "BlackboardArtifactNode.createSheet.mimeType.name"),
+                            NbBundle.getMessage(this.getClass(), "BlackboardArtifactNode.createSheet.mimeType.displayName"),
+                            NO_DESCR,
+                            actualMimeType));
                 }
             } catch (TskCoreException ex) {
                 logger.log(Level.WARNING, "Error while searching for TSK_FILE_TYPE_SIG attribute: ", ex);
@@ -163,12 +172,15 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
             try {
                 sourcePath = associated.getUniquePath();
             } catch (TskCoreException ex) {
-                logger.log(Level.WARNING, "Failed to get unique path from: " + associated.getName());
+                logger.log(Level.WARNING, "Failed to get unique path from: {0}", associated.getName());
             }
 
             if (sourcePath.isEmpty() == false) {
-                ss.put(new NodeProperty("File Path", "File Path", 
-                        NO_DESCR, sourcePath));
+                ss.put(new NodeProperty<>(
+                        NbBundle.getMessage(this.getClass(), "BlackboardArtifactNode.createSheet.filePath.name"),
+                        NbBundle.getMessage(this.getClass(), "BlackboardArtifactNode.createSheet.filePath.displayName"),
+                        NO_DESCR,
+                        sourcePath));
             }
         } else {
             String dataSource = "";
@@ -180,12 +192,15 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
                     dataSource = getRootParentName();
                 }
             } catch (TskCoreException ex) {
-                logger.log(Level.WARNING, "Failed to get image name from " + associated.getName());
+                logger.log(Level.WARNING, "Failed to get image name from {0}", associated.getName());
             }
             
             if (dataSource.isEmpty() == false) {
-                ss.put(new NodeProperty("Data Source", "Data Source",
-                        NO_DESCR, dataSource));
+                ss.put(new NodeProperty<>(
+                        NbBundle.getMessage(this.getClass(), "BlackboardArtifactNode.createSheet.dataSrc.name"),
+                        NbBundle.getMessage(this.getClass(), "BlackboardArtifactNode.createSheet.dataSrc.displayName"),
+                        NO_DESCR,
+                        dataSource));
             }
         }
 
@@ -200,7 +215,7 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
                 parentName = parent.getName();
             }
         } catch (TskCoreException ex) {
-            logger.log(Level.WARNING, "Failed to get parent name from " + associated.getName());
+            logger.log(Level.WARNING, "Failed to get parent name from {0}", associated.getName());
             return "";
         }
         return parentName;
@@ -212,10 +227,10 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
      *
      * @param np NodeProperty to add
      */
-    public void addNodeProperty(NodeProperty np) {
+    public <T> void addNodeProperty(NodeProperty<T> np) {
         if (customProperties == null) {
             //lazy create the list
-            customProperties = new ArrayList<NodeProperty>();
+            customProperties = new ArrayList<>();
         }
         customProperties.add(np);
 
@@ -282,7 +297,7 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
     private static Lookup getLookups(BlackboardArtifact artifact) {
         Content content = getAssociatedContent(artifact);
         HighlightLookup highlight = getHighlightLookup(artifact, content);
-        List<Object> forLookup = new ArrayList<Object>();
+        List<Object> forLookup = new ArrayList<>();
         forLookup.add(artifact);
         if (content != null) {
             forLookup.add(content);
@@ -300,7 +315,8 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
         } catch (TskException ex) {
             logger.log(Level.WARNING, "Getting file failed", ex);
         }
-        throw new IllegalArgumentException("Couldn't get file from database");
+        throw new IllegalArgumentException(
+                NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.getAssocCont.exception.msg"));
     }
 
     private static HighlightLookup getHighlightLookup(BlackboardArtifact artifact, Content content) {
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactTagNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactTagNode.java
index 3503776324..e390c90550 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactTagNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactTagNode.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  * 
- * Copyright 2013 Basis Technology Corp.
+ * Copyright 2013-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,6 +24,7 @@ import java.util.logging.Logger;
 import javax.swing.Action;
 import org.openide.nodes.Children;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.autopsy.actions.DeleteBlackboardArtifactTagAction;
 import org.sleuthkit.datamodel.BlackboardArtifactTag;
@@ -31,14 +32,15 @@ import org.sleuthkit.datamodel.TskCoreException;
 
 /**
  * Instances of this class wrap BlackboardArtifactTag objects. In the Autopsy
- * presentation of the SleuthKit data model, they are leaf nodes of a sub-tree 
- * organized as follows: there is a tags root node with tag name child nodes; 
- * tag name nodes have tag type child nodes; tag type nodes are the parents of 
+ * presentation of the SleuthKit data model, they are leaf nodes of a sub-tree
+ * organized as follows: there is a tags root node with tag name child nodes;
+ * tag name nodes have tag type child nodes; tag type nodes are the parents of
  * either content or blackboard artifact tag nodes.
  */
-public class BlackboardArtifactTagNode  extends DisplayableItemNode {  
+public class BlackboardArtifactTagNode extends DisplayableItemNode {
+
     private static final String ICON_PATH = "org/sleuthkit/autopsy/images/green-tag-icon-16.png";
-    private final BlackboardArtifactTag tag; 
+    private final BlackboardArtifactTag tag;
 
     public BlackboardArtifactTagNode(BlackboardArtifactTag tag) {
         super(Children.LEAF, Lookups.fixed(tag, tag.getArtifact(), tag.getContent()));
@@ -57,19 +59,34 @@ public class BlackboardArtifactTagNode  extends DisplayableItemNode {
             propertySheet.put(properties);
         }
 
-        properties.put(new NodeProperty("Source File", "Source File", "", tag.getContent().getName()));
-        String contentPath; 
+        properties.put(new NodeProperty<>(
+                NbBundle.getMessage(this.getClass(), "BlackboardArtifactTagNode.createSheet.srcFile.text"),
+                NbBundle.getMessage(this.getClass(), "BlackboardArtifactTagNode.createSheet.srcFile.text"),
+                "",
+                tag.getContent().getName()));
+        String contentPath;
         try {
             contentPath = tag.getContent().getUniquePath();
+        } catch (TskCoreException ex) {
+            Logger.getLogger(ContentTagNode.class.getName()).log(Level.SEVERE, "Failed to get path for content (id = " + tag.getContent().getId() + ")", ex);
+            contentPath = NbBundle.getMessage(this.getClass(), "BlackboardArtifactTagNode.createSheet.unavail.text");
         }
-        catch (TskCoreException ex) {
-            Logger.getLogger(ContentTagNode.class.getName()).log(Level.SEVERE, "Failed to get path for content (id = " + tag.getContent().getId() + ")", ex);                    
-            contentPath = "Unavailable";
-        }
-        properties.put(new NodeProperty("Source File Path", "Source File Path", "", contentPath));        
-        properties.put(new NodeProperty("Result Type", "Result Type", "", tag.getArtifact().getDisplayName()));
-        properties.put(new NodeProperty("Comment", "Comment", "", tag.getComment()));
-                
+        properties.put(new NodeProperty<>(
+                NbBundle.getMessage(this.getClass(), "BlackboardArtifactTagNode.createSheet.srcFilePath.text"),
+                NbBundle.getMessage(this.getClass(), "BlackboardArtifactTagNode.createSheet.srcFilePath.text"),
+                "",
+                contentPath));
+        properties.put(new NodeProperty<>(
+                NbBundle.getMessage(this.getClass(), "BlackboardArtifactTagNode.createSheet.resultType.text"),
+                NbBundle.getMessage(this.getClass(), "BlackboardArtifactTagNode.createSheet.resultType.text"),
+                "",
+                tag.getArtifact().getDisplayName()));
+        properties.put(new NodeProperty<>(
+                NbBundle.getMessage(this.getClass(), "BlackboardArtifactTagNode.createSheet.comment.text"),
+                NbBundle.getMessage(this.getClass(), "BlackboardArtifactTagNode.createSheet.comment.text"),
+                "",
+                tag.getComment()));
+
         return propertySheet;
     }
 
@@ -79,8 +96,8 @@ public class BlackboardArtifactTagNode  extends DisplayableItemNode {
         actions.add(null); // Adds a menu item separator.         
         actions.add(DeleteBlackboardArtifactTagAction.getInstance());
         return actions.toArray(new Action[0]);
-    }    
-        
+    }
+
     @Override
     public <T> T accept(DisplayableItemNodeVisitor<T> v) {
         return v.visit(this);
@@ -89,6 +106,5 @@ public class BlackboardArtifactTagNode  extends DisplayableItemNode {
     @Override
     public boolean isLeafTypeNode() {
         return true;
-    }    
+    }
 }
-
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties b/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties
index cd313e7b75..a14b5f8d58 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties
@@ -1 +1,254 @@
 OpenIDE-Module-Name=DataModel
+AbstractAbstractFileNode.nameColLbl=Name
+AbstractAbstractFileNode.locationColLbl=Location
+AbstractAbstractFileNode.modifiedTimeColLbl=Modified Time
+AbstractAbstractFileNode.changeTimeColLbl=Change Time
+AbstractAbstractFileNode.accessTimeColLbl=Access Time
+AbstractAbstractFileNode.createdTimeColLbl=Created Time
+AbstractAbstractFileNode.sizeColLbl=Size
+AbstractAbstractFileNode.flagsDirColLbl=Flags(Dir)
+AbstractAbstractFileNode.flagsMetaColLbl=Flags(Meta)
+AbstractAbstractFileNode.modeColLbl=Mode
+AbstractAbstractFileNode.useridColLbl=UserID
+AbstractAbstractFileNode.groupidColLbl=GroupID
+AbstractAbstractFileNode.metaAddrColLbl=Meta Addr.
+AbstractAbstractFileNode.attrAddrColLbl=Attr. Addr.
+AbstractAbstractFileNode.typeDirColLbl=Type(Dir)
+AbstractAbstractFileNode.typeMetaColLbl=Type(Meta)
+AbstractAbstractFileNode.knownColLbl=Known
+AbstractAbstractFileNode.inHashsetsColLbl=In Hashsets
+AbstractAbstractFileNode.md5HashColLbl=MD5 Hash
+AbstractContentChildren.CreateTSKNodeVisitor.exception.noNodeMsg=No Node defined for the given SleuthkitItem
+AbstractContentChildren.createAutopsyNodeVisitor.exception.noNodeMsg=No Node defined for the given DisplayableItem
+AbstractContentNode.exception.cannotChangeSysName.msg=Can't change the system name.
+AbstractFsContentNode.noDesc.text=no description
+ArtifactStringContent.getStr.srcFilePath.text=Source File Path
+ArtifactStringContent.getStr.err=Error getting content
+ArtifactStringContent.exception.msg=Couldn't get file from database
+ArtifactTypeNode.createSheet.artType.name=Artifact Type
+ArtifactTypeNode.createSheet.artType.displayName=Artifact Type
+ArtifactTypeNode.createSheet.artType.desc=no description
+ArtifactTypeNode.createSheet.childCnt.name=Child Count
+ArtifactTypeNode.createSheet.childCnt.displayName=Child Count
+ArtifactTypeNode.createSheet.childCnt.desc=no description
+BlackboardArtifactNode.noDesc.text=no description
+BlackboardArtifactNode.createSheet.srcFile.name=Source File
+BlackboardArtifactNode.createSheet.srcFile.displayName=Source File
+BlackboardArtifactNode.createSheet.ext.name=Extension
+BlackboardArtifactNode.createSheet.ext.displayName=Extension
+BlackboardArtifactNode.createSheet.mimeType.name=MIME Type
+BlackboardArtifactNode.createSheet.mimeType.displayName=MIME Type
+BlackboardArtifactNode.createSheet.filePath.name=File Path
+BlackboardArtifactNode.createSheet.filePath.displayName=File Path
+BlackboardArtifactNode.createSheet.dataSrc.name=Data Source
+BlackboardArtifactNode.createSheet.dataSrc.displayName=Data Source
+BlackboardArtifactNode.getAssocCont.exception.msg=Couldn't get file from database
+BlackboardArtifactTagNode.createSheet.srcFile.text=Source File
+BlackboardArtifactTagNode.createSheet.unavail.text=Unavailable
+BlackboardArtifactTagNode.createSheet.srcFilePath.text=Source File Path
+BlackboardArtifactTagNode.createSheet.resultType.text=Result Type
+BlackboardArtifactTagNode.createSheet.comment.text=Comment
+ContentTagNode.createSheet.file.name=File
+ContentTagNode.createSheet.file.displayName=File
+ContentTagNode.createSheet.unavail.path=Unavailable
+ContentTagNode.createSheet.filePath.name=File Path
+ContentTagNode.createSheet.filePath.displayName=File Path
+ContentTagNode.createSheet.comment.name=Comment
+ContentTagNode.createSheet.comment.displayName=Comment
+ContentTagTypeNode.displayName.text=File Tags
+ContentTagTypeNode.createSheet.name.name=Name
+ContentTagTypeNode.createSheet.name.displayName=Name
+ContentUtils.exception.msg=Can't extract a {0}
+DataModelActionsFactory.srcFileInDir.text=View Source File in Directory
+DataModelActionsFactory.fileInDir.text=View File in Directory
+DataModelActionsFactory.viewNewWin.text=View in New Window
+DataModelActionsFactory.openExtViewer.text=Open in External Viewer
+DataModelActionsFactory.srfFileSameMD5.text=Search for files with the same MD5 hash
+DataSourcesNode.name=Data Sources
+DataSourcesNode.createSheet.name.name=Name
+DataSourcesNode.createSheet.name.displayName=Name
+DataSourcesNode.createSheet.name.desc=no description
+DeletedContent.fsDelFilter.text=File System
+DeletedContent.allDelFilter.text=All
+DeletedContent.deletedContentsNode.name=Deleted Files
+DeletedContent.createSheet.name.name=Name
+DeletedContent.createSheet.name.displayName=Name
+DeletedContent.createSheet.name.desc=no description
+DeletedContent.createSheet.filterType.name=Filter Type
+DeletedContent.createSheet.filterType.displayName=Filter Type
+DeletedContent.createSheet.filterType.desc=no description
+DeletedContent.createKeys.maxObjects.msg=There are more Deleted Files than can be displayed. Only the first {0} Deleted Files will be shown.
+DeletedContent.createNodeForKey.typeNotSupported.msg=Not supported for this type of Displayable Item\: {0}
+DirectoryNode.parFolder.text=[parent folder]
+DirectoryNode.curFolder.text=[current folder]
+DirectoryNode.getActions.viewFileInDir.text=View File in Directory
+DirectoryNode.viewInNewWin.text=View in New Window
+EmailExtracted.mailAccount.text=Account
+EmailExtracted.mailFolder.text=Folder
+EmailExtracted.defaultAcct.text=Default
+EmailExtracted.defaultFolder.text=Default
+EmailExtracted.createSheet.name.name=Name
+EmailExtracted.createSheet.name.displayName=Name
+EmailExtracted.createSheet.name.desc=no description
+ExtractedContentNode.name.text=Extracted Content
+ExtractedContentNode.createSheet.name.name=Name
+ExtractedContentNode.createSheet.name.displayName=Name
+ExtractedContentNode.createSheet.name.desc=no description
+FileNode.viewFileInDir.text=View File in Directory
+FileNode.getActions.viewInNewWin.text=View in New Window
+FileNode.getActions.openInExtViewer.text=Open in External Viewer
+FileNode.getActions.searchFilesSameMD5.text=Search for files with the same MD5 hash
+FileSize.fileSizeRootNode.name=File Size
+FileSize.createSheet.name.name=Name
+FileSize.createSheet.name.displayName=Name
+FileSize.createSheet.name.desc=no description
+FileSize.createSheet.filterType.name=Filter Type
+FileSize.createSheet.filterType.displayName=Filter Type
+FileSize.createSheet.filterType.desc=no description
+FileSize.exception.notSupported.msg=Not supported for this type of Displayable Item\: {0}
+FileTypeChildren.exception.notSupported.msg=Not supported for this type of Displayable Item\: {0}
+FileTypeExtensionFilters.tskImgFilter.text=Images
+FileTypeExtensionFilters.tskVideoFilter.text=Videos
+FileTypeExtensionFilters.tskAudioFilter.text=Audio
+FileTypeExtensionFilters.tskArchiveFilter.text=Archives
+FileTypeExtensionFilters.tskDocumentFilter.text=Documents
+FileTypeExtensionFilters.tskExecFilter.text=Executable
+FileTypeExtensionFilters.autDocHtmlFilter.text=HTML
+FileTypeExtensionFilters.autDocOfficeFilter.text=Office
+FileTypeExtensionFilters.autoDocPdfFilter.text=PDF
+FileTypeExtensionFilters.autDocTxtFilter.text=Plain Text
+FileTypeExtensionFilters.autDocRtfFilter.text=Rich Text
+FileTypeNode.createSheet.filterType.name=Filter Type
+FileTypeNode.createSheet.filterType.displayName=Filter Type
+FileTypeNode.createSheet.filterType.desc=no description
+FileTypeNode.createSheet.fileExt.name=File Extensions
+FileTypeNode.createSheet.fileExt.displayName=File Extensions
+FileTypeNode.createSheet.fileExt.desc=no description
+FileTypesNode.fname.text=File Types
+FileTypesNode.createSheet.name.name=Name
+FileTypesNode.createSheet.name.displayName=Name
+FileTypesNode.createSheet.name.desc=no description
+HashsetHits.createSheet.name.name=Name
+HashsetHits.createSheet.name.displayName=Name
+HashsetHits.createSheet.name.desc=no description
+ImageNode.getActions.viewInNewWin.text=View in New Window
+ImageNode.getActions.openFileSearchByAttr.text=Open File Search by Attributes
+ImageNode.createSheet.name.name=Name
+ImageNode.createSheet.name.displayName=Name
+ImageNode.createSheet.name.desc=no description
+Installer.exception.tskVerStringNull.msg=Sleuth Kit JNI test call returned without error, but version string was null\!
+Installer.exception.taskVerStringBang.msg=Sleuth Kit JNI test call returned without error, but version string was ""\!
+Installer.tskLibErr.msg=Problem with Sleuth Kit JNI. Test call failed\!\
+\
+Details\: {0}
+Installer.tskLibErr.err=Fatal Error\!
+InterestingHits.interestingItems.text=INTERESTING ITEMS
+InterestingHits.displayName.text=Interesting Items
+InterestingHits.createSheet.name.name=Name
+InterestingHits.createSheet.name.displayName=Name
+InterestingHits.createSheet.name.desc=no description
+KeyValueNode.createSheet.name.name=Name
+KeyValueNode.createSheet.name.displayName=Name
+KeyValueNode.createSheet.name.desc=n/a
+KeyValueNode.createSheet.map.desc=n/a
+KeywordHits.kwHits.text=Keyword Hits
+KeywordHits.simpleLiteralSearch.text=Single Literal Keyword Search
+KeywordHits.singleRegexSearch.text=Single Regular Expression Search
+KeywordHits.createSheet.name.name=Name
+KeywordHits.createSheet.name.displayName=Name
+KeywordHits.createSheet.name.desc=no description
+KeywordHits.createSheet.listName.name=List Name
+KeywordHits.createSheet.listName.displayName=List Name
+KeywordHits.createSheet.listName.desc=no description
+KeywordHits.createSheet.numChildren.name=Number of Children
+KeywordHits.createSheet.numChildren.displayName=Number of Children
+KeywordHits.createSheet.numChildren.desc=no description
+KeywordHits.createSheet.filesWithHits.name=Files with Hits
+KeywordHits.createSheet.filesWithHits.displayName=Files with Hits
+KeywordHits.createSheet.filesWithHits.desc=no description
+KeywordHits.createNodeForKey.modTime.displayName=Modified Time
+KeywordHits.createNodeForKey.modTime.desc=Modified Time
+KeywordHits.createNodeForKey.accessTime.displayName=Access Time
+KeywordHits.createNodeForKey.accessTime.desc=Access Time
+KeywordHits.createNodeForKey.chgTime.displayName=Change Time
+KeywordHits.createNodeForKey.chgTime.desc=Change Time
+KeywordHits.createNodeForKey.chgTime.name=ChangeTime
+KeywordHits.createNodeForKey.accessTime.name=AccessTime
+KeywordHits.createNodeForKey.modTime.name=ModifiedTime
+KnownFileFilterNode.selectionContext.dataSources=Data Sources
+KnownFileFilterNode.selectionContext.views=Views
+LayoutFileNode.propertyType.parts=Parts
+LayoutFileNode.createSheet.name.name=Name
+LayoutFileNode.createSheet.name.displayName=Name
+LayoutFileNode.createSheet.name.desc=no description
+LayoutFileNode.createSheet.noDescr.text=no description
+LayoutFileNode.getActions.viewInNewWin.text=View in New Window
+LayoutFileNode.getActions.openInExtViewer.text=Open in External Viewer
+LocalFileNode.createSheet.name.name=Name
+LocalFileNode.createSheet.name.displayName=Name
+LocalFileNode.createSheet.name.desc=no description
+LocalFileNode.createSheet.noDescr.text=no description
+LocalFileNode.getActions.viewInNewWin.text=View in New Window
+LocalFileNode.getActions.openInExtViewer.text=Open in External Viewer
+LocalFileNode.getActions.searchFilesSameMd5.text=Search for files with the same MD5 hash
+RecentFiles.aut0DayFilter.displayName.text=Final Day
+RecentFiles.aut1dayFilter.displayName.text=Final Day - 1
+RecentFiles.aut2dayFilter.displayName.text=Final Day - 2
+RecentFiles.aut3dayFilter.displayName.text=Final Day - 3
+RecentFiles.aut4dayFilter.displayName.text=Final Day - 4
+RecentFiles.aut5dayFilter.displayName.text=Final Day - 5
+RecentFiles.aut6dayFilter.displayName.text=Final Day - 6
+RecentFilesFilterChildren.exception.defaultVisit.msg=Not supported for this type of Displayable Item\: {0}
+RecentFilesFilterNode.createSheet.filterType.name=Filter Type
+RecentFilesFilterNode.createSheet.filterType.displayName=Filter Type
+RecentFilesFilterNode.createSheet.filterType.desc=no description
+RecentFilesNode.createSheet.name.name=Name
+RecentFilesNode.createSheet.name.displayName=Name
+RecentFilesNode.createSheet.name.desc=no description
+RecentFilesNode.name.text=Recent Files
+ResultsNode.name.text=Results
+ResultsNode.createSheet.name.name=Name
+ResultsNode.createSheet.name.displayName=Name
+ResultsNode.createSheet.name.desc=no description
+TagNameNode.namePlusTags.text={0} Tags
+TagNameNode.contentTagTypeNodeKey.text=Content Tags
+TagNameNode.bbArtTagTypeNodeKey.text=Result Tags
+TagNameNode.bookmark.text=Bookmark
+TagNameNode.createSheet.name.name=Name
+TagNameNode.createSheet.name.displayName=Name
+TagsNode.displayName.text=Tags
+TagsNode.createSheet.name.name=Name
+TagsNode.createSheet.name.displayName=Name
+ViewsNode.name.text=Views
+ViewsNode.createSheet.name.name=Name
+ViewsNode.createSheet.name.displayName=Name
+ViewsNode.createSheet.name.desc=no description
+VirtualDirectoryNode.getActions.viewInNewWin.text=View in New Window
+VirtualDirectoryNode.createSheet.name.name=Name
+VirtualDirectoryNode.createSheet.name.displayName=Name
+VirtualDirectoryNode.createSheet.name.desc=no description
+VirtualDirectoryNode.createSheet.noDesc=no description
+VolumeNode.getActions.viewInNewWin.text=View in New Window
+VolumeNode.createSheet.name.name=Name
+VolumeNode.createSheet.name.displayName=Name
+VolumeNode.createSheet.name.desc=no description
+VolumeNode.createSheet.id.name=ID
+VolumeNode.createSheet.id.displayName=ID
+VolumeNode.createSheet.id.desc=no description
+VolumeNode.createSheet.startSector.name=Starting Sector
+VolumeNode.createSheet.startSector.displayName=Starting Sector
+VolumeNode.createSheet.startSector.desc=no description
+VolumeNode.createSheet.lenSectors.name=Length in Sectors
+VolumeNode.createSheet.lenSectors.displayName=Length in Sectors
+VolumeNode.createSheet.lenSectors.desc=no description
+VolumeNode.createSheet.description.name=Description
+VolumeNode.createSheet.description.displayName=Description
+VolumeNode.createSheet.description.desc=no description
+VolumeNode.createSheet.flags.name=Flags
+VolumeNode.createSheet.flags.displayName=Flags
+VolumeNode.createSheet.flags.desc=no description
+
+
+
+
+
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/datamodel/Bundle_ja.properties
new file mode 100644
index 0000000000..3f672341fa
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/Bundle_ja.properties
@@ -0,0 +1,249 @@
+OpenIDE-Module-Name=\u30C7\u30FC\u30BF\u30E2\u30C7\u30EB
+AbstractAbstractFileNode.nameColLbl=\u540D\u79F0
+AbstractAbstractFileNode.locationColLbl=\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3
+AbstractAbstractFileNode.modifiedTimeColLbl=\u4FEE\u6B63\u65E5\u6642
+AbstractAbstractFileNode.changeTimeColLbl=\u5909\u66F4\u65E5\u6642
+AbstractAbstractFileNode.accessTimeColLbl=\u30A2\u30AF\u30BB\u30B9\u65E5\u6642
+AbstractAbstractFileNode.createdTimeColLbl=\u4F5C\u6210\u65E5\u6642
+AbstractAbstractFileNode.sizeColLbl=\u30B5\u30A4\u30BA
+AbstractAbstractFileNode.modeColLbl=\u30E2\u30FC\u30C9
+AbstractAbstractFileNode.useridColLbl=\u30E6\u30FC\u30B6ID
+AbstractAbstractFileNode.groupidColLbl=\u30B0\u30EB\u30FC\u30D7ID
+AbstractAbstractFileNode.knownColLbl=\u65E2\u77E5
+AbstractAbstractFileNode.inHashsetsColLbl=HashSet\u306B\u5B58\u5728
+AbstractAbstractFileNode.md5HashColLbl=MD5\u30CF\u30C3\u30B7\u30E5
+AbstractContentChildren.CreateTSKNodeVisitor.exception.noNodeMsg=\u6307\u5B9A\u3055\u308C\u305FSleuthkitItem\u306E\u30CE\u30FC\u30C9\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+AbstractContentChildren.createAutopsyNodeVisitor.exception.noNodeMsg=\u6307\u5B9A\u3055\u308C\u305F\u8868\u793A\u53EF\u80FD\u306A\u30A2\u30A4\u30C6\u30E0\u306E\u30CE\u30FC\u30C9\u304C\u5B9A\u7FA9\u3055\u308C\u3066\u3044\u307E\u305B\u3093
+AbstractContentNode.exception.cannotChangeSysName.msg=\u30B7\u30B9\u30C6\u30E0\u540D\u3092\u5909\u66F4\u3067\u304D\u307E\u305B\u3093\u3002
+AbstractFsContentNode.noDesc.text=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+ArtifactStringContent.getStr.srcFilePath.text=\u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9
+ArtifactStringContent.getStr.err=\u30B3\u30F3\u30C6\u30F3\u30C4\u5165\u624B\u30A8\u30E9\u30FC
+ArtifactStringContent.exception.msg=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304B\u3089\u30D5\u30A1\u30A4\u30EB\u3092\u5165\u624B\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+ArtifactTypeNode.createSheet.artType.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+ArtifactTypeNode.createSheet.childCnt.name=\u30C1\u30E3\u30A4\u30EB\u30C9\u6570
+ArtifactTypeNode.createSheet.childCnt.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+BlackboardArtifactNode.noDesc.text=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+BlackboardArtifactNode.createSheet.srcFile.name=\u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB
+BlackboardArtifactNode.createSheet.srcFile.displayName=\u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB
+BlackboardArtifactNode.createSheet.ext.name=\u62E1\u5F35\u5B50
+BlackboardArtifactNode.createSheet.ext.displayName=\u62E1\u5F35\u5B50
+BlackboardArtifactNode.createSheet.mimeType.name=MIME\u30BF\u30A4\u30D7
+BlackboardArtifactNode.createSheet.mimeType.displayName=MIME\u30BF\u30A4\u30D7
+BlackboardArtifactNode.createSheet.filePath.name=\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9
+BlackboardArtifactNode.createSheet.filePath.displayName=\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9
+BlackboardArtifactNode.createSheet.dataSrc.name=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9
+BlackboardArtifactNode.createSheet.dataSrc.displayName=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9
+BlackboardArtifactNode.getAssocCont.exception.msg=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304B\u3089\u30D5\u30A1\u30A4\u30EB\u3092\u5165\u624B\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+BlackboardArtifactTagNode.createSheet.srcFile.text=\u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB
+BlackboardArtifactTagNode.createSheet.unavail.text=\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+BlackboardArtifactTagNode.createSheet.srcFilePath.text=\u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9
+BlackboardArtifactTagNode.createSheet.resultType.text=\u7D50\u679C\u30BF\u30A4\u30D7
+BlackboardArtifactTagNode.createSheet.comment.text=\u30B3\u30E1\u30F3\u30C8
+ContentTagNode.createSheet.file.name=\u30D5\u30A1\u30A4\u30EB
+ContentTagNode.createSheet.file.displayName=\u30D5\u30A1\u30A4\u30EB
+ContentTagNode.createSheet.unavail.path=\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
+ContentTagNode.createSheet.filePath.name=\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9
+ContentTagNode.createSheet.filePath.displayName=\u30D5\u30A1\u30A4\u30EB\u30D1\u30B9
+ContentTagNode.createSheet.comment.name=\u30B3\u30E1\u30F3\u30C8
+ContentTagNode.createSheet.comment.displayName=\u30B3\u30E1\u30F3\u30C8
+ContentTagTypeNode.displayName.text=\u30D5\u30A1\u30A4\u30EB\u30BF\u30B0
+ContentTagTypeNode.createSheet.name.name=\u540D\u79F0
+ContentTagTypeNode.createSheet.name.displayName=\u540D\u79F0
+ContentUtils.exception.msg={0}\u3092\u62BD\u51FA\u3067\u304D\u307E\u305B\u3093
+DataModelActionsFactory.srcFileInDir.text=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u5185\u306E\u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u3092\u8868\u793A
+DataModelActionsFactory.fileInDir.text=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u5185\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u8868\u793A
+DataModelActionsFactory.viewNewWin.text=\u65B0\u898F\u30A6\u30A3\u30F3\u30C9\u30A6\u306B\u8868\u793A
+DataModelActionsFactory.openExtViewer.text=\u5916\u90E8\u30D3\u30E5\u30FC\u30A2\u306B\u8868\u793A
+DataModelActionsFactory.srfFileSameMD5.text=\u540C\u3058MD5\u30CF\u30C3\u30B7\u30E5\u3092\u6301\u3064\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22
+DataSourcesNode.name=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9
+DataSourcesNode.createSheet.name.name=\u540D\u79F0
+DataSourcesNode.createSheet.name.displayName=\u540D\u79F0
+DataSourcesNode.createSheet.name.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+DeletedContent.fsDelFilter.text=\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0
+DeletedContent.allDelFilter.text=\u3059\u3079\u3066
+DeletedContent.deletedContentsNode.name=\u524A\u9664\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB
+DeletedContent.createSheet.name.name=\u540D\u79F0
+DeletedContent.createSheet.name.displayName=\u540D\u79F0
+DeletedContent.createSheet.name.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+DeletedContent.createSheet.filterType.name=\u30D5\u30A1\u30A4\u30EB\u30BF\u30FC\u30BF\u30A4\u30D7
+DeletedContent.createSheet.filterType.displayName=\u30D5\u30A3\u30EB\u30BF\u30FC\u30BF\u30A4\u30D7
+DeletedContent.createSheet.filterType.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+DeletedContent.createKeys.maxObjects.msg=\u8868\u793A\u53EF\u80FD\u306A\u6570\u3088\u308A\u3082\u591A\u304F\u306E\u524A\u9664\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u304C\u5B58\u5728\u3057\u307E\u3059\u3002\u6700\u521D\u306E{0}\u306E\u524A\u9664\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u304C\u8868\u793A\u3055\u308C\u307E\u3059\u3002
+DeletedContent.createNodeForKey.typeNotSupported.msg=\u3053\u306E\u30BF\u30A4\u30D7\u306E\u8868\u793A\u53EF\u80FD\u306A\u30A2\u30A4\u30C6\u30E0\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\uFF1A{0}
+DirectoryNode.parFolder.text=[\u30DA\u30A2\u30EC\u30F3\u30C8\u30D5\u30A9\u30EB\u30C0\u30FC]
+DirectoryNode.curFolder.text=[\u73FE\u5728\u306E\u30D5\u30A9\u30EB\u30C0\u30FC]
+DirectoryNode.getActions.viewFileInDir.text=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u5185\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u8868\u793A
+DirectoryNode.viewInNewWin.text=\u65B0\u898F\u30A6\u30A3\u30F3\u30C9\u30A6\u306B\u8868\u793A
+EmailExtracted.mailAccount.text=\u30A2\u30AB\u30A6\u30F3\u30C8
+EmailExtracted.mailFolder.text=\u30D5\u30A9\u30EB\u30C0\u30FC
+EmailExtracted.defaultAcct.text=\u30C7\u30D5\u30A9\u30EB\u30C8
+EmailExtracted.defaultFolder.text=\u30C7\u30D5\u30A9\u30EB\u30C8
+EmailExtracted.createSheet.name.name=\u540D\u79F0
+EmailExtracted.createSheet.name.displayName=\u540D\u79F0
+EmailExtracted.createSheet.name.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+ExtractedContentNode.name.text=\u62BD\u51FA\u3055\u308C\u305F\u30B3\u30F3\u30C6\u30F3\u30C4
+ExtractedContentNode.createSheet.name.name=\u540D\u79F0
+ExtractedContentNode.createSheet.name.displayName=\u540D\u79F0
+ExtractedContentNode.createSheet.name.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+FileNode.viewFileInDir.text=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u5185\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u8868\u793A
+FileNode.getActions.viewInNewWin.text=\u65B0\u898F\u30A6\u30A3\u30F3\u30C9\u30A6\u306B\u8868\u793A
+FileNode.getActions.openInExtViewer.text=\u5916\u90E8\u30D3\u30E5\u30FC\u30A2\u3067\u958B\u304F
+FileNode.getActions.searchFilesSameMD5.text=\u540C\u3058MD5\u30CF\u30C3\u30B7\u30E5\u3092\u6301\u3064\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22
+FileSize.fileSizeRootNode.name=\u30D5\u30A1\u30A4\u30EB\u30B5\u30A4\u30BA
+FileSize.createSheet.name.name=\u540D\u79F0
+FileSize.createSheet.name.displayName=\u540D\u79F0
+FileSize.createSheet.name.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+FileSize.createSheet.filterType.name=\u30D5\u30A3\u30EB\u30BF\u30FC\u30BF\u30A4\u30D7
+FileSize.createSheet.filterType.displayName=\u30D5\u30A3\u30EB\u30BF\u30FC\u30BF\u30A4\u30D7
+FileSize.createSheet.filterType.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+FileSize.exception.notSupported.msg=\u3053\u306E\u30BF\u30A4\u30D7\u306E\u8868\u793A\u53EF\u80FD\u306A\u30A2\u30A4\u30C6\u30E0\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\uFF1A{0}
+FileTypeChildren.exception.notSupported.msg=\u3053\u306E\u30BF\u30A4\u30D7\u306E\u8868\u793A\u53EF\u80FD\u306A\u30A2\u30A4\u30C6\u30E0\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\uFF1A{0}
+FileTypeExtensionFilters.tskImgFilter.text=\u753B\u50CF
+FileTypeExtensionFilters.tskVideoFilter.text=\u30D3\u30C7\u30AA
+FileTypeExtensionFilters.tskAudioFilter.text=\u30AA\u30FC\u30C7\u30A3\u30AA
+FileTypeExtensionFilters.tskArchiveFilter.text=\u30A2\u30FC\u30AB\u30A4\u30D6
+FileTypeExtensionFilters.tskDocumentFilter.text=\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8
+FileTypeExtensionFilters.tskExecFilter.text=\u5B9F\u884C\u53EF\u80FD
+FileTypeExtensionFilters.autDocHtmlFilter.text=HTML
+FileTypeExtensionFilters.autDocOfficeFilter.text=\u30AA\u30D5\u30A3\u30B9
+FileTypeExtensionFilters.autoDocPdfFilter.text=PDF
+FileTypeExtensionFilters.autDocTxtFilter.text=\u30D7\u30EC\u30FC\u30F3\u30C6\u30AD\u30B9\u30C8
+FileTypeExtensionFilters.autDocRtfFilter.text=\u30EA\u30C3\u30C1\u30C6\u30AD\u30B9\u30C8
+FileTypeNode.createSheet.filterType.name=\u30D5\u30A3\u30EB\u30BF\u30FC\u30BF\u30A4\u30D7
+FileTypeNode.createSheet.filterType.displayName=\u30D5\u30A3\u30EB\u30BF\u30FC\u30BF\u30A4\u30D7
+FileTypeNode.createSheet.filterType.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+FileTypeNode.createSheet.fileExt.name=\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u5B50
+FileTypeNode.createSheet.fileExt.displayName=\u30D5\u30A1\u30A4\u30EB\u62E1\u5F35\u5B50
+FileTypeNode.createSheet.fileExt.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+FileTypesNode.fname.text=\u30D5\u30A1\u30A4\u30EB\u30BF\u30A4\u30D7
+FileTypesNode.createSheet.name.name=\u540D\u79F0
+FileTypesNode.createSheet.name.displayName=\u540D\u79F0
+FileTypesNode.createSheet.name.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+HashsetHits.createSheet.name.name=\u540D\u79F0
+HashsetHits.createSheet.name.displayName=\u540D\u79F0
+HashsetHits.createSheet.name.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+ImageNode.getActions.viewInNewWin.text=\u65B0\u898F\u30A6\u30A3\u30F3\u30C9\u30A6\u306B\u8868\u793A
+ImageNode.getActions.openFileSearchByAttr.text=\u5C5E\u6027\u306B\u3088\u308B\u30D5\u30A1\u30A4\u30EB\u691C\u7D22\u3092\u958B\u304F
+ImageNode.createSheet.name.name=\u540D\u79F0
+ImageNode.createSheet.name.displayName=\u540D\u79F0
+ImageNode.createSheet.name.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+Installer.exception.tskVerStringNull.msg=Sleuth Kit JNI\u30C6\u30B9\u30C8\u30B3\u30FC\u30EB\u3067\u306F\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u304C\u3001\u30D0\u30FC\u30B8\u30E7\u30F3\u30B9\u30C8\u30EA\u30F3\u30B0\u306F\u30CC\u30EB\u3067\u3057\u305F\uFF01
+Installer.tskLibErr.msg=Sleuth Kit JNI\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u30C6\u30B9\u30C8\u30B3\u30FC\u30EB\u304C\u5931\u6557\u3057\u307E\u3057\u305F\uFF1A\
+\
+\u8A73\u7D30\uFF1A {0}
+Installer.tskLibErr.err=\u81F4\u547D\u7684\u30A8\u30E9\u30FC\uFF1A
+InterestingHits.interestingItems.text=\u602A\u3057\u3044\u30A2\u30A4\u30C6\u30E0
+InterestingHits.displayName.text=\u602A\u3057\u3044\u30A2\u30A4\u30C6\u30E0
+InterestingHits.createSheet.name.name=\u540D\u79F0
+InterestingHits.createSheet.name.displayName=\u540D\u79F0
+InterestingHits.createSheet.name.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+KeyValueNode.createSheet.name.name=\u540D\u79F0
+KeyValueNode.createSheet.name.displayName=\u540D\u79F0
+KeyValueNode.createSheet.name.desc=\u8A72\u5F53\u306A\u3057
+KeyValueNode.createSheet.map.desc=\u8A72\u5F53\u306A\u3057
+KeywordHits.kwHits.text=\u30AD\u30FC\u30EF\u30FC\u30C9\u30D2\u30C3\u30C8
+KeywordHits.createSheet.name.name=\u540D\u79F0
+KeywordHits.createSheet.name.displayName=\u540D\u79F0
+KeywordHits.createSheet.name.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+KeywordHits.createSheet.listName.name=\u30EA\u30B9\u30C8\u540D
+KeywordHits.createSheet.listName.displayName=\u30EA\u30B9\u30C8\u540D
+KeywordHits.createSheet.listName.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+KeywordHits.createSheet.numChildren.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+KeywordHits.createSheet.filesWithHits.name=\u30D2\u30C3\u30C8\u3057\u305F\u30D5\u30A1\u30A4\u30EB
+KeywordHits.createSheet.filesWithHits.displayName=\u30D2\u30C3\u30C8\u3057\u305F\u30D5\u30A1\u30A4\u30EB
+KeywordHits.createSheet.filesWithHits.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+KeywordHits.createNodeForKey.modTime.displayName=
+KeywordHits.createNodeForKey.modTime.desc=\u4FEE\u6B63\u65E5\u6642
+KeywordHits.createNodeForKey.accessTime.displayName=\u30A2\u30AF\u30BB\u30B9\u65E5\u6642
+KeywordHits.createNodeForKey.accessTime.desc=\u30A2\u30AF\u30BB\u30B9\u65E5\u6642
+KeywordHits.createNodeForKey.chgTime.displayName=\u5909\u66F4\u65E5\u6642
+KeywordHits.createNodeForKey.chgTime.desc=\u5909\u66F4\u65E5\u6642
+KeywordHits.createNodeForKey.chgTime.name=\u5909\u66F4\u65E5\u6642
+KeywordHits.createNodeForKey.accessTime.name=\u30A2\u30AF\u30BB\u30B9\u65E5\u6642
+KeywordHits.createNodeForKey.modTime.name=\u4FEE\u6B63\u65E5\u6642
+KnownFileFilterNode.selectionContext.dataSources=\u30C7\u30FC\u30BF\u30BD\u30FC\u30B9
+KnownFileFilterNode.selectionContext.views=\u30D3\u30E5\u30FC
+LayoutFileNode.propertyType.parts=\u30D1\u30FC\u30C4
+LayoutFileNode.createSheet.name.name=\u540D\u79F0
+LayoutFileNode.createSheet.name.displayName=\u540D\u79F0
+LayoutFileNode.createSheet.name.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+LayoutFileNode.createSheet.noDescr.text=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+LayoutFileNode.getActions.viewInNewWin.text=\u65B0\u898F\u30A6\u30A3\u30F3\u30C9\u30A6\u3067\u8868\u793A
+LayoutFileNode.getActions.openInExtViewer.text=\u5916\u90E8\u30D3\u30E5\u30FC\u30A2\u3067\u958B\u304F
+LocalFileNode.createSheet.name.name=\u540D\u79F0
+LocalFileNode.createSheet.name.displayName=\u540D\u79F0
+LocalFileNode.createSheet.name.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+LocalFileNode.createSheet.noDescr.text=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+LocalFileNode.getActions.viewInNewWin.text=\u65B0\u898F\u30A6\u30A3\u30F3\u30C9\u30A6\u306B\u8868\u793A
+LocalFileNode.getActions.openInExtViewer.text=\u5916\u90E8\u30D3\u30E5\u30FC\u30A2\u3067\u958B\u304F
+LocalFileNode.getActions.searchFilesSameMd5.text=\u540C\u3058MD5\u30CF\u30C3\u30B7\u30E5\u3092\u6301\u3064\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22
+RecentFiles.aut0DayFilter.displayName.text=\u6700\u7D42\u65E5
+RecentFiles.aut1dayFilter.displayName.text=\u6700\u7D42\u65E5 - 1
+RecentFiles.aut2dayFilter.displayName.text=\u6700\u7D42\u65E5 - \uFF12
+RecentFiles.aut3dayFilter.displayName.text=\u6700\u7D42\u65E5 - \uFF13
+RecentFiles.aut4dayFilter.displayName.text=\u6700\u7D42\u65E5 - \uFF14
+RecentFiles.aut5dayFilter.displayName.text=\u6700\u7D42\u65E5 - \uFF15
+RecentFiles.aut6dayFilter.displayName.text=\u6700\u7D42\u65E5 - \uFF16
+RecentFilesFilterChildren.exception.defaultVisit.msg=\u3053\u306E\u30BF\u30A4\u30D7\u306E\u8868\u793A\u3067\u304D\u308B\u30A2\u30A4\u30C6\u30E0
+Installer.exception.taskVerStringBang.msg=Sleuth Kit JNI\u30C6\u30B9\u30C8\u30B3\u30FC\u30EB\u3067\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u305B\u3093\u3067\u3057\u305F\u304C\u3001\u30D0\u30FC\u30B8\u30E7\u30F3\u30B9\u30C8\u30EA\u30F3\u30B0\u306F""\u3067\u3057\u305F\uFF01
+RecentFilesFilterNode.createSheet.filterType.name=\u30D5\u30A3\u30EB\u30BF\u30FC\u30BF\u30A4\u30D7
+RecentFilesFilterNode.createSheet.filterType.displayName=\u30D5\u30A3\u30EB\u30BF\u30FC\u30BF\u30A4\u30D7
+RecentFilesFilterNode.createSheet.filterType.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+RecentFilesNode.createSheet.name.name=\u540D\u79F0
+RecentFilesNode.createSheet.name.displayName=\u540D\u79F0
+RecentFilesNode.createSheet.name.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+RecentFilesNode.name.text=\u6700\u8FD1\u4F7F\u7528\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB
+ResultsNode.name.text=\u7D50\u679C
+ResultsNode.createSheet.name.name=\u540D\u79F0
+ResultsNode.createSheet.name.displayName=\u540D\u79F0
+ResultsNode.createSheet.name.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+TagNameNode.namePlusTags.text={0}\u30BF\u30B0
+TagNameNode.contentTagTypeNodeKey.text=\u30B3\u30F3\u30C6\u30F3\u30C4\u30BF\u30B0
+TagNameNode.bbArtTagTypeNodeKey.text=\u7D50\u679C\u30BF\u30B0
+TagNameNode.bookmark.text=\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF
+TagNameNode.createSheet.name.name=\u540D\u79F0
+TagNameNode.createSheet.name.displayName=\u540D\u79F0
+TagsNode.displayName.text=\u30BF\u30B0
+TagsNode.createSheet.name.name=\u540D\u79F0
+AbstractAbstractFileNode.flagsDirColLbl=\u30D5\u30E9\u30B0\uFF08\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\uFF09
+AbstractAbstractFileNode.flagsMetaColLbl=\u30D5\u30E9\u30B0\uFF08\u30E1\u30BF\u30C7\u30FC\u30BF\uFF09
+AbstractAbstractFileNode.metaAddrColLbl=\u30E1\u30BF\u30C7\u30FC\u30BF\u30A2\u30C9\u30EC\u30B9
+AbstractAbstractFileNode.attrAddrColLbl=\u5C5E\u6027\u30A2\u30C9\u30EC\u30B9
+AbstractAbstractFileNode.typeDirColLbl=\u30BF\u30A4\u30D7\uFF08\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\uFF09
+AbstractAbstractFileNode.typeMetaColLbl=\u30BF\u30A4\u30D7\uFF08\u30E1\u30BF\u30C7\u30FC\u30BF\uFF09
+ArtifactTypeNode.createSheet.childCnt.displayName=\u30C1\u30E3\u30A4\u30EB\u30C9\u6570
+TagsNode.createSheet.name.displayName=\u540D\u79F0
+ViewsNode.name.text=\u30D3\u30E5\u30FC
+ViewsNode.createSheet.name.name=\u540D\u79F0
+ViewsNode.createSheet.name.displayName=\u540D\u79F0
+ViewsNode.createSheet.name.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+VirtualDirectoryNode.getActions.viewInNewWin.text=\u65B0\u898F\u30A6\u30A3\u30F3\u30C9\u30A6\u306B\u8868\u793A
+VirtualDirectoryNode.createSheet.name.name=\u540D\u79F0
+VirtualDirectoryNode.createSheet.name.displayName=\u540D\u79F0
+VirtualDirectoryNode.createSheet.name.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+VirtualDirectoryNode.createSheet.noDesc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+VolumeNode.getActions.viewInNewWin.text=\u65B0\u898F\u30A6\u30A3\u30F3\u30C9\u30A6\u306B\u8868\u793A
+VolumeNode.createSheet.name.name=\u540D\u79F0
+VolumeNode.createSheet.name.displayName=\u540D\u79F0
+VolumeNode.createSheet.name.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+VolumeNode.createSheet.id.name=ID
+VolumeNode.createSheet.id.displayName=ID
+VolumeNode.createSheet.id.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+VolumeNode.createSheet.startSector.name=\u6700\u521D\u306E\u30BB\u30AF\u30BF\u30FC
+VolumeNode.createSheet.startSector.displayName=\u6700\u521D\u306E\u30BB\u30AF\u30BF\u30FC
+VolumeNode.createSheet.startSector.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+VolumeNode.createSheet.lenSectors.name=\u30BB\u30AF\u30BF\u30FC\u306E\u9577\u3055
+VolumeNode.createSheet.lenSectors.displayName=\u30BB\u30AF\u30BF\u30FC\u306E\u9577\u3055
+VolumeNode.createSheet.lenSectors.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+VolumeNode.createSheet.description.name=\u8AAC\u660E
+VolumeNode.createSheet.description.displayName=\u8AAC\u660E
+VolumeNode.createSheet.description.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+VolumeNode.createSheet.flags.name=\u30D5\u30E9\u30B0
+VolumeNode.createSheet.flags.displayName=\u30D5\u30E9\u30B0
+VolumeNode.createSheet.flags.desc=\u8AAC\u660E\u304C\u3042\u308A\u307E\u305B\u3093
+ArtifactTypeNode.createSheet.artType.name=\u6210\u679C\u7269\u30BF\u30A4\u30D7
+ArtifactTypeNode.createSheet.artType.displayName=\u6210\u679C\u7269\u30BF\u30A4\u30D7
+KeywordHits.createSheet.numChildren.name=\u30C1\u30E3\u30A4\u30EB\u30C9\u6570
+KeywordHits.createSheet.numChildren.displayName=\u30C1\u30E3\u30A4\u30EB\u30C9\u6570
+KeywordHits.simpleLiteralSearch.text=\u30B7\u30F3\u30B0\u30EB\u30EA\u30C6\u30E9\u30EB\u691C\u7D22
+KeywordHits.singleRegexSearch.text=\u30B7\u30F3\u30B0\u30EB\u6B63\u898F\u8868\u73FE\u691C\u7D22
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java
index 5749b53aa3..47a9bc8dfd 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java
@@ -16,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.sleuthkit.autopsy.datamodel;
 
 import java.util.List;
@@ -25,18 +24,20 @@ import java.util.logging.Logger;
 import javax.swing.Action;
 import org.openide.nodes.Children;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.autopsy.actions.DeleteContentTagAction;
 import org.sleuthkit.datamodel.ContentTag;
 import org.sleuthkit.datamodel.TskCoreException;
 
 /**
- * Instances of this class wrap ContentTag objects. In the Autopsy
- * presentation of the SleuthKit data model, they are leaf nodes of a tree 
- * consisting of content and blackboard artifact tags, grouped first by tag 
- * type, then by tag name.
+ * Instances of this class wrap ContentTag objects. In the Autopsy presentation
+ * of the SleuthKit data model, they are leaf nodes of a tree consisting of
+ * content and blackboard artifact tags, grouped first by tag type, then by tag
+ * name.
  */
- class ContentTagNode extends DisplayableItemNode {
+class ContentTagNode extends DisplayableItemNode {
+
     private static final String ICON_PATH = "org/sleuthkit/autopsy/images/blue-tag-icon-16.png";
     private final ContentTag tag;
 
@@ -57,18 +58,26 @@ import org.sleuthkit.datamodel.TskCoreException;
             propertySheet.put(properties);
         }
 
-        properties.put(new NodeProperty("File", "File", "", tag.getContent().getName()));
-        String contentPath; 
+        properties.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ContentTagNode.createSheet.file.name"),
+                NbBundle.getMessage(this.getClass(), "ContentTagNode.createSheet.file.displayName"),
+                "",
+                tag.getContent().getName()));
+        String contentPath;
         try {
             contentPath = tag.getContent().getUniquePath();
+        } catch (TskCoreException ex) {
+            Logger.getLogger(ContentTagNode.class.getName()).log(Level.SEVERE, "Failed to get path for content (id = " + tag.getContent().getId() + ")", ex);
+            contentPath = NbBundle.getMessage(this.getClass(), "ContentTagNode.createSheet.unavail.path");
         }
-        catch (TskCoreException ex) {
-            Logger.getLogger(ContentTagNode.class.getName()).log(Level.SEVERE, "Failed to get path for content (id = " + tag.getContent().getId() + ")", ex);                    
-            contentPath = "Unavailable";
-        }
-        properties.put(new NodeProperty("File Path", "File Path", "", contentPath));        
-        properties.put(new NodeProperty("Comment", "Comment", "", tag.getComment()));
-        
+        properties.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ContentTagNode.createSheet.filePath.name"),
+                NbBundle.getMessage(this.getClass(), "ContentTagNode.createSheet.filePath.displayName"),
+                "",
+                contentPath));
+        properties.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ContentTagNode.createSheet.comment.name"),
+                NbBundle.getMessage(this.getClass(), "ContentTagNode.createSheet.comment.displayName"),
+                "",
+                tag.getComment()));
+
         return propertySheet;
     }
 
@@ -78,8 +87,8 @@ import org.sleuthkit.datamodel.TskCoreException;
         actions.add(null); // Adds a menu item separator. 
         actions.add(DeleteContentTagAction.getInstance());
         return actions.toArray(new Action[0]);
-    }    
-    
+    }
+
     @Override
     public <T> T accept(DisplayableItemNodeVisitor<T> v) {
         return v.visit(this);
@@ -88,5 +97,5 @@ import org.sleuthkit.datamodel.TskCoreException;
     @Override
     public boolean isLeafTypeNode() {
         return true;
-    }    
+    }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagTypeNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagTypeNode.java
index 41dad8ac5b..f96719a501 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagTypeNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagTypeNode.java
@@ -24,6 +24,7 @@ import org.openide.nodes.ChildFactory;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -33,24 +34,24 @@ import org.sleuthkit.datamodel.TskCoreException;
 
 /**
  * Instances of this class are are elements of a directory tree sub-tree
- * consisting of content and blackboard artifact tags, grouped first by tag type,
- * then by tag name. 
+ * consisting of content and blackboard artifact tags, grouped first by tag
+ * type, then by tag name.
  */
 public class ContentTagTypeNode extends DisplayableItemNode {
-    private static final String DISPLAY_NAME = "File Tags";
+
+    private static final String DISPLAY_NAME = NbBundle.getMessage(ContentTagTypeNode.class, "ContentTagTypeNode.displayName.text");
     private static final String ICON_PATH = "org/sleuthkit/autopsy/images/tag-folder-blue-icon-16.png";
 
     public ContentTagTypeNode(TagName tagName) {
         super(Children.create(new ContentTagNodeFactory(tagName), true), Lookups.singleton(tagName.getDisplayName() + " " + DISPLAY_NAME));
-        
+
         long tagsCount = 0;
         try {
             tagsCount = Case.getCurrentCase().getServices().getTagsManager().getContentTagsCountByTagName(tagName);
-        }
-        catch (TskCoreException ex) {
+        } catch (TskCoreException ex) {
             Logger.getLogger(ContentTagTypeNode.class.getName()).log(Level.SEVERE, "Failed to get content tags count for " + tagName.getDisplayName() + " tag name", ex);
         }
-        
+
         super.setName(DISPLAY_NAME);
         super.setDisplayName(DISPLAY_NAME + " (" + tagsCount + ")");
         this.setIconBaseWithExtension(ICON_PATH);
@@ -65,7 +66,10 @@ public class ContentTagTypeNode extends DisplayableItemNode {
             propertySheet.put(properties);
         }
 
-        properties.put(new NodeProperty("Name", "Name", "", getName()));
+        properties.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ContentTagTypeNode.createSheet.name.name"),
+                NbBundle.getMessage(this.getClass(), "ContentTagTypeNode.createSheet.name.displayName"),
+                "",
+                getName()));
 
         return propertySheet;
     }
@@ -79,23 +83,23 @@ public class ContentTagTypeNode extends DisplayableItemNode {
     public boolean isLeafTypeNode() {
         return true;
     }
-    
+
     private static class ContentTagNodeFactory extends ChildFactory<ContentTag> {
+
         private final TagName tagName;
-        
+
         ContentTagNodeFactory(TagName tagName) {
             this.tagName = tagName;
         }
-        
+
         @Override
         protected boolean createKeys(List<ContentTag> keys) {
             // Use the content tags bearing the specified tag name as the keys. 
             try {
-                keys.addAll(Case.getCurrentCase().getServices().getTagsManager().getContentTagsByTagName(tagName));            
+                keys.addAll(Case.getCurrentCase().getServices().getTagsManager().getContentTagsByTagName(tagName));
+            } catch (TskCoreException ex) {
+                Logger.getLogger(ContentTagTypeNode.ContentTagNodeFactory.class.getName()).log(Level.SEVERE, "Failed to get tag names", ex);
             }
-            catch (TskCoreException ex) {
-                Logger.getLogger(ContentTagTypeNode.ContentTagNodeFactory.class.getName()).log(Level.SEVERE, "Failed to get tag names", ex);                    
-            }                        
             return true;
         }
 
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
index 9cc844cae6..ee771c4ea8 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentUtils.java
@@ -25,6 +25,8 @@ import java.text.SimpleDateFormat;
 import java.util.TimeZone;
 import java.util.logging.Level;
 import java.util.prefs.Preferences;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.SwingWorker;
 import org.netbeans.api.progress.ProgressHandle;
@@ -157,8 +159,8 @@ public final class ContentUtils {
      * @return number of bytes extracted
      * @throws IOException if file could not be written
      */
-    public static long writeToFile(Content content, java.io.File outputFile,
-            ProgressHandle progress, SwingWorker worker, boolean source) throws IOException {
+    public static <T,V> long writeToFile(Content content, java.io.File outputFile,
+            ProgressHandle progress, SwingWorker<T,V> worker, boolean source) throws IOException {
 
         InputStream in = new ReadContentInputStream(content);
 
@@ -213,11 +215,11 @@ public final class ContentUtils {
      * Assumes there will be no collisions with existing directories/files, and
      * that the directory to contain the destination file already exists.
      */
-    public static class ExtractFscContentVisitor extends ContentVisitor.Default<Void> {
+    public static class ExtractFscContentVisitor<T,V> extends ContentVisitor.Default<Void> {
 
         java.io.File dest;
         ProgressHandle progress;
-        SwingWorker worker;
+        SwingWorker<T,V> worker;
         boolean source = false;
 
         /**
@@ -232,7 +234,7 @@ public final class ContentUtils {
          * @param source true if source file
          */
         public ExtractFscContentVisitor(java.io.File dest,
-                ProgressHandle progress, SwingWorker worker, boolean source) {
+                ProgressHandle progress, SwingWorker<T,V> worker, boolean source) {
             this.dest = dest;
             this.progress = progress;
             this.worker = worker;
@@ -247,8 +249,8 @@ public final class ContentUtils {
          * Convenience method to make a new instance for given destination and
          * extract given content
          */
-        public static void extract(Content cntnt, java.io.File dest, ProgressHandle progress, SwingWorker worker) {
-            cntnt.accept(new ExtractFscContentVisitor(dest, progress, worker, true));
+        public static <T,V> void extract(Content cntnt, java.io.File dest, ProgressHandle progress, SwingWorker<T,V> worker) {
+            cntnt.accept(new ExtractFscContentVisitor<>(dest, progress, worker, true));
         }
 
         @Override
@@ -331,8 +333,8 @@ public final class ContentUtils {
                 // recurse on children
                 for (Content child : dir.getChildren()) {
                     java.io.File childFile = getFsContentDest(child);
-                    ExtractFscContentVisitor childVisitor =
-                            new ExtractFscContentVisitor(childFile, progress, worker, false);
+                    ExtractFscContentVisitor<T,V> childVisitor =
+                            new ExtractFscContentVisitor<>(childFile, progress, worker, false);
                     // If this is the source directory of an extract it
                     // will have a progress and worker, and will keep track
                     // of the progress bar's progress
@@ -355,8 +357,9 @@ public final class ContentUtils {
 
         @Override
         protected Void defaultVisit(Content cntnt) {
-            throw new UnsupportedOperationException("Can't extract a "
-                    + cntnt.getClass().getSimpleName());
+            throw new UnsupportedOperationException(NbBundle.getMessage(this.getClass(),
+                                                                        "ContentUtils.exception.msg",
+                                                                        cntnt.getClass().getSimpleName()));
         }
     }
     /**sets displayInlocalTime value based on button in GeneralPanel.java
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DataConversion.java b/Core/src/org/sleuthkit/autopsy/datamodel/DataConversion.java
index b4672bbb55..5c7ff971f5 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/DataConversion.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/DataConversion.java
@@ -102,10 +102,10 @@ public class DataConversion {
                 outputStringBuilder.append("  ");
 
                 // print the ascii columns
-                String ascii = new String(array, curOffset, lineLen);                
+                String ascii = new String(array, curOffset, lineLen, java.nio.charset.StandardCharsets.US_ASCII);                
                 for (int i = 0; i < 16; i++) {
                     char c = ' ';
-                    if (i < lineLen) {
+                    if (i < ascii.length()) {
                         c = ascii.charAt(i);
                         int dec = (int) c;
                         
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DataModelActionsFactory.java b/Core/src/org/sleuthkit/autopsy/datamodel/DataModelActionsFactory.java
index 6660d61868..b69f25ef6d 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/DataModelActionsFactory.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/DataModelActionsFactory.java
@@ -21,6 +21,8 @@ package org.sleuthkit.autopsy.datamodel;
 import java.util.ArrayList;
 import java.util.List;
 import javax.swing.Action;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.actions.AddBlackboardArtifactTagAction;
 import org.sleuthkit.autopsy.actions.AddContentTagAction;
 import org.sleuthkit.autopsy.coreutils.ContextMenuExtensionPoint;
@@ -46,17 +48,28 @@ import org.sleuthkit.datamodel.VirtualDirectory;
 //   method could be implemented. If the different nodes are necessary, is it merely because of some misuse of the Visitor pattern somewhere?
 //   2. All of this would be much improved by not constructing nodes with actions, but this might be necessary with pushing of nodes rather than use of lookups to 
 //   handle selections.
-class DataModelActionsFactory  {    
+class DataModelActionsFactory  {
+    public static final String VIEW_SOURCE_FILE_IN_DIR = NbBundle
+            .getMessage(DataModelActionsFactory.class, "DataModelActionsFactory.srcFileInDir.text");
+    public static final String VIEW_FILE_IN_DIR = NbBundle
+            .getMessage(DataModelActionsFactory.class, "DataModelActionsFactory.fileInDir.text");
+    public static final String VIEW_IN_NEW_WINDOW = NbBundle
+            .getMessage(DataModelActionsFactory.class, "DataModelActionsFactory.viewNewWin.text");
+    public static final String OPEN_IN_EXTERNAL_VIEWER = NbBundle
+            .getMessage(DataModelActionsFactory.class, "DataModelActionsFactory.openExtViewer.text");
+    public static final String SEARCH_FOR_FILES_SAME_MD5 = NbBundle
+            .getMessage(DataModelActionsFactory.class, "DataModelActionsFactory.srfFileSameMD5.text");
+
     static List<Action> getActions(File file, boolean isArtifactSource) {
         List<Action> actions = new ArrayList<>();
-        actions.add(new ViewContextAction((isArtifactSource ? "View Source File in Directory" : "View File in Directory"), file));                    
+        actions.add(new ViewContextAction((isArtifactSource ? VIEW_SOURCE_FILE_IN_DIR : VIEW_FILE_IN_DIR), file));
         final FileNode fileNode = new FileNode(file);
         actions.add(null); // creates a menu separator
-        actions.add(new NewWindowViewAction("View in New Window", fileNode));
-        actions.add(new ExternalViewerAction("Open in External Viewer", fileNode));
+        actions.add(new NewWindowViewAction(VIEW_IN_NEW_WINDOW, fileNode));
+        actions.add(new ExternalViewerAction(OPEN_IN_EXTERNAL_VIEWER, fileNode));
         actions.add(null); // creates a menu separator
         actions.add(ExtractAction.getInstance());
-        actions.add(new HashSearchAction("Search for files with the same MD5 hash", fileNode));
+        actions.add(new HashSearchAction(SEARCH_FOR_FILES_SAME_MD5, fileNode));
         actions.add(null); // creates a menu separator
         actions.add(AddContentTagAction.getInstance());
         if (isArtifactSource) {
@@ -68,11 +81,11 @@ class DataModelActionsFactory  {
 
     static List<Action> getActions(LayoutFile file, boolean isArtifactSource) {
         List<Action> actions = new ArrayList<>();
-        actions.add(new ViewContextAction((isArtifactSource ? "View Source File in Directory" : "View File in Directory"), file));                    
+        actions.add(new ViewContextAction((isArtifactSource ? VIEW_SOURCE_FILE_IN_DIR : VIEW_FILE_IN_DIR), file));
         LayoutFileNode layoutFileNode = new LayoutFileNode(file);
         actions.add(null); // creates a menu separator
-        actions.add(new NewWindowViewAction("View in New Window", layoutFileNode));
-        actions.add(new ExternalViewerAction("Open in External Viewer", layoutFileNode));
+        actions.add(new NewWindowViewAction(VIEW_IN_NEW_WINDOW, layoutFileNode));
+        actions.add(new ExternalViewerAction(OPEN_IN_EXTERNAL_VIEWER, layoutFileNode));
         actions.add(null); // creates a menu separator
         actions.add(ExtractAction.getInstance());//
         actions.add(null); // creates a menu separator
@@ -86,11 +99,11 @@ class DataModelActionsFactory  {
     
     static List<Action> getActions(Directory directory, boolean isArtifactSource) {
         List<Action> actions = new ArrayList<>();        
-        actions.add(new ViewContextAction((isArtifactSource ? "View Source File in Directory" : "View File in Directory"), directory));                    
+        actions.add(new ViewContextAction((isArtifactSource ? VIEW_SOURCE_FILE_IN_DIR : VIEW_FILE_IN_DIR), directory));
         DirectoryNode directoryNode = new DirectoryNode(directory);
         actions.add(null); // creates a menu separator
-        actions.add(new NewWindowViewAction("View in New Window", directoryNode));
-        actions.add(new ExternalViewerAction("Open in External Viewer", directoryNode));
+        actions.add(new NewWindowViewAction(VIEW_IN_NEW_WINDOW, directoryNode));
+        actions.add(new ExternalViewerAction(OPEN_IN_EXTERNAL_VIEWER, directoryNode));
         actions.add(null); // creates a menu separator
         actions.add(ExtractAction.getInstance());
         actions.add(null); // creates a menu separator
@@ -104,11 +117,11 @@ class DataModelActionsFactory  {
     
     static List<Action> getActions(VirtualDirectory directory, boolean isArtifactSource) {
         List<Action> actions = new ArrayList<>();
-        actions.add(new ViewContextAction((isArtifactSource ? "View Source File in Directory" : "View File in Directory"), directory));                    
+        actions.add(new ViewContextAction((isArtifactSource ? VIEW_SOURCE_FILE_IN_DIR : VIEW_FILE_IN_DIR), directory));
         VirtualDirectoryNode directoryNode = new VirtualDirectoryNode(directory);
         actions.add(null); // creates a menu separator
-        actions.add(new NewWindowViewAction("View in New Window", directoryNode));
-        actions.add(new ExternalViewerAction("Open in External Viewer", directoryNode));
+        actions.add(new NewWindowViewAction(VIEW_IN_NEW_WINDOW, directoryNode));
+        actions.add(new ExternalViewerAction(OPEN_IN_EXTERNAL_VIEWER, directoryNode));
         actions.add(null); // creates a menu separator
         actions.add(ExtractAction.getInstance());
         actions.add(null); // creates a menu separator
@@ -122,11 +135,11 @@ class DataModelActionsFactory  {
         
     static List<Action> getActions(LocalFile file, boolean isArtifactSource) {
         List<Action> actions = new ArrayList<>();
-        actions.add(new ViewContextAction((isArtifactSource ? "View Source File in Directory" : "View File in Directory"), file));                    
+        actions.add(new ViewContextAction((isArtifactSource ? VIEW_SOURCE_FILE_IN_DIR : VIEW_FILE_IN_DIR), file));
         final LocalFileNode localFileNode = new LocalFileNode(file);
         actions.add(null); // creates a menu separator
-        actions.add(new NewWindowViewAction("View in New Window", localFileNode));
-        actions.add(new ExternalViewerAction("Open in External Viewer", localFileNode));
+        actions.add(new NewWindowViewAction(VIEW_IN_NEW_WINDOW, localFileNode));
+        actions.add(new ExternalViewerAction(OPEN_IN_EXTERNAL_VIEWER, localFileNode));
         actions.add(null); // creates a menu separator
         actions.add(ExtractAction.getInstance());
         actions.add(null); // creates a menu separator
@@ -140,11 +153,11 @@ class DataModelActionsFactory  {
         
     static List<Action> getActions(DerivedFile file, boolean isArtifactSource) {
         List<Action> actions = new ArrayList<>();
-        actions.add(new ViewContextAction((isArtifactSource ? "View Source File in Directory" : "View File in Directory"), file));                    
+        actions.add(new ViewContextAction((isArtifactSource ? VIEW_SOURCE_FILE_IN_DIR : VIEW_FILE_IN_DIR), file));
         final LocalFileNode localFileNode = new LocalFileNode(file);
         actions.add(null); // creates a menu separator
-        actions.add(new NewWindowViewAction("View in New Window", localFileNode));
-        actions.add(new ExternalViewerAction("Open in External Viewer", localFileNode));
+        actions.add(new NewWindowViewAction(VIEW_IN_NEW_WINDOW, localFileNode));
+        actions.add(new ExternalViewerAction(OPEN_IN_EXTERNAL_VIEWER, localFileNode));
         actions.add(null); // creates a menu separator
         actions.add(ExtractAction.getInstance());
         actions.add(null); // creates a menu separator
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesNode.java
index c8f2e93e29..4ef002365f 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesNode.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");
@@ -19,8 +19,9 @@
 package org.sleuthkit.autopsy.datamodel;
 
 import java.util.List;
-import org.openide.nodes.AbstractNode;
+
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.datamodel.Content;
 
@@ -29,7 +30,7 @@ import org.sleuthkit.datamodel.Content;
  */
 public class DataSourcesNode extends DisplayableItemNode {
 
-    public static final String NAME = "Data Sources";
+    public static final String NAME = NbBundle.getMessage(DataSourcesNode.class, "DataSourcesNode.name");
 
     public DataSourcesNode(List<Content> images) {
         super(new RootContentChildren(images), Lookups.singleton(NAME));
@@ -42,7 +43,7 @@ public class DataSourcesNode extends DisplayableItemNode {
     public boolean isLeafTypeNode() {
         return false;
     }
-    
+
     @Override
     public <T> T accept(DisplayableItemNodeVisitor<T> v) {
         return v.visit(this);
@@ -57,9 +58,9 @@ public class DataSourcesNode extends DisplayableItemNode {
             s.put(ss);
         }
 
-        ss.put(new NodeProperty("Name",
-                "Name",
-                "no description",
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "DataSourcesNode.createSheet.name.name"),
+                NbBundle.getMessage(this.getClass(), "DataSourcesNode.createSheet.name.displayName"),
+                NbBundle.getMessage(this.getClass(), "DataSourcesNode.createSheet.name.desc"),
                 NAME));
         return s;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DeletedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/DeletedContent.java
index bf85dd703a..580858aa44 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/DeletedContent.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/DeletedContent.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  * 
- * Copyright 2013 Basis Technology Corp.
+ * Copyright 2013-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,6 +29,7 @@ import org.openide.nodes.ChildFactory;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.AbstractFile;
@@ -51,8 +52,12 @@ public class DeletedContent implements AutopsyVisitableItem {
 
     public enum DeletedContentFilter implements AutopsyVisitableItem {
 
-        FS_DELETED_FILTER(0, "FS_DELETED_FILTER", "File System"),
-        ALL_DELETED_FILTER(1, "ALL_DELETED_FILTER", "All");
+        FS_DELETED_FILTER(0,
+        "FS_DELETED_FILTER",
+        NbBundle.getMessage(DeletedContent.class, "DeletedContent.fsDelFilter.text")),
+        ALL_DELETED_FILTER(1,
+        "ALL_DELETED_FILTER",
+        NbBundle.getMessage(DeletedContent.class, "DeletedContent.allDelFilter.text"));
         private int id;
         private String name;
         private String displayName;
@@ -97,7 +102,8 @@ public class DeletedContent implements AutopsyVisitableItem {
 
     public static class DeletedContentsNode extends DisplayableItemNode {
 
-        private static final String NAME = "Deleted Files";
+        private static final String NAME = NbBundle.getMessage(DeletedContent.class,
+                "DeletedContent.deletedContentsNode.name");
         private SleuthkitCase skCase;
 
         DeletedContentsNode(SleuthkitCase skCase) {
@@ -112,7 +118,7 @@ public class DeletedContent implements AutopsyVisitableItem {
         public boolean isLeafTypeNode() {
             return false;
         }
-                
+
         @Override
         public <T> T accept(DisplayableItemNodeVisitor<T> v) {
             return v.visit(this);
@@ -127,9 +133,9 @@ public class DeletedContent implements AutopsyVisitableItem {
                 s.put(ss);
             }
 
-            ss.put(new NodeProperty("Name",
-                    "Name",
-                    "no description",
+            ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "DeletedContent.createSheet.name.name"),
+                    NbBundle.getMessage(this.getClass(), "DeletedContent.createSheet.name.displayName"),
+                    NbBundle.getMessage(this.getClass(), "DeletedContent.createSheet.name.desc"),
                     NAME));
             return s;
         }
@@ -157,14 +163,12 @@ public class DeletedContent implements AutopsyVisitableItem {
 
         public class DeletedContentNode extends DisplayableItemNode {
 
-            private SleuthkitCase skCase;
             private DeletedContent.DeletedContentFilter filter;
             private final Logger logger = Logger.getLogger(DeletedContentNode.class.getName());
 
             DeletedContentNode(SleuthkitCase skCase, DeletedContent.DeletedContentFilter filter) {
                 super(Children.create(new DeletedContentChildren(filter, skCase), true), Lookups.singleton(filter.getDisplayName()));
                 super.setName(filter.getName());
-                this.skCase = skCase;
                 this.filter = filter;
 
                 String tooltip = filter.getDisplayName();
@@ -191,9 +195,10 @@ public class DeletedContent implements AutopsyVisitableItem {
                     s.put(ss);
                 }
 
-                ss.put(new NodeProperty("Filter Type",
-                        "Filter Type",
-                        "no description",
+                ss.put(new NodeProperty<>(
+                        NbBundle.getMessage(this.getClass(), "DeletedContent.createSheet.filterType.name"),
+                        NbBundle.getMessage(this.getClass(), "DeletedContent.createSheet.filterType.displayName"),
+                        NbBundle.getMessage(this.getClass(), "DeletedContent.createSheet.filterType.desc"),
                         filter.getDisplayName()));
 
                 return s;
@@ -210,8 +215,7 @@ public class DeletedContent implements AutopsyVisitableItem {
             private SleuthkitCase skCase;
             private DeletedContent.DeletedContentFilter filter;
             private final Logger logger = Logger.getLogger(DeletedContentChildren.class.getName());
-            
-        private static final int MAX_OBJECTS = 2001;
+            private static final int MAX_OBJECTS = 10001;
 
             DeletedContentChildren(DeletedContent.DeletedContentFilter filter, SleuthkitCase skCase) {
                 this.skCase = skCase;
@@ -225,13 +229,13 @@ public class DeletedContent implements AutopsyVisitableItem {
                     SwingUtilities.invokeLater(new Runnable() {
                         @Override
                         public void run() {
-                            JOptionPane.showMessageDialog(null, "There are more Deleted Files than can be displayed. Only the first " 
-                                                                + (MAX_OBJECTS - 1) 
-                                                                + " Deleted Files will be shown.");
+                            JOptionPane.showMessageDialog(null, NbBundle.getMessage(this.getClass(),
+                                    "DeletedContent.createKeys.maxObjects.msg",
+                                    MAX_OBJECTS - 1));
                         }
                     });
                 }
-                
+
                 queryList.remove(queryList.size() - 1);
                 list.addAll(queryList);
                 return true;
@@ -266,7 +270,7 @@ public class DeletedContent implements AutopsyVisitableItem {
                         break;
 
                     default:
-                        logger.log(Level.SEVERE, "Unsupported filter type to get deleted content: " + filter);
+                        logger.log(Level.SEVERE, "Unsupported filter type to get deleted content: {0}", filter);
 
                 }
 
@@ -275,7 +279,7 @@ public class DeletedContent implements AutopsyVisitableItem {
             }
 
             private List<AbstractFile> runFsQuery() {
-                List<AbstractFile> ret = new ArrayList<AbstractFile>();
+                List<AbstractFile> ret = new ArrayList<>();
 
                 String query = makeQuery();
                 try {
@@ -330,7 +334,9 @@ public class DeletedContent implements AutopsyVisitableItem {
 
                     @Override
                     protected AbstractNode defaultVisit(Content di) {
-                        throw new UnsupportedOperationException("Not supported for this type of Displayable Item: " + di.toString());
+                        throw new UnsupportedOperationException(NbBundle.getMessage(this.getClass(),
+                                "DeletedContent.createNodeForKey.typeNotSupported.msg",
+                                di.toString()));
                     }
                 });
             }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java
index 624facfebc..ced9942d07 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java
@@ -21,6 +21,8 @@ package org.sleuthkit.autopsy.datamodel;
 import java.util.ArrayList;
 import java.util.List;
 import javax.swing.Action;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.ContextMenuExtensionPoint;
 import org.sleuthkit.autopsy.actions.AddContentTagAction;
 import org.sleuthkit.autopsy.directorytree.ExtractAction;
@@ -36,8 +38,8 @@ import org.sleuthkit.datamodel.TskData.TSK_FS_NAME_FLAG_ENUM;
  */
 public class DirectoryNode extends AbstractFsContentNode<AbstractFile> {
 
-    public static final String DOTDOTDIR = "[parent folder]";
-    public static final String DOTDIR = "[current folder]";
+    public static final String DOTDOTDIR = NbBundle.getMessage(DirectoryNode.class, "DirectoryNode.parFolder.text");
+    public static final String DOTDIR = NbBundle.getMessage(DirectoryNode.class, "DirectoryNode.curFolder.text");
 
     public DirectoryNode(Directory dir) {
         this(dir, true);
@@ -70,10 +72,11 @@ public class DirectoryNode extends AbstractFsContentNode<AbstractFile> {
     public Action[] getActions(boolean popup) {
         List<Action> actions = new ArrayList<>();
         if (!getDirectoryBrowseMode()) {
-            actions.add(new ViewContextAction("View File in Directory", this));
+            actions.add(new ViewContextAction(
+                    NbBundle.getMessage(this.getClass(), "DirectoryNode.getActions.viewFileInDir.text"), this));
             actions.add(null); // creates a menu separator
         }
-        actions.add(new NewWindowViewAction("View in New Window", this));
+        actions.add(new NewWindowViewAction(NbBundle.getMessage(this.getClass(), "DirectoryNode.viewInNewWin.text"), this));
         actions.add(null); // creates a menu separator
         actions.add(ExtractAction.getInstance());
         actions.add(null); // creates a menu separator
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java b/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java
index c5311b3d20..aed1c7ed77 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  * 
- * Copyright 2012 Basis Technology Corp.
+ * Copyright 2012-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,8 +26,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.openide.nodes.AbstractNode;
 import org.openide.nodes.ChildFactory;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
@@ -49,15 +50,15 @@ public class EmailExtracted implements AutopsyVisitableItem {
     private static final String LABEL_NAME = BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG.getLabel();
     private static final String DISPLAY_NAME = BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG.getDisplayName();
     private static final Logger logger = Logger.getLogger(EmailExtracted.class.getName());
-    private static final String MAIL_ACCOUNT = "Account";
-    private static final String MAIL_FOLDER = "Folder";
+    private static final String MAIL_ACCOUNT = NbBundle.getMessage(EmailExtracted.class, "EmailExtracted.mailAccount.text");
+    private static final String MAIL_FOLDER = NbBundle.getMessage(EmailExtracted.class, "EmailExtracted.mailFolder.text");
     private static final String MAIL_PATH_SEPARATOR = "/";
     private SleuthkitCase skCase;
     private Map<String, Map<String, List<Long>>> accounts;
 
     public EmailExtracted(SleuthkitCase skCase) {
         this.skCase = skCase;
-        accounts = new LinkedHashMap<String, Map<String, List<Long>>>();
+        accounts = new LinkedHashMap<>();
     }
 
     @SuppressWarnings("deprecation")
@@ -81,12 +82,12 @@ public class EmailExtracted implements AutopsyVisitableItem {
 
                 Map<String, List<Long>> folders = accounts.get(account);
                 if (folders == null) {
-                    folders = new LinkedHashMap<String, List<Long>>();
+                    folders = new LinkedHashMap<>();
                     accounts.put(account, folders);
                 }
                 List<Long> messages = folders.get(folder);
                 if (messages == null) {
-                    messages = new ArrayList<Long>();
+                    messages = new ArrayList<>();
                     folders.put(folder, messages);
                 }
                 messages.add(artifactId);
@@ -99,13 +100,12 @@ public class EmailExtracted implements AutopsyVisitableItem {
     }
 
     private static Map<String, String> parsePath(String path) {
-        Map<String, String> parsed = new HashMap<String, String>();
+        Map<String, String> parsed = new HashMap<>();
         String[] split = path.split(MAIL_PATH_SEPARATOR);
         if (split.length < 4) {
-            logger.log(Level.WARNING, "Unexpected number of tokens when parsing email PATH: "
-                    + split.length + ", will use defaults");
-            parsed.put(MAIL_ACCOUNT, "Default");
-            parsed.put(MAIL_FOLDER, "Default");
+            logger.log(Level.WARNING, "Unexpected number of tokens when parsing email PATH: {0}, will use defaults", split.length);
+            parsed.put(MAIL_ACCOUNT, NbBundle.getMessage(EmailExtracted.class, "EmailExtracted.defaultAcct.text"));
+            parsed.put(MAIL_FOLDER, NbBundle.getMessage(EmailExtracted.class, "EmailExtracted.defaultFolder.text"));
             return parsed;
         }
 
@@ -136,7 +136,7 @@ public class EmailExtracted implements AutopsyVisitableItem {
         public boolean isLeafTypeNode() {
             return false;
         }
-                
+
         @Override
         public <T> T accept(DisplayableItemNodeVisitor<T> v) {
             //return v.visit(this);
@@ -152,11 +152,10 @@ public class EmailExtracted implements AutopsyVisitableItem {
                 s.put(ss);
             }
 
-            ss.put(new NodeProperty("Name",
-                    "Name",
-                    "no description",
+            ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.name"),
+                    NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.displayName"),
+                    NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.desc"),
                     getName()));
-
             return s;
         }
     }
@@ -189,7 +188,6 @@ public class EmailExtracted implements AutopsyVisitableItem {
                 }
             }
 
-
             list.addAll(tempList);
             return true;
         }
@@ -218,7 +216,7 @@ public class EmailExtracted implements AutopsyVisitableItem {
         public boolean isLeafTypeNode() {
             return false;
         }
-                
+
         @Override
         public <T> T accept(DisplayableItemNodeVisitor<T> v) {
             return v.visit(this);
@@ -234,9 +232,9 @@ public class EmailExtracted implements AutopsyVisitableItem {
                 s.put(ss);
             }
 
-            ss.put(new NodeProperty("Name",
-                    "Name",
-                    "no description",
+            ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.name"),
+                    NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.displayName"),
+                    NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.desc"),
                     getName()));
 
             return s;
@@ -281,9 +279,9 @@ public class EmailExtracted implements AutopsyVisitableItem {
                 s.put(ss);
             }
 
-            ss.put(new NodeProperty("Name",
-                    "Name",
-                    "no description",
+            ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.name"),
+                    NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.displayName"),
+                    NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.desc"),
                     getName()));
 
             return s;
@@ -293,7 +291,7 @@ public class EmailExtracted implements AutopsyVisitableItem {
         public boolean isLeafTypeNode() {
             return false;
         }
-                
+
         @Override
         public <T> T accept(DisplayableItemNodeVisitor<T> v) {
             return v.visit(this);
@@ -351,9 +349,9 @@ public class EmailExtracted implements AutopsyVisitableItem {
                 s.put(ss);
             }
 
-            ss.put(new NodeProperty("Name",
-                    "Name",
-                    "no description",
+            ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.name"),
+                    NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.displayName"),
+                    NbBundle.getMessage(this.getClass(), "EmailExtracted.createSheet.name.desc"),
                     getName()));
 
             return s;
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java
index d5d92183b2..10ded0f291 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentChildren.java
@@ -46,7 +46,7 @@ class ExtractedContentChildren extends ChildFactory<BlackboardArtifact.ARTIFACT_
         this.skCase = skCase;
         
         // these are shown in other parts of the UI tree
-        doNotShow = new ArrayList();
+        doNotShow = new ArrayList<>();
         doNotShow.add(BlackboardArtifact.ARTIFACT_TYPE.TSK_GEN_INFO);
         doNotShow.add(BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG);
         doNotShow.add(BlackboardArtifact.ARTIFACT_TYPE.TSK_HASHSET_HIT);
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentNode.java
index bd63cdb7e2..496919bbc1 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContentNode.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");
@@ -18,18 +18,19 @@
  */
 package org.sleuthkit.autopsy.datamodel;
 
-import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.datamodel.SleuthkitCase;
 
 /**
- * Node for the extracted content artifacts (artifacts that are not shown in more specific areas of the tree)
+ * Node for the extracted content artifacts (artifacts that are not shown in
+ * more specific areas of the tree)
  */
 public class ExtractedContentNode extends DisplayableItemNode {
 
-    public static final String NAME = "Extracted Content";
+    public static final String NAME = NbBundle.getMessage(ExtractedContentNode.class, "ExtractedContentNode.name.text");
 
     public ExtractedContentNode(SleuthkitCase skCase) {
         super(Children.create(new ExtractedContentChildren(skCase), true), Lookups.singleton(NAME));
@@ -42,7 +43,7 @@ public class ExtractedContentNode extends DisplayableItemNode {
     public boolean isLeafTypeNode() {
         return false;
     }
-                                
+
     @Override
     public <T> T accept(DisplayableItemNodeVisitor<T> v) {
         return v.visit(this);
@@ -57,9 +58,9 @@ public class ExtractedContentNode extends DisplayableItemNode {
             s.put(ss);
         }
 
-        ss.put(new NodeProperty("Name",
-                "Name",
-                "no description",
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ExtractedContentNode.createSheet.name.name"),
+                NbBundle.getMessage(this.getClass(), "ExtractedContentNode.createSheet.name.displayName"),
+                NbBundle.getMessage(this.getClass(), "ExtractedContentNode.createSheet.name.desc"),
                 NAME));
         return s;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java
index f16325609a..7c6fc354dd 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java
@@ -21,6 +21,8 @@ package org.sleuthkit.autopsy.datamodel;
 import java.util.ArrayList;
 import java.util.List;
 import javax.swing.Action;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.ContextMenuExtensionPoint;
 import org.sleuthkit.autopsy.actions.AddContentTagAction;
 import org.sleuthkit.autopsy.directorytree.ExternalViewerAction;
@@ -76,14 +78,17 @@ public class FileNode extends AbstractFsContentNode<AbstractFile> {
     public Action[] getActions(boolean popup) {
         List<Action> actionsList = new ArrayList<>();        
         if (!this.getDirectoryBrowseMode()) {
-            actionsList.add(new ViewContextAction("View File in Directory", this));
+            actionsList.add(new ViewContextAction(NbBundle.getMessage(this.getClass(), "FileNode.viewFileInDir.text"), this));
             actionsList.add(null); // creates a menu separator
         }
-        actionsList.add(new NewWindowViewAction("View in New Window", this));
-        actionsList.add(new ExternalViewerAction("Open in External Viewer", this));
+        actionsList.add(new NewWindowViewAction(
+                NbBundle.getMessage(this.getClass(), "FileNode.getActions.viewInNewWin.text"), this));
+        actionsList.add(new ExternalViewerAction(
+                NbBundle.getMessage(this.getClass(), "FileNode.getActions.openInExtViewer.text"), this));
         actionsList.add(null); // creates a menu separator
         actionsList.add(ExtractAction.getInstance());
-        actionsList.add(new HashSearchAction("Search for files with the same MD5 hash", this));
+        actionsList.add(new HashSearchAction(
+                NbBundle.getMessage(this.getClass(), "FileNode.getActions.searchFilesSameMD5.text"), this));
         actionsList.add(null); // creates a menu separator        
         actionsList.add(AddContentTagAction.getInstance());
         actionsList.addAll(ContextMenuExtensionPoint.getActions());        
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileSize.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileSize.java
index 2d8b44f8e5..8bf1d606a4 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileSize.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileSize.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  * 
- * Copyright 2013 Basis Technology Corp.
+ * Copyright 2013-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,6 +27,7 @@ import org.openide.nodes.ChildFactory;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.AbstractFile;
@@ -99,14 +100,12 @@ public class FileSize implements AutopsyVisitableItem {
 
     public static class FileSizeRootNode extends DisplayableItemNode {
 
-        private static final String NAME = "File Size";
-        private SleuthkitCase skCase;
+        private static final String NAME = NbBundle.getMessage(FileSize.class, "FileSize.fileSizeRootNode.name");
 
         FileSizeRootNode(SleuthkitCase skCase) {
             super(Children.create(new FileSizeRootChildren(skCase), true), Lookups.singleton(NAME));
             super.setName(NAME);
             super.setDisplayName(NAME);
-            this.skCase = skCase;
             this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/file-size-16.png");
         }
 
@@ -114,7 +113,7 @@ public class FileSize implements AutopsyVisitableItem {
         public boolean isLeafTypeNode() {
             return false;
         }
-                
+
         @Override
         public <T> T accept(DisplayableItemNodeVisitor<T> v) {
             return v.visit(this);
@@ -129,9 +128,9 @@ public class FileSize implements AutopsyVisitableItem {
                 s.put(ss);
             }
 
-            ss.put(new NodeProperty("Name",
-                    "Name",
-                    "no description",
+            ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileSize.createSheet.name.name"),
+                    NbBundle.getMessage(this.getClass(), "FileSize.createSheet.name.displayName"),
+                    NbBundle.getMessage(this.getClass(), "FileSize.createSheet.name.desc"),
                     NAME));
             return s;
         }
@@ -159,14 +158,12 @@ public class FileSize implements AutopsyVisitableItem {
 
         public class FileSizeNode extends DisplayableItemNode {
 
-            private SleuthkitCase skCase;
             private FileSizeFilter filter;
             private final Logger logger = Logger.getLogger(FileSizeNode.class.getName());
 
             FileSizeNode(SleuthkitCase skCase, FileSizeFilter filter) {
                 super(Children.create(new FileSizeChildren(filter, skCase), true), Lookups.singleton(filter.getDisplayName()));
                 super.setName(filter.getName());
-                this.skCase = skCase;
                 this.filter = filter;
 
                 String tooltip = filter.getDisplayName();
@@ -193,9 +190,9 @@ public class FileSize implements AutopsyVisitableItem {
                     s.put(ss);
                 }
 
-                ss.put(new NodeProperty("Filter Type",
-                        "Filter Type",
-                        "no description",
+                ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileSize.createSheet.filterType.name"),
+                        NbBundle.getMessage(this.getClass(), "FileSize.createSheet.filterType.displayName"),
+                        NbBundle.getMessage(this.getClass(), "FileSize.createSheet.filterType.desc"),
                         filter.getDisplayName()));
 
                 return s;
@@ -243,7 +240,7 @@ public class FileSize implements AutopsyVisitableItem {
                         break;
 
                     default:
-                        logger.log(Level.SEVERE, "Unsupported filter type to get files by size: " + filter);
+                        logger.log(Level.SEVERE, "Unsupported filter type to get files by size: {0}", filter);
                         return null;
                 }
                 // ignore unalloc block files
@@ -253,13 +250,13 @@ public class FileSize implements AutopsyVisitableItem {
             }
 
             private List<AbstractFile> runFsQuery() {
-                List<AbstractFile> ret = new ArrayList<AbstractFile>();
+                List<AbstractFile> ret = new ArrayList<>();
 
                 String query = makeQuery();
                 if (query == null) {
                     return null;
                 }
-                
+
                 try {
                     ret = skCase.findAllFilesWhere(query);
                 } catch (TskCoreException e) {
@@ -327,7 +324,10 @@ public class FileSize implements AutopsyVisitableItem {
 
                     @Override
                     protected AbstractNode defaultVisit(Content di) {
-                        throw new UnsupportedOperationException("Not supported for this type of Displayable Item: " + di.toString());
+                        throw new UnsupportedOperationException(
+                                NbBundle.getMessage(this.getClass(),
+                                "FileSize.exception.notSupported.msg",
+                                di.toString()));
                     }
                 });
             }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java
index 3376e9f0d9..4628c6f607 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeChildren.java
@@ -21,6 +21,8 @@ package org.sleuthkit.autopsy.datamodel;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.openide.nodes.AbstractNode;
 import org.openide.nodes.ChildFactory;
@@ -125,7 +127,10 @@ class FileTypeChildren extends ChildFactory<Content> {
 
             @Override
             protected AbstractNode defaultVisit(Content di) {
-                throw new UnsupportedOperationException("Not supported for this type of Displayable Item: " + di.toString());
+                throw new UnsupportedOperationException(
+                        NbBundle.getMessage(this.getClass(),
+                                            "FileTypeChildren.exception.notSupported.msg",
+                                            di.toString()));
             }
         });
     }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensionFilters.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensionFilters.java
index b90a257419..aa98f52fd4 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensionFilters.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeExtensionFilters.java
@@ -20,6 +20,8 @@ package org.sleuthkit.autopsy.datamodel;
 
 import java.util.Arrays;
 import java.util.List;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.datamodel.SleuthkitCase;
 
 /**
@@ -31,12 +33,24 @@ import org.sleuthkit.datamodel.SleuthkitCase;
 
     // root node filters
     public enum RootFilter implements AutopsyVisitableItem,SearchFilterInterface {
-        TSK_IMAGE_FILTER(0, "TSK_IMAGE_FILTER", "Images", FileTypeExtensions.getImageExtensions()),
-        TSK_VIDEO_FILTER(1, "TSK_VIDEO_FILTER", "Videos", FileTypeExtensions.getVideoExtensions()),
-        TSK_AUDIO_FILTER(2, "TSK_AUDIO_FILTER", "Audio", FileTypeExtensions.getAudioExtensions()),
-        TSK_ARCHIVE_FILTER(3, "TSK_ARCHIVE_FILTER", "Archives", FileTypeExtensions.getArchiveExtensions()),
-        TSK_DOCUMENT_FILTER(3, "TSK_DOCUMENT_FILTER", "Documents", Arrays.asList(".doc", ".docx", ".pdf", ".xls", ".rtf", ".txt")),
-        TSK_EXECUTABLE_FILTER(3, "TSK_EXECUTABLE_FILTER", "Executable", Arrays.asList(".exe", ".dll", ".bat", ".cmd", ".com"));
+        TSK_IMAGE_FILTER(0, "TSK_IMAGE_FILTER",
+                         NbBundle.getMessage(FileTypeExtensionFilters.class, "FileTypeExtensionFilters.tskImgFilter.text"),
+                         FileTypeExtensions.getImageExtensions()),
+        TSK_VIDEO_FILTER(1, "TSK_VIDEO_FILTER",
+                         NbBundle.getMessage(FileTypeExtensionFilters.class, "FileTypeExtensionFilters.tskVideoFilter.text"),
+                         FileTypeExtensions.getVideoExtensions()),
+        TSK_AUDIO_FILTER(2, "TSK_AUDIO_FILTER",
+                         NbBundle.getMessage(FileTypeExtensionFilters.class, "FileTypeExtensionFilters.tskAudioFilter.text"),
+                         FileTypeExtensions.getAudioExtensions()),
+        TSK_ARCHIVE_FILTER(3, "TSK_ARCHIVE_FILTER",
+                           NbBundle.getMessage(FileTypeExtensionFilters.class, "FileTypeExtensionFilters.tskArchiveFilter.text"),
+                           FileTypeExtensions.getArchiveExtensions()),
+        TSK_DOCUMENT_FILTER(3, "TSK_DOCUMENT_FILTER",
+                            NbBundle.getMessage(FileTypeExtensionFilters.class, "FileTypeExtensionFilters.tskDocumentFilter.text"),
+                            Arrays.asList(".doc", ".docx", ".pdf", ".xls", ".rtf", ".txt")),
+        TSK_EXECUTABLE_FILTER(3, "TSK_EXECUTABLE_FILTER",
+                              NbBundle.getMessage(FileTypeExtensionFilters.class, "FileTypeExtensionFilters.tskExecFilter.text"),
+                              Arrays.asList(".exe", ".dll", ".bat", ".cmd", ".com"));
 
         private int id;
         private String name;
@@ -78,12 +92,21 @@ import org.sleuthkit.datamodel.SleuthkitCase;
     
     // document sub-node filters
     public enum DocumentFilter implements AutopsyVisitableItem,SearchFilterInterface {
-        AUT_DOC_HTML(0, "AUT_DOC_HTML", "HTML", Arrays.asList(".htm", ".html")),
-        AUT_DOC_OFFICE(1, "AUT_DOC_OFFICE", "Office", Arrays.asList(".doc", ".docx", 
-                ".odt", ".xls", ".xlsx", ".ppt", ".pptx")),
-        AUT_DOC_PDF(2, "AUT_DOC_PDF", "PDF", Arrays.asList(".pdf")),
-        AUT_DOC_TXT(3, "AUT_DOC_TXT", "Plain Text", Arrays.asList(".txt")),
-        AUT_DOC_RTF(4, "AUT_DOC_RTF", "Rich Text", Arrays.asList(".rtf"));
+        AUT_DOC_HTML(0, "AUT_DOC_HTML",
+                     NbBundle.getMessage(FileTypeExtensionFilters.class, "FileTypeExtensionFilters.autDocHtmlFilter.text"),
+                     Arrays.asList(".htm", ".html")),
+        AUT_DOC_OFFICE(1, "AUT_DOC_OFFICE",
+                       NbBundle.getMessage(FileTypeExtensionFilters.class, "FileTypeExtensionFilters.autDocOfficeFilter.text"),
+                       Arrays.asList(".doc", ".docx", ".odt", ".xls", ".xlsx", ".ppt", ".pptx")),
+        AUT_DOC_PDF(2, "AUT_DOC_PDF",
+                    NbBundle.getMessage(FileTypeExtensionFilters.class, "FileTypeExtensionFilters.autoDocPdfFilter.text"),
+                    Arrays.asList(".pdf")),
+        AUT_DOC_TXT(3, "AUT_DOC_TXT",
+                    NbBundle.getMessage(FileTypeExtensionFilters.class, "FileTypeExtensionFilters.autDocTxtFilter.text"),
+                    Arrays.asList(".txt")),
+        AUT_DOC_RTF(4, "AUT_DOC_RTF",
+                    NbBundle.getMessage(FileTypeExtensionFilters.class, "FileTypeExtensionFilters.autDocRtfFilter.text"),
+                    Arrays.asList(".rtf"));
 
         private int id;
         private String name;
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeNode.java
index 02c8b89e1c..53575f67e3 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeNode.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");
@@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.datamodel;
 
 import org.openide.nodes.Children;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.datamodel.SleuthkitCase;
 
@@ -33,12 +34,12 @@ public class FileTypeNode extends DisplayableItemNode {
 
     FileTypeNode(FileTypeExtensionFilters.SearchFilterInterface filter, SleuthkitCase skCase) {
         super(Children.create(new FileTypeChildren(filter, skCase), true), Lookups.singleton(filter.getDisplayName()));
-        
+
         this.filter = filter;
         this.skCase = skCase;
-        
+
         super.setName(filter.getName());
-        
+
         //get count of children without preloading all children nodes
         final long count = new FileTypeChildren(filter, skCase).calculateItems();
         //final long count = getChildren().getNodesCount(true);
@@ -61,18 +62,18 @@ public class FileTypeNode extends DisplayableItemNode {
             s.put(ss);
         }
 
-        ss.put(new NodeProperty("Filter Type",
-                "Filter Type",
-                "no description",
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileTypeNode.createSheet.filterType.name"),
+                NbBundle.getMessage(this.getClass(), "FileTypeNode.createSheet.filterType.displayName"),
+                NbBundle.getMessage(this.getClass(), "FileTypeNode.createSheet.filterType.desc"),
                 filter.getDisplayName()));
         String extensions = "";
         for (String ext : filter.getFilter()) {
             extensions += "'" + ext + "', ";
         }
         extensions = extensions.substring(0, extensions.lastIndexOf(','));
-        ss.put(new NodeProperty("File Extensions",
-                "File Extensions",
-                "no description",
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileTypeNode.createSheet.fileExt.name"),
+                NbBundle.getMessage(this.getClass(), "FileTypeNode.createSheet.fileExt.displayName"),
+                NbBundle.getMessage(this.getClass(), "FileTypeNode.createSheet.fileExt.desc"),
                 extensions));
 
         return s;
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesNode.java
index 98b64f7d9b..83e3d69717 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesNode.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");
@@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.datamodel;
 
 import org.openide.nodes.Children;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.datamodel.SleuthkitCase;
 
@@ -28,13 +29,13 @@ import org.sleuthkit.datamodel.SleuthkitCase;
  */
 public class FileTypesNode extends DisplayableItemNode {
 
-    private static final String FNAME = "File Types";
-    private SleuthkitCase skCase;
+    private static final String FNAME = NbBundle.getMessage(FileTypesNode.class, "FileTypesNode.fname.text");
 
     /**
-     * 
+     *
      * @param skCase
-     * @param filter null to display root node of file type tree, pass in something to provide a sub-node.  
+     * @param filter null to display root node of file type tree, pass in
+     * something to provide a sub-node.
      */
     FileTypesNode(SleuthkitCase skCase, FileTypeExtensionFilters.RootFilter filter) {
         super(Children.create(new FileTypesChildren(skCase, filter), true), Lookups.singleton(filter == null ? FNAME : filter.getName()));
@@ -42,13 +43,11 @@ public class FileTypesNode extends DisplayableItemNode {
         if (filter == null) {
             super.setName(FNAME);
             super.setDisplayName(FNAME);
-        } 
-        // sub-node in file tree (i.e. documents, exec, etc.)
+        } // sub-node in file tree (i.e. documents, exec, etc.)
         else {
             super.setName(filter.getName());
             super.setDisplayName(filter.getDisplayName());
         }
-        this.skCase = skCase;
         this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/file_types.png");
     }
 
@@ -56,7 +55,7 @@ public class FileTypesNode extends DisplayableItemNode {
     public boolean isLeafTypeNode() {
         return false;
     }
-    
+
     @Override
     public <T> T accept(DisplayableItemNodeVisitor<T> v) {
         return v.visit(this);
@@ -71,9 +70,9 @@ public class FileTypesNode extends DisplayableItemNode {
             s.put(ss);
         }
 
-        ss.put(new NodeProperty("Name",
-                "Name",
-                "no description",
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "FileTypesNode.createSheet.name.name"),
+                NbBundle.getMessage(this.getClass(), "FileTypesNode.createSheet.name.displayName"),
+                NbBundle.getMessage(this.getClass(), "FileTypesNode.createSheet.name.desc"),
                 getName()));
         return s;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java
index 846cd5f7f5..78d337d0c3 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.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");
@@ -20,21 +20,19 @@ package org.sleuthkit.autopsy.datamodel;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.openide.nodes.AbstractNode;
 import org.openide.nodes.ChildFactory;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
 import org.openide.nodes.Sheet;
-import org.openide.util.Exceptions;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardAttribute;
@@ -54,7 +52,7 @@ public class HashsetHits implements AutopsyVisitableItem {
 
     public HashsetHits(SleuthkitCase skCase) {
         this.skCase = skCase;
-        hashSetHitsMap = new LinkedHashMap<String, Set<Long>>();
+        hashSetHitsMap = new LinkedHashMap<>();
     }
 
     @SuppressWarnings("deprecation")
@@ -79,21 +77,20 @@ public class HashsetHits implements AutopsyVisitableItem {
                 hashSetHitsMap.get(value).add(artifactId);
 
             }
-           
+
         } catch (SQLException ex) {
             logger.log(Level.WARNING, "SQL Exception occurred: ", ex);
-        }
-        finally {
+        } finally {
             if (rs != null) {
                 try {
                     skCase.closeRunQuery(rs);
                 } catch (SQLException ex) {
-                   logger.log(Level.WARNING, "Error closing result set after getting hashset hits", ex);
+                    logger.log(Level.WARNING, "Error closing result set after getting hashset hits", ex);
                 }
             }
         }
     }
-   
+
     @Override
     public <T> T accept(AutopsyItemVisitor<T> v) {
         return v.visit(this);
@@ -116,7 +113,7 @@ public class HashsetHits implements AutopsyVisitableItem {
         public boolean isLeafTypeNode() {
             return false;
         }
-                
+
         @Override
         public <T> T accept(DisplayableItemNodeVisitor<T> v) {
             return v.visit(this);
@@ -131,9 +128,9 @@ public class HashsetHits implements AutopsyVisitableItem {
                 s.put(ss);
             }
 
-            ss.put(new NodeProperty("Name",
-                    "Name",
-                    "no description",
+            ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "HashsetHits.createSheet.name.name"),
+                    NbBundle.getMessage(this.getClass(), "HashsetHits.createSheet.name.displayName"),
+                    NbBundle.getMessage(this.getClass(), "HashsetHits.createSheet.name.desc"),
                     getName()));
 
             return s;
@@ -177,9 +174,9 @@ public class HashsetHits implements AutopsyVisitableItem {
                 s.put(ss);
             }
 
-            ss.put(new NodeProperty("Name",
-                    "Name",
-                    "no description",
+            ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "HashsetHits.createSheet.name.name"),
+                    NbBundle.getMessage(this.getClass(), "HashsetHits.createSheet.name.displayName"),
+                    NbBundle.getMessage(this.getClass(), "HashsetHits.createSheet.name.desc"),
                     getName()));
 
             return s;
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java
index bea81eebc7..6ca6224d76 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.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");
@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.swing.Action;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.directorytree.ExplorerNodeActionVisitor;
 import org.sleuthkit.autopsy.directorytree.FileSearchAction;
 import org.sleuthkit.autopsy.directorytree.NewWindowViewAction;
@@ -66,8 +67,10 @@ public class ImageNode extends AbstractContentNode<Image> {
     public Action[] getActions(boolean context) {
         List<Action> actionsList = new ArrayList<Action>();
 
-        actionsList.add(new NewWindowViewAction("View in New Window", this));
-        actionsList.add(new FileSearchAction("Open File Search by Attributes"));
+        actionsList.add(new NewWindowViewAction(
+                NbBundle.getMessage(this.getClass(), "ImageNode.getActions.viewInNewWin.text"), this));
+        actionsList.add(new FileSearchAction(
+                NbBundle.getMessage(this.getClass(), "ImageNode.getActions.openFileSearchByAttr.text")));
         actionsList.addAll(ExplorerNodeActionVisitor.getActions(content));
 
         return actionsList.toArray(new Action[0]);
@@ -82,8 +85,10 @@ public class ImageNode extends AbstractContentNode<Image> {
             s.put(ss);
         }
 
-        ss.put(new NodeProperty("Name", "Name", "no description", getName()));
-        // @@@ add more properties here...
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ImageNode.createSheet.name.name"),
+                NbBundle.getMessage(this.getClass(), "ImageNode.createSheet.name.displayName"),
+                NbBundle.getMessage(this.getClass(), "ImageNode.createSheet.name.desc"),
+                getName()));
 
         return s;
     }
@@ -97,7 +102,7 @@ public class ImageNode extends AbstractContentNode<Image> {
     public boolean isLeafTypeNode() {
         return false;
     }
-                
+
     @Override
     public <T> T accept(DisplayableItemNodeVisitor<T> v) {
         return v.visit(this);
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Installer.java b/Core/src/org/sleuthkit/autopsy/datamodel/Installer.java
index 1357b0ccd6..a9fa9c2a48 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/Installer.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/Installer.java
@@ -20,6 +20,8 @@ package org.sleuthkit.autopsy.datamodel;
 
 import java.awt.Component;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.JOptionPane;
 import org.openide.LifecycleManager;
@@ -62,9 +64,9 @@ public class Installer extends ModuleInstall {
             String skVersion = SleuthkitJNI.getVersion();
 
             if (skVersion == null) {
-                throw new Exception("Sleuth Kit JNI test call returned without error, but version string was null!");
+                throw new Exception(NbBundle.getMessage(this.getClass(), "Installer.exception.tskVerStringNull.msg"));
             } else if (skVersion.length() == 0) {
-                throw new Exception("Sleuth Kit JNI test call returned without error, but version string was \"\"!");
+                throw new Exception(NbBundle.getMessage(this.getClass(), "Installer.exception.taskVerStringBang.msg"));
             } else {
                 logger.log(Level.CONFIG, "Sleuth Kit Version: {0}", skVersion);
             }
@@ -75,8 +77,8 @@ public class Installer extends ModuleInstall {
 
             // Normal error box log handler won't be loaded yet, so show error here.
             final Component parentComponent = null; // Use default window frame.
-            final String message = "Problem with Sleuth Kit JNI. Test call failed!\n\nDetails: " + e.toString();
-            final String title = "Fatal Error!";
+            final String message = NbBundle.getMessage(this.getClass(), "Installer.tskLibErr.msg", e.toString());
+            final String title = NbBundle.getMessage(this.getClass(), "Installer.tskLibErr.err");
             final int messageType = JOptionPane.ERROR_MESSAGE;
 
             JOptionPane.showMessageDialog(
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java
index cc165631f4..5e762bfa4e 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java
@@ -27,6 +27,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.openide.nodes.ChildFactory;
 import org.openide.nodes.Children;
@@ -41,8 +43,9 @@ import org.sleuthkit.datamodel.TskException;
 
 public class InterestingHits implements AutopsyVisitableItem {
     
-    private static final String INTERESTING_ITEMS = "INTERESTING ITEMS";
-    private static final String DISPLAY_NAME = "Interesting Items";
+    private static final String INTERESTING_ITEMS = NbBundle
+            .getMessage(InterestingHits.class, "InterestingHits.interestingItems.text");
+    private static final String DISPLAY_NAME = NbBundle.getMessage(InterestingHits.class, "InterestingHits.displayName.text");
     private static final Logger logger = Logger.getLogger(InterestingHits.class.getName());
     private SleuthkitCase skCase;
     private Map<String, Set<Long>> interestingItemsMap;
@@ -132,10 +135,10 @@ public class InterestingHits implements AutopsyVisitableItem {
                 s.put(ss);
             }
 
-            ss.put(new NodeProperty("Name",
-                    "Name",
-                    "no description",
-                    getName()));
+            ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.name"),
+                                    NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.displayName"),
+                                    NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.desc"),
+                                    getName()));
 
             return s;
         }
@@ -178,10 +181,10 @@ public class InterestingHits implements AutopsyVisitableItem {
                 s.put(ss);
             }
 
-            ss.put(new NodeProperty("Name",
-                    "Name",
-                    "no description",
-                    getName()));
+            ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.name"),
+                                    NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.name"),
+                                    NbBundle.getMessage(this.getClass(), "InterestingHits.createSheet.name.desc"),
+                                    getName()));
 
             return s;
         }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.java
index e1330f0f92..648d27e161 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/KeyValueNode.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");
@@ -23,6 +23,7 @@ import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children;
 import org.openide.nodes.Sheet;
 import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.datamodel.AbstractFile;
 
@@ -30,10 +31,8 @@ import org.sleuthkit.datamodel.AbstractFile;
  * Node that contains a KeyValue object. The node also has that KeyValue object
  * set to its lookup so that when the node is passed to the content viewers its
  * string will be displayed.
- *
- * @author alawrence
  */
- public class KeyValueNode extends AbstractNode {
+public class KeyValueNode extends AbstractNode {
 
     private KeyValue data;
 
@@ -49,12 +48,12 @@ import org.sleuthkit.datamodel.AbstractFile;
         super(children, lookup);
         this.setName(thing.getName());
         this.data = thing;
-        
+
         setIcon();
     }
-    
+
     private void setIcon() {
-         //if file/dir, set icon
+        //if file/dir, set icon
         AbstractFile af = Lookup.getDefault().lookup(AbstractFile.class);
         if (af != null) {
             // set name, display name, and icon
@@ -78,12 +77,18 @@ import org.sleuthkit.datamodel.AbstractFile;
 
         // table view drops first column of properties under assumption
         // that it contains the node's name
-        ss.put(new NodeProperty("Name", "Name", "n/a", data.getName()));
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "KeyValueNode.createSheet.name.name"),
+                NbBundle.getMessage(this.getClass(), "KeyValueNode.createSheet.name.displayName"),
+                NbBundle.getMessage(this.getClass(), "KeyValueNode.createSheet.name.desc"),
+                data.getName()));
 
         for (Map.Entry<String, Object> entry : data.getMap().entrySet()) {
             String key = entry.getKey();
             Object value = entry.getValue();
-            ss.put(new NodeProperty(key, key, "n/a", value));
+            ss.put(new NodeProperty<>(key,
+                    key,
+                    NbBundle.getMessage(this.getClass(), "KeyValueNode.createSheet.map.desc"),
+                    value));
         }
 
         return s;
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java
index 59055bdcff..8045af52ad 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.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");
@@ -27,12 +27,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.openide.nodes.ChildFactory;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
 import org.openide.nodes.Sheet;
-import org.openide.util.Exceptions;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardAttribute;
@@ -48,10 +48,12 @@ public class KeywordHits implements AutopsyVisitableItem {
 
     private SleuthkitCase skCase;
     private static final Logger logger = Logger.getLogger(KeywordHits.class.getName());
-    private static final String KEYWORD_HITS = "Keyword Hits";
+    private static final String KEYWORD_HITS = NbBundle.getMessage(KeywordHits.class, "KeywordHits.kwHits.text");
     public static final String NAME = BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getLabel();
-    public static final String SIMPLE_LITERAL_SEARCH = "Single Literal Keyword Search";
-    public static final String SIMPLE_REGEX_SEARCH = "Single Regular Expression Search";
+    public static final String SIMPLE_LITERAL_SEARCH = NbBundle
+            .getMessage(KeywordHits.class, "KeywordHits.simpleLiteralSearch.text");
+    public static final String SIMPLE_REGEX_SEARCH = NbBundle
+            .getMessage(KeywordHits.class, "KeywordHits.singleRegexSearch.text");
     // Map from String (list name) to Map from string (keyword) to set<long> (artifact ids)
     private Map<String, Map<String, Set<Long>>> topLevelMap;
     private Map<String, Map<String, Set<Long>>> listsMap;
@@ -63,11 +65,11 @@ public class KeywordHits implements AutopsyVisitableItem {
 
     public KeywordHits(SleuthkitCase skCase) {
         this.skCase = skCase;
-        artifacts = new LinkedHashMap<Long, Map<Long, String>>();
-        listsMap = new LinkedHashMap<String, Map<String, Set<Long>>>();
-        literalMap = new LinkedHashMap<String, Set<Long>>();
-        regexMap = new LinkedHashMap<String, Set<Long>>();
-        topLevelMap = new LinkedHashMap<String, Map<String, Set<Long>>>();
+        artifacts = new LinkedHashMap<>();
+        listsMap = new LinkedHashMap<>();
+        literalMap = new LinkedHashMap<>();
+        regexMap = new LinkedHashMap<>();
+        topLevelMap = new LinkedHashMap<>();
     }
 
     private void initMaps() {
@@ -104,7 +106,6 @@ public class KeywordHits implements AutopsyVisitableItem {
                 literalMap.get(word).add(id);
             }
             topLevelMap.putAll(listsMap);
-
         }
     }
 
@@ -137,16 +138,15 @@ public class KeywordHits implements AutopsyVisitableItem {
                 }
 
             }
-      
+
         } catch (SQLException ex) {
             logger.log(Level.WARNING, "SQL Exception occurred: ", ex);
-        }
-        finally {
-              if (rs != null) {
+        } finally {
+            if (rs != null) {
                 try {
                     skCase.closeRunQuery(rs);
                 } catch (SQLException ex) {
-                   logger.log(Level.WARNING, "Error closing result set after getting keyword hits", ex);
+                    logger.log(Level.WARNING, "Error closing result set after getting keyword hits", ex);
                 }
             }
         }
@@ -164,18 +164,15 @@ public class KeywordHits implements AutopsyVisitableItem {
             super.setName(NAME);
             super.setDisplayName(KEYWORD_HITS);
             this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/keyword_hits.png");
-            //long start = System.currentTimeMillis();
             initArtifacts();
             initMaps();
-            //long finish = System.currentTimeMillis();
-            //logger.info("Process took " + (finish-start) + " ms" );
         }
 
-                @Override
+        @Override
         public boolean isLeafTypeNode() {
             return false;
         }
-                
+
         @Override
         public <T> T accept(DisplayableItemNodeVisitor<T> v) {
             return v.visit(this);
@@ -190,9 +187,9 @@ public class KeywordHits implements AutopsyVisitableItem {
                 s.put(ss);
             }
 
-            ss.put(new NodeProperty("Name",
-                    "Name",
-                    "no description",
+            ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "KeywordHits.createSheet.name.name"),
+                    NbBundle.getMessage(this.getClass(), "KeywordHits.createSheet.name.displayName"),
+                    NbBundle.getMessage(this.getClass(), "KeywordHits.createSheet.name.desc"),
                     getName()));
 
             return s;
@@ -239,16 +236,16 @@ public class KeywordHits implements AutopsyVisitableItem {
                 ss = Sheet.createPropertiesSet();
                 s.put(ss);
             }
-            
-            ss.put(new NodeProperty("List Name",
-                    "List Name",
-                    "no description",
+
+            ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "KeywordHits.createSheet.listName.name"),
+                    NbBundle.getMessage(this.getClass(), "KeywordHits.createSheet.listName.displayName"),
+                    NbBundle.getMessage(this.getClass(), "KeywordHits.createSheet.listName.desc"),
                     name));
 
 
-            ss.put(new NodeProperty("Number of Children",
-                    "Number of Children",
-                    "no description",
+            ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "KeywordHits.createSheet.numChildren.name"),
+                    NbBundle.getMessage(this.getClass(), "KeywordHits.createSheet.numChildren.displayName"),
+                    NbBundle.getMessage(this.getClass(), "KeywordHits.createSheet.numChildren.desc"),
                     children.size()));
 
             return s;
@@ -258,7 +255,7 @@ public class KeywordHits implements AutopsyVisitableItem {
         public boolean isLeafTypeNode() {
             return false;
         }
-                
+
         @Override
         public <T> T accept(DisplayableItemNodeVisitor<T> v) {
             return v.visit(this);
@@ -288,7 +285,6 @@ public class KeywordHits implements AutopsyVisitableItem {
 
     public class KeywordHitsKeywordNode extends DisplayableItemNode {
 
-        private String name;
         private Set<Long> children;
 
         public KeywordHitsKeywordNode(String name, Set<Long> children) {
@@ -296,7 +292,6 @@ public class KeywordHits implements AutopsyVisitableItem {
             super.setName(name);
             super.setDisplayName(name + " (" + children.size() + ")");
             this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/keyword_hits.png");
-            this.name = name;
             this.children = children;
         }
 
@@ -305,8 +300,6 @@ public class KeywordHits implements AutopsyVisitableItem {
             return true;
         }
 
-        
-        
         @Override
         public <T> T accept(DisplayableItemNodeVisitor<T> v) {
             return v.visit(this);
@@ -320,16 +313,15 @@ public class KeywordHits implements AutopsyVisitableItem {
                 ss = Sheet.createPropertiesSet();
                 s.put(ss);
             }
-            
-            ss.put(new NodeProperty("List Name",
-                    "List Name",
-                    "no description",
+
+            ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "KeywordHits.createSheet.listName.name"),
+                    NbBundle.getMessage(this.getClass(), "KeywordHits.createSheet.listName.displayName"),
+                    NbBundle.getMessage(this.getClass(), "KeywordHits.createSheet.listName.desc"),
                     getDisplayName()));
 
-
-            ss.put(new NodeProperty("Files with Hits",
-                    "Files with Hits",
-                    "no description",
+            ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "KeywordHits.createSheet.filesWithHits.name"),
+                    NbBundle.getMessage(this.getClass(), "KeywordHits.createSheet.filesWithHits.displayName"),
+                    NbBundle.getMessage(this.getClass(), "KeywordHits.createSheet.filesWithHits.desc"),
                     children.size()));
 
             return s;
@@ -370,20 +362,29 @@ public class KeywordHits implements AutopsyVisitableItem {
                 logger.log(Level.SEVERE, "TskCoreException while constructing BlackboardArtifact Node from KeywordHitsKeywordChildren");
                 return n;
             }
-            
-            n.addNodeProperty(new NodeProperty("ModifiedTime",
-                    "Modified Time",
-                    "Modified Time",
+
+            n.addNodeProperty(new NodeProperty<>(
+                    NbBundle.getMessage(this.getClass(), "KeywordHits.createNodeForKey.modTime.name"),
+                    NbBundle.getMessage(this.getClass(),
+                    "KeywordHits.createNodeForKey.modTime.displayName"),
+                    NbBundle.getMessage(this.getClass(),
+                    "KeywordHits.createNodeForKey.modTime.desc"),
                     ContentUtils.getStringTime(file.getMtime(), file)));
-            n.addNodeProperty(new NodeProperty("AccessTime",
-                    "Access Time",
-                    "Access Time",
+            n.addNodeProperty(new NodeProperty<>(
+                    NbBundle.getMessage(this.getClass(), "KeywordHits.createNodeForKey.accessTime.name"),
+                    NbBundle.getMessage(this.getClass(),
+                    "KeywordHits.createNodeForKey.accessTime.displayName"),
+                    NbBundle.getMessage(this.getClass(),
+                    "KeywordHits.createNodeForKey.accessTime.desc"),
                     ContentUtils.getStringTime(file.getAtime(), file)));
-            n.addNodeProperty(new NodeProperty("ChangeTime",
-                    "Change Time",
-                    "Change Time",
+            n.addNodeProperty(new NodeProperty<>(
+                    NbBundle.getMessage(this.getClass(), "KeywordHits.createNodeForKey.chgTime.name"),
+                    NbBundle.getMessage(this.getClass(),
+                    "KeywordHits.createNodeForKey.chgTime.displayName"),
+                    NbBundle.getMessage(this.getClass(),
+                    "KeywordHits.createNodeForKey.chgTime.desc"),
                     ContentUtils.getStringTime(file.getCtime(), file)));
-            
+
             return n;
         }
     }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/KnownFileFilterNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/KnownFileFilterNode.java
index 30cb2ddab3..ce37222728 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/KnownFileFilterNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/KnownFileFilterNode.java
@@ -23,6 +23,7 @@ import java.util.prefs.PreferenceChangeListener;
 import java.util.prefs.Preferences;
 import org.openide.nodes.FilterNode;
 import org.openide.nodes.Node;
+import org.openide.util.NbBundle;
 import org.openide.util.NbPreferences;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.TskData;
@@ -56,8 +57,8 @@ public class KnownFileFilterNode extends FilterNode {
      * is a sub-node of. (i.e. Data Sources, Views, Results)
      */
     public enum SelectionContext {
-        DATA_SOURCES("Data Sources"),   // Subnode of DataSources
-        VIEWS("Views"),                 // Subnode of Views
+        DATA_SOURCES(NbBundle.getMessage(KnownFileFilterNode.class, "KnownFileFilterNode.selectionContext.dataSources")),   // Subnode of DataSources
+        VIEWS(NbBundle.getMessage(KnownFileFilterNode.class, "KnownFileFilterNode.selectionContext.views")),                 // Subnode of Views
         OTHER("");                      // Subnode of another node.
         
         private final String displayName;
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java
index a896442f04..30f59d9abf 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  * 
- * Copyright 2011 - 2013 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,6 +24,7 @@ import java.util.List;
 import java.util.Map;
 import javax.swing.Action;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.ContextMenuExtensionPoint;
 import org.sleuthkit.autopsy.directorytree.ExternalViewerAction;
 import org.sleuthkit.autopsy.directorytree.ExtractAction;
@@ -42,7 +43,7 @@ public class LayoutFileNode extends AbstractAbstractFileNode<LayoutFile> {
         PARTS {
             @Override
             public String toString() {
-                return "Parts";
+                return NbBundle.getMessage(this.getClass(), "LayoutFileNode.propertyType.parts");
             }
         }
     }
@@ -72,16 +73,18 @@ public class LayoutFileNode extends AbstractAbstractFileNode<LayoutFile> {
             s.put(ss);
         }
 
-        Map<String, Object> map = new LinkedHashMap<String, Object>();
+        Map<String, Object> map = new LinkedHashMap<>();
         fillPropertyMap(map, content);
 
-        ss.put(new NodeProperty("Name", "Name", "no description", getName()));
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "LayoutFileNode.createSheet.name.name"),
+                NbBundle.getMessage(this.getClass(), "LayoutFileNode.createSheet.name.displayName"),
+                NbBundle.getMessage(this.getClass(), "LayoutFileNode.createSheet.name.desc"),
+                getName()));
 
-        final String NO_DESCR = "no description";
+        final String NO_DESCR = NbBundle.getMessage(this.getClass(), "LayoutFileNode.createSheet.noDescr.text");
         for (Map.Entry<String, Object> entry : map.entrySet()) {
-            ss.put(new NodeProperty(entry.getKey(), entry.getKey(), NO_DESCR, entry.getValue()));
+            ss.put(new NodeProperty<>(entry.getKey(), entry.getKey(), NO_DESCR, entry.getValue()));
         }
-        // @@@ add more properties here...
 
         return s;
     }
@@ -95,7 +98,7 @@ public class LayoutFileNode extends AbstractAbstractFileNode<LayoutFile> {
     public boolean isLeafTypeNode() {
         return false;
     }
-    
+
     @Override
     public <T> T accept(DisplayableItemNodeVisitor<T> v) {
         return v.visit(this);
@@ -104,8 +107,10 @@ public class LayoutFileNode extends AbstractAbstractFileNode<LayoutFile> {
     @Override
     public Action[] getActions(boolean context) {
         List<Action> actionsList = new ArrayList<>();
-        actionsList.add(new NewWindowViewAction("View in New Window", this));
-        actionsList.add(new ExternalViewerAction("Open in External Viewer", this));
+        actionsList.add(new NewWindowViewAction(
+                NbBundle.getMessage(this.getClass(), "LayoutFileNode.getActions.viewInNewWin.text"), this));
+        actionsList.add(new ExternalViewerAction(
+                NbBundle.getMessage(this.getClass(), "LayoutFileNode.getActions.openInExtViewer.text"), this));
         actionsList.add(null); // creates a menu separator
         actionsList.add(ExtractAction.getInstance());
         actionsList.add(null); // creates a menu separator
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/LocalFileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/LocalFileNode.java
index 02121410da..7e6cffbff1 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/LocalFileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/LocalFileNode.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  * 
- * Copyright 2013 Basis Technology Corp.
+ * Copyright 2013-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.sleuthkit.autopsy.datamodel;
 
 import java.util.ArrayList;
@@ -25,6 +24,7 @@ import java.util.List;
 import java.util.Map;
 import javax.swing.Action;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.ContextMenuExtensionPoint;
 import org.sleuthkit.autopsy.directorytree.ExternalViewerAction;
 import org.sleuthkit.autopsy.directorytree.ExtractAction;
@@ -64,14 +64,17 @@ public class LocalFileNode extends AbstractAbstractFileNode<AbstractFile> {
             s.put(ss);
         }
 
-        Map<String, Object> map = new LinkedHashMap<String, Object>();
+        Map<String, Object> map = new LinkedHashMap<>();
         fillPropertyMap(map, content);
 
-        ss.put(new NodeProperty("Name", "Name", "no description", getName()));
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "LocalFileNode.createSheet.name.name"),
+                NbBundle.getMessage(this.getClass(), "LocalFileNode.createSheet.name.displayName"),
+                NbBundle.getMessage(this.getClass(), "LocalFileNode.createSheet.name.desc"),
+                getName()));
 
-        final String NO_DESCR = "no description";
+        final String NO_DESCR = NbBundle.getMessage(this.getClass(), "LocalFileNode.createSheet.noDescr.text");
         for (Map.Entry<String, Object> entry : map.entrySet()) {
-            ss.put(new NodeProperty(entry.getKey(), entry.getKey(), NO_DESCR, entry.getValue()));
+            ss.put(new NodeProperty<>(entry.getKey(), entry.getKey(), NO_DESCR, entry.getValue()));
         }
         // @@@ add more properties here...
 
@@ -81,11 +84,14 @@ public class LocalFileNode extends AbstractAbstractFileNode<AbstractFile> {
     @Override
     public Action[] getActions(boolean context) {
         List<Action> actionsList = new ArrayList<>();
-        actionsList.add(new NewWindowViewAction("View in New Window", this));
-        actionsList.add(new ExternalViewerAction("Open in External Viewer", this));
+        actionsList.add(new NewWindowViewAction(
+                NbBundle.getMessage(this.getClass(), "LocalFileNode.getActions.viewInNewWin.text"), this));
+        actionsList.add(new ExternalViewerAction(
+                NbBundle.getMessage(this.getClass(), "LocalFileNode.getActions.openInExtViewer.text"), this));
         actionsList.add(null); // creates a menu separator
         actionsList.add(ExtractAction.getInstance());
-        actionsList.add(new HashSearchAction("Search for files with the same MD5 hash", this));
+        actionsList.add(new HashSearchAction(
+                NbBundle.getMessage(this.getClass(), "LocalFileNode.getActions.searchFilesSameMd5.text"), this));
         actionsList.add(null); // creates a menu separator
         actionsList.add(AddContentTagAction.getInstance());
         actionsList.addAll(ContextMenuExtensionPoint.getActions());
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/NodeProperty.java b/Core/src/org/sleuthkit/autopsy/datamodel/NodeProperty.java
index d9ee6da0b6..96682fcdb4 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/NodeProperty.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/NodeProperty.java
@@ -25,19 +25,19 @@ import org.openide.nodes.PropertySupport;
  * This class is used to represent the properties for each node.
  *
  */
-public class NodeProperty extends PropertySupport.ReadOnly {
+public class NodeProperty<T> extends PropertySupport.ReadOnly<T> {
 
-    private Object value;
+    private T value;
     
-    @SuppressWarnings({"unchecked"})
-   public  NodeProperty(String name, String displayName, String desc, Object value) {
-        super(name, value.getClass(), displayName, desc);
+    @SuppressWarnings("unchecked")
+    public NodeProperty(String name, String displayName, String desc, T value) {
+        super(name, (Class<T>) value.getClass(), displayName, desc);
         setValue("suppressCustomEditor", Boolean.TRUE); // remove the "..." (editing) button
         this.value = value;
     }
 
     @Override
-    public Object getValue() throws IllegalAccessException, InvocationTargetException {
+    public T getValue() throws IllegalAccessException, InvocationTargetException {
         return this.value;
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java
index 2745951574..75168f8b21 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFiles.java
@@ -18,6 +18,7 @@
  */
 package org.sleuthkit.autopsy.datamodel;
 
+import org.openide.util.NbBundle;
 import org.sleuthkit.datamodel.SleuthkitCase;
 
 /**
@@ -28,13 +29,20 @@ import org.sleuthkit.datamodel.SleuthkitCase;
     SleuthkitCase skCase;
     
     public enum RecentFilesFilter implements AutopsyVisitableItem {
-        AUT_0DAY_FILTER(0, "AUT_0DAY_FILTER", "Final Day", 0),
-        AUT_1DAY_FILTER(0, "AUT_1DAY_FILTER", "Final Day - 1", 1),
-        AUT_2DAY_FILTER(0, "AUT_2DAY_FILTER", "Final Day - 2", 2),
-        AUT_3DAY_FILTER(0, "AUT_3DAY_FILTER", "Final Day - 3", 3),
-        AUT_4DAY_FILTER(0, "AUT_4DAY_FILTER", "Final Day - 4", 4),
-        AUT_5DAY_FILTER(0, "AUT_5DAY_FILTER", "Final Day - 5", 5),
-        AUT_6DAY_FILTER(0, "AUT_6DAY_FILTER", "Final Day - 6", 6);
+        AUT_0DAY_FILTER(0, "AUT_0DAY_FILTER",
+                        NbBundle.getMessage(RecentFiles.class, "RecentFiles.aut0DayFilter.displayName.text"), 0),
+        AUT_1DAY_FILTER(0, "AUT_1DAY_FILTER",
+                        NbBundle.getMessage(RecentFiles.class, "RecentFiles.aut1dayFilter.displayName.text"), 1),
+        AUT_2DAY_FILTER(0, "AUT_2DAY_FILTER",
+                        NbBundle.getMessage(RecentFiles.class, "RecentFiles.aut2dayFilter.displayName.text"), 2),
+        AUT_3DAY_FILTER(0, "AUT_3DAY_FILTER",
+                        NbBundle.getMessage(RecentFiles.class, "RecentFiles.aut3dayFilter.displayName.text"), 3),
+        AUT_4DAY_FILTER(0, "AUT_4DAY_FILTER",
+                        NbBundle.getMessage(RecentFiles.class, "RecentFiles.aut4dayFilter.displayName.text"), 4),
+        AUT_5DAY_FILTER(0, "AUT_5DAY_FILTER",
+                        NbBundle.getMessage(RecentFiles.class, "RecentFiles.aut5dayFilter.displayName.text"), 5),
+        AUT_6DAY_FILTER(0, "AUT_6DAY_FILTER",
+                        NbBundle.getMessage(RecentFiles.class, "RecentFiles.aut6dayFilter.displayName.text"), 6);
         
         private int id;
         private String name;
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java
index 374fe54db2..636f1f82e8 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterChildren.java
@@ -22,6 +22,8 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.openide.nodes.AbstractNode;
 import org.openide.nodes.ChildFactory;
@@ -136,7 +138,10 @@ import org.sleuthkit.datamodel.TskData;
 
             @Override
             protected AbstractNode defaultVisit(Content di) {
-                throw new UnsupportedOperationException("Not supported for this type of Displayable Item: " + di.toString());
+                throw new UnsupportedOperationException(
+                        NbBundle.getMessage(this.getClass(),
+                                            "RecentFilesFilterChildren.exception.defaultVisit.msg",
+                                            di.toString()));
             }
         });
     }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterNode.java
index 6646eb24c3..bb234a7e45 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterNode.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");
@@ -20,8 +20,8 @@ package org.sleuthkit.autopsy.datamodel;
 
 import java.util.Calendar;
 import java.util.Locale;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children;
 import org.openide.nodes.Sheet;
 import org.openide.util.lookup.Lookups;
@@ -40,7 +40,6 @@ public class RecentFilesFilterNode extends DisplayableItemNode {
     RecentFilesFilterNode(SleuthkitCase skCase, RecentFilesFilter filter, Calendar lastDay) {
         super(Children.create(new RecentFilesFilterChildren(filter, skCase, lastDay), true), Lookups.singleton(filter.getDisplayName()));
         super.setName(filter.getName());
-        //super.setDisplayName(filter.getDisplayName());
         this.skCase = skCase;
         this.filter = filter;
         Calendar prevDay = (Calendar) lastDay.clone();
@@ -50,10 +49,9 @@ public class RecentFilesFilterNode extends DisplayableItemNode {
                 + prevDay.get(Calendar.YEAR);
         this.setShortDescription(tooltip);
         this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/recent_files.png");
-        
+
         //get count of children without preloading all children nodes
         final long count = new RecentFilesFilterChildren(filter, skCase, lastDay).calculateItems();
-        //final long count = getChildren().getNodesCount(true);
         super.setDisplayName(filter.getDisplayName() + " (" + count + ")");
     }
 
@@ -71,9 +69,10 @@ public class RecentFilesFilterNode extends DisplayableItemNode {
             s.put(ss);
         }
 
-        ss.put(new NodeProperty("Filter Type",
-                "Filter Type",
-                "no description",
+        ss.put(new NodeProperty<>(
+                NbBundle.getMessage(this.getClass(), "RecentFilesFilterNode.createSheet.filterType.name"),
+                NbBundle.getMessage(this.getClass(), "RecentFilesFilterNode.createSheet.filterType.displayName"),
+                NbBundle.getMessage(this.getClass(), "RecentFilesFilterNode.createSheet.filterType.desc"),
                 filter.getDisplayName()));
 
         return s;
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesNode.java
index ecacf715e2..c593a25c0f 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesNode.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");
@@ -18,9 +18,9 @@
  */
 package org.sleuthkit.autopsy.datamodel;
 
-import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.datamodel.SleuthkitCase;
 
@@ -29,7 +29,7 @@ import org.sleuthkit.datamodel.SleuthkitCase;
  */
 public class RecentFilesNode extends DisplayableItemNode {
 
-    private static final String NAME = "Recent Files";
+    private static final String NAME = NbBundle.getMessage(RecentFilesNode.class, "RecentFilesNode.name.text");
     private SleuthkitCase skCase;
 
     RecentFilesNode(SleuthkitCase skCase) {
@@ -38,14 +38,13 @@ public class RecentFilesNode extends DisplayableItemNode {
         super.setDisplayName(NAME);
         this.skCase = skCase;
         this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/recent_files.png");
-        
     }
 
     @Override
     public boolean isLeafTypeNode() {
         return false;
     }
-    
+
     @Override
     public <T> T accept(DisplayableItemNodeVisitor<T> v) {
         return v.visit(this);
@@ -60,9 +59,9 @@ public class RecentFilesNode extends DisplayableItemNode {
             s.put(ss);
         }
 
-        ss.put(new NodeProperty("Name",
-                "Name",
-                "no description",
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "RecentFilesNode.createSheet.name.name"),
+                NbBundle.getMessage(this.getClass(), "RecentFilesNode.createSheet.name.displayName"),
+                NbBundle.getMessage(this.getClass(), "RecentFilesNode.createSheet.name.desc"),
                 NAME));
         return s;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ResultsNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ResultsNode.java
index cbd1d941ea..f1fd416af4 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ResultsNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ResultsNode.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");
@@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.datamodel;
 
 import java.util.Arrays;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.datamodel.SleuthkitCase;
 
@@ -28,7 +29,7 @@ import org.sleuthkit.datamodel.SleuthkitCase;
  */
 public class ResultsNode extends DisplayableItemNode {
 
-    public static final String NAME = "Results";
+    public static final String NAME = NbBundle.getMessage(ResultsNode.class, "ResultsNode.name.text");
 
     public ResultsNode(SleuthkitCase sleuthkitCase) {
         super(new RootContentChildren(Arrays.asList(new ExtractedContent(sleuthkitCase),
@@ -36,8 +37,7 @@ public class ResultsNode extends DisplayableItemNode {
                 new HashsetHits(sleuthkitCase),
                 new EmailExtracted(sleuthkitCase),
                 new InterestingHits(sleuthkitCase),
-                new TagsNodeKey()
-                )), Lookups.singleton(NAME));
+                new TagsNodeKey())), Lookups.singleton(NAME));
         setName(NAME);
         setDisplayName(NAME);
         this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/results.png");
@@ -47,7 +47,7 @@ public class ResultsNode extends DisplayableItemNode {
     public boolean isLeafTypeNode() {
         return false;
     }
-    
+
     @Override
     public <T> T accept(DisplayableItemNodeVisitor<T> v) {
         return v.visit(this);
@@ -62,9 +62,9 @@ public class ResultsNode extends DisplayableItemNode {
             s.put(ss);
         }
 
-        ss.put(new NodeProperty("Name",
-                "Name",
-                "no description",
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ResultsNode.createSheet.name.name"),
+                NbBundle.getMessage(this.getClass(), "ResultsNode.createSheet.name.displayName"),
+                NbBundle.getMessage(this.getClass(), "ResultsNode.createSheet.name.desc"),
                 NAME));
         return s;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/TagNameNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/TagNameNode.java
index 38d140b039..de55d5545e 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/TagNameNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/TagNameNode.java
@@ -24,6 +24,7 @@ import org.openide.nodes.ChildFactory;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -32,34 +33,38 @@ import org.sleuthkit.datamodel.TagName;
 import org.sleuthkit.datamodel.TskCoreException;
 
 /**
- * Instances of this class are elements of Node hierarchies consisting of 
- * content and blackboard artifact tags, grouped first by tag type, then by 
- * tag name. 
+ * Instances of this class are elements of Node hierarchies consisting of
+ * content and blackboard artifact tags, grouped first by tag type, then by tag
+ * name.
  */
-public class TagNameNode  extends DisplayableItemNode {
+public class TagNameNode extends DisplayableItemNode {
+
     private static final String ICON_PATH = "org/sleuthkit/autopsy/images/tag-folder-blue-icon-16.png";
     private static final String BOOKMARK_TAG_ICON_PATH = "org/sleuthkit/autopsy/images/star-bookmark-icon-16.png";
     private final TagName tagName;
+    private static final String CONTENT_TAG_TYPE_NODE_KEY = NbBundle.getMessage(TagNameNode.class,
+            "TagNameNode.contentTagTypeNodeKey.text");
+    private static final String BLACKBOARD_ARTIFACT_TAG_TYPE_NODE_KEY = NbBundle.getMessage(TagNameNode.class,
+            "TagNameNode.bbArtTagTypeNodeKey.text");
 
     public TagNameNode(TagName tagName) {
-        super(Children.create(new TagTypeNodeFactory(tagName), true), Lookups.singleton(tagName.getDisplayName() + " Tags"));
+        super(Children.create(new TagTypeNodeFactory(tagName), true), Lookups.singleton(
+                NbBundle.getMessage(TagNameNode.class, "TagNameNode.namePlusTags.text", tagName.getDisplayName())));
         this.tagName = tagName;
-        
+
         long tagsCount = 0;
         try {
             tagsCount = Case.getCurrentCase().getServices().getTagsManager().getContentTagsCountByTagName(tagName);
             tagsCount += Case.getCurrentCase().getServices().getTagsManager().getBlackboardArtifactTagsCountByTagName(tagName);
-        }
-        catch (TskCoreException ex) {
+        } catch (TskCoreException ex) {
             Logger.getLogger(TagNameNode.class.getName()).log(Level.SEVERE, "Failed to get tags count for " + tagName.getDisplayName() + " tag name", ex);
         }
-        
+
         super.setName(tagName.getDisplayName());
         super.setDisplayName(tagName.getDisplayName() + " (" + tagsCount + ")");
-        if (tagName.getDisplayName().equals("Bookmark")) {
+        if (tagName.getDisplayName().equals(NbBundle.getMessage(this.getClass(), "TagNameNode.bookmark.text"))) {
             setIconBaseWithExtension(BOOKMARK_TAG_ICON_PATH);
-        }
-        else {
+        } else {
             setIconBaseWithExtension(ICON_PATH);
         }
     }
@@ -73,7 +78,10 @@ public class TagNameNode  extends DisplayableItemNode {
             propertySheet.put(properties);
         }
 
-        properties.put(new NodeProperty("Name", "Name", tagName.getDescription(), getName()));
+        properties.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "TagNameNode.createSheet.name.name"),
+                NbBundle.getMessage(this.getClass(), "TagNameNode.createSheet.name.displayName"),
+                tagName.getDescription(),
+                getName()));
 
         return propertySheet;
     }
@@ -89,16 +97,15 @@ public class TagNameNode  extends DisplayableItemNode {
     public boolean isLeafTypeNode() {
         return false;
     }
-    
+
     private static class TagTypeNodeFactory extends ChildFactory<String> {
-        private static final String CONTENT_TAG_TYPE_NODE_KEY = "Content Tags";
-        private static final String BLACKBOARD_ARTIFACT_TAG_TYPE_NODE_KEY = "Result Tags";
+
         private final TagName tagName;
-        
+
         TagTypeNodeFactory(TagName tagName) {
             this.tagName = tagName;
         }
-        
+
         @Override
         protected boolean createKeys(List<String> keys) {
             keys.add(CONTENT_TAG_TYPE_NODE_KEY);
@@ -108,16 +115,24 @@ public class TagNameNode  extends DisplayableItemNode {
 
         @Override
         protected Node createNodeForKey(String key) {
-            switch (key) {
-                case CONTENT_TAG_TYPE_NODE_KEY:
-                    return new ContentTagTypeNode(tagName);
-                case BLACKBOARD_ARTIFACT_TAG_TYPE_NODE_KEY:
-                    return new BlackboardArtifactTagTypeNode(tagName);
-                default:
-                    Logger.getLogger(TagNameNode.class.getName()).log(Level.SEVERE, "{0} not a recognized key", key);                    
-                    return null;
+//            switch (key) {
+//                case CONTENT_TAG_TYPE_NODE_KEY:
+//                    return new ContentTagTypeNode(tagName);
+//                case BLACKBOARD_ARTIFACT_TAG_TYPE_NODE_KEY:
+//                    return new BlackboardArtifactTagTypeNode(tagName);
+//                default:
+//                    Logger.getLogger(TagNameNode.class.getName()).log(Level.SEVERE, "{0} not a recognized key", key);
+//                    return null;
+//            }
+            // converted switch to if/else due to non-constant strings in case key
+            if (CONTENT_TAG_TYPE_NODE_KEY.equals(key)) {
+                return new ContentTagTypeNode(tagName);
+            } else if (BLACKBOARD_ARTIFACT_TAG_TYPE_NODE_KEY.equals(key)) {
+                return new BlackboardArtifactTagTypeNode(tagName);
+            } else {
+                Logger.getLogger(TagNameNode.class.getName()).log(Level.SEVERE, "{0} not a recognized key", key);
+                return null;
             }
         }
     }
 }
-
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/TagsNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/TagsNode.java
index b9acc010e7..087f2e16b3 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/TagsNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/TagsNode.java
@@ -24,6 +24,7 @@ import org.openide.nodes.ChildFactory;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -31,27 +32,28 @@ import org.sleuthkit.datamodel.TagName;
 import org.sleuthkit.datamodel.TskCoreException;
 
 /**
- * Instances of this class are the root nodes of tree that is a sub-tree of the 
- * Autopsy presentation of the SleuthKit data model. The sub-tree consists of 
- * content and blackboard artifact tags, grouped first by tag type, then by 
- * tag name. 
+ * Instances of this class are the root nodes of tree that is a sub-tree of the
+ * Autopsy presentation of the SleuthKit data model. The sub-tree consists of
+ * content and blackboard artifact tags, grouped first by tag type, then by tag
+ * name.
  */
- class TagsNode extends DisplayableItemNode {
-    private static final String DISPLAY_NAME = "Tags";
+class TagsNode extends DisplayableItemNode {
+
+    private static final String DISPLAY_NAME = NbBundle.getMessage(TagsNode.class, "TagsNode.displayName.text");
     private static final String ICON_PATH = "org/sleuthkit/autopsy/images/tag-folder-blue-icon-16.png";
-        
+
     public TagsNode() {
         super(Children.create(new TagNameNodeFactory(), true), Lookups.singleton(DISPLAY_NAME));
         super.setName(DISPLAY_NAME);
         super.setDisplayName(DISPLAY_NAME);
         this.setIconBaseWithExtension(ICON_PATH);
     }
-    
+
     @Override
     public boolean isLeafTypeNode() {
         return false;
     }
-    
+
     @Override
     public <T> T accept(DisplayableItemNodeVisitor<T> v) {
         return v.visit(this);
@@ -66,20 +68,23 @@ import org.sleuthkit.datamodel.TskCoreException;
             propertySheet.put(properties);
         }
 
-        properties.put(new NodeProperty("Name", "Name", "", getName()));
+        properties.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "TagsNode.createSheet.name.name"),
+                NbBundle.getMessage(this.getClass(), "TagsNode.createSheet.name.displayName"),
+                "",
+                getName()));
 
         return propertySheet;
     }
-            
+
     private static class TagNameNodeFactory extends ChildFactory<TagName> {
+
         @Override
         protected boolean createKeys(List<TagName> keys) {
             try {
                 keys.addAll(Case.getCurrentCase().getServices().getTagsManager().getTagNamesInUse());
+            } catch (TskCoreException ex) {
+                Logger.getLogger(TagNameNodeFactory.class.getName()).log(Level.SEVERE, "Failed to get tag names", ex);
             }
-            catch (TskCoreException ex) {
-                Logger.getLogger(TagNameNodeFactory.class.getName()).log(Level.SEVERE, "Failed to get tag names", ex);                    
-            }            
             return true;
         }
 
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ViewsNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ViewsNode.java
index 1690eb310b..76b1011568 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ViewsNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ViewsNode.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");
@@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.datamodel;
 
 import java.util.Arrays;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.datamodel.SleuthkitCase;
 
@@ -30,15 +31,14 @@ import org.sleuthkit.datamodel.SleuthkitCase;
  */
 public class ViewsNode extends DisplayableItemNode {
 
-    public static final String NAME = "Views";
+    public static final String NAME = NbBundle.getMessage(ViewsNode.class, "ViewsNode.name.text");
 
     public ViewsNode(SleuthkitCase sleuthkitCase) {
         super(new RootContentChildren(Arrays.asList(
-                new FileTypeExtensionFilters(sleuthkitCase), 
-                new RecentFiles(sleuthkitCase), 
+                new FileTypeExtensionFilters(sleuthkitCase),
+                new RecentFiles(sleuthkitCase),
                 new DeletedContent(sleuthkitCase),
-                new FileSize(sleuthkitCase)
-                )), 
+                new FileSize(sleuthkitCase))),
                 Lookups.singleton(NAME));
         setName(NAME);
         setDisplayName(NAME);
@@ -49,7 +49,7 @@ public class ViewsNode extends DisplayableItemNode {
     public boolean isLeafTypeNode() {
         return false;
     }
-    
+
     @Override
     public <T> T accept(DisplayableItemNodeVisitor<T> v) {
         return v.visit(this);
@@ -64,9 +64,9 @@ public class ViewsNode extends DisplayableItemNode {
             s.put(ss);
         }
 
-        ss.put(new NodeProperty("Name",
-                "Name",
-                "no description",
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ViewsNode.createSheet.name.name"),
+                NbBundle.getMessage(this.getClass(), "ViewsNode.createSheet.name.displayName"),
+                NbBundle.getMessage(this.getClass(), "ViewsNode.createSheet.name.desc"),
                 NAME));
         return s;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
index d1a66fd25c..f80041cf79 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  * 
- * Copyright 2011 - 2013 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,6 +24,7 @@ import java.util.List;
 import java.util.Map;
 import javax.swing.Action;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.ContextMenuExtensionPoint;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.directorytree.ExtractAction;
@@ -35,12 +36,11 @@ import org.sleuthkit.datamodel.TskData;
  * Node for layout dir
  */
 public class VirtualDirectoryNode extends AbstractAbstractFileNode<VirtualDirectory> {
-    
-    private static Logger logger = Logger.getLogger(VirtualDirectoryNode.class.getName());
 
+    private static Logger logger = Logger.getLogger(VirtualDirectoryNode.class.getName());
     //prefix for special VirtualDirectory root nodes grouping local files
     public final static String LOGICAL_FILE_SET_PREFIX = "LogicalFileSet";
-    
+
     public static String nameForLayoutFile(VirtualDirectory ld) {
         return ld.getName();
     }
@@ -49,26 +49,23 @@ public class VirtualDirectoryNode extends AbstractAbstractFileNode<VirtualDirect
         super(ld);
 
         this.setDisplayName(nameForLayoutFile(ld));
-        
+
         String name = ld.getName();
-        
+
         //set icon for name, special case for some built-ins
         if (name.equals(VirtualDirectory.NAME_UNALLOC)) {
             this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/folder-icon-deleted.png");
-        }
-        else if (name.startsWith(LOGICAL_FILE_SET_PREFIX)) {
+        } else if (name.startsWith(LOGICAL_FILE_SET_PREFIX)) {
             this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/fileset-icon-16.png");
-        }
-        else if (name.equals(VirtualDirectory.NAME_CARVED)) {
+        } else if (name.equals(VirtualDirectory.NAME_CARVED)) {
             this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/Folder-icon.png"); //TODO
-        }
-        else {
+        } else {
             this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/Folder-icon.png");
         }
-        
+
     }
 
-        /**
+    /**
      * Right click action for this node
      *
      * @param popup
@@ -77,14 +74,15 @@ public class VirtualDirectoryNode extends AbstractAbstractFileNode<VirtualDirect
     @Override
     public Action[] getActions(boolean popup) {
         List<Action> actions = new ArrayList<>();
-        actions.add(new NewWindowViewAction("View in New Window", this));
+        actions.add(new NewWindowViewAction(
+                NbBundle.getMessage(this.getClass(), "VirtualDirectoryNode.getActions.viewInNewWin.text"), this));
         actions.add(null); // creates a menu separator
         actions.add(ExtractAction.getInstance());
         actions.add(null); // creates a menu separator
         actions.addAll(ContextMenuExtensionPoint.getActions());
         return actions.toArray(new Action[0]);
     }
-            
+
     @Override
     protected Sheet createSheet() {
         Sheet s = super.createSheet();
@@ -94,16 +92,19 @@ public class VirtualDirectoryNode extends AbstractAbstractFileNode<VirtualDirect
             s.put(ss);
         }
 
-        Map<String, Object> map = new LinkedHashMap<String, Object>();
+        Map<String, Object> map = new LinkedHashMap<>();
         fillPropertyMap(map, content);
 
-        ss.put(new NodeProperty("Name", "Name", "no description", getName()));
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VirtualDirectoryNode.createSheet.name.name"),
+                NbBundle.getMessage(this.getClass(),
+                "VirtualDirectoryNode.createSheet.name.displayName"),
+                NbBundle.getMessage(this.getClass(), "VirtualDirectoryNode.createSheet.name.desc"),
+                getName()));
 
-        final String NO_DESCR = "no description";
+        final String NO_DESCR = NbBundle.getMessage(this.getClass(), "VirtualDirectoryNode.createSheet.noDesc");
         for (Map.Entry<String, Object> entry : map.entrySet()) {
-            ss.put(new NodeProperty(entry.getKey(), entry.getKey(), NO_DESCR, entry.getValue()));
+            ss.put(new NodeProperty<>(entry.getKey(), entry.getKey(), NO_DESCR, entry.getValue()));
         }
-        // @@@ add more properties here...
 
         return s;
     }
@@ -123,7 +124,6 @@ public class VirtualDirectoryNode extends AbstractAbstractFileNode<VirtualDirect
         return true;
     }
 
-    
     /**
      * Convert meta flag long to user-readable string / label
      *
@@ -137,12 +137,6 @@ public class VirtualDirectoryNode extends AbstractAbstractFileNode<VirtualDirect
         short allocFlag = TskData.TSK_FS_META_FLAG_ENUM.ALLOC.getValue();
         short unallocFlag = TskData.TSK_FS_META_FLAG_ENUM.UNALLOC.getValue();
 
-        // some variables that might be needed in the future
-        //long usedFlag = TskData.TSK_FS_META_FLAG_ENUM.USED.getMetaFlag();
-        //long unusedFlag = TskData.TSK_FS_META_FLAG_ENUM.UNUSED.getMetaFlag();
-        //long compFlag = TskData.TSK_FS_META_FLAG_ENUM.COMP.getMetaFlag();
-        //long orphanFlag = TskData.TSK_FS_META_FLAG_ENUM.ORPHAN.getMetaFlag();
-
         if ((metaFlag & allocFlag) == allocFlag) {
             result = TskData.TSK_FS_META_FLAG_ENUM.ALLOC.toString();
         }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java
index 9e009a8f0a..0ea663c45e 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.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");
@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.swing.Action;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.directorytree.ExplorerNodeActionVisitor;
 import org.sleuthkit.autopsy.directorytree.NewWindowViewAction;
 import org.sleuthkit.datamodel.Volume;
@@ -68,9 +69,10 @@ public class VolumeNode extends AbstractContentNode<Volume> {
      */
     @Override
     public Action[] getActions(boolean popup) {
-        List<Action> actionsList = new ArrayList<Action>();
+        List<Action> actionsList = new ArrayList<>();
 
-        actionsList.add(new NewWindowViewAction("View in New Window", this));
+        actionsList.add(new NewWindowViewAction(
+                NbBundle.getMessage(this.getClass(), "VolumeNode.getActions.viewInNewWin.text"), this));
         actionsList.addAll(ExplorerNodeActionVisitor.getActions(content));
 
         return actionsList.toArray(new Action[0]);
@@ -85,12 +87,30 @@ public class VolumeNode extends AbstractContentNode<Volume> {
             s.put(ss);
         }
 
-        ss.put(new NodeProperty("Name", "Name", "no description", this.getDisplayName()));
-        ss.put(new NodeProperty("ID", "ID", "no description", content.getAddr()));
-        ss.put(new NodeProperty("Starting Sector", "Starting Sector", "no description", content.getStart()));
-        ss.put(new NodeProperty("Length in Sectors", "Length in Sectors", "no description", content.getLength()));
-        ss.put(new NodeProperty("Description", "Description", "no description", content.getDescription()));
-        ss.put(new NodeProperty("Flags", "Flags", "no description", content.getFlagsAsString()));
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.name.name"),
+                NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.name.displayName"),
+                NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.name.desc"),
+                this.getDisplayName()));
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.id.name"),
+                NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.id.displayName"),
+                NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.id.desc"),
+                content.getAddr()));
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.startSector.name"),
+                NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.startSector.displayName"),
+                NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.startSector.desc"),
+                content.getStart()));
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.lenSectors.name"),
+                NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.lenSectors.displayName"),
+                NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.lenSectors.desc"),
+                content.getLength()));
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.description.name"),
+                NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.description.displayName"),
+                NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.description.desc"),
+                content.getDescription()));
+        ss.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.flags.name"),
+                NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.flags.displayName"),
+                NbBundle.getMessage(this.getClass(), "VolumeNode.createSheet.flags.desc"),
+                content.getFlagsAsString()));
 
         return s;
     }
@@ -104,7 +124,7 @@ public class VolumeNode extends AbstractContentNode<Volume> {
     public boolean isLeafTypeNode() {
         return false;
     }
-                
+
     @Override
     public <T> T accept(DisplayableItemNodeVisitor<T> v) {
         return v.visit(this);
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/BlackboardArtifactTagTypeNode.java b/Core/src/org/sleuthkit/autopsy/directorytree/BlackboardArtifactTagTypeNode.java
index 067b68a49c..a1dbb18794 100755
--- a/Core/src/org/sleuthkit/autopsy/directorytree/BlackboardArtifactTagTypeNode.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/BlackboardArtifactTagTypeNode.java
@@ -24,6 +24,7 @@ import org.openide.nodes.ChildFactory;
 import org.openide.nodes.Children;
 import org.openide.nodes.Node;
 import org.openide.nodes.Sheet;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -42,7 +43,8 @@ import org.sleuthkit.datamodel.TskCoreException;
  * and blackboard artifact tags, grouped first by tag type, then by tag name.
  */
 public class BlackboardArtifactTagTypeNode extends DisplayableItemNode {
-    private static final String DISPLAY_NAME = "Result Tags";
+    private static final String DISPLAY_NAME = NbBundle.getMessage(BlackboardArtifactTagTypeNode.class,
+                                                                   "BlackboardArtifactTagTypeNode.displayName.text");
     private static final String ICON_PATH = "org/sleuthkit/autopsy/images/tag-folder-blue-icon-16.png";
 
     public BlackboardArtifactTagTypeNode(TagName tagName) {
@@ -70,7 +72,11 @@ public class BlackboardArtifactTagTypeNode extends DisplayableItemNode {
             propertySheet.put(properties);
         }
 
-        properties.put(new NodeProperty("Name", "Name", "", getName()));
+        properties.put(new NodeProperty<>(
+                NbBundle.getMessage(this.getClass(), "BlackboardArtifactTagTypeNode.createSheet.name.name"),
+                NbBundle.getMessage(this.getClass(), "BlackboardArtifactTagTypeNode.createSheet.name.displayName"),
+                "",
+                getName()));
 
         return propertySheet;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties b/Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties
index 0420f6278a..2bd981934c 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties
@@ -1,7 +1,6 @@
-CTL_DirectoryTreeAction=DirectoryTree
-CTL_DirectoryTreeExplorerAction=DirectoryTreeExplorer
+#CTL_DirectoryTreeAction=DirectoryTree
+#CTL_DirectoryTreeExplorerAction=DirectoryTreeExplorer
 CTL_DirectoryTreeTopComponent=Directory Tree
-#CTL_FileBrowserAction=FileBrowser (new)
 HINT_DirectoryTreeTopComponent=This is a DirectoryTree window
 OpenIDE-Module-Name=DirectoryTree
 FileSystemDetailsPanel.imgOffsetLabel.text=Image Offset:
@@ -51,3 +50,53 @@ ImageDetailsPanel.imgTotalSizeValue.text=...
 ImageDetailsPanel.imgTotalSizeLabel.text=Total Size:
 ImageDetailsPanel.imgHashValue.text=...
 ImageDetailsPanel.imgHashLabel.text=Hash Value:
+BlackboardArtifactTagTypeNode.displayName.text=Result Tags
+BlackboardArtifactTagTypeNode.createSheet.name.name=Name
+BlackboardArtifactTagTypeNode.createSheet.name.displayName=Name
+ChangeViewAction.menuItem.view=View
+ChangeViewAction.menuItem.view.hex=Hex
+ChangeViewAction.menuItem.view.string=String
+DataResultFilterNode.action.viewFileInDir.text=View File in Directory
+DataResultFilterNode.action.viewSrcFileInDir.text=View Source File in Directory
+DataResultFilterNode.action.viewInNewWin.text=View in New Window
+DataResultFilterNode.action.openInExtViewer.text=Open in External Viewer
+DataResultFilterNode.action.searchFilesSameMd5.text=Search for files with the same MD5 hash
+DataResultFilterNode.action.viewInDir.text=View in Directory
+DirectoryTreeFilterNode.action.collapseAll.text=Collapse All
+DirectoryTreeFilterNode.action.openFileSrcByAttr.text=Open File Search by Attributes
+DirectoryTreeFilterNode.action.runIngestMods.text=Run Ingest Modules
+DirectoryTreeTopComponent.title.text=Directory Listing
+DirectoryTreeTopComponent.action.viewArtContent.text=View Artifact Content
+DirectoryTreeTopComponent.moduleErr=Module Error
+DirectoryTreeTopComponent.moduleErr.msg=A module caused an error listening to DirectoryTreeTopComponent updates. See log to determine which module. Some data could be incomplete.
+ExplorerNodeActionVisitor.action.imgDetails.title=Image Details
+ExplorerNodeActionVisitor.action.extUnallocToSingleFiles=Extract Unallocated Space to Single Files
+ExplorerNodeActionVisitor.action.fileSystemDetails.title=File System Details
+ExplorerNodeActionVisitor.action.volumeDetails.title=Volume Details
+ExplorerNodeActionVisitor.action.extUnallocToSingleFile=Extract Unallocated Space to Single File
+ExplorerNodeActionVisitor.volDetail.noVolMatchErr=Error\: No Volume Matches.
+ExplorerNodeActionVisitor.imgDetail.noVolMatchesErr=Error\: No Volume Matches.
+ExplorerNodeActionVisitor.exception.probGetParent.text=Problem getting parent from {0}\: {1}
+ExtractAction.title.extractFiles.text=Extract File(s)
+ExtractAction.extractFiles.cantCreateFolderErr.msg=Couldn't create selected folder.
+ExtractAction.confDlg.destFileExist.msg=Destination file {0} already exists, overwrite?
+ExtractAction.confDlg.destFileExist.title=File Exists
+ExtractAction.msgDlg.cantOverwriteFile.msg=Couldn't overwrite existing file {0}
+ExtractAction.notifyDlg.noFileToExtr.msg=No file(s) to extract.
+ExtractAction.progress.extracting=Extracting
+ExtractAction.progress.cancellingExtraction={0} (Cancelling...)
+ExtractAction.done.notifyMsg.fileExtr.text=File(s) extracted.
+ExtractUnallocAction.notifyMsg.unallocAlreadyBeingExtr.msg=Unallocated Space is already being extracted on this Image. Please select a different Image.
+ExtractUnallocAction.msgDlg.folderDoesntExist.msg=Folder does not exist. Please choose a valid folder before continuing
+ExtractUnallocAction.dlgTitle.selectDirToSaveTo.msg=Select directory to save to
+ExtractUnallocAction.confDlg.unallocFileAlreadyExist.msg=The Unalloc File for this volume, {0} already exists, do you want to replace it?
+ExtractUnallocAction.progress.extractUnalloc.title=Extracting Unallocated Space
+ExtractUnallocAction.progress.displayName.cancelling.text=Extracting Unallocated Space (Cancelling...)
+ExtractUnallocAction.processing.counter.msg=processing {0} of {1} MBs
+ExtractUnallocAction.done.notifyMsg.completedExtract.title=Completed extraction of unallocated space.
+ExtractUnallocAction.done.notifyMsg.completedExtract.msg=Files were extracted to {0}
+ResultDeleteAction.actionPerf.confDlg.delAllResults.msg=Are you sure you want to delete all {0} results?
+ResultDeleteAction.actoinPerf.confDlg.delAllresults.details={0} Results Deletion
+ResultDeleteAction.exception.invalidAction.msg=Invalid action type\: {0}
+ExtractUnallocAction.done.errMsg.title=Error Extracting
+ExtractUnallocAction.done.errMsg.msg=Error extracting unallocated space\: {0}
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/directorytree/Bundle_ja.properties
new file mode 100644
index 0000000000..cee27ecc4b
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/Bundle_ja.properties
@@ -0,0 +1,100 @@
+CTL_DirectoryTreeTopComponent=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30C4\u30EA\u30FC
+HINT_DirectoryTreeTopComponent=\u3053\u308C\u306F\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30C4\u30EA\u30FC\u3067\u3059
+OpenIDE-Module-Name=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30C4\u30EA\u30FC
+FileSystemDetailsPanel.imgOffsetLabel.text=\u30A4\u30E1\u30FC\u30B8\u30AA\u30D5\u30BB\u30C3\u30C8\uFF1A
+FileSystemDetailsPanel.fsTypeLabel.text=\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u30BF\u30A4\u30D7\uFF1A
+FileSystemDetailsPanel.genInfoLabel.text=\u30D5\u30A1\u30A4\u30EB\u4E00\u822C\u60C5\u5831
+FileSystemDetailsPanel.jLabel2.text=\u30D0\u30A4\u30C8
+FileSystemDetailsPanel.jLabel3.text=\u30D0\u30A4\u30C8
+FileSystemDetailsPanel.fsTypeValue.text=...
+FileSystemDetailsPanel.imgOffsetValue.text=...
+FileSystemDetailsPanel.volumeIDValue.text=...
+FileSystemDetailsPanel.blockSizeValue.text=...
+FileSystemDetailsPanel.blockCountValue.text=...
+FileSystemDetailsPanel.rootInumValue.text=...
+FileSystemDetailsPanel.firstInumValue.text=...
+FileSystemDetailsPanel.lastInumValue.text=...
+FileSystemDetailsPanel.jLabel1.text=\u30D5\u30A1\u30A4\u30EB\u8A73\u7D30\u60C5\u5831
+FileSystemDetailsPanel.volumeIDLabel.text=\u30DC\u30EA\u30E5\u30FC\u30E0ID\uFF1A
+FileSystemDetailsPanel.blockSizeLabel.text=\u30D6\u30ED\u30C3\u30AF\u30B5\u30A4\u30BA\uFF1A
+FileSystemDetailsPanel.blockCountLabel.text=\u30D6\u30ED\u30C3\u30AF\u6570\uFF1A
+#todo better translation?
+FileSystemDetailsPanel.rootInumLabel.text=\u30EB\u30FC\u30C8\u30E1\u30BF\u30C7\u30FC\u30BF\u30A8\u30F3\u30C8\u30EA\u30FC\uFF1A
+FileSystemDetailsPanel.firstInumLabel.text=\u6700\u521D\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u30A8\u30F3\u30C8\u30EA\u30FC\uFF1A
+FileSystemDetailsPanel.lastInumLabel.text=\u6700\u5F8C\u306E\u30E1\u30BF\u30C7\u30FC\u30BF\u30A8\u30F3\u30C8\u30EA\u30FC\uFF1A
+FileSystemDetailsPanel.OKButton.text=OK
+VolumeDetailsPanel.volumeIDLabel.text=\u30DC\u30EA\u30E5\u30FC\u30E0ID\uFF1A
+VolumeDetailsPanel.volumeIDValue.text=...
+VolumeDetailsPanel.startValue.text=...
+VolumeDetailsPanel.lengthValue.text=...
+VolumeDetailsPanel.descValue.text=...
+VolumeDetailsPanel.flagsValue.text=...
+VolumeDetailsPanel.startLabel.text=\u6700\u521D\u306E\u30BB\u30AF\u30BF\u30FC\uFF1A
+VolumeDetailsPanel.lengthLabel.text=\u30BB\u30AF\u30BF\u30FC\u306E\u9577\u3055\uFF1A
+VolumeDetailsPanel.descLabel.text=\u8AAC\u660E\uFF1A
+VolumeDetailsPanel.flagsLabel.text=\u30D5\u30E9\u30B0\uFF1A
+VolumeDetailsPanel.jLabel1.text=\u30DC\u30EA\u30E5\u30FC\u30E0\u4E00\u822C\u60C5\u5831
+VolumeDetailsPanel.OKButton.text=OK
+ImageDetailsPanel.imageInfoLabel.text=\u30A4\u30E1\u30FC\u30B8\u60C5\u5831
+ImageDetailsPanel.imgNameLabel.text=\u540D\u79F0\uFF1A
+ImageDetailsPanel.imgNameValue.text=...
+ImageDetailsPanel.imgTypeLabel.text=\u30BF\u30A4\u30D7\uFF1A
+ImageDetailsPanel.imgTypeValue.text=...
+ImageDetailsPanel.OKButton.text=OK
+ImageDetailsPanel.imgSectorSizeLabel.text=\u30BB\u30AF\u30BF\u30FC\u30B5\u30A4\u30BA\uFF1A
+ImageDetailsPanel.imgSectorSizeValue.text=...
+ImageDetailsPanel.imgTotalSizeValue.text=...
+ImageDetailsPanel.imgTotalSizeLabel.text=\u5408\u8A08\u30B5\u30A4\u30BA\uFF1A
+ImageDetailsPanel.imgHashValue.text=...
+ImageDetailsPanel.imgHashLabel.text=\u30CF\u30C3\u30B7\u30E5\u5024\uFF1A
+BlackboardArtifactTagTypeNode.displayName.text=\u7D50\u679C\u30BF\u30B0
+BlackboardArtifactTagTypeNode.createSheet.name.name=\u540D\u79F0
+BlackboardArtifactTagTypeNode.createSheet.name.displayName=\u540D\u79F0
+ChangeViewAction.menuItem.view=\u30D3\u30E5\u30FC
+ChangeViewAction.menuItem.view.hex=Hex
+ChangeViewAction.menuItem.view.string=\u30B9\u30C8\u30EA\u30F3\u30B0
+DataResultFilterNode.action.viewFileInDir.text=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u5185\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u8868\u793A
+DataResultFilterNode.action.viewSrcFileInDir.text=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u5185\u306E\u30BD\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u3092\u8868\u793A
+DataResultFilterNode.action.viewInNewWin.text=\u65B0\u898F\u30A6\u30A3\u30F3\u30C9\u30A6\u306B\u8868\u793A
+DataResultFilterNode.action.openInExtViewer.text=\u5916\u90E8\u30D3\u30E5\u30FC\u30A2\u3067\u958B\u304F
+DataResultFilterNode.action.searchFilesSameMd5.text=\u540C\u3058MD5\u30CF\u30C3\u30B7\u30E5\u3092\u6301\u3064\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22
+DataResultFilterNode.action.viewInDir.text=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30FC\u306B\u8868\u793A
+DirectoryTreeFilterNode.action.openFileSrcByAttr.text=\u5C5E\u6027\u306B\u3088\u308B\u30D5\u30A1\u30A4\u30EB\u691C\u7D22\u3092\u958B\u304F
+DirectoryTreeFilterNode.action.runIngestMods.text=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u5B9F\u884C
+DirectoryTreeTopComponent.title.text=\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u30EA\u30B9\u30C6\u30A3\u30F3\u30B0
+DirectoryTreeTopComponent.action.viewArtContent.text=\u6210\u679C\u7269\u30B3\u30F3\u30C6\u30F3\u30C4\u3092\u8868\u793A
+DirectoryTreeTopComponent.moduleErr=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
+DirectoryTreeTopComponent.moduleErr.msg=DirectoryTreeTopComponent\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\u30ED\u30B0\u3067\u3069\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u304B\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
+ExplorerNodeActionVisitor.action.imgDetails.title=\u30A4\u30E1\u30FC\u30B8\u8A73\u7D30
+ExplorerNodeActionVisitor.action.extUnallocToSingleFiles=\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u5185\u306E\u30C7\u30FC\u30BF\u3092\u8907\u6570\u306E\u30B7\u30F3\u30B0\u30EB\u30D5\u30A1\u30A4\u30EB\u306B\u62BD\u51FA
+ExplorerNodeActionVisitor.action.fileSystemDetails.title=\u30D5\u30A1\u30A4\u30EB\u30B7\u30B9\u30C6\u30E0\u8A73\u7D30
+ExplorerNodeActionVisitor.action.volumeDetails.title=\u30DC\u30EA\u30E5\u30FC\u30E0\u8A73\u7D30
+ExplorerNodeActionVisitor.action.extUnallocToSingleFile=\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u5185\u306E\u30C7\u30FC\u30BF\u3092\u4E00\u3064\u306E\u30B7\u30F3\u30B0\u30EB\u30D5\u30A1\u30A4\u30EB\u306B\u62BD\u51FA
+ExplorerNodeActionVisitor.volDetail.noVolMatchErr=\u30A8\u30E9\u30FC\uFF1A\u4E00\u81F4\u3059\u308B\u30DC\u30EA\u30E5\u30FC\u30E0\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+ExplorerNodeActionVisitor.imgDetail.noVolMatchesErr=\u30A8\u30E9\u30FC\uFF1A\u4E00\u81F4\u3059\u308B\u30DC\u30EA\u30E5\u30FC\u30E0\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+ExplorerNodeActionVisitor.exception.probGetParent.text={0}\: {1}\u304B\u3089\u30DA\u30A2\u30EC\u30F3\u30C8\u3092\u5165\u624B\u3059\u308B\u969B\u306B\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F
+ExtractAction.title.extractFiles.text=\u30D5\u30A1\u30A4\u30EB\u3092\u62BD\u51FA
+ExtractAction.extractFiles.cantCreateFolderErr.msg=\u6307\u5B9A\u3055\u308C\u305F\u30D5\u30A9\u30EB\u30C0\u30FC\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
+ExtractAction.confDlg.destFileExist.msg=\u4FDD\u5B58\u5148\u306E\u30D5\u30A1\u30A4\u30EB{0}\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\u3001\u4E0A\u66F8\u304D\u3057\u307E\u3059\u304B\uFF1F
+ExtractAction.confDlg.destFileExist.title=\u30D5\u30A1\u30A4\u30EB\u304C\u5B58\u5728\u3057\u307E\u3059
+ExtractAction.msgDlg.cantOverwriteFile.msg=\u65E2\u5B58\u30D5\u30A1\u30A4\u30EB{0}\u3092\u4E0A\u66F8\u304D\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
+ExtractAction.notifyDlg.noFileToExtr.msg=\u62BD\u51FA\u3067\u304D\u308B\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093\u3002
+ExtractAction.progress.extracting=\u62BD\u51FA\u4E2D
+ExtractAction.progress.cancellingExtraction={0}\uFF08\u30AD\u30E3\u30F3\u30BB\u30EB\u4E2D\u2026\uFF09
+ExtractAction.done.notifyMsg.fileExtr.text=\u30D5\u30A1\u30A4\u30EB\u304C\u62BD\u51FA\u3055\u308C\u307E\u3057\u305F\u3002
+ExtractUnallocAction.notifyMsg.unallocAlreadyBeingExtr.msg=\u3053\u306E\u30A4\u30E1\u30FC\u30B8\u306E\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u306E\u30C7\u30FC\u30BF\u306F\u65E2\u306B\u62BD\u51FA\u4E2D\u3067\u3059\u3002\u5225\u306E\u30A4\u30E1\u30FC\u30B8\u3092\u9078\u629E\u3057\u3066\u4E0B\u3055\u3044\u3002
+ExtractUnallocAction.msgDlg.folderDoesntExist.msg=\u30D5\u30A9\u30EB\u30C0\u306F\u5B58\u5728\u3057\u307E\u305B\u3093\u3002\u7D9A\u884C\u3059\u308B\u524D\u306B\u6709\u52B9\u306A\u30D5\u30A9\u30EB\u30C0\u3092\u9078\u629E\u3057\u3066\u4E0B\u3055\u3044\u3002
+ExtractUnallocAction.dlgTitle.selectDirToSaveTo.msg=\u4FDD\u5B58\u5148\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3092\u9078\u629E\u3057\u3066\u4E0B\u3055\u3044
+#todo check meaning
+ExtractUnallocAction.confDlg.unallocFileAlreadyExist.msg=\u3053\u306E\u30DC\u30EA\u30E5\u30FC\u30E0\u306E\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u306E\u30D5\u30A1\u30A4\u30EB{0}\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u65E2\u5B58\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u7F6E\u304D\u63DB\u3048\u307E\u3059\u304B\uFF1F
+ExtractUnallocAction.progress.extractUnalloc.title=\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u306E\u30C7\u30FC\u30BF\u3092\u62BD\u51FA\u4E2D
+ExtractUnallocAction.progress.displayName.cancelling.text=\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u306E\u30C7\u30FC\u30BF\u3092\u62BD\u51FA\u4E2D\uFF08\u30AD\u30E3\u30F3\u30BB\u30EB\u4E2D\u2026\uFF09
+ExtractUnallocAction.processing.counter.msg=\u51E6\u7406\u4E2D\u3000{0}\uFF0F{1} MBs
+ExtractUnallocAction.done.notifyMsg.completedExtract.title=\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u306E\u62BD\u51FA\u304C\u5B8C\u4E86\u3057\u307E\u3057\u305F\u3002
+ExtractUnallocAction.done.notifyMsg.completedExtract.msg=\u30D5\u30A1\u30A4\u30EB\u306F{0}\u3078\u62BD\u51FA\u3055\u308C\u307E\u3057\u305F
+ResultDeleteAction.actionPerf.confDlg.delAllResults.msg={0}\u306E\u7D50\u679C\u5168\u3066\u3092\u672C\u5F53\u306B\u524A\u9664\u3057\u307E\u3059\u304B\uFF1F
+ResultDeleteAction.actoinPerf.confDlg.delAllresults.details={0}\u7D50\u679C\u524A\u9664
+ResultDeleteAction.exception.invalidAction.msg=\u7121\u52B9\u306A\u30A2\u30AF\u30B7\u30E7\u30F3\u30BF\u30A4\u30D7\uFF1A{0}
+ExtractUnallocAction.done.errMsg.title=\u62BD\u51FA\u30A8\u30E9\u30FC
+ExtractUnallocAction.done.errMsg.msg=\u672A\u5272\u308A\u5F53\u3066\u9818\u57DF\u306E\u62BD\u51FA\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\uFF1A{0}
+DirectoryTreeFilterNode.action.collapseAll.text=\u3059\u3079\u3066\u30B3\u30E9\u30D7\u30B9
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java
index 1c6c42ce58..751948690f 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/ChangeViewAction.java
@@ -23,6 +23,7 @@ import javax.swing.AbstractAction;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import org.openide.nodes.Node;
+import org.openide.util.NbBundle;
 import org.openide.util.actions.Presenter;
 import org.sleuthkit.autopsy.corecomponents.DataContentTopComponent;
 import org.sleuthkit.autopsy.corecomponents.DataContentViewerHex;
@@ -95,9 +96,9 @@ import org.sleuthkit.autopsy.coreutils.Logger;
      */
     @Override
     public JMenuItem getPopupPresenter() {
-        JMenu item = new JMenu("View");
-        item.add(new ChangeViewAction("Hex", 1, node));
-        item.add(new ChangeViewAction("String", 2, node));
+        JMenu item = new JMenu(NbBundle.getMessage(this.getClass(), "ChangeViewAction.menuItem.view"));
+        item.add(new ChangeViewAction(NbBundle.getMessage(this.getClass(), "ChangeViewAction.menuItem.view.hex"), 1, node));
+        item.add(new ChangeViewAction(NbBundle.getMessage(this.getClass(), "ChangeViewAction.menuItem.view.string"), 2, node));
         return item;
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
index 2d1941968f..506a37741c 100755
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
@@ -18,6 +18,7 @@
  */
 package org.sleuthkit.autopsy.directorytree;
 
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.actions.AddBlackboardArtifactTagAction;
 import org.sleuthkit.autopsy.actions.AddContentTagAction;
 import java.awt.event.ActionEvent;
@@ -190,16 +191,19 @@ public class DataResultFilterNode extends FilterNode {
 
             if (artifactTypeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_HASHSET_HIT.getTypeID()
                     || artifactTypeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID() ) {
-                actions.add(new ViewContextAction("View File in Directory", ban));
+                actions.add(new ViewContextAction(
+                        NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.viewFileInDir.text"), ban));
             } else {
                 // if the artifact links to another file, add an action to go to
                 // that file
                 Content c = findLinked(ban);
                 if (c != null) {
-                    actions.add(new ViewContextAction("View File in Directory", c));
+                    actions.add(new ViewContextAction(
+                            NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.viewFileInDir.text"), c));
                 }
                 // action to go to the source file of the artifact
-                actions.add(new ViewContextAction("View Source File in Directory", ban));
+                actions.add(new ViewContextAction(
+                        NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.viewSrcFileInDir.text"), ban));
             }
             File f = ban.getLookup().lookup(File.class);
             LayoutFile lf = null;
@@ -209,11 +213,14 @@ public class DataResultFilterNode extends FilterNode {
             if (f != null) {
                 final FileNode fn = new FileNode(f);
                 actions.add(null); // creates a menu separator
-                actions.add(new NewWindowViewAction("View in New Window", fn));
-                actions.add(new ExternalViewerAction("Open in External Viewer", fn));
+                actions.add(new NewWindowViewAction(
+                        NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.viewInNewWin.text"), fn));
+                actions.add(new ExternalViewerAction(
+                        NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.openInExtViewer.text"), fn));
                 actions.add(null); // creates a menu separator
                 actions.add(ExtractAction.getInstance());
-                actions.add(new HashSearchAction("Search for files with the same MD5 hash", fn));
+                actions.add(new HashSearchAction(
+                        NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.searchFilesSameMd5.text"), fn));
 
                 //add file/result tag if itself is not a tag
                 if (artifactTypeID != BlackboardArtifact.ARTIFACT_TYPE.TSK_TAG_FILE.getTypeID()
@@ -227,8 +234,10 @@ public class DataResultFilterNode extends FilterNode {
             if ((d = ban.getLookup().lookup(Directory.class)) != null) {
                 DirectoryNode dn = new DirectoryNode(d);
                 actions.add(null); // creates a menu separator
-                actions.add(new NewWindowViewAction("View in New Window", dn));
-                actions.add(new ExternalViewerAction("Open in External Viewer", dn));
+                actions.add(new NewWindowViewAction(
+                        NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.viewInNewWin.text"), dn));
+                actions.add(new ExternalViewerAction(
+                        NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.openInExtViewer.text"), dn));
                 actions.add(null); // creates a menu separator
                 actions.add(ExtractAction.getInstance());
 
@@ -244,8 +253,10 @@ public class DataResultFilterNode extends FilterNode {
             if ((vd = ban.getLookup().lookup(VirtualDirectory.class)) != null) {
                 VirtualDirectoryNode dn = new VirtualDirectoryNode(vd);
                 actions.add(null); // creates a menu separator
-                actions.add(new NewWindowViewAction("View in New Window", dn));
-                actions.add(new ExternalViewerAction("Open in External Viewer", dn));
+                actions.add(new NewWindowViewAction(
+                        NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.viewInNewWin.text"), dn));
+                actions.add(new ExternalViewerAction(
+                        NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.openInExtViewer.text"), dn));
                 actions.add(null); // creates a menu separator
                 actions.add(ExtractAction.getInstance());
 
@@ -260,8 +271,10 @@ public class DataResultFilterNode extends FilterNode {
             } else if ((lf = ban.getLookup().lookup(LayoutFile.class)) != null) {
                 LayoutFileNode lfn = new LayoutFileNode(lf);
                 actions.add(null); // creates a menu separator
-                actions.add(new NewWindowViewAction("View in New Window", lfn));
-                actions.add(new ExternalViewerAction("Open in External Viewer", lfn));
+                actions.add(new NewWindowViewAction(
+                        NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.viewInNewWin.text"), lfn));
+                actions.add(new ExternalViewerAction(
+                        NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.openInExtViewer.text"), lfn));
                 actions.add(null); // creates a menu separator
                 actions.add(ExtractAction.getInstance());
 
@@ -277,8 +290,10 @@ public class DataResultFilterNode extends FilterNode {
                     || (locF = ban.getLookup().lookup(DerivedFile.class)) != null) {
                 final LocalFileNode locfn = new LocalFileNode(locF);
                 actions.add(null); // creates a menu separator
-                actions.add(new NewWindowViewAction("View in New Window", locfn));
-                actions.add(new ExternalViewerAction("Open in External Viewer", locfn));
+                actions.add(new NewWindowViewAction(
+                        NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.viewInNewWin.text"), locfn));
+                actions.add(new ExternalViewerAction(
+                        NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.openInExtViewer.text"), locfn));
                 actions.add(null); // creates a menu separator
                 actions.add(ExtractAction.getInstance());
 
@@ -423,7 +438,8 @@ public class DataResultFilterNode extends FilterNode {
 
         @Override
         public AbstractAction visit(BlackboardArtifactNode ban) {
-            return new ViewContextAction("View in Directory", ban);
+            return new ViewContextAction(
+                    NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.viewInDir.text"), ban);
         }
 
         @Override
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java
index 753ae4a691..ab941e2ff1 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterChildren.java
@@ -180,7 +180,7 @@ class DirectoryTreeFilterChildren extends FilterNode.Children {
             return isLeafDirectory(dn);
         }
 
-        private Boolean visitDeep(AbstractAbstractFileNode node) {
+        private Boolean visitDeep(AbstractAbstractFileNode<? extends AbstractFile> node) {
             //is a leaf if has no children, or children are files not dirs
             boolean hasChildren = node.hasContentChildren();
             if (!hasChildren) {
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java
index cd3322fd81..90a78c24e5 100755
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.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");
@@ -27,6 +27,7 @@ import javax.swing.AbstractAction;
 import javax.swing.Action;
 import org.openide.nodes.FilterNode;
 import org.openide.nodes.Node;
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.openide.util.lookup.ProxyLookup;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -46,7 +47,8 @@ import org.sleuthkit.datamodel.TskCoreException;
  */
 class DirectoryTreeFilterNode extends FilterNode {
 
-    private static final Action collapseAll = new CollapseAction("Collapse All");
+    private static final Action collapseAll = new CollapseAction(
+            NbBundle.getMessage(DirectoryTreeFilterNode.class, "DirectoryTreeFilterNode.action.collapseAll.text"));
     private static final Logger logger = Logger.getLogger(DirectoryTreeFilterNode.class.getName());
 
     /**
@@ -90,7 +92,7 @@ class DirectoryTreeFilterNode extends FilterNode {
      */
     @Override
     public Action[] getActions(boolean popup) {
-        List<Action> actions = new ArrayList<Action>();
+        List<Action> actions = new ArrayList<>();
 
         final Content content = this.getLookup().lookup(Content.class);
         if (content != null) {
@@ -101,22 +103,24 @@ class DirectoryTreeFilterNode extends FilterNode {
             if (dir != null) {
                 actions.add(ExtractAction.getInstance());
             }
-            
+
             // file search action
             final Image img = this.getLookup().lookup(Image.class);
             if (img != null) {
-                actions.add(new FileSearchAction("Open File Search by Attributes"));
+                actions.add(new FileSearchAction(
+                        NbBundle.getMessage(this.getClass(), "DirectoryTreeFilterNode.action.openFileSrcByAttr.text")));
             }
-            
+
             //ingest action
-             actions.add(new AbstractAction("Run Ingest Modules") {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        final IngestDialog ingestDialog = new IngestDialog();
-                        ingestDialog.setContent(Collections.<Content>singletonList(content));
-                        ingestDialog.display();
-                    }
-                });
+            actions.add(new AbstractAction(
+                    NbBundle.getMessage(this.getClass(), "DirectoryTreeFilterNode.action.runIngestMods.text")) {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    final IngestDialog ingestDialog = new IngestDialog();
+                    ingestDialog.setContent(Collections.<Content>singletonList(content));
+                    ingestDialog.display();
+                }
+            });
         }
 
         //check if delete actions should be added
@@ -131,7 +135,7 @@ class DirectoryTreeFilterNode extends FilterNode {
     }
 
     private static List<Action> getDeleteActions(DisplayableItemNode original) {
-        List<Action> actions = new ArrayList<Action>();
+        List<Action> actions = new ArrayList<>();
         //actions.addAll(original.accept(getDeleteActionVisitor));
         return actions;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
index ae09e6cffa..c00b54811f 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
@@ -81,7 +81,8 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
 
     private transient ExplorerManager em = new ExplorerManager();
     private static DirectoryTreeTopComponent instance;
-    private DataResultTopComponent dataResult = new DataResultTopComponent(true, "Directory Listing");
+    private DataResultTopComponent dataResult = new DataResultTopComponent(true, NbBundle.getMessage(this.getClass(),
+                                                                                                     "DirectoryTreeTopComponent.title.text"));
     private LinkedList<String[]> backList;
     private LinkedList<String[]> forwardList;
     /**
@@ -1014,7 +1015,9 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
 
     @Override
     public void viewArtifactContent(BlackboardArtifact art) {
-        new ViewContextAction("View Artifact Content", new BlackboardArtifactNode(art)).actionPerformed(null);
+        new ViewContextAction(
+                NbBundle.getMessage(this.getClass(), "DirectoryTreeTopComponent.action.viewArtContent.text"),
+                new BlackboardArtifactNode(art)).actionPerformed(null);
     }
 
 //    private class HistoryManager<T> {
@@ -1033,7 +1036,10 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
         }
         catch (Exception e) {
             logger.log(Level.SEVERE, "DirectoryTreeTopComponent listener threw exception", e);
-            MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to DirectoryTreeTopComponent updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+            MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "DirectoryTreeTopComponent.moduleErr"),
+                                          NbBundle.getMessage(this.getClass(),
+                                                              "DirectoryTreeTopComponent.moduleErr.msg"),
+                                          MessageNotifyUtil.MessageType.ERROR);
         }
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ExplorerNodeActionVisitor.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExplorerNodeActionVisitor.java
index 8ea28dd457..55dd6deef8 100755
--- a/Core/src/org/sleuthkit/autopsy/directorytree/ExplorerNodeActionVisitor.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/ExplorerNodeActionVisitor.java
@@ -18,6 +18,7 @@
  */
 package org.sleuthkit.autopsy.directorytree;
 
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.actions.AddContentTagAction;
 import java.awt.Toolkit;
 import java.awt.Dimension;
@@ -81,22 +82,27 @@ public class ExplorerNodeActionVisitor extends ContentVisitor.Default<List<? ext
     @Override
     public List<? extends Action> visit(final Image img) {
         List<Action> lst = new ArrayList<Action>();
-        lst.add(new ImageDetails("Image Details", img));
+        lst.add(new ImageDetails(
+                NbBundle.getMessage(this.getClass(), "ExplorerNodeActionVisitor.action.imgDetails.title"), img));
         //TODO lst.add(new ExtractAction("Extract Image", img));
-        lst.add(new ExtractUnallocAction("Extract Unallocated Space to Single Files", img));
+        lst.add(new ExtractUnallocAction(
+                NbBundle.getMessage(this.getClass(), "ExplorerNodeActionVisitor.action.extUnallocToSingleFiles"), img));
         return lst;
     }
 
     @Override
     public List<? extends Action> visit(final FileSystem fs) {
-        return Collections.singletonList(new FileSystemDetails("File System Details", fs));
+        return Collections.singletonList(new FileSystemDetails(
+                NbBundle.getMessage(this.getClass(), "ExplorerNodeActionVisitor.action.fileSystemDetails.title"), fs));
     }
 
     @Override
     public List<? extends Action> visit(final Volume vol) {
         List<AbstractAction> lst = new ArrayList<AbstractAction>();
-        lst.add(new VolumeDetails("Volume Details", vol));
-        lst.add(new ExtractUnallocAction("Extract Unallocated Space to Single File", vol));
+        lst.add(new VolumeDetails(
+                NbBundle.getMessage(this.getClass(), "ExplorerNodeActionVisitor.action.volumeDetails.title"), vol));
+        lst.add(new ExtractUnallocAction(
+                NbBundle.getMessage(this.getClass(), "ExplorerNodeActionVisitor.action.extUnallocToSingleFile"), vol));
         return lst;
     }
 
@@ -197,7 +203,8 @@ public class ExplorerNodeActionVisitor extends ContentVisitor.Default<List<? ext
                 popUpWindow.add(volumeDetailPanel);
             } else {
                 // error handler if no volume matches
-                JLabel error = new JLabel("Error: No Volume Matches.");
+                JLabel error = new JLabel(
+                        NbBundle.getMessage(this.getClass(), "ExplorerNodeActionVisitor.volDetail.noVolMatchErr"));
                 error.setFont(new Font("Arial", Font.BOLD, 24));
                 popUpWindow.add(error);
             }
@@ -269,7 +276,8 @@ public class ExplorerNodeActionVisitor extends ContentVisitor.Default<List<? ext
                 popUpWindow.add(imgDetailPanel);
             } else {
                 // error handler if no volume matches
-                JLabel error = new JLabel("Error: No Volume Matches.");
+                JLabel error = new JLabel(
+                        NbBundle.getMessage(this.getClass(), "ExplorerNodeActionVisitor.imgDetail.noVolMatchesErr"));
                 error.setFont(new Font("Arial", Font.BOLD, 24));
                 popUpWindow.add(error);
             }
@@ -340,7 +348,9 @@ public class ExplorerNodeActionVisitor extends ContentVisitor.Default<List<? ext
             try {
                 parent = fs.getParent();
             } catch (Exception ex) {
-                throw new RuntimeException("Problem getting parent from " + FileSystem.class.getName() + ": " + fs, ex);
+                throw new RuntimeException(
+                        NbBundle.getMessage(this.getClass(), "ExplorerNodeActionVisitor.exception.probGetParent.text",
+                                            FileSystem.class.getName(), fs), ex);
             }
             long id = -1;
             if (parent != null) {
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ExtractAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExtractAction.java
index 7d6719c5fb..29cc8f4ebf 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/ExtractAction.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/ExtractAction.java
@@ -27,6 +27,8 @@ import java.util.Iterator;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.AbstractAction;
 import javax.swing.JFileChooser;
@@ -64,7 +66,7 @@ public final class ExtractAction extends AbstractAction {
     }
 
     private ExtractAction() {
-        super("Extract File(s)");
+        super(NbBundle.getMessage(ExtractAction.class, "ExtractAction.title.extractFiles.text"));
     }
         
     /**
@@ -111,7 +113,8 @@ public final class ExtractAction extends AbstractAction {
                     destinationFolder.mkdirs();
                 }
                 catch (Exception ex) {
-                    JOptionPane.showMessageDialog((Component) e.getSource(), "Couldn't create selected folder.");                    
+                    JOptionPane.showMessageDialog((Component) e.getSource(), NbBundle.getMessage(this.getClass(),
+                                                                                                 "ExtractAction.extractFiles.cantCreateFolderErr.msg"));
                     logger.log(Level.INFO, "Unable to create folder(s) for user " + destinationFolder.getAbsolutePath(), ex);
                     return;
                 }
@@ -143,9 +146,13 @@ public final class ExtractAction extends AbstractAction {
              * Unique Id was added to set of names before calling this method to deal with that.
              */
             if (task.destination.exists()) {
-                if (JOptionPane.showConfirmDialog((Component) e.getSource(), "Destination file " + task.destination.getAbsolutePath() + " already exists, overwrite?", "File Exists", JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
+                if (JOptionPane.showConfirmDialog((Component) e.getSource(),
+                                                  NbBundle.getMessage(this.getClass(), "ExtractAction.confDlg.destFileExist.msg", task.destination.getAbsolutePath()),
+                                                  NbBundle.getMessage(this.getClass(), "ExtractAction.confDlg.destFileExist.title"),
+                                                  JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
                     if (!FileUtil.deleteFileDir(task.destination)) {
-                        JOptionPane.showMessageDialog((Component) e.getSource(), "Couldn't overwrite existing file " + task.destination.getAbsolutePath());
+                        JOptionPane.showMessageDialog((Component) e.getSource(),
+                                                      NbBundle.getMessage(this.getClass(), "ExtractAction.msgDlg.cantOverwriteFile.msg", task.destination.getAbsolutePath()));
                         it.remove();
                     }
                 }
@@ -165,7 +172,8 @@ public final class ExtractAction extends AbstractAction {
             }                                    
         }
         else {
-            MessageNotifyUtil.Message.info("No file(s) to extract.");
+            MessageNotifyUtil.Message.info(
+                    NbBundle.getMessage(this.getClass(), "ExtractAction.notifyDlg.noFileToExtr.msg"));
         }
     }
         
@@ -195,12 +203,13 @@ public final class ExtractAction extends AbstractAction {
             }
             
             // Setup progress bar.
-            final String displayName = "Extracting";
+            final String displayName = NbBundle.getMessage(this.getClass(), "ExtractAction.progress.extracting");
             progress = ProgressHandleFactory.createHandle(displayName, new Cancellable() {
                 @Override
                 public boolean cancel() {
                     if (progress != null)
-                        progress.setDisplayName(displayName + " (Cancelling...)");
+                        progress.setDisplayName(
+                                NbBundle.getMessage(this.getClass(), "ExtractAction.progress.cancellingExtraction", displayName));
                     return ExtractAction.FileExtracter.this.cancel(true);
                 }
             });
@@ -238,7 +247,8 @@ public final class ExtractAction extends AbstractAction {
             finally {
                 progress.finish();
                 if (!this.isCancelled() && !msgDisplayed) {
-                    MessageNotifyUtil.Message.info("File(s) extracted.");
+                    MessageNotifyUtil.Message.info(
+                            NbBundle.getMessage(this.getClass(), "ExtractAction.done.notifyMsg.fileExtr.text"));
                 } 
             }
         }
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java
index ae642a5a23..d70d4ffbdb 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/ExtractUnallocAction.java
@@ -39,6 +39,7 @@ import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.util.Cancellable;
 import org.openide.util.Exceptions;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
@@ -97,7 +98,7 @@ import org.sleuthkit.datamodel.VolumeSystem;
     public void actionPerformed(ActionEvent e) {
         if (LstUnallocs != null && LstUnallocs.size() > 0) {
             if (lockedImages.contains(currentImage)) {
-                MessageNotifyUtil.Message.info("Unallocated Space is already being extracted on this Image. Please select a different Image.");
+                MessageNotifyUtil.Message.info(NbBundle.getMessage(this.getClass(), "ExtractUnallocAction.notifyMsg.unallocAlreadyBeingExtr.msg"));
                 //JOptionPane.showMessageDialog(new Frame(), "Unallocated Space is already being extracted on this Image. Please select a different Image.");
                 return;
             }
@@ -113,7 +114,8 @@ import org.sleuthkit.datamodel.VolumeSystem;
                 public void approveSelection() {
                     File f = getSelectedFile();
                     if (!f.exists() && getDialogType() == SAVE_DIALOG || !f.canWrite()) {
-                        JOptionPane.showMessageDialog(this, "Folder does not exist. Please choose a valid folder before continuing");
+                        JOptionPane.showMessageDialog(this, NbBundle.getMessage(this.getClass(),
+                                                                                "ExtractUnallocAction.msgDlg.folderDoesntExist.msg"));
                         return;
                     }
                      super.approveSelection();
@@ -121,7 +123,8 @@ import org.sleuthkit.datamodel.VolumeSystem;
             };
             
             fc.setCurrentDirectory(new File(Case.getCurrentCase().getCaseDirectory() + File.separator + "Export"));
-            fc.setDialogTitle("Select directory to save to");
+            fc.setDialogTitle(
+                    NbBundle.getMessage(this.getClass(), "ExtractUnallocAction.dlgTitle.selectDirToSaveTo.msg"));
             fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
             fc.setAcceptAllFileFilterUsed(false);
             int returnValue = fc.showSaveDialog((Component) e.getSource());
@@ -132,7 +135,9 @@ import org.sleuthkit.datamodel.VolumeSystem;
                     if (u.llf != null && u.llf.size() > 0 && !lockedVols.contains(u.getFileName())) {
                         //Format for single Unalloc File is ImgName-Unalloc-ImgObjectID-VolumeID.dat                    
                         if (u.FileInstance.exists()) {
-                            int res = JOptionPane.showConfirmDialog(new Frame(), "The Unalloc File for this volume, " + u.getFileName() + " already exists, do you want to replace it?");
+                            int res = JOptionPane.showConfirmDialog(new Frame(), NbBundle.getMessage(this.getClass(),
+                                                                                                     "ExtractUnallocAction.confDlg.unallocFileAlreadyExist.msg",
+                                                                                                     u.getFileName()));
                             if (res == JOptionPane.YES_OPTION) {
                                 u.FileInstance.delete();
                             } else {
@@ -224,13 +229,15 @@ import org.sleuthkit.datamodel.VolumeSystem;
         @Override
         protected Integer doInBackground() {
             try {
-                progress = ProgressHandleFactory.createHandle("Extracting Unallocated Space", new Cancellable() {
+                progress = ProgressHandleFactory.createHandle(
+                        NbBundle.getMessage(this.getClass(), "ExtractUnallocAction.progress.extractUnalloc.title"), new Cancellable() {
                     @Override
                     public boolean cancel() {
                         logger.log(Level.INFO, "Canceling extraction of unallocated space");
                         canceled = true;
                         if (progress != null) {
-                            progress.setDisplayName("Extracting Unallocated Space" + " (Cancelling...)");
+                            progress.setDisplayName(NbBundle.getMessage(this.getClass(),
+                                                                        "ExtractUnallocAction.progress.displayName.cancelling.text"));
                         }
                         return true;
                     }
@@ -256,7 +263,9 @@ import org.sleuthkit.datamodel.VolumeSystem;
                         while(offsetPerFile != f.getSize() && !canceled){
                             if (++kbs % 128 == 0) {
                                 mbs++;                                
-                                progress.progress("processing " + mbs + " of " + totalSizeinMegs + " MBs", mbs-1);
+                                progress.progress(NbBundle.getMessage(this.getClass(),
+                                                                      "ExtractUnallocAction.processing.counter.msg",
+                                                                      mbs, totalSizeinMegs), mbs-1);
                             }
                             bytesRead = f.read(buf, offsetPerFile, MAX_BYTES);  
                             offsetPerFile+= bytesRead;
@@ -300,10 +309,16 @@ import org.sleuthkit.datamodel.VolumeSystem;
             try {
                 get();
                 if (!canceled && !lus.isEmpty()) {
-                   MessageNotifyUtil.Notify.info("Completed extraction of unallocated space.", "Files were extracted to " + lus.get(0).getFile().getParent());
+                    MessageNotifyUtil.Notify.info(NbBundle.getMessage(this.getClass(),
+                                                                      "ExtractUnallocAction.done.notifyMsg.completedExtract.title"),
+                                                  NbBundle.getMessage(this.getClass(),
+                                                                      "ExtractUnallocAction.done.notifyMsg.completedExtract.msg",
+                                                                      lus.get(0).getFile().getParent()));
                 }
             } catch (InterruptedException | ExecutionException ex) {
-                MessageNotifyUtil.Notify.error("Error Extracting", "Error extracting unallocated space: " + ex.getMessage());
+                MessageNotifyUtil.Notify.error(
+                        NbBundle.getMessage(this.getClass(), "ExtractUnallocAction.done.errMsg.title"),
+                        NbBundle.getMessage(this.getClass(), "ExtractUnallocAction.done.errMsg.msg", ex.getMessage()));
             } 
         }        
     }
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/NewWindowViewAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/NewWindowViewAction.java
index f65aaf4506..ec5a5f0f32 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/NewWindowViewAction.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/NewWindowViewAction.java
@@ -76,6 +76,8 @@ public class NewWindowViewAction extends AbstractAction{
             @Override
             public void run() {
                 dctc.setNode(contentNode);
+                dctc.toFront();
+                dctc.requestActive();
             }
         });
     }
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java
index 05ff64d947..43e5891fbb 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/ResultDeleteAction.java
@@ -23,6 +23,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.AbstractAction;
 import javax.swing.JOptionPane;
@@ -89,15 +91,21 @@ import org.sleuthkit.datamodel.SleuthkitCase;
             viewer.refreshTree(BlackboardArtifact.ARTIFACT_TYPE.fromID(art.getArtifactTypeID()));
         } else if (this.actionType == ActionType.TYPE_ARTIFACTS) {
             if (JOptionPane.showConfirmDialog(null,
-                    "Are you sure you want to delete all " + artType.getDisplayName() + " results?",
-                    artType.getDisplayName() + " Results Deletion", JOptionPane.YES_NO_OPTION,
-                    JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
+                                              NbBundle.getMessage(this.getClass(),
+                                                                  "ResultDeleteAction.actionPerf.confDlg.delAllResults.msg",
+                                                                  artType.getDisplayName()),
+                                              NbBundle.getMessage(this.getClass(),
+                                                                  "ResultDeleteAction.actoinPerf.confDlg.delAllresults.details",
+                                                                  artType.getDisplayName()), JOptionPane.YES_NO_OPTION,
+                                              JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
                 deleteArtifacts(artType);
                 DirectoryTreeTopComponent viewer = DirectoryTreeTopComponent.findInstance();
                 viewer.refreshTree(artType);
             }
         } else {
-            throw new IllegalArgumentException("Invalid action type: " + this.actionType);
+            throw new IllegalArgumentException(
+                    NbBundle.getMessage(this.getClass(), "ResultDeleteAction.exception.invalidAction.msg",
+                                        this.actionType));
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ViewContextAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/ViewContextAction.java
index e959e7e3ed..7a643770fb 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/ViewContextAction.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/ViewContextAction.java
@@ -39,6 +39,7 @@ import org.sleuthkit.autopsy.datamodel.AbstractFsContentNode;
 import org.sleuthkit.autopsy.datamodel.BlackboardArtifactNode;
 import org.sleuthkit.autopsy.datamodel.DataSourcesNode;
 import org.sleuthkit.autopsy.datamodel.RootContentChildren;
+import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.ContentVisitor;
 import org.sleuthkit.datamodel.FileSystem;
@@ -66,7 +67,7 @@ public class ViewContextAction extends AbstractAction {
 
     }
 
-    public ViewContextAction(String title, AbstractFsContentNode node) {
+    public ViewContextAction(String title, AbstractFsContentNode<? extends AbstractFile> node) {
         super(title);
         this.content = node.getLookup().lookup(Content.class);
     }
diff --git a/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java b/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java
index 8b47e77101..810894b089 100755
--- a/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/examples/SampleDataSourceIngestModule.java
@@ -32,7 +32,6 @@ package org.sleuthkit.autopsy.examples;
 
 import java.util.List;
 import org.apache.log4j.Logger;
-import org.openide.util.Exceptions;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.services.FileManager;
 import org.sleuthkit.autopsy.casemodule.services.Services;
@@ -50,8 +49,7 @@ import org.sleuthkit.datamodel.TskCoreException;
  * Sample DataSource-level ingest module that doesn't do much at all. 
  * Just exists to show basic idea of these modules
  */
- class SampleDataSourceIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleDataSource {
-
+ public class SampleDataSourceIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleDataSource {
     /* Data Source modules operate on a disk or set of logical files. They
      * are passed in teh data source refernce and query it for things they want.
      */
@@ -84,23 +82,19 @@ import org.sleuthkit.datamodel.TskCoreException;
         } catch (TskCoreException ex) {
             Logger log = Logger.getLogger(SampleDataSourceIngestModule.class);
             log.fatal("Error retrieving files from database:  " + ex.getLocalizedMessage());
-            return;
         }    
     }
 
     @Override
     public void init(IngestModuleInit initContext) throws IngestModuleException {
-        // do nothing
     }
 
     @Override
     public void complete() {
-        // do nothing
     }
 
     @Override
     public void stop() {
-        // do nothing
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java
index 23c2bf6c31..a8ad161a3c 100755
--- a/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/examples/SampleFileIngestModule.java
@@ -1,33 +1,32 @@
 /*
-* Sample module in the public domain.  Feel free to use this as a template
-* for your modules.
-* 
-*  Contact: Brian Carrier [carrier <at> sleuthkit [dot] org]
-*
-*  This is free and unencumbered software released into the public domain.
-*  
-*  Anyone is free to copy, modify, publish, use, compile, sell, or
-*  distribute this software, either in source code form or as a compiled
-*  binary, for any purpose, commercial or non-commercial, and by any
-*  means.
-*  
-*  In jurisdictions that recognize copyright laws, the author or authors
-*  of this software dedicate any and all copyright interest in the
-*  software to the public domain. We make this dedication for the benefit
-*  of the public at large and to the detriment of our heirs and
-*  successors. We intend this dedication to be an overt act of
-*  relinquishment in perpetuity of all present and future rights to this
-*  software under copyright law.
-*  
-*  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-*  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-*  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-*  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-*  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-*  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-*  OTHER DEALINGS IN THE SOFTWARE. 
-*/
-
+ * Sample module in the public domain.  Feel free to use this as a template
+ * for your modules.
+ * 
+ *  Contact: Brian Carrier [carrier <at> sleuthkit [dot] org]
+ *
+ *  This is free and unencumbered software released into the public domain.
+ *  
+ *  Anyone is free to copy, modify, publish, use, compile, sell, or
+ *  distribute this software, either in source code form or as a compiled
+ *  binary, for any purpose, commercial or non-commercial, and by any
+ *  means.
+ *  
+ *  In jurisdictions that recognize copyright laws, the author or authors
+ *  of this software dedicate any and all copyright interest in the
+ *  software to the public domain. We make this dedication for the benefit
+ *  of the public at large and to the detriment of our heirs and
+ *  successors. We intend this dedication to be an overt act of
+ *  relinquishment in perpetuity of all present and future rights to this
+ *  software under copyright law.
+ *  
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ *  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ *  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ *  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ *  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *  OTHER DEALINGS IN THE SOFTWARE. 
+ */
 package org.sleuthkit.autopsy.examples;
 
 import org.apache.log4j.Logger;
@@ -44,23 +43,25 @@ import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskData;
 
 /**
- * This is a sample and simple module.  It is a file-level ingest module, meaning
- * that it will get called on each file in the disk image / logical file set.
- * It does a stupid calculation of the number of null bytes in the beginning of the
- * file in order to show the basic flow. 
- * 
- * Autopsy has been hard coded to ignore this module based on the it's package name.
- * IngestModuleLoader will not load things from the org.sleuthkit.autopsy.examples package.
- * Either change the package or the loading code to make this module actually run. 
+ * This is a sample and simple module. It is a file-level ingest module, meaning
+ * that it will get called on each file in the disk image / logical file set. It
+ * does a stupid calculation of the number of null bytes in the beginning of the
+ * file in order to show the basic flow.
+ *
+ * Autopsy has been hard coded to ignore this module based on the it's package
+ * name. IngestModuleLoader will not load things from the
+ * org.sleuthkit.autopsy.examples package. Either change the package or the
+ * loading code to make this module actually run.
  */
- class SampleFileIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile {
+public class SampleFileIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile {
+
     private int attrId = -1;
     private static SampleFileIngestModule defaultInstance = null;
-    
+
     // Private to ensure Singleton status
     private SampleFileIngestModule() {
     }
-    
+
     // File-level ingest modules are currently singleton -- this is required
     public static synchronized SampleFileIngestModule getDefault() {
         //defaultInstance is a private static class variable
@@ -70,7 +71,6 @@ import org.sleuthkit.datamodel.TskData;
         return defaultInstance;
     }
 
-    
     @Override
     public void init(IngestModuleInit initContext) throws IngestModuleException {
         /* For this demo, we are going to make a private attribute to post our
@@ -82,7 +82,7 @@ import org.sleuthkit.datamodel.TskData;
          */
         Case case1 = Case.getCurrentCase();
         SleuthkitCase sleuthkitCase = case1.getSleuthkitCase();
-        
+
         // see if the type already exists in the blackboard.
         try {
             attrId = sleuthkitCase.getAttrTypeID("ATTR_SAMPLE");
@@ -97,21 +97,21 @@ import org.sleuthkit.datamodel.TskData;
             }
         }
     }
-    
+
     @Override
     public ProcessResult process(PipelineContext<IngestModuleAbstractFile> pipelineContext, AbstractFile abstractFile) {
         // skip non-files
-        if ((abstractFile.getType() == TskData.TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS) ||
-            (abstractFile.getType() == TskData.TSK_DB_FILES_TYPE_ENUM.UNUSED_BLOCKS)) {
+        if ((abstractFile.getType() == TskData.TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS)
+                || (abstractFile.getType() == TskData.TSK_DB_FILES_TYPE_ENUM.UNUSED_BLOCKS)) {
             return ProcessResult.OK;
         }
-        
+
         // skip NSRL / known files
         if (abstractFile.getKnown() == TskData.FileKnown.KNOWN) {
             return ProcessResult.OK;
         }
-    
-        
+
+
         /* Do a non-sensical calculation of the number of 0x00 bytes
          * in the first 1024-bytes of the file.  This is for demo
          * purposes only.
@@ -125,7 +125,7 @@ import org.sleuthkit.datamodel.TskData;
                     count++;
                 }
             }
-            
+
             if (attrId != -1) {
                 // Make an attribute using the ID for the private type that we previously created.
                 BlackboardAttribute attr = new BlackboardAttribute(attrId, getName(), count);
@@ -136,30 +136,27 @@ import org.sleuthkit.datamodel.TskData;
                 BlackboardArtifact art = abstractFile.getGenInfoArtifact();
                 art.addAttribute(attr);
             }
-                
+
             return ProcessResult.OK;
         } catch (TskCoreException ex) {
             Exceptions.printStackTrace(ex);
             return ProcessResult.ERROR;
         }
     }
-    
 
     @Override
     public void complete() {
-        
     }
 
     @Override
     public void stop() {
-        
     }
 
     @Override
     public String getVersion() {
         return "1.0";
     }
-    
+
     @Override
     public String getName() {
         return "SampleFileIngestModule";
@@ -172,7 +169,6 @@ import org.sleuthkit.datamodel.TskData;
 
     @Override
     public boolean hasBackgroundJobsRunning() {
-        // we're single threaded...
         return false;
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/Bundle.properties b/Core/src/org/sleuthkit/autopsy/filesearch/Bundle.properties
index afeec73469..b8958f62c5 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/Bundle.properties
@@ -1,31 +1,9 @@
-CTL_FileSearchAction=File Search by Attributes
-CTL_FileSearchTopComponent=File Search by Attributes
-HINT_FileSearchTopComponent=This is a FileSearch window
 OpenIDE-Module-Name=FileSearch
-FileSearchTopComponent.searchTermLabel1.text=Search for files that match the following criteria:
-FileSearchTopComponent.searchButton1.text=Search
-FileSearchTopComponent.sizeCheckBox1.text=Size:
-FileSearchTopComponent.noteNameLabel1.text=<html>*Note: Name match is case insensitive and matches<br/> any part of the file name. Regular expressions are<br/> not currently supported. </html>
-FileSearchTopComponent.searchTextField1.text=
-FileSearchTopComponent.nameCheckBox1.text=Name:
-FileSearchTopComponent.jLabel8.text=Timezone:
-FileSearchTopComponent.jLabel7.text=*The date format is mm/dd/yyyy
-FileSearchTopComponent.jLabel6.text=*Empty fields mean "No Limit"
-FileSearchTopComponent.createdCheckBox1.text=Created
-FileSearchTopComponent.accessedCheckBox1.text=Accessed
-FileSearchTopComponent.changedCheckBox1.text=Changed
-FileSearchTopComponent.modifiedCheckBox1.text=Modified
-FileSearchTopComponent.dateToButtonCalendar1.text=
-FileSearchTopComponent.dateToTextField1.text=
-FileSearchTopComponent.jLabel5.text=to
-FileSearchTopComponent.dateFromTextField1.text=
-FileSearchTopComponent.dateFromButtonCalendar1.text=
-FileSearchTopComponent.dateCheckBox1.text=Date:
-FileSearchTopComponent.dateFiltersButton1.text=Date Filters
 KnownStatusSearchPanel.knownCheckBox.text=Known Status:
 KnownStatusSearchPanel.knownBadOptionCheckBox.text=Known bad
 KnownStatusSearchPanel.knownOptionCheckBox.text=Known (NSRL or other)
 KnownStatusSearchPanel.unknownOptionCheckBox.text=Unknown
+DateSearchFilter.noneSelectedMsg.text=At least one date type must be selected\!
 DateSearchPanel.dateCheckBox.text=Date:
 DateSearchPanel.jLabel4.text=Timezone:
 DateSearchPanel.jLabel3.text=*The date format is mm/dd/yyyy
@@ -55,3 +33,20 @@ DateSearchPanel.cutMenuItem.text=Cut
 DateSearchPanel.selectAllMenuItem.text=Select All
 DateSearchPanel.pasteMenuItem.text=Paste
 DateSearchPanel.copyMenuItem.text=Copy
+FileSearchAction.getName.text=File Search by Attributes
+FileSearchDialog.frame.title=File Search by Attributes
+FileSearchDialog.frame.msg=File Search by Attributes
+FileSearchPanel.custComp.label.text=Search for files that match the following criteria\:
+FileSearchPanel.filterTitle.name=Name
+FileSearchPanel.filterTitle.metadata=Metadata
+FileSearchPanel.filterTitle.knownStatus=Known Status
+FileSearchPanel.searchButton.text=Search
+FileSearchPanel.search.results.title=File Search Results {0}
+FileSearchPanel.search.results.pathText=Filename Search Results\:
+FileSearchPanel.search.results.msg=File Search\: {0} matches found
+FileSearchPanel.search.results.details=Large number of matches may impact performance on some operations
+FileSearchPanel.search.exception.noFilterSelected.msg=At least one filter must be selected.
+FileSearchPanel.search.validationErr.msg=Validation Error\: {0}
+KnownStatusSearchFilter.noneSelectedMsg.text=At least one known status must be selected\!
+NameSearchFilter.emptyNameMsg.text=Must enter something for name search.
+SearchNode.getName.text=Search Result
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/filesearch/Bundle_ja.properties
new file mode 100644
index 0000000000..9c1b3da39f
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/Bundle_ja.properties
@@ -0,0 +1,47 @@
+OpenIDE-Module-Name=\u30D5\u30A1\u30A4\u30EB\u691C\u7D22
+KnownStatusSearchPanel.knownCheckBox.text=\u65E2\u77E5\u30B9\u30C6\u30FC\u30BF\u30B9\uFF1A
+KnownStatusSearchPanel.knownBadOptionCheckBox.text=\u65E2\u77E5\u60AA\u8CEA
+KnownStatusSearchPanel.knownOptionCheckBox.text=\u65E2\u77E5\uFF08NSRL\u307E\u305F\u306F\u305D\u306E\u4ED6\uFF09
+KnownStatusSearchPanel.unknownOptionCheckBox.text=\u4E0D\u660E
+DateSearchFilter.noneSelectedMsg.text=\u6700\u4F4E\u4E00\u3064\u306E\u30C7\u30FC\u30BF\u30BF\u30A4\u30D7\u3092\u9078\u629E\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\uFF01
+DateSearchPanel.dateCheckBox.text=\u65E5\u6642\uFF1A
+DateSearchPanel.jLabel4.text=\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3\uFF1A
+DateSearchPanel.jLabel3.text=*\u65E5\u6642\u306E\u5F62\u5F0F\u306Fmm/dd/yyyy
+DateSearchPanel.jLabel2.text=*\u7A7A\u767D\u306E\u9805\u76EE\u306F\u300C\u5236\u9650\u306A\u3057\u300D\u3068\u3044\u3046\u610F\u5473\u3067\u3059
+DateSearchPanel.createdCheckBox.text=\u4F5C\u6210\u6E08\u307F
+DateSearchPanel.accessedCheckBox.text=\u30A2\u30AF\u30BB\u30B9\u6E08\u307F
+DateSearchPanel.changedCheckBox.text=\u5909\u66F4\u6E08\u307F
+DateSearchPanel.modifiedCheckBox.text=\u4FEE\u6B63\u6E08\u307F
+DateSearchPanel.jLabel1.text=to
+NameSearchPanel.nameCheckBox.text=\u540D\u79F0\uFF1A
+NameSearchPanel.noteNameLabel.text=<html>*\u6CE8\u610F\uFF1A\u540D\u79F0\u30DE\u30C3\u30C1\u306F\u5927\u6587\u5B57\u3068\u5C0F\u6587\u5B57\u3092\u533A\u5225\u3057\u307E\u3059\u3002\u307E\u305F\u3001<br/> \u30D5\u30A1\u30A4\u30EB\u540D\u306E\u3044\u304B\u306A\u308B\u90E8\u5206\u3082\u30DE\u30C3\u30C1\u3057\u307E\u3059\u3002\u6B63\u898F\u8868\u73FE\u306F<br/>\u73FE\u5728\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 </html>
+SizeSearchPanel.sizeCheckBox.text=\u30B5\u30A4\u30BA\uFF1A
+NameSearchPanel.cutMenuItem.text=\u30AB\u30C3\u30C8
+NameSearchPanel.copyMenuItem.text=\u30B3\u30D4\u30FC
+NameSearchPanel.pasteMenuItem.text=\u8CBC\u308A\u4ED8\u3051
+NameSearchPanel.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629E
+SizeSearchPanel.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629E
+SizeSearchPanel.pasteMenuItem.text=\u8CBC\u308A\u4ED8\u3051
+SizeSearchPanel.copyMenuItem.text=\u30B3\u30D4\u30FC
+SizeSearchPanel.cutMenuItem.text=\u30AB\u30C3\u30C8
+DateSearchPanel.cutMenuItem.text=\u30AB\u30C3\u30C8
+DateSearchPanel.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629E
+DateSearchPanel.pasteMenuItem.text=\u8CBC\u308A\u4ED8\u3051
+DateSearchPanel.copyMenuItem.text=\u30B3\u30D4\u30FC
+FileSearchAction.getName.text=\u5C5E\u6027\u306B\u3088\u308B\u30D5\u30A1\u30A4\u30EB\u691C\u7D22
+FileSearchDialog.frame.title=\u5C5E\u6027\u306B\u3088\u308B\u30D5\u30A1\u30A4\u30EB\u691C\u7D22
+FileSearchDialog.frame.msg=\u5C5E\u6027\u306B\u3088\u308B\u30D5\u30A1\u30A4\u30EB\u691C\u7D22
+FileSearchPanel.custComp.label.text=\u4E0B\u8A18\u306E\u6761\u4EF6\u306B\u4E00\u81F4\u3059\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\uFF1A
+FileSearchPanel.filterTitle.name=\u540D\u79F0
+FileSearchPanel.filterTitle.metadata=\u30E1\u30BF\u30C7\u30FC\u30BF
+FileSearchPanel.filterTitle.knownStatus=\u65E2\u77E5\u30B9\u30C6\u30FC\u30BF\u30B9
+FileSearchPanel.searchButton.text=\u691C\u7D22
+FileSearchPanel.search.results.title=\u30D5\u30A1\u30A4\u30EB\u691C\u7D22\u7D50\u679C{0}
+FileSearchPanel.search.results.pathText=\u30D5\u30A1\u30A4\u30EB\u540D\u691C\u7D22\u7D50\u679C\uFF1A
+FileSearchPanel.search.results.msg=\u30D5\u30A1\u30A4\u30EB\u691C\u7D22\uFF1A{0}\u500B\u306E\u30DE\u30C3\u30C1\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F
+FileSearchPanel.search.results.details=\u591A\u304F\u306E\u30DE\u30C3\u30C1\u304C\u3042\u308B\u5834\u5408\u3001\u4E00\u90E8\u306E\u51E6\u7406\u306E\u30D1\u30D5\u30A9\u30FC\u30DE\u30F3\u30B9\u306B\u5F71\u97FF\u3092\u4E0E\u3048\u308B\u304B\u3082\u3057\u308C\u307E\u305B\u3093
+FileSearchPanel.search.exception.noFilterSelected.msg=\u6700\u4F4E\uFF11\u500B\u306E\u30D5\u30A3\u30EB\u30BF\u3092\u9078\u629E\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+FileSearchPanel.search.validationErr.msg=\u30D0\u30EA\u30C7\u30FC\u30B7\u30E7\u30F3\u30A8\u30E9\u30FC\uFF1A{0}
+KnownStatusSearchFilter.noneSelectedMsg.text=\u6700\u4F4E\uFF11\u500B\u306E\u65E2\u77E5\u30B9\u30C6\u30FC\u30BF\u30B9\u3092\u9078\u629E\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\uFF01
+NameSearchFilter.emptyNameMsg.text=\u540D\u79F0\u691C\u7D22\u306B\u4F55\u304B\u8A18\u5165\u3057\u306A\u3051\u308C\u3070\u3044\u3051\u307E\u305B\u3093\u3002
+SearchNode.getName.text=\u691C\u7D22\u7D50\u679C
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java b/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java
index d61c174358..4cb224e2ba 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchFilter.java
@@ -38,6 +38,8 @@ import javax.swing.JList;
 import javax.swing.JSeparator;
 import javax.swing.ListCellRenderer;
 import javax.swing.border.EmptyBorder;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 
 /**
@@ -46,7 +48,7 @@ import org.sleuthkit.autopsy.casemodule.Case;
  */
 class DateSearchFilter extends AbstractFileSearchFilter<DateSearchPanel> {
 
-    private static final String NONE_SELECTED_MESSAGE = "At least one date type must be selected!";
+    private static final String NONE_SELECTED_MESSAGE = NbBundle.getMessage(DateSearchFilter.class, "DateSearchFilter.noneSelectedMsg.text");
     private static final DateFormat DATE_FORMAT = new SimpleDateFormat("MM/dd/yyyy");
     private static final String SEPARATOR = "SEPARATOR";
 
@@ -202,7 +204,7 @@ class DateSearchFilter extends AbstractFileSearchFilter<DateSearchPanel> {
     /**
      * Inner class to put the separator inside the combo box.
      */
-    static class ComboBoxRenderer extends JLabel implements ListCellRenderer {
+    static class ComboBoxRenderer extends JLabel implements ListCellRenderer<String> {
 
         JSeparator separator;
 
@@ -213,8 +215,8 @@ class DateSearchFilter extends AbstractFileSearchFilter<DateSearchPanel> {
         }
 
         @Override
-        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-            String str = (value == null) ? "" : value.toString();
+        public Component getListCellRendererComponent(JList<? extends String> list, String value, int index, boolean isSelected, boolean cellHasFocus) {
+            String str = (value == null) ? "" : value;
             if (SEPARATOR.equals(str)) {
                 return separator;
             }
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.form b/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.form
index 3f8829a864..0418d2eec7 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <NonVisualComponents>
@@ -181,8 +181,9 @@
         </Property>
       </Properties>
       <AuxValues>
-        <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new JComboBox(this.timeZones.toArray());"/>
+        <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new JComboBox&lt;&gt;(this.timeZones.toArray(new String[this.timeZones.size()]))"/>
         <AuxValue name="JavaCodeGenerator_CreateCodePost" type="java.lang.String" value="timeZoneComboBox.setRenderer(new DateSearchFilter.ComboBoxRenderer());"/>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
       </AuxValues>
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel3">
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.java
index e9336f402c..d805db749d 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/DateSearchPanel.java
@@ -102,7 +102,7 @@ class DateSearchPanel extends javax.swing.JPanel {
         return modifiedCheckBox;
     }
 
-    JComboBox getTimeZoneComboBox() {
+    JComboBox<String> getTimeZoneComboBox() {
         return timeZoneComboBox;
     }
 
@@ -132,7 +132,7 @@ class DateSearchPanel extends javax.swing.JPanel {
         jLabel1 = new javax.swing.JLabel();
         jLabel4 = new javax.swing.JLabel();
         dateCheckBox = new javax.swing.JCheckBox();
-        timeZoneComboBox = new JComboBox(this.timeZones.toArray());
+        timeZoneComboBox = new JComboBox<>(this.timeZones.toArray(new String[this.timeZones.size()]));
         timeZoneComboBox.setRenderer(new DateSearchFilter.ComboBoxRenderer());
         jLabel3 = new javax.swing.JLabel();
         dateFromTextField = new JFormattedTextField(this.dateFormat);
@@ -359,7 +359,7 @@ class DateSearchPanel extends javax.swing.JPanel {
     private javax.swing.JMenuItem pasteMenuItem;
     private javax.swing.JPopupMenu rightClickMenu;
     private javax.swing.JMenuItem selectAllMenuItem;
-    private javax.swing.JComboBox timeZoneComboBox;
+    private javax.swing.JComboBox<String> timeZoneComboBox;
     // End of variables declaration//GEN-END:variables
 
     void addActionListener(ActionListener l) {
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java
index c6b2e28697..fc76a5c0e3 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java
@@ -22,6 +22,7 @@ import java.awt.event.ActionEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import org.openide.util.HelpCtx;
+import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.directorytree.FileSearchProvider;
@@ -66,7 +67,7 @@ import org.sleuthkit.autopsy.directorytree.FileSearchProvider;
 
     @Override
     public String getName() {
-        return "File Search by Attributes";
+        return NbBundle.getMessage(this.getClass(), "FileSearchAction.getName.text");
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.java b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.java
index 726f0826e2..f689d34640 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchDialog.java
@@ -24,6 +24,8 @@
  */
 package org.sleuthkit.autopsy.filesearch;
 
+import org.openide.util.NbBundle;
+
 import java.awt.Dimension;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
@@ -37,7 +39,8 @@ import javax.swing.JFrame;
 
     /** Creates new form FileSearchDialog */
     public FileSearchDialog() {
-        super(new JFrame("File Search by Attributes"), "File Search by Attributes", true);
+        super(new JFrame(NbBundle.getMessage(FileSearchDialog.class, "FileSearchDialog.frame.title")),
+              NbBundle.getMessage(FileSearchDialog.class, "FileSearchDialog.frame.msg"), true);
         initComponents();
 
         setResizable(false);
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java
index 492510e739..e063636c24 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchPanel.java
@@ -35,6 +35,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
@@ -84,20 +86,20 @@ import org.sleuthkit.datamodel.TskCoreException;
 
         this.add(filterPanel, BorderLayout.CENTER);
 
-        JLabel label = new JLabel("Search for files that match the following criteria:");
+        JLabel label = new JLabel(NbBundle.getMessage(this.getClass(), "FileSearchPanel.custComp.label.text"));
         label.setAlignmentX(Component.LEFT_ALIGNMENT);
         label.setBorder(new EmptyBorder(0, 0, 10, 0));
         filterPanel.add(label);
 
         // Create and add filter areas
-        this.filterAreas.add(new FilterArea("Name", new NameSearchFilter()));
+        this.filterAreas.add(new FilterArea(NbBundle.getMessage(this.getClass(), "FileSearchPanel.filterTitle.name"), new NameSearchFilter()));
 
         List<FileSearchFilter> metadataFilters = new ArrayList<FileSearchFilter>();
         metadataFilters.add(new SizeSearchFilter());
         metadataFilters.add(new DateSearchFilter());
-        this.filterAreas.add(new FilterArea("Metadata", metadataFilters));
+        this.filterAreas.add(new FilterArea(NbBundle.getMessage(this.getClass(), "FileSearchPanel.filterTitle.metadata"), metadataFilters));
 
-        this.filterAreas.add(new FilterArea("Known Status", new KnownStatusSearchFilter()));
+        this.filterAreas.add(new FilterArea(NbBundle.getMessage(this.getClass(), "FileSearchPanel.filterTitle.knownStatus"), new KnownStatusSearchFilter()));
 
         for (FilterArea fa : this.filterAreas) {
             fa.setMaximumSize(new Dimension(Integer.MAX_VALUE, fa.getMinimumSize().height));
@@ -106,7 +108,7 @@ import org.sleuthkit.datamodel.TskCoreException;
         }
 
         // Create and add search button
-        this.searchButton = new JButton("Search");
+        this.searchButton = new JButton(NbBundle.getMessage(this.getClass(), "FileSearchPanel.searchButton.text"));
         this.searchButton.setAlignmentX(Component.LEFT_ALIGNMENT);
         filterPanel.add(searchButton);
 
@@ -140,8 +142,8 @@ import org.sleuthkit.datamodel.TskCoreException;
         this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
         try {
             if (this.anyFiltersEnabled()) {
-                String title = "File Search Results " + (++resultWindowCount);
-                String pathText = "Filename Search Results:";
+                String title = NbBundle.getMessage(this.getClass(), "FileSearchPanel.search.results.title", ++resultWindowCount);
+                String pathText = NbBundle.getMessage(this.getClass(), "FileSearchPanel.search.results.pathText");
 
                 // try to get the number of matches first
                 Case currentCase = Case.getCurrentCase(); // get the most updated case
@@ -173,15 +175,17 @@ import org.sleuthkit.datamodel.TskCoreException;
                  */
                 if (totalMatches > 10000) {
                     // show info
-                    String msg = "File Search: " + totalMatches + " matches found";
-                    String details = "Large number of matches may impact performance on some operations";
+                    String msg = NbBundle.getMessage(this.getClass(), "FileSearchPanel.search.results.msg", totalMatches);
+                    String details = NbBundle.getMessage(this.getClass(), "FileSearchPanel.search.results.details");
                     MessageNotifyUtil.Notify.info(msg, details);
                 }
             } else {
-                throw new FilterValidationException("At least one filter must be selected.");
+                throw new FilterValidationException(
+                        NbBundle.getMessage(this.getClass(), "FileSearchPanel.search.exception.noFilterSelected.msg"));
             }
         } catch (FilterValidationException ex) {
-            NotifyDescriptor d = new NotifyDescriptor.Message("Validation Error: " + ex.getMessage());
+            NotifyDescriptor d = new NotifyDescriptor.Message(
+                    NbBundle.getMessage(this.getClass(), "FileSearchPanel.search.validationErr.msg", ex.getMessage()));
             DialogDisplayer.getDefault().notify(d);
         } finally {
             this.setCursor(null);
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchFilter.java b/Core/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchFilter.java
index 501a13c440..f76ae9d664 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchFilter.java
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/KnownStatusSearchFilter.java
@@ -19,6 +19,8 @@
 package org.sleuthkit.autopsy.filesearch;
 
 import java.awt.event.ActionListener;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.datamodel.TskData.FileKnown;
 
 /**
@@ -26,7 +28,8 @@ import org.sleuthkit.datamodel.TskData.FileKnown;
  */
 class KnownStatusSearchFilter extends AbstractFileSearchFilter<KnownStatusSearchPanel> {
 
-    private static final String NONE_SELECTED_MESSAGE = "At least one known status must be selected!";
+    private static final String NONE_SELECTED_MESSAGE = NbBundle
+            .getMessage(KnownStatusSearchFilter.class, "KnownStatusSearchFilter.noneSelectedMsg.text");
 
     KnownStatusSearchFilter(KnownStatusSearchPanel panel) {
         super(panel);
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchFilter.java b/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchFilter.java
index 3940a6fff8..7fd24a5d8d 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchFilter.java
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/NameSearchFilter.java
@@ -19,6 +19,8 @@
 package org.sleuthkit.autopsy.filesearch;
 
 import java.awt.event.ActionListener;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.filesearch.FileSearchFilter.FilterValidationException;
 
 /**
@@ -27,7 +29,8 @@ import org.sleuthkit.autopsy.filesearch.FileSearchFilter.FilterValidationExcepti
  */
 class NameSearchFilter extends AbstractFileSearchFilter<NameSearchPanel> {
 
-    private static final String EMPTY_NAME_MESSAGE = "Must enter something for name search.";
+    private static final String EMPTY_NAME_MESSAGE = NbBundle
+            .getMessage(NameSearchFilter.class, "NameSearchFilter.emptyNameMsg.text");
 
     public NameSearchFilter() {
         this(new NameSearchPanel());
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/SearchNode.java b/Core/src/org/sleuthkit/autopsy/filesearch/SearchNode.java
index 9984f6ea74..bde25acd3b 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/SearchNode.java
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/SearchNode.java
@@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.filesearch;
 
 import java.util.List;
 import org.openide.nodes.AbstractNode;
+import org.openide.util.NbBundle;
 import org.sleuthkit.datamodel.AbstractFile;
 
 /**
@@ -38,6 +39,6 @@ class SearchNode extends AbstractNode {
 
     @Override
     public String getName() {
-        return "Search Result";
+        return NbBundle.getMessage(this.getClass(), "SearchNode.getName.text");
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchFilter.java b/Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchFilter.java
index b9f09f06d8..60e7470844 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchFilter.java
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchFilter.java
@@ -51,7 +51,7 @@ class SizeSearchFilter extends AbstractFileSearchFilter<SizeSearchPanel> {
         return "size " + operator + " " + size;
     }
 
-    private String compareComboBoxToOperator(JComboBox compare) {
+    private String compareComboBoxToOperator(JComboBox<String> compare) {
         String compareSize = compare.getSelectedItem().toString();
 
         if (compareSize.equals("equal to")) {
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchPanel.form b/Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchPanel.form
index 866bebbb81..26a8e904bc 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchPanel.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <NonVisualComponents>
@@ -79,16 +79,13 @@
   <SubComponents>
     <Component class="javax.swing.JComboBox" name="sizeUnitComboBox">
       <Properties>
-        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-          <StringArray count="5">
-            <StringItem index="0" value="Byte(s)"/>
-            <StringItem index="1" value="KB"/>
-            <StringItem index="2" value="MB"/>
-            <StringItem index="3" value="GB"/>
-            <StringItem index="4" value="TB"/>
-          </StringArray>
+        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+          <Connection code="new javax.swing.DefaultComboBoxModel&lt;String&gt;(new String[] { &quot;Byte(s)&quot;, &quot;KB&quot;, &quot;MB&quot;, &quot;GB&quot;, &quot;TB&quot; })" type="code"/>
         </Property>
       </Properties>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
+      </AuxValues>
     </Component>
     <Component class="javax.swing.JFormattedTextField" name="sizeTextField">
       <Properties>
@@ -105,14 +102,13 @@
     </Component>
     <Component class="javax.swing.JComboBox" name="sizeCompareComboBox">
       <Properties>
-        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-          <StringArray count="3">
-            <StringItem index="0" value="equal to"/>
-            <StringItem index="1" value="greater than"/>
-            <StringItem index="2" value="less than"/>
-          </StringArray>
+        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+          <Connection code="new javax.swing.DefaultComboBoxModel&lt;String&gt;(new String[] { &quot;equal to&quot;, &quot;greater than&quot;, &quot;less than&quot; })" type="code"/>
         </Property>
       </Properties>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
+      </AuxValues>
     </Component>
     <Component class="javax.swing.JCheckBox" name="sizeCheckBox">
       <Properties>
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchPanel.java b/Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchPanel.java
index c3e5fb1428..0933941364 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/SizeSearchPanel.java
@@ -67,7 +67,7 @@ class SizeSearchPanel extends javax.swing.JPanel {
         return sizeCheckBox;
     }
 
-    JComboBox getSizeCompareComboBox() {
+    JComboBox<String> getSizeCompareComboBox() {
         return sizeCompareComboBox;
     }
 
@@ -75,7 +75,7 @@ class SizeSearchPanel extends javax.swing.JPanel {
         return sizeTextField;
     }
 
-    JComboBox getSizeUnitComboBox() {
+    JComboBox<String> getSizeUnitComboBox() {
         return sizeUnitComboBox;
     }
 
@@ -93,9 +93,9 @@ class SizeSearchPanel extends javax.swing.JPanel {
         copyMenuItem = new javax.swing.JMenuItem();
         pasteMenuItem = new javax.swing.JMenuItem();
         selectAllMenuItem = new javax.swing.JMenuItem();
-        sizeUnitComboBox = new javax.swing.JComboBox();
+        sizeUnitComboBox = new javax.swing.JComboBox<String>();
         sizeTextField = new JFormattedTextField(NumberFormat.getIntegerInstance());
-        sizeCompareComboBox = new javax.swing.JComboBox();
+        sizeCompareComboBox = new javax.swing.JComboBox<String>();
         sizeCheckBox = new javax.swing.JCheckBox();
 
         cutMenuItem.setText(org.openide.util.NbBundle.getMessage(SizeSearchPanel.class, "SizeSearchPanel.cutMenuItem.text")); // NOI18N
@@ -110,7 +110,7 @@ class SizeSearchPanel extends javax.swing.JPanel {
         selectAllMenuItem.setText(org.openide.util.NbBundle.getMessage(SizeSearchPanel.class, "SizeSearchPanel.selectAllMenuItem.text")); // NOI18N
         rightClickMenu.add(selectAllMenuItem);
 
-        sizeUnitComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Byte(s)", "KB", "MB", "GB", "TB" }));
+        sizeUnitComboBox.setModel(new javax.swing.DefaultComboBoxModel<String>(new String[] { "Byte(s)", "KB", "MB", "GB", "TB" }));
 
         sizeTextField.setValue(0);
         sizeTextField.addMouseListener(new java.awt.event.MouseAdapter() {
@@ -119,7 +119,7 @@ class SizeSearchPanel extends javax.swing.JPanel {
             }
         });
 
-        sizeCompareComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "equal to", "greater than", "less than" }));
+        sizeCompareComboBox.setModel(new javax.swing.DefaultComboBoxModel<String>(new String[] { "equal to", "greater than", "less than" }));
 
         sizeCheckBox.setText(org.openide.util.NbBundle.getMessage(SizeSearchPanel.class, "SizeSearchPanel.sizeCheckBox.text")); // NOI18N
 
@@ -157,9 +157,9 @@ class SizeSearchPanel extends javax.swing.JPanel {
     private javax.swing.JPopupMenu rightClickMenu;
     private javax.swing.JMenuItem selectAllMenuItem;
     private javax.swing.JCheckBox sizeCheckBox;
-    private javax.swing.JComboBox sizeCompareComboBox;
+    private javax.swing.JComboBox<String> sizeCompareComboBox;
     private javax.swing.JFormattedTextField sizeTextField;
-    private javax.swing.JComboBox sizeUnitComboBox;
+    private javax.swing.JComboBox<String> sizeUnitComboBox;
     // End of variables declaration//GEN-END:variables
 
     void addActionListener(ActionListener l) {
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
index 0674b59bf7..af1f7bea14 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/ingest/Bundle.properties
@@ -1,21 +1,6 @@
 OpenIDE-Module-Name=Ingest
-CTL_IngestAction=Ingest
-CTL_IngestMessagesAction=Ingest Messages
 CTL_IngestMessageTopComponent=Messages
-CTL_IngestTopComponent=Ingest
 HINT_IngestMessageTopComponent=Messages windows
-HINT_IngestTopComponent=Ingest window
-IngestTopComponent.messageFrame.title=Messages
-IngestTopComponent.ingestProgressLabel.text=File Ingest Progress
-IngestControlPanel.topLable.text=Image ingest modules
-IngestControlPanel.startButton.text=Start
-IngestDialogPanel.ingestServicesLabel.text=Image Ingest Modules
-IngestDialogForm2.okButton.text=OK
-IngestDialogForm2.cancelButton.text=Cancel
-IngestDialogForm.cancelButton.text=Cancel
-IngestDialogForm.startButton.text=Start
-IngestDialogForm.jLabel1.text=Ingest Modules
-IngestTopComponent.refreshFreqLabel.text=Refresh frequency
 IngestMessageDetailsPanel.backButton.text=
 IngestMessageDetailsPanel.viewArtifactButton.text=Go to Result
 IngestMessageDetailsPanel.viewContentButton.text=Go to Directory
@@ -34,3 +19,86 @@ IngestMessagePanel.totalUniqueMessagesNameLabel.text=Unique:
 IngestMessagePanel.totalUniqueMessagesNameVal.text=-
 IngestDialogPanel.processUnallocCheckbox.text=Process Unallocated Space
 IngestDialogPanel.processUnallocCheckbox.toolTipText=Processes unallocated space, such as deleted files. Produces more complete results, but it may take longer to process on large images.
+DataSourceTask.toString.text=ScheduledTask'{'input\={0}, modules\={1}'}'
+GeneralIngestConfigurator.modName.tbirdParser.text=Thunderbird Parser
+GeneralIngestConfigurator.modName.mboxParser.text=MBox Parser
+GeneralIngestConfigurator.modName.emailParser.text=Email Parser
+GeneralIngestConfigurator.enabledMods.notFound.msg={0} was previously enabled, but could not be found
+IngestDataSourceThread.displayName.text={0} dataSource id\:{1}
+IngestDataSourceThread.progress.pending={0} (Pending...)
+IngestDataSourceThread.progress.cancelling={0} (Cancelling...)
+IngestDialog.title.text=Ingest Modules
+IngestDialog.startButton.title=Start
+IngestDialog.closeButton.title=Close
+IngestManager.moduleProperties.text=ingest
+IngestManager.moduleErr=Module Error
+IngestManager.moduleErr.errListenToUpdates.msg=A module caused an error listening to Ingest Manager updates. See log to determine which module. Some data could be incomplete.
+IngestManager.displayInitError.failedToLoad.msg=Failed to load {0} ingest module.\
+\
+No ingest modules will be run. Please disable the module or fix the error and restart ingest by right clicking on the data source and selecting Run Ingest Modules.\
+\
+Error\: {1}
+IngestManager.getFileModStats.moduleInfo.text={0} took\: {1} secs. to process()
+IngestManager.toString.startTime.text=Start time\: {0}{1}
+IngestManager.toString.endTime.text=End time\: {0}{1}
+IngestManager.toString.totalIngestTime.text=Total ingest time\: {0}{1}
+IngestManager.toString.totalErrs.text=Total errors\: {0}{1}
+IngestManager.toString.errsPerMod.text=Errors per module\:
+IngestManager.toHtmlStr.ingestTime.text=Ingest time\: {0}
+IngestManager.toHtmlStr.totalErrs.text=Total errors\: {0}
+IngestManager.toHtmlStr.module.text=Module
+IngestManager.toHtmlStr.time.text=Time
+IngestManager.toHtmlStr.errors.text=Errors
+IngestManager.IngestAbstractFileProcessor.displayName=File Ingest
+IngestManager.IngestAbstractFileProcessor.process.cancelling={0} (Cancelling...)
+IngestManager.EnqueueWorker.displayName.text=Queueing Ingest
+IngestManager.EnqueueWorker.process.cancelling={0} (Cancelling...)
+IngestManager.datatSourceIngest.progress.text=DataSource Ingest {0}
+IngestManager.fileIngest.progress.text=File Ingest {0}
+IngestMessage.toString.type.text=type\: {0}
+IngestMessage.toString.source.text=\ source\: {0}
+IngestMessage.toString.date.text=\ date\: {0}
+IngestMessage.toString.subject.text=\ subject\: {0}
+IngestMessage.toString.details.text=\ details\: {0}
+IngestMessage.toString.data.text=\ data\: {0}
+IngestMessage.exception.typeSrcSubjNotNull.msg=message type, source and subject cannot be null
+IngestMessage.exception.srcSubjNotNull.msg=source and subject cannot be null
+IngestMessage.exception.srcSubjDetailsDataNotNull.msg=source, subject, details and data cannot be null
+IngestMessagePanel.moduleErr=Module Error
+IngestMessagePanel.moduleErr.errListenUpdates.text=A module caused an error listening to IngestMessagePanel updates. See log to determine which module. Some data could be incomplete.
+IngestMessagePanel.MsgTableMod.colNames.module=Module
+IngestMessagePanel.MsgTableMod.colNames.num=Num
+IngestMessagePanel.MsgTableMod.colNames.new=New?
+IngestMessagePanel.MsgTableMod.colNames.subject=Subject
+IngestMessagePanel.MsgTableMod.colNames.timestamp=Timestamp
+IngestMessagePanel.BooleanRenderer.exception.nonBoolVal.msg=Tried to use BooleanRenderer on non-boolean value.
+IngestMessagePanel.DateRenderer.exception.nonDateVal.text=Tried to use DateRenderer on non-Date value.
+IngestMessageTopComponent.displayReport.option.OK=OK
+IngestMessageTopComponent.displayReport.option.GenRpt=Generate Report
+IngestMessageTopComponent.msgDlg.ingestRpt.text=Ingest Report
+IngestModuleLoader.moduleErr=Module Error
+IngestModuleLoader.moduleErr.errListenUpdates.msg=A module caused an error listening to IngestModuleLoader updates. See log to determine which module. Some data could be incomplete.
+IngestModuleLoader.exception.notImplemented.msg=Not yet implemented
+IngestModuleLoader.exception.cantFindPipeline.msg=Could not find expected pipeline of type\: {0}, cannot add autodiscovered module\: {1}
+IngestModuleLoader.save.comment.text=Saved by\: {0} on\: {1}
+IngestModuleLoader.loadRawPipeline.exception.cantLoadXML.msg=Could not load pipeline config XML\: {0}
+IngestModuleLoader.loadRawPipeline.exception.invalidFileFormat.msg=Error loading pipeline configuration\: invalid file format.
+IngestModuleLoader.loadRawPipeline.exception.noPipelinesInConf.msg=No pipelines found in the pipeline configuration\: {0}
+IngestModuleLoader.exception.noPipelineTypeForStr.msg=No PIPELINE_TYPE for string\: {0}
+IngestMonitor.mgrErrMsg.lowDiskSpace.title=Ingest stopped - low disk space on {0}
+IngestMonitor.mgrErrMsg.lowDiskSpace.msg=Stopping ingest due to low disk space on disk {0}. \
+Ensure the Case drive has at least 1GB free space and restart ingest.
+IngestScheduler.FileSched.toString.rootDirs.text=\
+RootDirs(sorted), size\: {0}
+IngestScheduler.FileSched.toString.curDirs.text=\
+CurDirs(stack), size\: {0}
+IngestScheduler.FileSched.toString.curFiles.text=\
+CurFiles, size\: {0}
+IngestScheduler.fileTask.toString.long=ProcessTask'{'file\={0}\: {1}'}'
+IngestScheduler.fileTask.toString.short=ProcessTask'{'file\={0}\: {1}'}'
+IngestScheduler.FileTask.next.exception.msg=No next ProcessTask, check hasNext() first\!
+IngestScheduler.remove.exception.notSupported.msg=Not supported.
+IngestScheduler.DataSourceScheduler.exception.next.msg=There is no data source tasks in the queue, check hasNext()
+IngestScheduler.DataSourceScheduler.exception.remove.msg=Removing of scheduled data source ingest tasks is not supported.
+IngestScheduler.DataSourceScheduler.toString.size=DataSourceQueue, size\: {0}
+PipelineContext.toString.text=pipelineContext'{'task\={0}'}'
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/ingest/Bundle_ja.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceTask.java b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceTask.java
index 01bac09f19..d35f4a89b7 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceTask.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceTask.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  * 
- * Copyright 2013 Basis Technology Corp.
+ * Copyright 2013-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +20,7 @@
 package org.sleuthkit.autopsy.ingest;
 
 import java.util.List;
+import org.openide.util.NbBundle;
 import org.sleuthkit.datamodel.Content;
 
 /**
@@ -72,7 +73,7 @@ class DataSourceTask<T extends IngestModuleAbstract> {
 
     @Override
     public String toString() {
-        return "ScheduledTask{" + "input=" + input + ", modules=" + modules + '}';
+        return NbBundle.getMessage(this.getClass(), "DataSourceTask.toString.text", input, modules);
     }
 
     /**
@@ -91,6 +92,7 @@ class DataSourceTask<T extends IngestModuleAbstract> {
         if (getClass() != obj.getClass()) {
             return false;
         }
+        @SuppressWarnings("unchecked")
         final DataSourceTask<T> other = (DataSourceTask<T>) obj;
         if (this.input != other.input && (this.input == null || !this.input.equals(other.input))) {
             return false;
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java b/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java
index 203e98cbe8..b96ad9cd49 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java
@@ -22,6 +22,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import javax.swing.JPanel;
+
+import org.openide.util.NbBundle;
 import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.datamodel.Content;
@@ -104,9 +106,11 @@ public class GeneralIngestConfigurator implements IngestConfigurator {
         // the UI component.
         List<IngestModuleAbstract> enabledModules = new ArrayList<>();
         for (String moduleName : enabledList) {
-            if (moduleName.equals("Thunderbird Parser") 
-                    || moduleName.equals("MBox Parser")) {
-                moduleName = "Email Parser";
+            if (moduleName.equals(
+                    NbBundle.getMessage(this.getClass(), "GeneralIngestConfigurator.modName.tbirdParser.text"))
+                    || moduleName.equals(
+                    NbBundle.getMessage(this.getClass(), "GeneralIngestConfigurator.modName.mboxParser.text"))) {
+                moduleName = NbBundle.getMessage(this.getClass(), "GeneralIngestConfigurator.modName.emailParser.text");
             }
             
             IngestModuleAbstract moduleFound =  null;
@@ -120,7 +124,8 @@ public class GeneralIngestConfigurator implements IngestConfigurator {
                 enabledModules.add(moduleFound);
             }
             else {
-                messages.add(moduleName + " was previously enabled, but could not be found");
+                messages.add(NbBundle.getMessage(this.getClass(), "GeneralIngestConfigurator.enabledMods.notFound.msg",
+                                                 moduleName));
             }
         }        
         ingestDialogPanel.setEnabledIngestModules(enabledModules);                            
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java
index 8c427eeff1..217a568344 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java
@@ -23,6 +23,8 @@ import java.awt.EventQueue;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.SwingWorker;
 import org.netbeans.api.progress.ProgressHandle;
@@ -95,13 +97,17 @@ import org.sleuthkit.datamodel.Content;
 
         logger.log(Level.INFO, "Pending module: " + module.getName());
         
-        final String displayName = module.getName() + " dataSource id:" + dataSource.getId();
-        progress = ProgressHandleFactory.createHandle(displayName + " (Pending...)", new Cancellable() {
+        final String displayName = NbBundle.getMessage(this.getClass(), "IngestDataSourceThread.displayName.text",
+                                                       module.getName(),
+                                                       dataSource.getId());
+        progress = ProgressHandleFactory.createHandle(
+                NbBundle.getMessage(this.getClass(), "IngestDataSourceThread.progress.pending", displayName), new Cancellable() {
             @Override
             public boolean cancel() {
                 logger.log(Level.INFO, "DataSource ingest module " + module.getName() + " cancelled by user.");
                 if (progress != null) {
-                    progress.setDisplayName(displayName + " (Cancelling...)");
+                    progress.setDisplayName(
+                            NbBundle.getMessage(this.getClass(), "IngestDataSourceThread.progress.cancelling", displayName));
                 }
                 return IngestDataSourceThread.this.cancel(true);
             }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestDialog.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestDialog.java
index fb68c15a5e..b6cedc099f 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestDialog.java
@@ -32,6 +32,8 @@ import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.datamodel.Content;
 
 /**
@@ -40,7 +42,7 @@ import org.sleuthkit.datamodel.Content;
  */
 public class IngestDialog extends JDialog {
     
-    private static final String TITLE = "Ingest Modules";
+    private static final String TITLE = NbBundle.getMessage(IngestDialog.class, "IngestDialog.title.text");
     private static Dimension DIMENSIONS = new Dimension(500, 300);
     private IngestConfigurator ingestConfigurator;
     
@@ -77,8 +79,8 @@ public class IngestDialog extends JDialog {
         setLocation((screenDimension.width - w) / 2, (screenDimension.height - h) / 2);
 
         add(ingestConfigurator.getIngestConfigPanel(), BorderLayout.PAGE_START);
-        JButton startButton = new JButton("Start");
-        JButton closeButton = new JButton("Close");
+        JButton startButton = new JButton(NbBundle.getMessage(this.getClass(), "IngestDialog.startButton.title"));
+        JButton closeButton = new JButton(NbBundle.getMessage(this.getClass(), "IngestDialog.closeButton.title"));
         startButton.addActionListener(new ActionListener() {
 
             @Override
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
index 6ccd1b89dd..b8bbf43557 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
@@ -32,6 +32,8 @@ import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.SwingWorker;
 import org.netbeans.api.progress.ProgressHandle;
@@ -77,7 +79,8 @@ public class IngestManager {
     //module loader
     private IngestModuleLoader moduleLoader = null;
     //property file name id for the module
-    public final static String MODULE_PROPERTIES = "ingest";
+    public final static String MODULE_PROPERTIES = NbBundle.getMessage(IngestManager.class,
+                                                                       "IngestManager.moduleProperties.text");
     private volatile int messageID = 0;
 
     /**
@@ -212,7 +215,9 @@ public class IngestManager {
         }
         catch (Exception e) {
             logger.log(Level.SEVERE, "Ingest manager listener threw exception", e);
-            MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to Ingest Manager updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+            MessageNotifyUtil.Notify.show(NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr"),
+                                          NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr.errListenToUpdates.msg"),
+                                          MessageNotifyUtil.MessageType.ERROR);
         }
     }
     
@@ -227,7 +232,9 @@ public class IngestManager {
         }
         catch (Exception e) {
             logger.log(Level.SEVERE, "Ingest manager listener threw exception", e);
-            MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to Ingest Manager updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+            MessageNotifyUtil.Notify.show(NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr"),
+                                          NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr.errListenToUpdates.msg"),
+                                          MessageNotifyUtil.MessageType.ERROR);
         }
     }
 
@@ -242,7 +249,9 @@ public class IngestManager {
         }
         catch (Exception e) {
             logger.log(Level.SEVERE, "Ingest manager listener threw exception", e);
-            MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to Ingest Manager updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+            MessageNotifyUtil.Notify.show(NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr"),
+                                          NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr.errListenToUpdates.msg"),
+                                          MessageNotifyUtil.MessageType.ERROR);
         }
     }
 
@@ -256,7 +265,9 @@ public class IngestManager {
         }
         catch (Exception e) {
             logger.log(Level.SEVERE, "Ingest manager listener threw exception", e);
-            MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to Ingest Manager updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+            MessageNotifyUtil.Notify.show(NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr"),
+                                          NbBundle.getMessage(IngestManager.class, "IngestManager.moduleErr.errListenToUpdates.msg"),
+                                          MessageNotifyUtil.MessageType.ERROR);
         }
     }
 
@@ -332,7 +343,7 @@ public class IngestManager {
      * @param pipelineContext ingest context used to ingest parent of the file
      * to be scheduled
      */
-    void scheduleFile(AbstractFile file, PipelineContext pipelineContext) {
+    void scheduleFile(AbstractFile file, PipelineContext<IngestModuleAbstractFile> pipelineContext) {
         scheduler.getFileScheduler().schedule(file, pipelineContext);
     }
 
@@ -495,11 +506,8 @@ public class IngestManager {
      */
     private void displayInitError(String moduleName, String errorMessage) {
         MessageNotifyUtil.Message.error(
-                "Failed to load " + moduleName + " ingest module.\n\n"
-                + "No ingest modules will be run. Please disable the module "
-                + "or fix the error and restart ingest by right clicking on "
-                + "the data source and selecting Run Ingest Modules.\n\n"
-                + "Error: " + errorMessage);
+                NbBundle.getMessage(this.getClass(), "IngestManager.displayInitError.failedToLoad.msg", moduleName,
+                                    errorMessage));
     }
 
     /**
@@ -856,9 +864,9 @@ public class IngestManager {
         String getFileModuleStats() {
             StringBuilder sb = new StringBuilder();
             for (final String moduleName : fileModuleTimers.keySet()) {
-                sb.append(moduleName).append(" took: ")
-                        .append(fileModuleTimers.get(moduleName) / 1000)
-                        .append(" secs. to process()").append('\n');
+                sb.append(NbBundle.getMessage(this.getClass(),
+                                              "IngestManager.getFileModStats.moduleInfo.text",
+                                              moduleName, fileModuleTimers.get(moduleName) / 1000));
             }
             return sb.toString();
         }
@@ -868,15 +876,18 @@ public class IngestManager {
             final String EOL = System.getProperty("line.separator");
             StringBuilder sb = new StringBuilder();
             if (startTime != null) {
-                sb.append("Start time: ").append(dateFormatter.format(startTime)).append(EOL);
+                sb.append(NbBundle.getMessage(this.getClass(), "IngestManager.toString.startTime.text",
+                                              dateFormatter.format(startTime), EOL));
             }
             if (endTime != null) {
-                sb.append("End time: ").append(dateFormatter.format(endTime)).append(EOL);
+                sb.append(NbBundle.getMessage(this.getClass(), "IngestManager.toString.endTime.text",
+                                              dateFormatter.format(endTime), EOL));
             }
-            sb.append("Total ingest time: ").append(getTotalTimeString()).append(EOL);
-            sb.append("Total errors: ").append(errorsTotal).append(EOL);
+            sb.append(NbBundle.getMessage(this.getClass(), "IngestManager.toString.totalIngestTime.text",
+                                          getTotalTimeString(), EOL));
+            sb.append(NbBundle.getMessage(this.getClass(), "IngestManager.toString.totalErrs.text", errorsTotal, EOL));
             if (errorsTotal > 0) {
-                sb.append("Errors per module:");
+                sb.append(NbBundle.getMessage(this.getClass(), "IngestManager.toString.errsPerMod.text"));
                 for (String moduleName : errors.keySet()) {
                     sb.append("\t").append(moduleName).append(": ").append(errors.get(moduleName)).append(EOL);
                 }
@@ -887,9 +898,18 @@ public class IngestManager {
         public String toHtmlString() {
             StringBuilder sb = new StringBuilder();
             sb.append("<html><body>");
-            sb.append("Ingest time: ").append(getTotalTimeString()).append("<br />");
-            sb.append("Total errors: ").append(errorsTotal).append("<br />");
-            sb.append("<table><tr><th>Module</th><th>Time</th><th>Errors</th></tr>\n");
+            sb.append(NbBundle.getMessage(this.getClass(), "IngestManager.toHtmlStr.ingestTime.text",
+                                          getTotalTimeString()))
+              .append("<br />");
+            sb.append(NbBundle.getMessage(this.getClass(), "IngestManager.toHtmlStr.totalErrs.text", errorsTotal))
+              .append("<br />");
+            sb.append("<table><tr><th>")
+              .append(NbBundle.getMessage(this.getClass(), "IngestManager.toHtmlStr.module.text"))
+              .append("</th><th>")
+              .append(NbBundle.getMessage(this.getClass(), "IngestManager.toHtmlStr.time.text"))
+              .append("</th><th>")
+              .append(NbBundle.getMessage(this.getClass(), "IngestManager.toHtmlStr.errors.text"))
+              .append("</th></tr>\n");
             
             for (final String moduleName : fileModuleTimers.keySet()) {
                 sb.append("<tr><td>").append(moduleName).append("</td><td>");
@@ -993,13 +1013,16 @@ public class IngestManager {
                 IngestManager.fireModuleEvent(IngestModuleEvent.STARTED.toString(), s.getName());
             }
 
-            final String displayName = "File Ingest";
+            final String displayName = NbBundle
+                    .getMessage(this.getClass(), "IngestManager.IngestAbstractFileProcessor.displayName");
             progress = ProgressHandleFactory.createHandle(displayName, new Cancellable() {
                 @Override
                 public boolean cancel() {
                     logger.log(Level.INFO, "Filed ingest cancelled by user.");
                     if (progress != null) {
-                        progress.setDisplayName(displayName + " (Cancelling...)");
+                        progress.setDisplayName(NbBundle.getMessage(this.getClass(),
+                                                                    "IngestManager.IngestAbstractFileProcessor.process.cancelling",
+                                                                    displayName));
                     }
                     return IngestAbstractFileProcessor.this.cancel(true);
                 }
@@ -1169,13 +1192,16 @@ public class IngestManager {
         @Override
         protected Object doInBackground() throws Exception {
 
-            final String displayName = "Queueing Ingest";
+            final String displayName = NbBundle
+                    .getMessage(this.getClass(), "IngestManager.EnqueueWorker.displayName.text");
             progress = ProgressHandleFactory.createHandle(displayName, new Cancellable() {
                 @Override
                 public boolean cancel() {
                     logger.log(Level.INFO, "Queueing ingest cancelled by user.");
                     if (progress != null) {
-                        progress.setDisplayName(displayName + " (Cancelling...)");
+                        progress.setDisplayName(
+                                NbBundle.getMessage(this.getClass(), "IngestManager.EnqueueWorker.process.cancelling",
+                                                    displayName));
                     }
                     return EnqueueWorker.this.cancel(true);
                 }
@@ -1274,10 +1300,12 @@ public class IngestManager {
                 
                 
                 logger.log(Level.INFO, "Queing data source ingest task: " + dataSourceTask);
-                progress.progress("DataSource Ingest" + " " + inputName, processed);
+                progress.progress(NbBundle.getMessage(this.getClass(), "IngestManager.datatSourceIngest.progress.text",
+                                                      inputName), processed);
                 final IngestScheduler.DataSourceScheduler dataSourceScheduler = scheduler.getDataSourceScheduler();
                 dataSourceScheduler.schedule(dataSourceTask);
-                progress.progress("DataSource Ingest" + " " + inputName, ++processed);
+                progress.progress(NbBundle.getMessage(this.getClass(), "IngestManager.datatSourceIngest.progress.text",
+                                                      inputName), ++processed);
 
                 
                 /* Schedule the file-level ingest modules for the children of the data source */
@@ -1285,10 +1313,12 @@ public class IngestManager {
                         new DataSourceTask(input, fileMods, getProcessUnallocSpace());
                 
                 logger.log(Level.INFO, "Queing file ingest task: " + fTask);
-                progress.progress("File Ingest" + " " + inputName, processed);
+                progress.progress(
+                        NbBundle.getMessage(this.getClass(), "IngestManager.fileIngest.progress.text", inputName), processed);
                 final IngestScheduler.FileScheduler fileScheduler = scheduler.getFileScheduler();
                 fileScheduler.schedule(fTask);
-                progress.progress("File Ingest" + " " + inputName, ++processed);
+                progress.progress(
+                        NbBundle.getMessage(this.getClass(), "IngestManager.fileIngest.progress.text", inputName), ++processed);
 
             } //for data sources
         }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java
index de0da0cae3..77e22204e1 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessage.java
@@ -20,7 +20,8 @@ package org.sleuthkit.autopsy.ingest;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import org.sleuthkit.autopsy.datamodel.KeyValue;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 
 /**
@@ -101,18 +102,19 @@ public class IngestMessage {
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append(Long.toString(ID)).append(": ");
-        sb.append("type: ").append(messageType.name());
+        sb.append(NbBundle.getMessage(this.getClass(), "IngestMessage.toString.type.text", messageType.name()));
         if (source != null) //can be null for manager messages
         {
-            sb.append(" source: ").append(source.getName());
+            sb.append(NbBundle.getMessage(this.getClass(), "IngestMessage.toString.source.text", source.getName()));
         }
-        sb.append(" date: ").append(dateFormat.format(datePosted));
-        sb.append(" subject: ").append(subject);
+        sb.append(
+                NbBundle.getMessage(this.getClass(), "IngestMessage.toString.date.text", dateFormat.format(datePosted)));
+        sb.append(NbBundle.getMessage(this.getClass(), "IngestMessage.toString.subject.text", subject));
         if (detailsHtml != null) {
-            sb.append(" details: ").append(detailsHtml);
+            sb.append(NbBundle.getMessage(this.getClass(), "IngestMessage.toString.details.text", detailsHtml));
         }
         if (data != null) {
-            sb.append(" data: ").append(data.toString()).append(' ');
+            sb.append(NbBundle.getMessage(this.getClass(), "IngestMessage.toString.data.text", data.toString()));
         }
         return sb.toString();
     }
@@ -176,7 +178,8 @@ public class IngestMessage {
      */
     public static IngestMessage createMessage(long ID, MessageType messageType, IngestModuleAbstract source, String subject, String detailsHtml) {
         if (messageType == null || source == null || subject == null) {
-            throw new IllegalArgumentException("message type, source and subject cannot be null");
+            throw new IllegalArgumentException(
+                    NbBundle.getMessage(IngestMessage.class, "IngestMessage.exception.typeSrcSubjNotNull.msg"));
         }
         return new IngestMessage(ID, messageType, source, subject, detailsHtml, null);
     }
@@ -204,7 +207,8 @@ public class IngestMessage {
      */
     public static IngestMessage createErrorMessage(long ID, IngestModuleAbstract source, String subject, String detailsHtml) {
         if (source == null || subject == null) {
-            throw new IllegalArgumentException("source and subject cannot be null");
+            throw new IllegalArgumentException(
+                    NbBundle.getMessage(IngestMessage.class, "IngestMessage.exception.srcSubjNotNull.msg"));
         }
         return new IngestMessage(ID, MessageType.ERROR, source, subject, detailsHtml, null);
     }
@@ -219,7 +223,8 @@ public class IngestMessage {
      */
     public static IngestMessage createWarningMessage(long ID, IngestModuleAbstract source, String subject, String detailsHtml) {
         if (source == null || subject == null) {
-            throw new IllegalArgumentException("source and subject cannot be null");
+            throw new IllegalArgumentException(
+                    NbBundle.getMessage(IngestMessage.class, "IngestMessage.exception.srcSubjNotNull.msg"));
         }
         return new IngestMessage(ID, MessageType.WARNING, source, subject, detailsHtml, null);
     }
@@ -236,7 +241,8 @@ public class IngestMessage {
      */
     public static IngestMessage createDataMessage(long ID, IngestModuleAbstract source, String subject, String detailsHtml, String uniqueKey, BlackboardArtifact data) {
         if (source == null || subject == null || detailsHtml == null || data == null) {
-            throw new IllegalArgumentException("source, subject, details and data cannot be null");
+            throw new IllegalArgumentException(
+                    NbBundle.getMessage(IngestMessage.class, "IngestMessage.exception.srcSubjDetailsDataNotNull.msg"));
         }
 
         IngestMessage im = new IngestMessage(ID, MessageType.DATA, source, subject, detailsHtml, uniqueKey);
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form
index 91fde4f52a..4a964d3b9d 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.form
@@ -100,11 +100,11 @@
                   <EmptySpace min="-2" pref="101" max="-2" attributes="0"/>
                   <Component id="totalMessagesNameLabel" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
-                  <Component id="totalMessagesNameVal" pref="9" max="32767" attributes="0"/>
+                  <Component id="totalMessagesNameVal" pref="24" max="32767" attributes="0"/>
                   <EmptySpace min="-2" pref="22" max="-2" attributes="0"/>
                   <Component id="totalUniqueMessagesNameLabel" min="-2" max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
-                  <Component id="totalUniqueMessagesNameVal" pref="8" max="32767" attributes="0"/>
+                  <Component id="totalUniqueMessagesNameVal" pref="24" max="32767" attributes="0"/>
                   <EmptySpace min="-2" pref="22" max="-2" attributes="0"/>
               </Group>
           </Group>
@@ -132,11 +132,8 @@
         </Component>
         <Component class="javax.swing.JComboBox" name="sortByComboBox">
           <Properties>
-            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-              <StringArray count="2">
-                <StringItem index="0" value="Time"/>
-                <StringItem index="1" value="Priority"/>
-              </StringArray>
+            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+              <Connection code="new javax.swing.DefaultComboBoxModel&lt;String&gt;(new String[] { &quot;Time&quot;, &quot;Priority&quot; })" type="code"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="org/sleuthkit/autopsy/ingest/Bundle.properties" key="IngestMessagePanel.sortByComboBox.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -146,7 +143,7 @@
             <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="sortByComboBoxActionPerformed"/>
           </Events>
           <AuxValues>
-            <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new javax.swing.JComboBox&lt;String&gt;()"/>
+            <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
           </AuxValues>
         </Component>
         <Component class="javax.swing.JLabel" name="totalMessagesNameLabel">
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
index 782737bb15..40e409c81c 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
@@ -38,6 +38,8 @@ import java.util.Map;
 import java.util.logging.Level;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
@@ -52,8 +54,6 @@ import javax.swing.table.TableCellRenderer;
 import org.sleuthkit.autopsy.ingest.IngestMessage.*;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
-import java.util.logging.Level;
-import org.sleuthkit.autopsy.coreutils.Logger;
 
 /**
  * Notification window showing messages from modules to user
@@ -149,7 +149,7 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
 
         sortByLabel.setText(org.openide.util.NbBundle.getMessage(IngestMessagePanel.class, "IngestMessagePanel.sortByLabel.text")); // NOI18N
 
-        sortByComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Time", "Priority" }));
+        sortByComboBox.setModel(new javax.swing.DefaultComboBoxModel<String>(new String[] { "Time", "Priority" }));
         sortByComboBox.setToolTipText(org.openide.util.NbBundle.getMessage(IngestMessagePanel.class, "IngestMessagePanel.sortByComboBox.toolTipText")); // NOI18N
         sortByComboBox.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -177,11 +177,11 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
                 .addGap(101, 101, 101)
                 .addComponent(totalMessagesNameLabel)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(totalMessagesNameVal, javax.swing.GroupLayout.DEFAULT_SIZE, 9, Short.MAX_VALUE)
+                .addComponent(totalMessagesNameVal, javax.swing.GroupLayout.DEFAULT_SIZE, 24, Short.MAX_VALUE)
                 .addGap(22, 22, 22)
                 .addComponent(totalUniqueMessagesNameLabel)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(totalUniqueMessagesNameVal, javax.swing.GroupLayout.DEFAULT_SIZE, 8, Short.MAX_VALUE)
+                .addComponent(totalUniqueMessagesNameVal, javax.swing.GroupLayout.DEFAULT_SIZE, 24, Short.MAX_VALUE)
                 .addGap(22, 22, 22))
         );
         controlPanelLayout.setVerticalGroup(
@@ -224,7 +224,7 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
     private javax.swing.JPanel controlPanel;
     private javax.swing.JScrollPane jScrollPane1;
     private javax.swing.JTable messageTable;
-    private javax.swing.JComboBox sortByComboBox;
+    private javax.swing.JComboBox<String> sortByComboBox;
     private javax.swing.JLabel sortByLabel;
     private javax.swing.JLabel totalMessagesNameLabel;
     private javax.swing.JLabel totalMessagesNameVal;
@@ -300,7 +300,10 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
         }
         catch (Exception e) {
             logger.log(Level.SEVERE, "IngestMessagePanel listener threw exception", e);
-            MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to IngestMessagePanel updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+            MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "IngestMessagePanel.moduleErr"),
+                                          NbBundle.getMessage(this.getClass(),
+                                                              "IngestMessagePanel.moduleErr.errListenUpdates.text"),
+                                          MessageNotifyUtil.MessageType.ERROR);
         }
 
         //update labels
@@ -325,7 +328,10 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
         }
         catch (Exception e) {
             logger.log(Level.SEVERE, "IngestMessagePanel listener threw exception", e);
-            MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to IngestMessagePanel updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+            MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "IngestMessagePanel.moduleErr"),
+                                          NbBundle.getMessage(this.getClass(),
+                                                              "IngestMessagePanel.moduleErr.errListenUpdates.text"),
+                                          MessageNotifyUtil.MessageType.ERROR);
         }
     }
     
@@ -344,7 +350,10 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
         }
         catch (Exception e) {
             logger.log(Level.SEVERE, "IngestMessagePanel listener threw exception", e);
-            MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to IngestMessagePanel updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+            MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "IngestMessagePanel.moduleErr"),
+                                          NbBundle.getMessage(this.getClass(),
+                                                              "IngestMessagePanel.moduleErr.errListenUpdates.text"),
+                                          MessageNotifyUtil.MessageType.ERROR);
         }
     }
 
@@ -357,13 +366,21 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
         }
         catch (Exception ee) {
             logger.log(Level.SEVERE, "IngestMessagePanel listener threw exception", ee);
-            MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to IngestMessagePanel updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+            MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "IngestMessagePanel.moduleErr"),
+                                          NbBundle.getMessage(this.getClass(),
+                                                              "IngestMessagePanel.moduleErr.errListenUpdates.text"),
+                                          MessageNotifyUtil.MessageType.ERROR);
         }
     }
 
     private class MessageTableModel extends AbstractTableModel {
 
-        private String[] columnNames = new String[]{"Module", "Num", "New?", "Subject", "Timestamp"};
+        private String[] columnNames = new String[]{
+                NbBundle.getMessage(this.getClass(), "IngestMessagePanel.MsgTableMod.colNames.module"),
+                NbBundle.getMessage(this.getClass(), "IngestMessagePanel.MsgTableMod.colNames.num"),
+                NbBundle.getMessage(this.getClass(), "IngestMessagePanel.MsgTableMod.colNames.new"),
+                NbBundle.getMessage(this.getClass(), "IngestMessagePanel.MsgTableMod.colNames.subject"),
+                NbBundle.getMessage(this.getClass(), "IngestMessagePanel.MsgTableMod.colNames.timestamp")};
         private List<TableEntry> messageData = new ArrayList<TableEntry>();
         //for keeping track of messages to group, per module, by uniqness
         private Map<IngestModuleAbstract, Map<String, List<IngestMessageGroup>>> groupings = new HashMap<IngestModuleAbstract, Map<String, List<IngestMessageGroup>>>();
@@ -845,7 +862,8 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
             if (value instanceof Boolean) {
                 boolVal = ((Boolean)value).booleanValue();
             } else {
-                throw new RuntimeException("Tried to use BooleanRenderer on non-boolean value.");
+                throw new RuntimeException(NbBundle.getMessage(this.getClass(),
+                                                               "IngestMessagePanel.BooleanRenderer.exception.nonBoolVal.msg"));
             }
             
             String aValue = boolVal ? bulletChar : "";
@@ -928,7 +946,8 @@ class IngestMessagePanel extends JPanel implements TableModelListener {
                 DateFormat df = new SimpleDateFormat("HH:mm:ss");
                 aValue = df.format(date);
             } else {
-                throw new RuntimeException("Tried to use DateRenderer on non-Date value.");
+                throw new RuntimeException(NbBundle.getMessage(this.getClass(),
+                                                               "IngestMessagePanel.DateRenderer.exception.nonDateVal.text"));
             }
             
             Component cell =  super.getTableCellRendererComponent(table, aValue, isSelected, hasFocus, row, column);
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java
index c37ef96c28..13acce0d2d 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMessageTopComponent.java
@@ -249,11 +249,12 @@ import org.sleuthkit.datamodel.Content;
     @Override
     public void displayReport(String ingestReport) {
 
-        Object[] options = {"OK",
-            "Generate Report"};
+        Object[] options = {NbBundle.getMessage(this.getClass(), "IngestMessageTopComponent.displayReport.option.OK"),
+                            NbBundle.getMessage(this.getClass(),
+                                                "IngestMessageTopComponent.displayReport.option.GenRpt")};
         final int choice = JOptionPane.showOptionDialog(null,
                 ingestReport,
-                "Ingest Report",
+                NbBundle.getMessage(this.getClass(), "IngestMessageTopComponent.msgDlg.ingestRpt.text"),
                 JOptionPane.YES_NO_OPTION,
                 JOptionPane.INFORMATION_MESSAGE,
                 null,
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java
index c3f406c89e..d5ba207771 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleLoader.java
@@ -48,10 +48,7 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import org.openide.modules.ModuleInfo;
-import org.openide.util.Exceptions;
-import org.openide.util.Lookup;
-import org.openide.util.LookupEvent;
-import org.openide.util.LookupListener;
+import org.openide.util.*;
 import org.reflections.Reflections;
 import org.reflections.scanners.ResourcesScanner;
 import org.reflections.scanners.SubTypesScanner;
@@ -611,7 +608,10 @@ import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
                 }
                 catch (Exception e) {
                     logger.log(Level.SEVERE, "IngestModuleLoader listener threw exception", e);
-                    MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to IngestModuleLoader updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                    MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(), "IngestModuleLoader.moduleErr"),
+                                                  NbBundle.getMessage(this.getClass(),
+                                                                      "IngestModuleLoader.moduleErr.errListenUpdates.msg"),
+                                                  MessageNotifyUtil.MessageType.ERROR);
                 }
             }
 
@@ -633,7 +633,8 @@ import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
      * @param newOrder new order to set
      */
     void setModuleOrder(IngestModuleLoader.XmlPipelineRaw.PIPELINE_TYPE pipeLineType, String moduleLocation, int newOrder) throws IngestModuleLoaderException {
-        throw new IngestModuleLoaderException("Not yet implemented");
+        throw new IngestModuleLoaderException(
+                NbBundle.getMessage(this.getClass(), "IngestModuleLoader.exception.notImplemented.msg"));
     }
 
     /**
@@ -665,7 +666,9 @@ import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
             }
         }
         if (pipeline == null) {
-            throw new IngestModuleLoaderException("Could not find expected pipeline of type: " + pipelineType.toString() + ", cannot add autodiscovered module: " + moduleLocation);
+            throw new IngestModuleLoaderException(
+                    NbBundle.getMessage(this.getClass(), "IngestModuleLoader.exception.cantFindPipeline.msg",
+                                        pipelineType.toString(), moduleLocation));
         } else {
             pipeline.modules.add(modRaw);
             logger.log(Level.INFO, "Added a new module " + moduleClass.getName() + " to pipeline " + pipelineType.toString());
@@ -706,8 +709,9 @@ import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
             Document doc = docBuilder.newDocument();
 
 
-            Comment comment = doc.createComment("Saved by: " + getClass().getName()
-                    + " on: " + dateFormatter.format(System.currentTimeMillis()));
+            Comment comment = doc.createComment(
+                    NbBundle.getMessage(this.getClass(), "IngestModuleLoader.save.comment.text", getClass().getName(),
+                                        dateFormatter.format(System.currentTimeMillis())));
             doc.appendChild(comment);
             Element rootEl = doc.createElement(IngestModuleLoader.XmlPipelineRaw.XML_PIPELINE_ROOT);
             doc.appendChild(rootEl);
@@ -885,18 +889,23 @@ import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
     private void loadRawPipeline() throws IngestModuleLoaderException {
         final Document doc = XMLUtil.loadDoc(IngestModuleLoader.class, absFilePath, XSDFILE);
         if (doc == null) {
-            throw new IngestModuleLoaderException("Could not load pipeline config XML: " + this.absFilePath);
+            throw new IngestModuleLoaderException(
+                    NbBundle.getMessage(this.getClass(), "IngestModuleLoader.loadRawPipeline.exception.cantLoadXML.msg",
+                                        this.absFilePath));
         }
         Element root = doc.getDocumentElement();
         if (root == null) {
-            String msg = "Error loading pipeline configuration: invalid file format.";
+            String msg = NbBundle
+                    .getMessage(this.getClass(), "IngestModuleLoader.loadRawPipeline.exception.invalidFileFormat.msg");
             logger.log(Level.SEVERE, msg);
             throw new IngestModuleLoaderException(msg);
         }
         NodeList pipelineNodes = root.getElementsByTagName(IngestModuleLoader.XmlPipelineRaw.XML_PIPELINE_EL);
         int numPipelines = pipelineNodes.getLength();
         if (numPipelines == 0) {
-            throw new IngestModuleLoaderException("No pipelines found in the pipeline configuration: " + absFilePath);
+            throw new IngestModuleLoaderException(NbBundle.getMessage(this.getClass(),
+                                                                      "IngestModuleLoader.loadRawPipeline.exception.noPipelinesInConf.msg",
+                                                                      absFilePath));
         }
         for (int pipelineNum = 0; pipelineNum < numPipelines; ++pipelineNum) {
             //process pipelines
@@ -1026,7 +1035,8 @@ import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
                     return types[i];
                 }
             }
-            throw new IllegalArgumentException("No PIPELINE_TYPE for string: " + s);
+            throw new IllegalArgumentException(
+                    NbBundle.getMessage(IngestModuleLoader.class, "IngestModuleLoader.exception.noPipelineTypeForStr.msg", s));
         }
         private static final String XML_PIPELINE_ROOT = "PIPELINE_CONFIG";
         private static final String XML_PIPELINE_EL = "PIPELINE";
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java
index 1eee1baf25..c97875d69d 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java
@@ -27,6 +27,8 @@ import java.io.IOException;
 import java.util.logging.FileHandler;
 import java.util.logging.Level;
 import java.util.logging.SimpleFormatter;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.Timer;
 import org.openide.util.Exceptions;
@@ -164,9 +166,9 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil;
                 MONITOR_LOGGER.log(Level.SEVERE, "Stopping ingest due to low disk space on disk " + diskPath);
                 logger.log(Level.SEVERE, "Stopping ingest due to low disk space on disk " + diskPath);
                 manager.stopAll();
-                manager.postMessage(IngestMessage.createManagerErrorMessage("Ingest stopped - low disk space on " + diskPath,
-                        "Stopping ingest due to low disk space on disk " + diskPath
-                        + ". \nEnsure the Case drive has at least 1GB free space and restart ingest."));
+                manager.postMessage(IngestMessage.createManagerErrorMessage(
+                        NbBundle.getMessage(this.getClass(), "IngestMonitor.mgrErrMsg.lowDiskSpace.title", diskPath),
+                        NbBundle.getMessage(this.getClass(), "IngestMonitor.mgrErrMsg.lowDiskSpace.msg", diskPath)));
             }
         }
 
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java
index 3b9836bf68..0989fc30aa 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2012-2013 Basis Technology Corp.
+ * Copyright 2012-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,8 +31,9 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
-import org.sleuthkit.autopsy.ingest.IngestScheduler.FileScheduler.FileTask;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.ContentVisitor;
@@ -134,15 +135,18 @@ class IngestScheduler {
         @Override
         public synchronized String toString() {
             StringBuilder sb = new StringBuilder();
-            sb.append("\nRootDirs(sorted), size: ").append(rootProcessTasks.size());
+            sb.append(NbBundle.getMessage(this.getClass(), "IngestScheduler.FileSched.toString.rootDirs.text",
+                                          rootProcessTasks.size()));
             for (FileTask task : rootProcessTasks) {
                 sb.append(task.toString()).append(" ");
             }
-            sb.append("\nCurDirs(stack), size: ").append(curDirProcessTasks.size());
+            sb.append(NbBundle.getMessage(this.getClass(), "IngestScheduler.FileSched.toString.curDirs.text",
+                                          curDirProcessTasks.size()));
             for (FileTask task : curDirProcessTasks) {
                 sb.append(task.toString()).append(" ");
             }
-            sb.append("\nCurFiles, size: ").append(curFileProcessTasks.size());
+            sb.append(NbBundle.getMessage(this.getClass(), "IngestScheduler.FileSched.toString.curFiles.text",
+                                          curFileProcessTasks.size()));
             for (FileTask task : curFileProcessTasks) {
                 sb.append(task.toString()).append(" ");
             }
@@ -224,13 +228,13 @@ class IngestScheduler {
             @Override
             public String toString() {
                 try {
-                    return "ProcessTask{" + "file=" + file.getId() + ": "
-                            + file.getUniquePath() + "}"; // + ", dataSourceTask=" + dataSourceTask + '}';
+                    return NbBundle.getMessage(this.getClass(), "IngestScheduler.fileTask.toString.long", file.getId(),
+                                               file.getUniquePath()); // + ", dataSourceTask=" + dataSourceTask + '}';
                 } catch (TskCoreException ex) {
                     logger.log(Level.SEVERE, "Cound not get unique path of file in queue, ", ex);
                 }
-                return "ProcessTask{" + "file=" + file.getId() + ": "
-                        + file.getName() + '}';
+                return NbBundle.getMessage(this.getClass(), "IngestScheduler.fileTask.toString.short", file.getId(),
+                                           file.getName());
             }
 
             /**
@@ -365,8 +369,8 @@ class IngestScheduler {
          * @param originalContext original content schedule context that was used
          * to schedule the parent origin content, with the modules, settings, etc.
          */
-        synchronized void schedule(AbstractFile file, PipelineContext originalContext) {
-            DataSourceTask originalTask = originalContext.getDataSourceTask();
+        synchronized void schedule(AbstractFile file, PipelineContext<IngestModuleAbstractFile> originalContext) {
+            DataSourceTask<IngestModuleAbstractFile> originalTask = originalContext.getDataSourceTask();
 
             //skip if task contains no modules
             if (originalTask.getModules().isEmpty()) {
@@ -389,7 +393,6 @@ class IngestScheduler {
          * @param context context to schedule, with scheduled task containing content to process and modules
          */
         synchronized void schedule(DataSourceTask<IngestModuleAbstractFile> task) {
-
             //skip if task contains no modules
             if (task.getModules().isEmpty()) {
                 return;
@@ -432,7 +435,8 @@ class IngestScheduler {
         @Override
         public synchronized FileTask next() {
             if (!hasNext()) {
-                throw new IllegalStateException("No next ProcessTask, check hasNext() first!");
+                throw new IllegalStateException(
+                        NbBundle.getMessage(this.getClass(), "IngestScheduler.FileTask.next.exception.msg"));
             }
 
             //dequeue the last in the list
@@ -502,7 +506,8 @@ class IngestScheduler {
 
         @Override
         public void remove() {
-            throw new UnsupportedOperationException("Not supported.");
+            throw new UnsupportedOperationException(
+                    NbBundle.getMessage(this.getClass(), "IngestScheduler.remove.exception.notSupported.msg"));
         }
 
         /**
@@ -933,7 +938,8 @@ class IngestScheduler {
         @Override
         public synchronized DataSourceTask<IngestModuleDataSource> next() throws IllegalStateException {
             if (!hasNext()) {
-                throw new IllegalStateException("There is no data source tasks in the queue, check hasNext()");
+                throw new IllegalStateException(
+                        NbBundle.getMessage(this.getClass(), "IngestScheduler.DataSourceScheduler.exception.next.msg"));
             }
 
             final DataSourceTask<IngestModuleDataSource> ret = tasks.pollFirst();
@@ -960,7 +966,8 @@ class IngestScheduler {
 
         @Override
         public void remove() {
-            throw new UnsupportedOperationException("Removing of scheduled data source ingest tasks is not supported. ");
+            throw new UnsupportedOperationException(
+                    NbBundle.getMessage(this.getClass(), "IngestScheduler.DataSourceScheduler.exception.remove.msg"));
         }
 
         synchronized void empty() {
@@ -974,7 +981,8 @@ class IngestScheduler {
         @Override
         public String toString() {
             StringBuilder sb = new StringBuilder();
-            sb.append("DataSourceQueue, size: ").append(getCount());
+            sb.append(NbBundle.getMessage(this.getClass(), "IngestScheduler.DataSourceScheduler.toString.size",
+                                          getCount()));
             for (DataSourceTask<IngestModuleDataSource> task : tasks) {
                 sb.append(task.toString()).append(" ");
             }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java
index 93f9edd626..e367cc3709 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java
@@ -136,7 +136,7 @@ public class IngestServices {
      * @param file file to be scheduled
      * @param pipelineContext the ingest context for the file ingest pipeline
      */
-    public void scheduleFile(AbstractFile file, PipelineContext pipelineContext)  {
+    public void scheduleFile(AbstractFile file, PipelineContext<IngestModuleAbstractFile> pipelineContext)  {
         logger.log(Level.INFO, "Scheduling file: " + file.getName());
         manager.scheduleFile(file, pipelineContext);
     }
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/PipelineContext.java b/Core/src/org/sleuthkit/autopsy/ingest/PipelineContext.java
index 1e2b69e981..85e9fed5a1 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/PipelineContext.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/PipelineContext.java
@@ -18,6 +18,8 @@
  */
 package org.sleuthkit.autopsy.ingest;
 
+import org.openide.util.NbBundle;
+
 import java.util.Objects;
 
 /**
@@ -45,7 +47,7 @@ public class PipelineContext <T extends IngestModuleAbstract> {
 
     @Override
     public String toString() {
-        return "pipelineContext{" + "task=" + task + '}';
+        return NbBundle.getMessage(this.getClass(), "PipelineContext.toString.text", task);
     }
 
     @Override
@@ -63,6 +65,7 @@ public class PipelineContext <T extends IngestModuleAbstract> {
         if (getClass() != obj.getClass()) {
             return false;
         }
+        @SuppressWarnings("unchecked")
         final PipelineContext<T> other = (PipelineContext<T>) obj;
 
         if (!Objects.equals(this.task, other.task)) {
diff --git a/Core/src/org/sleuthkit/autopsy/menuactions/Bundle.properties b/Core/src/org/sleuthkit/autopsy/menuactions/Bundle.properties
index e84d83f597..27a95765fe 100644
--- a/Core/src/org/sleuthkit/autopsy/menuactions/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/menuactions/Bundle.properties
@@ -1,2 +1,7 @@
-#CTL_FileBrowserAction=File Browser
 OpenIDE-Module-Name=MenuActions
+DataContentDynamicMenu.menu.dataContentWin.text=Data Content Windows
+DataContentMenu.getName.text=DataContent Menu
+DataExplorerMenu.getName.text=DataExplorer Tools
+DataResultMenu.menu.dataResWin.text=DataResult Windows
+DataResultMenu.getName.text=DataResult Menu
+SearchResultMenu.menu.dataRes.text=Data Results
diff --git a/Core/src/org/sleuthkit/autopsy/menuactions/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/menuactions/Bundle_ja.properties
new file mode 100644
index 0000000000..9bbd244f08
--- /dev/null
+++ b/Core/src/org/sleuthkit/autopsy/menuactions/Bundle_ja.properties
@@ -0,0 +1,7 @@
+OpenIDE-Module-Name=\u30E1\u30CB\u30E5\u30FC\u30A2\u30AF\u30B7\u30E7\u30F3
+DataContentDynamicMenu.menu.dataContentWin.text=\u30C7\u30FC\u30BF\u30B3\u30F3\u30C6\u30F3\u30C4\u30A6\u30A3\u30F3\u30C9\u30A6
+DataContentMenu.getName.text=\u30C7\u30FC\u30BF\u30B3\u30F3\u30C6\u30F3\u30C4\u30E1\u30CB\u30E5\u30FC
+DataExplorerMenu.getName.text=\u30C7\u30FC\u30BF\u30A8\u30AF\u30B9\u30D7\u30ED\u30FC\u30E9\u30C4\u30FC\u30EB
+DataResultMenu.menu.dataResWin.text=\u30C7\u30FC\u30BF\u7D50\u679C\u30A6\u30A3\u30F3\u30C9\u30A6
+DataResultMenu.getName.text=\u30C7\u30FC\u30BF\u7D50\u679C\u30E1\u30CB\u30E5\u30FC
+SearchResultMenu.menu.dataRes.text=\u30C7\u30FC\u30BF\u7D50\u679C
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/menuactions/DataContentDynamicMenu.java b/Core/src/org/sleuthkit/autopsy/menuactions/DataContentDynamicMenu.java
index 8c09bef862..75a5e2533b 100644
--- a/Core/src/org/sleuthkit/autopsy/menuactions/DataContentDynamicMenu.java
+++ b/Core/src/org/sleuthkit/autopsy/menuactions/DataContentDynamicMenu.java
@@ -25,6 +25,7 @@ import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import org.openide.awt.DynamicMenuContent;
 import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
 import org.openide.windows.TopComponent;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataContent;
@@ -62,7 +63,8 @@ import org.sleuthkit.autopsy.corecomponents.DataContentTopComponent;
         if (newWindowLists != null) {
             if (newWindowLists.size() > 0) {
 
-                JMenu submenu = new JMenu("Data Content Windows");
+                JMenu submenu = new JMenu(
+                        NbBundle.getMessage(this.getClass(), "DataContentDynamicMenu.menu.dataContentWin.text"));
                 for (int i = 0; i < newWindowLists.size(); i++) {
                     DataContentTopComponent dctc = newWindowLists.get(i);
                     JMenuItem item = new JMenuItem(dctc.getName());
diff --git a/Core/src/org/sleuthkit/autopsy/menuactions/DataContentMenu.java b/Core/src/org/sleuthkit/autopsy/menuactions/DataContentMenu.java
index c68b9f84c2..12a653af3e 100644
--- a/Core/src/org/sleuthkit/autopsy/menuactions/DataContentMenu.java
+++ b/Core/src/org/sleuthkit/autopsy/menuactions/DataContentMenu.java
@@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.menuactions;
 
 import javax.swing.JMenuItem;
 import org.openide.util.HelpCtx;
+import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 import org.openide.util.actions.Presenter;
 
@@ -43,7 +44,7 @@ import org.openide.util.actions.Presenter;
 
     @Override
     public String getName() {
-        return "DataContent Menu";
+        return NbBundle.getMessage(this.getClass(), "DataContentMenu.getName.text");
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/menuactions/DataExplorerMenu.java b/Core/src/org/sleuthkit/autopsy/menuactions/DataExplorerMenu.java
index 947b754e70..6acb069d6e 100644
--- a/Core/src/org/sleuthkit/autopsy/menuactions/DataExplorerMenu.java
+++ b/Core/src/org/sleuthkit/autopsy/menuactions/DataExplorerMenu.java
@@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.menuactions;
 
 import javax.swing.JMenuItem;
 import org.openide.util.HelpCtx;
+import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 import org.openide.util.actions.Presenter;
 
@@ -42,7 +43,7 @@ class DataExplorerMenu extends CallableSystemAction implements Presenter.Menu {
 
     @Override
     public String getName() {
-        return "DataExplorer Tools";
+        return NbBundle.getMessage(this.getClass(), "DataExplorerMenu.getName.text");
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/menuactions/DataResultMenu.java b/Core/src/org/sleuthkit/autopsy/menuactions/DataResultMenu.java
index 682d6f62f8..857b5b4241 100644
--- a/Core/src/org/sleuthkit/autopsy/menuactions/DataResultMenu.java
+++ b/Core/src/org/sleuthkit/autopsy/menuactions/DataResultMenu.java
@@ -24,6 +24,7 @@ import java.beans.PropertyChangeListener;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import org.openide.util.HelpCtx;
+import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 import org.openide.util.actions.Presenter;
 import org.sleuthkit.autopsy.casemodule.Case;
@@ -33,7 +34,7 @@ import org.sleuthkit.autopsy.casemodule.Case;
  */
  class DataResultMenu extends CallableSystemAction implements Presenter.Menu, PropertyChangeListener {
 
-    JMenu menu = new JMenu("DataResult Windows");
+    JMenu menu = new JMenu(NbBundle.getMessage(this.getClass(), "DataResultMenu.menu.dataResWin.text"));
 
     DataResultMenu(){
     }
@@ -73,7 +74,7 @@ import org.sleuthkit.autopsy.casemodule.Case;
 
     @Override
     public String getName() {
-        return "DataResult Menu";
+        return NbBundle.getMessage(this.getClass(), "DataResultMenu.getName.text");
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/menuactions/SearchResultMenu.java b/Core/src/org/sleuthkit/autopsy/menuactions/SearchResultMenu.java
index 851405e880..fee03df45d 100644
--- a/Core/src/org/sleuthkit/autopsy/menuactions/SearchResultMenu.java
+++ b/Core/src/org/sleuthkit/autopsy/menuactions/SearchResultMenu.java
@@ -25,6 +25,7 @@ import javax.swing.JComponent;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import org.openide.awt.DynamicMenuContent;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.corecomponents.DataResultTopComponent;
 import org.sleuthkit.autopsy.directorytree.DirectoryTreeTopComponent;
 
@@ -57,7 +58,7 @@ import org.sleuthkit.autopsy.directorytree.DirectoryTreeTopComponent;
 
         // add search results if there are any
         if(dataResultsIds.size() > 0){
-            JMenu submenu = new JMenu("Data Results");
+            JMenu submenu = new JMenu(NbBundle.getMessage(this.getClass(), "SearchResultMenu.menu.dataRes.text"));
             for(String resultTabId : dataResultsIds){
                 JMenuItem item = new JMenuItem(resultTabId);
                 item.addActionListener(new OpenTopComponentAction(resultTabId));
diff --git a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.form b/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.form
index cd714f81c8..c4bd675f90 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.form
+++ b/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.form
@@ -85,6 +85,10 @@
             <Property name="selectionMode" type="int" value="0"/>
             <Property name="layoutOrientation" type="int" value="2"/>
           </Properties>
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new javax.swing.JList&lt;&gt;()"/>
+            <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;ARTIFACT_TYPE&gt;"/>
+          </AuxValues>
         </Component>
       </SubComponents>
     </Container>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java b/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java
index b283da2e79..3ba14c7577 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ArtifactSelectionDialog.java
@@ -36,6 +36,7 @@ import javax.swing.JList;
 import javax.swing.ListCellRenderer;
 import javax.swing.ListModel;
 import javax.swing.event.ListDataListener;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.BlackboardArtifact;
@@ -43,12 +44,12 @@ import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
 import org.sleuthkit.datamodel.TskCoreException;
 
 public class ArtifactSelectionDialog extends javax.swing.JDialog {
+
     private ArtifactModel model;
     private ArtifactRenderer renderer;
-    
     private Map<BlackboardArtifact.ARTIFACT_TYPE, Boolean> artifactStates;
     private List<BlackboardArtifact.ARTIFACT_TYPE> artifacts;
-    
+
     /**
      * Creates new form ArtifactSelectionDialog
      */
@@ -58,27 +59,27 @@ public class ArtifactSelectionDialog extends javax.swing.JDialog {
         populateList();
         customInit();
     }
-    
+
     /**
      * Populate the list of artifacts with all important artifacts.
      */
     private void populateList() {
         try {
-            ArrayList<BlackboardArtifact.ARTIFACT_TYPE> doNotReport = new ArrayList();
+            ArrayList<BlackboardArtifact.ARTIFACT_TYPE> doNotReport = new ArrayList<>();
             doNotReport.add(BlackboardArtifact.ARTIFACT_TYPE.TSK_GEN_INFO);
             doNotReport.add(BlackboardArtifact.ARTIFACT_TYPE.TSK_TAG_FILE); // Obsolete artifact type
             doNotReport.add(BlackboardArtifact.ARTIFACT_TYPE.TSK_TAG_ARTIFACT); // Obsolete artifact type
-            
-            artifacts = Case.getCurrentCase().getSleuthkitCase().getBlackboardArtifactTypesInUse();            
-            artifacts.removeAll(doNotReport);            
+
+            artifacts = Case.getCurrentCase().getSleuthkitCase().getBlackboardArtifactTypesInUse();
+            artifacts.removeAll(doNotReport);
             Collections.sort(artifacts, new Comparator<BlackboardArtifact.ARTIFACT_TYPE>() {
                 @Override
                 public int compare(ARTIFACT_TYPE o1, ARTIFACT_TYPE o2) {
                     return o1.getDisplayName().compareTo(o2.getDisplayName());
                 }
             });
-            
-            artifactStates = new EnumMap<>(BlackboardArtifact.ARTIFACT_TYPE.class);                        
+
+            artifactStates = new EnumMap<>(BlackboardArtifact.ARTIFACT_TYPE.class);
             for (BlackboardArtifact.ARTIFACT_TYPE type : artifacts) {
                 artifactStates.put(type, Boolean.TRUE);
             }
@@ -86,31 +87,31 @@ public class ArtifactSelectionDialog extends javax.swing.JDialog {
             Logger.getLogger(ArtifactSelectionDialog.class.getName()).log(Level.SEVERE, "Error getting list of artifacts in use: " + ex.getLocalizedMessage());
         }
     }
-    
+
     private void customInit() {
         model = new ArtifactModel();
         renderer = new ArtifactRenderer();
         artifactList.setModel(model);
         artifactList.setCellRenderer(renderer);
         artifactList.setVisibleRowCount(-1);
-        
+
         artifactList.addMouseListener(new MouseAdapter() {
             @Override
             public void mousePressed(MouseEvent evt) {
                 JList list = (JList) evt.getSource();
                 int index = list.locationToIndex(evt.getPoint());
-                BlackboardArtifact.ARTIFACT_TYPE type = (BlackboardArtifact.ARTIFACT_TYPE) model.getElementAt(index);
+                BlackboardArtifact.ARTIFACT_TYPE type = model.getElementAt(index);
                 artifactStates.put(type, !artifactStates.get(type));
                 list.repaint();
             }
         });
     }
-        
+
     /**
      * Display this dialog, and return the selected artifacts.
      */
     Map<BlackboardArtifact.ARTIFACT_TYPE, Boolean> display() {
-        this.setTitle("Advanced Artifact Selection");
+        this.setTitle(NbBundle.getMessage(this.getClass(), "ArtifactSelectionDialog.dlgTitle.text"));
         Dimension screenDimension = Toolkit.getDefaultToolkit().getScreenSize();
         // set the popUp window / JFrame
         int w = this.getSize().width;
@@ -118,7 +119,7 @@ public class ArtifactSelectionDialog extends javax.swing.JDialog {
 
         // set the location of the popUp Window on the center of the screen
         setLocation((screenDimension.width - w) / 2, (screenDimension.height - h) / 2);
-        
+
         this.setVisible(true);
         return artifactStates;
     }
@@ -133,7 +134,7 @@ public class ArtifactSelectionDialog extends javax.swing.JDialog {
     private void initComponents() {
 
         artifactScrollPane = new javax.swing.JScrollPane();
-        artifactList = new javax.swing.JList();
+        artifactList = new javax.swing.JList<>();
         okButton = new javax.swing.JButton();
         titleLabel = new javax.swing.JLabel();
         selectAllButton = new javax.swing.JButton();
@@ -227,9 +228,8 @@ public class ArtifactSelectionDialog extends javax.swing.JDialog {
         }
         artifactList.repaint();
     }//GEN-LAST:event_deselectAllButtonActionPerformed
-
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JList artifactList;
+    private javax.swing.JList<ARTIFACT_TYPE> artifactList;
     private javax.swing.JScrollPane artifactScrollPane;
     private javax.swing.JButton deselectAllButton;
     private javax.swing.JButton okButton;
@@ -237,7 +237,7 @@ public class ArtifactSelectionDialog extends javax.swing.JDialog {
     private javax.swing.JLabel titleLabel;
     // End of variables declaration//GEN-END:variables
 
-    private class ArtifactModel implements ListModel {
+    private class ArtifactModel implements ListModel<ARTIFACT_TYPE> {
 
         @Override
         public int getSize() {
@@ -245,7 +245,7 @@ public class ArtifactSelectionDialog extends javax.swing.JDialog {
         }
 
         @Override
-        public Object getElementAt(int index) {
+        public ARTIFACT_TYPE getElementAt(int index) {
             return artifacts.get(index);
         }
 
@@ -257,11 +257,11 @@ public class ArtifactSelectionDialog extends javax.swing.JDialog {
         public void removeListDataListener(ListDataListener l) {
         }
     }
-    
+
     private class ArtifactRenderer extends JCheckBox implements ListCellRenderer<BlackboardArtifact.ARTIFACT_TYPE> {
 
         @Override
-        public Component getListCellRendererComponent(JList list, BlackboardArtifact.ARTIFACT_TYPE  value, int index, boolean isSelected, boolean cellHasFocus) {
+        public Component getListCellRendererComponent(JList<? extends ARTIFACT_TYPE> list, ARTIFACT_TYPE value, int index, boolean isSelected, boolean cellHasFocus) {
             if (value != null) {
                 setEnabled(list.isEnabled());
                 setSelected(artifactStates.get(value));
@@ -272,6 +272,6 @@ public class ArtifactSelectionDialog extends javax.swing.JDialog {
                 return this;
             }
             return new JLabel();
-        }   
+        }
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
index 351203751b..27b246e3d2 100644
--- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties
@@ -1,13 +1,14 @@
 OpenIDE-Module-Name=Report
-Toolbars/Reports/org-sleuthkit-autopsy-report-ReportAction.shadow=Reports
-GenerateReportPanel.selectAllLabel.text=Select All
-GenerateReportPanel.deselectAllLabel.text=Deselect All
-GenerateReportPanel.generateReportButton.text=Generate Report
-GenerateReportPanel.advancedButton.text=Advanced
-GenerateReportPanel.reportModulesLabel.text=Report Modules:
-GenerateReportPanel.dataLabel.text=Select which data to report on:
-GenerateReportPanel.artifactsRadioButton.text=All Artifacts
-GenerateReportPanel.tagsRadioButton.text=User Tags
+CTL_ReportWizardAction=Run Report
+#Toolbars/Reports/org-sleuthkit-autopsy-report-ReportAction.shadow=Reports
+#GenerateReportPanel.selectAllLabel.text=Select All
+#GenerateReportPanel.deselectAllLabel.text=Deselect All
+#GenerateReportPanel.generateReportButton.text=Generate Report
+#GenerateReportPanel.advancedButton.text=Advanced
+#GenerateReportPanel.reportModulesLabel.text=Report Modules:
+#GenerateReportPanel.dataLabel.text=Select which data to report on:
+#GenerateReportPanel.artifactsRadioButton.text=All Artifacts
+#GenerateReportPanel.tagsRadioButton.text=User Tags
 ArtifactSelectionDialog.titleLabel.text=Select which artifacts you would like to report on:
 ArtifactSelectionDialog.okButton.text=OK
 ReportVisualPanel1.reportModulesLabel.text=Report Modules:
@@ -18,25 +19,187 @@ ReportVisualPanel2.selectAllButton.text=Select All
 ReportVisualPanel2.advancedButton.text=Data Types
 ArtifactSelectionDialog.deselectAllButton.text=Deselect All
 ArtifactSelectionDialog.selectAllButton.text=Select All
-=Browse...
+#=Browse...
 ReportGenerationPanel.closeButton.text=Close
 ReportGenerationPanel.cancelAllButton.text=Cancel All
 ReportProgressPanel.reportLabel.text=reportLabel
 ReportProgressPanel.pathLabel.text=pathLabel
 ReportProgressPanel.separationLabel.text=-
 ReportProgressPanel.cancelButton.toolTipText=Queuing
-ReportProgressPanel.cancelButton.text=
+ReportProgressPanel.cancelButton.text=Cancel
 ReportProgressPanel.processingLabel.text=processingLabel
 ReportGenerationPanel.titleLabel.text=Report Generation Progress
 ReportVisualPanel2.taggedResultsRadioButton.text=Tagged Results
 ReportVisualPanel2.allResultsRadioButton.text=All Results
-FileReportConfigurationPanel.jLabel1.text=Select Items to Report:
-FileReportConfigurationPanel.selectAllButton.text=Select All
-FileReportConfigurationPanel.deselectAllButton.text=Deselect All
-FileReportConfigurationDialog.selectAllButton.text=Select All
-FileReportConfigurationDialog.deselectAllButton.text=Deselect All
-FileReportConfigurationDialog.jLabel1.text=Select items to include in the File Report
-FileReportConfigurationDialog.okButton.text=OK
+#FileReportConfigurationPanel.jLabel1.text=Select Items to Report:
+#FileReportConfigurationPanel.selectAllButton.text=Select All
+#FileReportConfigurationPanel.deselectAllButton.text=Deselect All
+#FileReportConfigurationDialog.selectAllButton.text=Select All
+#FileReportConfigurationDialog.deselectAllButton.text=Deselect All
+#FileReportConfigurationDialog.jLabel1.text=Select items to include in the File Report
+#FileReportConfigurationDialog.okButton.text=OK
 ReportWizardFileOptionsVisualPanel.selectAllButton.text=Select All
 ReportWizardFileOptionsVisualPanel.deselectAllButton.text=Deselect All
 ReportWizardFileOptionsVisualPanel.jLabel1.text=Select items to include in File Report:
+ArtifactSelectionDialog.dlgTitle.text=Advanced Artifact Selection
+FileReportDataTypes.filename.text=Name
+FileReportDataTypes.fileExt.text=File Extension
+FileReportDataTypes.fileType.text=File Type
+FileReportDataTypes.isDel.text=Is Deleted
+FileReportDataTypes.aTime.text=Last Accessed
+FileReportDataTypes.crTime.text=File Created
+FileReportDataTypes.mTime.text=Last Modified
+FileReportDataTypes.size.text=Size
+FileReportDataTypes.address.text=Address
+FileReportDataTypes.hash.text=Hash Value
+FileReportDataTypes.knownStatus.text=Known Status
+FileReportDataTypes.perms.text=Permissions
+FileReportDataTypes.path.text=Full Path
+FileReportText.getName.text=Files - Text
+FileReportText.getDesc.text=A tab delimited text file containing information about individual files in the case.
+ReportBodyFile.progress.querying=Querying files...
+ReportBodyFile.ingestWarning.text=Warning, this report was run before ingest services completed\!\
+
+ReportBodyFile.progress.loading=Loading files...
+ReportBodyFile.progress.processing=Now processing {0}...
+ReportBodyFile.getName.text=TSK Body File
+ReportBodyFile.getDesc.text=Body file format report with MAC times for every file. This format can be used for a timeline view.
+ReportBodyFile.getFilePath.text=BodyFile.txt
+ReportBranding.defaultReportTitle.text=Autopsy Forensic Report
+ReportBranding.defaultReportFooter.text=Powered by Autopsy Open Source Digital Forensics Platform - www.sleuthkit.org
+ReportExcel.numAartifacts.text=Number of artifacts\:
+ReportExcel.getName.text=Results - Excel
+ReportExcel.getDesc.text=A report about results and tagged items in Excel (XLS) format.
+ReportExcel.getFilePath.text=Excel.xlsx
+ReportExcel.sheetName.text=Summary
+ReportExcel.cellVal.summary=Summary
+ReportExcel.cellVal.caseName=Case Name\:
+ReportExcel.cellVal.caseNum=Case Number\:
+ReportExcel.cellVal.examiner=Examiner\:
+ReportExcel.cellVal.numImages=Number of Images\:
+ReportGenerationPanel.confDlg.sureToClose.msg=Are you sure you'd like to close the dialog?\
+All reports will be canceled.
+ReportGenerationPanel.confDlg.title.closing=Closing
+ReportGenerationPanel.confDlg.cancelReports.msg=Are you sure you'd like to cancel all the reports?
+ReportGenerator.displayProgress.title.text=Report Generation Progress...
+ReportGenerator.progress.queryingDb.text=Querying database...
+ReportGenerator.progress.processingFile.text=Now processing {0}
+ReportGenerator.artifactTable.taggedResults.text=Contains results that were tagged with one of the following\:
+ReportGenerator.progress.processing=Now processing {0}...
+ReportGenerator.msgShow.skippingArtType.title=Skipping artifact type {0} in reports
+ReportGenerator.msgShow.skippingArtType.msg=Unknown columns to report on
+ReportGenerator.msgShow.skippingArtRow.title=Skipping artifact rows for type {0} in reports
+ReportGenerator.msgShow.skippingArtRow.msg=Unknown columns to report on
+ReportGenerator.makeContTagTab.taggedFiles.msg=Contains files that were tagged with one of the following\:
+ReportGenerator.makeBbArtTagTab.taggedRes.msg=This report only includes results tagged with\:
+ReportGenerator.tagTable.header.resultType=Result Type
+ReportGenerator.tagTable.header.tag=Tag
+ReportGenerator.tagTable.header.comment=Comment
+ReportGenerator.tagTable.header.srcFile=Source File
+ReportGenerator.progress.createdThumb.text=Creating thumbnails...
+ReportGenerator.thumbnailTable.name=Thumbnails
+ReportGenerator.thumbnailTable.desc=Contains thumbnails of images that are associated with tagged files and results.
+ReportGenerator.writeKwHits.userSrchs=User Searches
+ReportGenerator.progress.processingList=Now processing {0} ({1})...
+ReportGenerator.artTableColHdr.url=URL
+ReportGenerator.artTableColHdr.title=Title
+ReportGenerator.artTableColHdr.dateCreated=Date Created
+ReportGenerator.artTableColHdr.program=Program
+ReportGenerator.artTableColHdr.srcFile=Source File
+ReportGenerator.artTableColHdr.dateTime=Date/Time
+ReportGenerator.artTableColHdr.name=Name
+ReportGenerator.artTableColHdr.value=Value
+ReportGenerator.artTableColHdr.dateAccessed=Date Accessed
+ReportGenerator.artTableColHdr.referrer=Referrer
+ReportGenerator.artTableColHdr.dest=Destination
+ReportGenerator.artTableColHdr.sourceUrl=Source URL
+ReportGenerator.artTableColHdr.path=Path
+ReportGenerator.artTableColHdr.progName=Program Name
+ReportGenerator.artTableColHdr.instDateTime=Install Date/Time
+ReportGenerator.artTableColHdr.preview=Preview
+ReportGenerator.artTableColHdr.file=File
+ReportGenerator.artTableColHdr.size=Size
+ReportGenerator.artTableColHdr.deviceId=Device ID
+ReportGenerator.artTableColHdr.text=Text
+ReportGenerator.artTableColHdr.domain=Domain
+ReportGenerator.artTableColHdr.dateTaken=Date Taken
+ReportGenerator.artTableColHdr.devManufacturer=Device Manufacturer
+ReportGenerator.artTableColHdr.devModel=Device Model
+ReportGenerator.artTableColHdr.latitude=Latitude
+ReportGenerator.artTableColHdr.longitude=Longitude
+ReportGenerator.artTableColHdr.personName=Person Name
+ReportGenerator.artTableColHdr.phoneNumber=Phone Number
+ReportGenerator.artTableColHdr.phoneNumHome=Phone Number (Home)
+ReportGenerator.artTableColHdr.phoneNumOffice=Phone Number (Office)
+ReportGenerator.artTableColHdr.phoneNumMobile=Phone Number (Mobile)
+ReportGenerator.artTableColHdr.email=Email
+ReportGenerator.artTableColHdr.msgType=Message Type
+ReportGenerator.artTableColHdr.direction=Direction
+ReportGenerator.artTableColHdr.fromPhoneNum=From Phone Number
+ReportGenerator.artTableColHdr.fromEmail=From Email
+ReportGenerator.artTableColHdr.toPhoneNum=To Phone Number
+ReportGenerator.artTableColHdr.toEmail=To Email
+ReportGenerator.artTableColHdr.subject=Subject
+ReportGenerator.artTableColHdr.calendarEntryType=Calendar Entry Type
+ReportGenerator.artTableColHdr.description=Description
+ReportGenerator.artTableColHdr.startDateTime=Start Date/Time
+ReportGenerator.artTableColHdr.endDateTime=End Date/Time
+ReportGenerator.artTableColHdr.location=Location
+ReportGenerator.artTableColHdr.shortCut=Short Cut
+ReportGenerator.artTableColHdr.deviceName=Device Name
+ReportGenerator.artTableColHdr.deviceAddress=Device Address
+ReportGenerator.artTableColHdr.altitude=Altitude
+ReportGenerator.artTableColHdr.locationAddress=Location Address
+ReportGenerator.artTableColHdr.category=Category
+ReportGenerator.artTableColHdr.userId=User ID
+ReportGenerator.artTableColHdr.password=Password
+ReportGenerator.artTableColHdr.appName=App Name
+ReportGenerator.artTableColHdr.appPath=App Path
+ReportGenerator.artTableColHdr.replytoAddress=ReplyTo Address
+ReportGenerator.artTableColHdr.mailServer=Mail Server
+ReportGenerator.artTableColHdr.tags=Tags
+ReportGenerator.errors.reportErrorTitle=Error generating report
+ReportGenerator.errors.reportErrorText=Error generating report: 
+ReportHTML.link.viewFile=View File
+ReportHTML.addThumbRows.dataType.title=Tagged Images - {0}
+ReportHTML.addThumbRows.dataType.msg=Tagged Results and Contents that contain images.
+ReportHTML.thumbLink.tags=Tags\:
+ReportHTML.getName.text=Results - HTML
+ReportHTML.getDesc.text=A report about results and tagged items in HTML format.
+ReportHTML.writeIndex.title=Autopsy Report for case {0}
+ReportHTML.writeIndex.noFrames.msg=Your browser is not compatible with our frame setup.
+ReportHTML.writeIndex.noFrames.seeNav=Please see <a href\="nav.html">the navigation page</a> for artifact links,
+ReportHTML.writeIndex.seeSum=and <a href\="summary.html">the summary page</a> for a case summary.
+ReportHTML.writeNav.title=Report Navigation
+ReportHTML.writeNav.h1=Report Navigation
+ReportHTML.writeNav.summary=Case Summary
+ReportHTML.writeSum.title=Case Summary
+ReportHTML.writeSum.warningMsg=<span>Warning, this report was run before ingest services completed\!</span>
+ReportHTML.writeSum.reportGenOn.text=HTML Report Generated on {0}
+ReportHTML.writeSum.caseName=Case\:
+ReportHTML.writeSum.caseNum=Case Number\:
+ReportHTML.writeSum.examiner=Examiner\:
+ReportHTML.writeSum.noExaminer=<i>No examiner</i>
+ReportHTML.writeSum.numImages=Number of Images\:
+ReportHTML.writeSum.imageInfoHeading=<h2>Image Information\:</h2>
+ReportHTML.writeSum.timezone=Timezone\:
+ReportHTML.writeSum.path=Path\:
+ReportProgressPanel.progress.queuing=Queuing...
+ReportProgressPanel.initPathLabel.noFile=<html><u>No report file</u></html>
+ReportProgressPanel.start.cancelButton.text=Cancel
+ReportProgressPanel.start.progress.text=Starting report...
+ReportProgressPanel.complete.processLbl.text=Complete
+ReportProgressPanel.complete.cancelButton.text=Complete
+ReportProgressPanel.cancel.cancelButton.toolTipText=Canceled
+ReportProgressPanel.cancel.procLbl.text=Canceled
+ReportVisualPanel1.getName.text=Select and Configure Report Modules
+ReportVisualPanel2.getName.text=Configure Artifact Reports
+ReportWizardAction.actionName.text=Generate Report
+ReportWizardAction.reportWiz.title=Generate Report
+ReportWizardAction.toolBarButton.text=Generate Report
+ReportWizardFileOptionsPanel.finishButton.text=Finish
+ReportWizardFileOptionsVisualPanel.getName.text=Configure File Report
+ReportWizardPanel1.nextButton.text=Next >
+ReportWizardPanel1.finishButton.text=Finish
+ReportWizardPanel2.finishButton.text=Finish
+ReportWizardPanel2.nextButton.text=Next >
diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle_ja.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportDataTypes.java b/Core/src/org/sleuthkit/autopsy/report/FileReportDataTypes.java
index ef6eb1c0ba..a118ef23f2 100755
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportDataTypes.java
+++ b/Core/src/org/sleuthkit/autopsy/report/FileReportDataTypes.java
@@ -18,6 +18,7 @@
  */
 package org.sleuthkit.autopsy.report;
 
+import org.openide.util.NbBundle;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
@@ -31,13 +32,13 @@ import org.sleuthkit.datamodel.TskData;
  */
  enum FileReportDataTypes {
     
-    NAME("Name") {
+    NAME(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.filename.text")) {
         @Override
         public String getValue(AbstractFile file) {
             return file.getName();
         }
     }, 
-    FILE_EXT("File Extension") {
+    FILE_EXT(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.fileExt.text")) {
         @Override
         public String getValue(AbstractFile file) {
             String name = file.getName();
@@ -45,13 +46,13 @@ import org.sleuthkit.datamodel.TskData;
             return (extIndex == -1 ? "" : name.substring(extIndex));
         }
     },
-    FILE_TYPE("File Type") {
+    FILE_TYPE(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.fileType.text")) {
         @Override
         public String getValue(AbstractFile file) {
             return file.getMetaTypeAsString();
         }
     },
-    DELETED("Is Deleted") {
+    DELETED(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.isDel.text")) {
         @Override
         public String getValue(AbstractFile file) {
             if (file.getMetaFlagsAsString().equals(TskData.TSK_FS_META_FLAG_ENUM.UNALLOC.toString())) {
@@ -60,55 +61,55 @@ import org.sleuthkit.datamodel.TskData;
             return "";
         }
     },
-    A_TIME("Last Accessed") {
+    A_TIME(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.aTime.text")) {
         @Override
         public String getValue(AbstractFile file) {
             return file.getAtimeAsDate();
         }
     },
-    CR_TIME("File Created") {
+    CR_TIME(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.crTime.text")) {
         @Override
         public String getValue(AbstractFile file) {
             return file.getCrtimeAsDate();
         }
     },
-    M_TIME("Last Modified") {
+    M_TIME(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.mTime.text")) {
         @Override
         public String getValue(AbstractFile file) {
             return file.getMtimeAsDate();
         }
     },
-    SIZE("Size") {
+    SIZE(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.size.text")) {
         @Override
         public String getValue(AbstractFile file) {
             return String.valueOf(file.getSize());
         }
     },
-    ADDRESS("Address") {
+    ADDRESS(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.address.text")) {
         @Override
         public String getValue(AbstractFile file) {
             return String.valueOf(file.getMetaAddr());
         }
     },
-    HASH_VALUE("Hash Value") {
+    HASH_VALUE(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.hash.text")) {
         @Override
         public String getValue(AbstractFile file) {
             return file.getMd5Hash();
         }
     },
-    KNOWN_STATUS("Known Status") {
+    KNOWN_STATUS(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.knownStatus.text")) {
         @Override
         public String getValue(AbstractFile file) {
             return file.getKnown().getName();
         }
     },
-    PERMISSIONS("Permissions") {
+    PERMISSIONS(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.perms.text")) {
         @Override
         public String getValue(AbstractFile file) {
             return file.getModesAsString();
         }
     },
-    FULL_PATH("Full Path") {
+    FULL_PATH(NbBundle.getMessage(FileReportText.class, "FileReportDataTypes.path.text")) {
         @Override
         public String getValue(AbstractFile file) {
             try {
diff --git a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java b/Core/src/org/sleuthkit/autopsy/report/FileReportText.java
index de9144e626..68268cf4d5 100755
--- a/Core/src/org/sleuthkit/autopsy/report/FileReportText.java
+++ b/Core/src/org/sleuthkit/autopsy/report/FileReportText.java
@@ -28,6 +28,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.datamodel.AbstractFile;
 
 /**
@@ -118,12 +120,12 @@ import org.sleuthkit.datamodel.AbstractFile;
 
     @Override
     public String getName() {
-        return "Files - Text";
+        return NbBundle.getMessage(this.getClass(), "FileReportText.getName.text");
     }
 
     @Override
     public String getDescription() {
-        return "A tab delimited text file containing information about individual files in the case."; 
+        return NbBundle.getMessage(this.getClass(), "FileReportText.getDesc.text");
     }
 
     @Override
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java b/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java
index d31af46908..d49c630774 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportBodyFile.java
@@ -30,6 +30,8 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.logging.Level;
 import javax.swing.JPanel;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.ingest.IngestManager;
@@ -72,7 +74,7 @@ import org.sleuthkit.datamodel.*;
         // Start the progress bar and setup the report
         progressPanel.setIndeterminate(false);
         progressPanel.start();
-        progressPanel.updateStatusLabel("Querying files...");  
+        progressPanel.updateStatusLabel(NbBundle.getMessage(this.getClass(), "ReportBodyFile.progress.querying"));
         reportPath = path + "BodyFile.txt";
         currentCase = Case.getCurrentCase();
         skCase = currentCase.getSleuthkitCase();
@@ -84,13 +86,13 @@ import org.sleuthkit.datamodel.*;
             final String query = "type = " + TskData.TSK_DB_FILES_TYPE_ENUM.FS.getFileType() 
                                + " AND name != '.' AND name != '..'";
             
-            progressPanel.updateStatusLabel("Loading files...");  
+            progressPanel.updateStatusLabel(NbBundle.getMessage(this.getClass(), "ReportBodyFile.progress.loading"));
             List<FsContent> fs = skCase.findFilesWhere(query);
             
             // Check if ingest has finished
             String ingestwarning = "";
             if (IngestManager.getDefault().isIngestRunning()) {
-                ingestwarning = "Warning, this report was run before ingest services completed!\n";
+                ingestwarning = NbBundle.getMessage(this.getClass(), "ReportBodyFile.ingestWarning.text");
             }
             
             int size = fs.size();
@@ -109,7 +111,9 @@ import org.sleuthkit.datamodel.*;
                     }
                     if(count++ == 100) {
                         progressPanel.increment();
-                        progressPanel.updateStatusLabel("Now processing " + file.getName() + "...");
+                        progressPanel.updateStatusLabel(
+                                NbBundle.getMessage(this.getClass(), "ReportBodyFile.progress.processing",
+                                                    file.getName()));
                         count = 0;
                     }
 
@@ -161,13 +165,13 @@ import org.sleuthkit.datamodel.*;
 
     @Override
     public String getName() {
-        String name = "TSK Body File";
+        String name = NbBundle.getMessage(this.getClass(), "ReportBodyFile.getName.text");
         return name;
     }
 
     @Override
     public String getFilePath() {
-        return "BodyFile.txt";
+        return NbBundle.getMessage(this.getClass(), "ReportBodyFile.getFilePath.text");
     }
 
     @Override
@@ -178,7 +182,7 @@ import org.sleuthkit.datamodel.*;
 
     @Override
     public String getDescription() {
-        String desc = "Body file format report with MAC times for every file. This format can be used for a timeline view.";
+        String desc = NbBundle.getMessage(this.getClass(), "ReportBodyFile.getDesc.text");
         return desc;
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java b/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java
index e8759358e7..f71e047f6e 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportBranding.java
@@ -26,6 +26,7 @@ import java.io.OutputStream;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.openide.filesystems.FileUtil;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
@@ -46,8 +47,10 @@ public final class ReportBranding implements ReportBrandingProviderI {
     private static final String REPORT_FOOTER_PROP = "ReportFooter";
     //default settings
     private static final String DEFAULT_GENERATOR_LOGO = "/org/sleuthkit/autopsy/report/images/default_generator_logo.png";
-    private static final String DEFAULT_REPORT_TITLE = "Autopsy Forensic Report";
-    private static final String DEFAULT_REPORT_FOOTER = "Powered by Autopsy Open Source Digital Forensics Platform - www.sleuthkit.org";
+    private static final String DEFAULT_REPORT_TITLE = NbBundle
+            .getMessage(ReportBranding.class, "ReportBranding.defaultReportTitle.text");
+    private static final String DEFAULT_REPORT_FOOTER = NbBundle
+            .getMessage(ReportBranding.class, "ReportBranding.defaultReportFooter.text");
     private String reportsBrandingDir; //dir with extracted reports branding resources
     private static final String MODULE_NAME = ReportBranding.class.getSimpleName();
     private static final Logger logger = Logger.getLogger(ReportBranding.class.getName());
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java b/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java
index ecb97ac83c..2b9c9c18f7 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportExcel.java
@@ -26,6 +26,7 @@ import java.util.logging.Level;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
@@ -146,7 +147,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
         // Add an artifacts count row. The actual count will be filled in later.
         row = sheet.createRow(rowIndex);
         row.setRowStyle(setStyle);
-        row.createCell(0).setCellValue("Number of artifacts:");
+        row.createCell(0).setCellValue(NbBundle.getMessage(this.getClass(), "ReportExcel.numAartifacts.text"));
         ++rowIndex;
 
         // Add a comment row, if a comment was supplied.
@@ -277,12 +278,12 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 
     @Override
     public String getName() {
-        return "Results - Excel";
+        return NbBundle.getMessage(this.getClass(), "ReportExcel.getName.text");
     }
 
     @Override
     public String getDescription() {
-        return "A report about results and tagged items in Excel (XLS) format.";
+        return NbBundle.getMessage(this.getClass(), "ReportExcel.getDesc.text");
     }
 
     @Override
@@ -292,7 +293,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
 
     @Override
     public String getFilePath() {
-        return "Excel.xlsx";
+        return NbBundle.getMessage(this.getClass(), "ReportExcel.getFilePath.text");
     }
     
     /**
@@ -306,12 +307,12 @@ import org.sleuthkit.autopsy.coreutils.Logger;
     }
     
     private void writeSummaryWorksheet() {
-        sheet = wb.createSheet("Summary");
+        sheet = wb.createSheet(NbBundle.getMessage(this.getClass(), "ReportExcel.sheetName.text"));
         rowIndex = 0;
         
         Row row = sheet.createRow(rowIndex);
         row.setRowStyle(setStyle);
-        row.createCell(0).setCellValue("Summary");
+        row.createCell(0).setCellValue(NbBundle.getMessage(this.getClass(), "ReportExcel.cellVal.summary"));
         ++rowIndex;
 
         sheet.createRow(rowIndex);
@@ -321,25 +322,25 @@ import org.sleuthkit.autopsy.coreutils.Logger;
                
         row = sheet.createRow(rowIndex);
         row.setRowStyle(setStyle);
-        row.createCell(0).setCellValue("Case Name:");
+        row.createCell(0).setCellValue(NbBundle.getMessage(this.getClass(), "ReportExcel.cellVal.caseName"));
         row.createCell(1).setCellValue(currentCase.getName());
         ++rowIndex;
 
         row = sheet.createRow(rowIndex);
         row.setRowStyle(setStyle);
-        row.createCell(0).setCellValue("Case Number:");
+        row.createCell(0).setCellValue(NbBundle.getMessage(this.getClass(), "ReportExcel.cellVal.caseNum"));
         row.createCell(1).setCellValue(currentCase.getNumber());
         ++rowIndex;
 
         row = sheet.createRow(rowIndex);
         row.setRowStyle(setStyle);
-        row.createCell(0).setCellValue("Examiner:");
+        row.createCell(0).setCellValue(NbBundle.getMessage(this.getClass(), "ReportExcel.cellVal.examiner"));
         row.createCell(1).setCellValue(currentCase.getExaminer());
         ++rowIndex;
 
         row = sheet.createRow(rowIndex);
         row.setRowStyle(setStyle);
-        row.createCell(0).setCellValue("Number of Images:");
+        row.createCell(0).setCellValue(NbBundle.getMessage(this.getClass(), "ReportExcel.cellVal.numImages"));
         row.createCell(1).setCellValue(currentCase.getImageIDs().length);
         ++rowIndex;
         
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java
index f4bf9cc14c..f79a9b02f7 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerationPanel.java
@@ -27,6 +27,8 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.swing.Box;
 import javax.swing.JOptionPane;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus;
 
  class ReportGenerationPanel extends javax.swing.JPanel {
@@ -96,7 +98,12 @@ import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus;
         if (closeable) {
             actionListener.actionPerformed(null);
         } else {
-            int result = JOptionPane.showConfirmDialog(null, "Are you sure you'd like to close the dialog?\nAll reports will be canceled.", "Closing", JOptionPane.YES_NO_OPTION);
+            int result = JOptionPane.showConfirmDialog(null,
+                                                       NbBundle.getMessage(this.getClass(),
+                                                                                 "ReportGenerationPanel.confDlg.sureToClose.msg"),
+                                                       NbBundle.getMessage(this.getClass(),
+                                                                           "ReportGenerationPanel.confDlg.title.closing"),
+                                                       JOptionPane.YES_NO_OPTION);
             if (result == 0) {
                 cancelAllReports();
                 actionListener.actionPerformed(null);
@@ -215,7 +222,11 @@ import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus;
     }//GEN-LAST:event_closeButtonActionPerformed
 
     private void cancelAllButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelAllButtonActionPerformed
-        int result = JOptionPane.showConfirmDialog(null, "Are you sure you'd like to cancel all the reports?", "Cancel All", JOptionPane.YES_NO_OPTION);
+        int result = JOptionPane.showConfirmDialog(null, NbBundle.getMessage(this.getClass(),
+                                                                             "ReportGenerationPanel.confDlg.cancelReports.msg"),
+                                                   NbBundle.getMessage(this.getClass(),
+                                                                       "ReportGenerationPanel.cancelAllButton.text"),
+                                                   JOptionPane.YES_NO_OPTION);
             if (result == 0) {
                 cancelAllReports();
             }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
index d7cb217697..bd819d9556 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
@@ -47,7 +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;
 import org.sleuthkit.autopsy.coreutils.ImageUtils;
@@ -65,7 +65,6 @@ import org.sleuthkit.datamodel.ContentTag;
 import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
-import org.sleuthkit.datamodel.TskException;
 
 /**
  * Instances of this class use GeneralReportModules, TableReportModules and 
@@ -169,7 +168,7 @@ import org.sleuthkit.datamodel.TskException;
     public void displayProgressPanels() {
         final JDialog dialog = new JDialog(new JFrame(), true);
         dialog.setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE);
-        dialog.setTitle("Report Generation Progress...");
+        dialog.setTitle(NbBundle.getMessage(this.getClass(), "ReportGenerator.displayProgress.title.text"));
         dialog.add(this.panel);
         dialog.pack();
         
@@ -210,7 +209,7 @@ import org.sleuthkit.datamodel.TskException;
      * @param artifactTypeSelections the enabled/disabled state of the artifact types to be included in the report
      * @param tagSelections the enabled/disabled state of the tag names to be included in the report
      */
-    public void generateBlackboardArtifactsReports(Map<ARTIFACT_TYPE, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections) {
+    public void generateTableReports(Map<ARTIFACT_TYPE, Boolean> artifactTypeSelections, Map<String, Boolean> tagNameSelections) {
         if (!tableProgress.isEmpty() && null != artifactTypeSelections) {
             TableReportsWorker worker = new TableReportsWorker(artifactTypeSelections, tagNameSelections);
             worker.execute();
@@ -257,6 +256,10 @@ import org.sleuthkit.datamodel.TskException;
             try {
                 get();
             } catch (InterruptedException | ExecutionException ex) {
+                MessageNotifyUtil.Notify.show(
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorTitle"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorText") + ex.getLocalizedMessage(),
+                        MessageNotifyUtil.MessageType.ERROR);
                 logger.log(Level.SEVERE, "failed to generate reports", ex);
             }
         }
@@ -283,7 +286,8 @@ import org.sleuthkit.datamodel.TskException;
                 ReportProgressPanel progress = fileProgress.get(module);
                 if (progress.getStatus() != ReportStatus.CANCELED) {
                     progress.start();
-                    progress.updateStatusLabel("Querying database...");
+                    progress.updateStatusLabel(
+                            NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.queryingDb.text"));
                 }
             }
             
@@ -316,7 +320,9 @@ import org.sleuthkit.datamodel.TskException;
                     }
                     
                     if ((i % 100) == 0) {
-                        progress.updateStatusLabel("Now processing " + file.getName());
+                        progress.updateStatusLabel(
+                                NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.processingFile.text",
+                                                    file.getName()));
                     }
                 }
                 i++;
@@ -343,7 +349,7 @@ import org.sleuthkit.datamodel.TskException;
                 return absFiles;
             } catch (TskCoreException ex) {
                 // TODO
-                return Collections.EMPTY_LIST;
+                return Collections.<AbstractFile>emptyList();
             }
         }
         
@@ -352,6 +358,10 @@ import org.sleuthkit.datamodel.TskException;
             try {
                 get();
             } catch (InterruptedException | ExecutionException ex) {
+                MessageNotifyUtil.Notify.show(
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorTitle"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorText") + ex.getLocalizedMessage(),
+                        MessageNotifyUtil.MessageType.ERROR);
                 logger.log(Level.SEVERE, "failed to generate reports", ex);
             }
         }
@@ -431,7 +441,7 @@ import org.sleuthkit.datamodel.TskException;
             // Make a comment string describing the tag names filter in effect. 
             StringBuilder comment = new StringBuilder();
             if (!tagNamesFilter.isEmpty()) {
-                comment.append("Contains results that were tagged with one of the following: ");
+                comment.append(NbBundle.getMessage(this.getClass(), "ReportGenerator.artifactTable.taggedResults.text"));
                 comment.append(makeCommaSeparatedList(tagNamesFilter));
             }            
 
@@ -444,7 +454,9 @@ import org.sleuthkit.datamodel.TskException;
                 }
                                                         
                 for (TableReportModule module : tableModules) {
-                    tableProgress.get(module).updateStatusLabel("Now processing " + type.getDisplayName() + "...");  
+                    tableProgress.get(module).updateStatusLabel(
+                            NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.processing",
+                                                type.getDisplayName()));
                 }
                 
                 // Keyword hits and hashset hit artifacts get sepcial handling.                
@@ -476,7 +488,10 @@ import org.sleuthkit.datamodel.TskException;
                 List<String> columnHeaders = getArtifactTableColumnHeaders(type.getTypeID());
                 if (columnHeaders == null) {
                     // @@@ Hack to prevent system from hanging.  Better solution is to merge all attributes into a single column or analyze the artifacts to find out how many are needed.
-                    MessageNotifyUtil.Notify.show("Skipping artifact type " + type + " in reports", "Unknown columns to report on", MessageNotifyUtil.MessageType.ERROR);
+                    MessageNotifyUtil.Notify.show(
+                            NbBundle.getMessage(this.getClass(), "ReportGenerator.msgShow.skippingArtType.title", type),
+                            NbBundle.getMessage(this.getClass(), "ReportGenerator.msgShow.skippingArtType.msg"),
+                            MessageNotifyUtil.MessageType.ERROR);
                     continue;
                 }
                 
@@ -494,7 +509,12 @@ import org.sleuthkit.datamodel.TskException;
                         List<String> rowData = artifactData.getRow();
                         if (rowData.isEmpty()) {
                             if (msgSent == false) {
-                                MessageNotifyUtil.Notify.show("Skipping artifact rows for type " + type + " in reports", "Unknown columns to report on", MessageNotifyUtil.MessageType.ERROR);
+                                MessageNotifyUtil.Notify.show(NbBundle.getMessage(this.getClass(),
+                                                                                  "ReportGenerator.msgShow.skippingArtRow.title",
+                                                                                  type),
+                                                              NbBundle.getMessage(this.getClass(),
+                                                                                  "ReportGenerator.msgShow.skippingArtRow.msg"),
+                                                              MessageNotifyUtil.MessageType.ERROR);
                                 msgSent = true;
                             }
                             continue;
@@ -503,7 +523,6 @@ import org.sleuthkit.datamodel.TskException;
                         module.addRow(rowData);
                     }
                 }
-                
                 // Finish up this data type
                 for (TableReportModule module : tableModules) {
                     tableProgress.get(module).increment();
@@ -537,11 +556,14 @@ import org.sleuthkit.datamodel.TskException;
             for (TableReportModule module : tableModules) {            
                 // @@@ This casting is a tricky little workaround to allow the HTML report module to slip in a content hyperlink.
                 // @@@ Alos Using the obsolete ARTIFACT_TYPE.TSK_TAG_FILE is also an expedient hack.
-                tableProgress.get(module).updateStatusLabel("Now processing " + ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName() + "...");                                
+                tableProgress.get(module).updateStatusLabel(
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.processing",
+                                            ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()));
                 ArrayList<String> columnHeaders = new ArrayList<>(Arrays.asList("File", "Tag", "Comment"));                
                 StringBuilder comment = new StringBuilder();
                 if (!tagNamesFilter.isEmpty()) {
-                    comment.append("Contains files that were tagged with one of the following: ");
+                    comment.append(
+                            NbBundle.getMessage(this.getClass(), "ReportGenerator.makeContTagTab.taggedFiles.msg"));
                     comment.append(makeCommaSeparatedList(tagNamesFilter));
                 }            
                 if (module instanceof ReportHTML) {
@@ -598,6 +620,10 @@ import org.sleuthkit.datamodel.TskException;
             try {
                 get();
             } catch (InterruptedException | ExecutionException ex) {
+                MessageNotifyUtil.Notify.show(
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorTitle"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.errors.reportErrorText") + ex.getLocalizedMessage(),
+                        MessageNotifyUtil.MessageType.ERROR);
                 logger.log(Level.SEVERE, "failed to generate reports", ex);
             }
         }
@@ -624,14 +650,21 @@ import org.sleuthkit.datamodel.TskException;
             // Tell the modules reporting on blackboard artifact tags data type is beginning.
             // @@@ Using the obsolete ARTIFACT_TYPE.TSK_TAG_ARTIFACT is an expedient hack.
             for (TableReportModule module : tableModules) {
-                tableProgress.get(module).updateStatusLabel("Now processing " + ARTIFACT_TYPE.TSK_TAG_ARTIFACT.getDisplayName() + "...");                                
+                tableProgress.get(module).updateStatusLabel(
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.processing",
+                                            ARTIFACT_TYPE.TSK_TAG_ARTIFACT.getDisplayName()));
                 StringBuilder comment = new StringBuilder();
                 if (!tagNamesFilter.isEmpty()) {
-                    comment.append("This report only includes results tagged with: ");
+                    comment.append(
+                            NbBundle.getMessage(this.getClass(), "ReportGenerator.makeBbArtTagTab.taggedRes.msg"));
                     comment.append(makeCommaSeparatedList(tagNamesFilter));
                 }                        
                 module.startDataType(ARTIFACT_TYPE.TSK_TAG_ARTIFACT.getDisplayName(), comment.toString());  
-                module.startTable(new ArrayList<>(Arrays.asList("Result Type", "Tag", "Comment", "Source File")));
+                module.startTable(new ArrayList<>(Arrays.asList(
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.tagTable.header.resultType"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.tagTable.header.tag"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.tagTable.header.comment"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.tagTable.header.srcFile"))));
             }
                         
             // Give the modules the rows for the content tags. 
@@ -683,11 +716,14 @@ import org.sleuthkit.datamodel.TskException;
          */
         private void makeThumbnailTable() {
             for (TableReportModule module : tableModules) {
-                tableProgress.get(module).updateStatusLabel("Creating thumbnails..."); 
+                tableProgress.get(module).updateStatusLabel(
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.createdThumb.text"));
                 
                 if (module instanceof ReportHTML) {
                     ReportHTML htmlModule = (ReportHTML) module;
-                    htmlModule.startDataType("Thumbnails", "Contains thumbnails of images that are associated with tagged files and results.");
+                    htmlModule.startDataType(
+                            NbBundle.getMessage(this.getClass(), "ReportGenerator.thumbnailTable.name"),
+                                             NbBundle.getMessage(this.getClass(), "ReportGenerator.thumbnailTable.desc"));
                     List<String> emptyHeaders = new ArrayList<>();
                     for (int i = 0; i < ReportHTML.THUMBNAIL_COLUMNS; i++) {
                         emptyHeaders.add("");
@@ -813,7 +849,7 @@ import org.sleuthkit.datamodel.TskException;
             while(listsRs.next()) {
                 String list = listsRs.getString("list");
                 if(list.isEmpty()) {
-                    list = "User Searches";
+                    list = NbBundle.getMessage(this.getClass(), "ReportGenerator.writeKwHits.userSrchs");
                 }
                 lists.add(list);
             }
@@ -822,8 +858,9 @@ import org.sleuthkit.datamodel.TskException;
             for (TableReportModule module : tableModules) {
                 module.startDataType(ARTIFACT_TYPE.TSK_KEYWORD_HIT.getDisplayName(), comment);
                 module.addSetIndex(lists);
-                tableProgress.get(module).updateStatusLabel("Now processing "
-                        + ARTIFACT_TYPE.TSK_KEYWORD_HIT.getDisplayName() + "...");
+                tableProgress.get(module).updateStatusLabel(
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.processing",
+                                            ARTIFACT_TYPE.TSK_KEYWORD_HIT.getDisplayName()));
             }
         }
         catch (SQLException ex) {
@@ -890,20 +927,22 @@ import org.sleuthkit.datamodel.TskException;
                 }
 
                 // If the lists aren't the same, we've started a new list
-                if((!list.equals(currentList) && !list.isEmpty()) || (list.isEmpty() && !currentList.equals("User Searches"))) {
+                if((!list.equals(currentList) && !list.isEmpty()) || (list.isEmpty() && !currentList.equals(
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.writeKwHits.userSrchs")))) {
                     if(!currentList.isEmpty()) {
                         for (TableReportModule module : tableModules) {
                             module.endTable();
                             module.endSet();
                         }
                     }
-                    currentList = list.isEmpty() ? "User Searches" : list;
+                    currentList = list.isEmpty() ? NbBundle
+                            .getMessage(this.getClass(), "ReportGenerator.writeKwHits.userSrchs") : list;
                     currentKeyword = ""; // reset the current keyword because it's a new list
                     for (TableReportModule module : tableModules) {
                         module.startSet(currentList);
-                        tableProgress.get(module).updateStatusLabel("Now processing "
-                                + ARTIFACT_TYPE.TSK_KEYWORD_HIT.getDisplayName()
-                                + " (" + currentList + ")...");
+                        tableProgress.get(module).updateStatusLabel(
+                                NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.processingList",
+                                                    ARTIFACT_TYPE.TSK_KEYWORD_HIT.getDisplayName(), currentList));
                     }
                 }
                 if (!keyword.equals(currentKeyword)) {
@@ -965,8 +1004,9 @@ import org.sleuthkit.datamodel.TskException;
             for (TableReportModule module : tableModules) {
                 module.startDataType(ARTIFACT_TYPE.TSK_HASHSET_HIT.getDisplayName(), comment);
                 module.addSetIndex(lists);
-                tableProgress.get(module).updateStatusLabel("Now processing "
-                        + ARTIFACT_TYPE.TSK_HASHSET_HIT.getDisplayName() + "...");
+                tableProgress.get(module).updateStatusLabel(
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.processing",
+                                            ARTIFACT_TYPE.TSK_HASHSET_HIT.getDisplayName()));
             }
         } catch (SQLException ex) {        
             logger.log(Level.SEVERE, "Failed to query hashset lists.", ex);
@@ -1037,9 +1077,9 @@ import org.sleuthkit.datamodel.TskException;
                     for (TableReportModule module : tableModules) {
                         module.startSet(currentSet);
                         module.startTable(getArtifactTableColumnHeaders(ARTIFACT_TYPE.TSK_HASHSET_HIT.getTypeID()));
-                        tableProgress.get(module).updateStatusLabel("Now processing "
-                                + ARTIFACT_TYPE.TSK_HASHSET_HIT.getDisplayName()
-                                + " (" + currentSet + ")...");
+                        tableProgress.get(module).updateStatusLabel(
+                                NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.processingList",
+                                                    ARTIFACT_TYPE.TSK_HASHSET_HIT.getDisplayName(), currentSet));
                     }
                 }
                 
@@ -1078,81 +1118,208 @@ import org.sleuthkit.datamodel.TskException;
         BlackboardArtifact.ARTIFACT_TYPE type = BlackboardArtifact.ARTIFACT_TYPE.fromID(artifactTypeId);        
         switch (type) {
             case TSK_WEB_BOOKMARK:
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"URL", "Title", "Date Created", "Program", "Source File"}));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.url"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.title"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.dateCreated"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.program"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")}));
                 break;
             case TSK_WEB_COOKIE: 
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"URL", "Date/Time", "Name", "Value", "Program", "Source File"}));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.url"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.dateTime"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.name"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.value"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.program"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")}));
                 break;
             case TSK_WEB_HISTORY: 
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"URL", "Date Accessed", "Referrer", "Title", "Program", "Source File"}));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.url"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.dateAccessed"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.referrer"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.title"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.program"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")}));
                 break;
             case TSK_WEB_DOWNLOAD: 
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Destination", "Source URL", "Date Accessed", "Program", "Source File"}));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.dest"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.sourceUrl"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.dateAccessed"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.program"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")}));
                 break;
             case TSK_RECENT_OBJECT: 
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Path", "Date/Time", "Source File"}));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.path"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.dateTime"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")}));
                 break;
             case TSK_INSTALLED_PROG: 
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Program Name", "Install Date/Time", "Source File"}));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.progName"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.instDateTime"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")}));
                 break;
             case TSK_KEYWORD_HIT: 
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Preview", "Source File"}));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.preview"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")}));
                 break;
             case TSK_HASHSET_HIT: 
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"File", "Size"}));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.file"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.size")}));
                 break;
             case TSK_DEVICE_ATTACHED: 
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Name", "Device ID", "Date/Time", "Source File"}));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.name"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.deviceId"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.dateTime"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")}));
                 break;
             case TSK_WEB_SEARCH_QUERY: 
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Text", "Domain", "Date Accessed", "Program Name", "Source File"}));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.text"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.domain"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.dateAccessed"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.progName"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")}));
                 break;
             case TSK_METADATA_EXIF: 
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Date Taken", "Device Manufacturer", "Device Model", "Latitude", "Longitude", "Source File"}));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.dateTaken"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.devManufacturer"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.devModel"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.latitude"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.longitude"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")}));
                 break;
             case TSK_CONTACT: 
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Person Name", "Phone Number", "Phone Number (Home)", "Phone Number (Office)", "Phone Number (Mobile)", "Email", "Source File"  }));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.personName"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.phoneNumber"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.phoneNumHome"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.phoneNumOffice"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.phoneNumMobile"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.email"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")  }));
                 break;
             case TSK_MESSAGE: 
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Message Type", "Direction", "Date/Time",  "From Phone Number", "From Email", "To Phone Number", "To Email", "Subject", "Text", "Source File"  }));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.msgType"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.direction"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.dateTime"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.fromPhoneNum"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.fromEmail"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.toPhoneNum"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.toEmail"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.subject"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.text"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")  }));
                 break;
             case TSK_CALLLOG:
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Person Name", "Phone Number", "Date/Time", "Direction", "Source File"  }));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.personName"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.phoneNumber"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.dateTime"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.direction"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")  }));
                 break;
             case TSK_CALENDAR_ENTRY:
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Calendar Entry Type", "Description", "Start Date/Time", "End Date/Time", "Location", "Source File"  }));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.calendarEntryType"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.description"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.startDateTime"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.endDateTime"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.location"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")  }));
                 break;
             case TSK_SPEED_DIAL_ENTRY:
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Short Cut", "Person Name", "Phone Number",  "Source File"  }));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.shortCut"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.personName"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.phoneNumber"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")  }));
                 break;
             case TSK_BLUETOOTH_PAIRING:
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Device Name", "Device Address", "Date/Time",  "Source File"  }));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.deviceName"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.deviceAddress"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.dateTime"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")  }));
                 break;
             case TSK_GPS_TRACKPOINT:
-                 columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Latitude", "Longitude", "Altitude",  "Name", "Location Address", "Date/Time", "Source File"  }));
+                 columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.latitude"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.longitude"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.altitude"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.name"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.locationAddress"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.dateTime"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")  }));
                 break;
             case TSK_GPS_BOOKMARK:
-                 columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Latitude", "Longitude", "Altitude",  "Name", "Location Address", "Date/Time", "Source File"  }));
+                 columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.latitude"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.longitude"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.altitude"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.name"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.locationAddress"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.dateTime"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")  }));
                 break;
             case TSK_GPS_LAST_KNOWN_LOCATION:
-                 columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Latitude", "Longitude", "Altitude",  "Name", "Location Address", "Date/Time", "Source File"  }));
+                 columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.latitude"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.longitude"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.altitude"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.name"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.locationAddress"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.dateTime"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")  }));
                 break;
             case TSK_GPS_SEARCH:
-                 columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Latitude", "Longitude", "Altitude",  "Name", "Location Address", "Date/Time", "Source File"  }));
+                 columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.latitude"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.longitude"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.altitude"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.name"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.locationAddress"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.dateTime"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")  }));
                 break;
             case TSK_SERVICE_ACCOUNT:
-                 columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Category", "User ID", "Password",  "Person Name", "App Name", "URL", "App Path", "Description", "ReplyTo Address", "Mail Server", "Source File" }));
+                 columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.category"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.userId"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.password"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.personName"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.appName"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.url"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.appPath"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.description"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.replytoAddress"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.mailServer"),
+                         NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile") }));
                 break;
             case TSK_TOOL_OUTPUT: 
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Program Name", "Text", "Source File"}));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.progName"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.text"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")}));
                 break;
             case TSK_ENCRYPTION_DETECTED:
-                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {"Name", "Source File"}));
+                columnHeaders = new ArrayList<>(Arrays.asList(new String[] {
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.name"),
+                        NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile")}));
                 break;
             default:
                 return null;
         }
-        columnHeaders.add("Tags");
+        columnHeaders.add(NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.tags"));
         
         return columnHeaders;
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
index 857037fa72..5beff2bc7a 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java
@@ -42,6 +42,7 @@ import java.util.TreeMap;
 import java.util.logging.Level;
 import org.openide.filesystems.FileObject;
 import org.openide.util.Exceptions;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.openide.filesystems.FileUtil;
 import org.sleuthkit.autopsy.casemodule.services.Services;
@@ -542,7 +543,7 @@ import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM;
         StringBuilder localFileLink = new StringBuilder();
         localFileLink.append("<a href=\"");
         localFileLink.append(localFilePath);
-        localFileLink.append("\">View File</a>");
+        localFileLink.append("\">").append(NbBundle.getMessage(this.getClass(), "ReportHTML.link.viewFile")).append("</a>");
         row.add(localFileLink.toString());              
         
         StringBuilder builder = new StringBuilder();
@@ -587,7 +588,8 @@ import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM;
                 pages++;
                 endTable();
                 endDataType();
-                startDataType("Tagged Images - " + pages, "Tagged Results and Contents that contain images.");
+                startDataType(NbBundle.getMessage(this.getClass(), "ReportHTML.addThumbRows.dataType.title", pages),
+                              NbBundle.getMessage(this.getClass(), "ReportHTML.addThumbRows.dataType.msg"));
                 List<String> emptyHeaders = new ArrayList<>();
                 for (int i = 0; i < THUMBNAIL_COLUMNS; i++) {
                     emptyHeaders.add("");
@@ -627,7 +629,7 @@ import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM;
             try {
                 List<ContentTag> tags = tagsManager.getContentTagsByContent(content);
                 if (tags.size() > 0) {
-                    linkToThumbnail.append("Tags: " );
+                    linkToThumbnail.append(NbBundle.getMessage(this.getClass(), "ReportHTML.thumbLink.tags") );
                 }
                 for (int i = 0; i < tags.size(); i++) {
                     ContentTag tag = tags.get(i);
@@ -739,12 +741,12 @@ import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM;
     
     @Override
     public String getName() {
-        return "Results - HTML";
+        return NbBundle.getMessage(this.getClass(), "ReportHTML.getName.text");
     }
     
     @Override
     public String getDescription() {
-        return "A report about results and tagged items in HTML format.";
+        return NbBundle.getMessage(this.getClass(), "ReportHTML.getDesc.text");
     }
 
     
@@ -802,15 +804,17 @@ import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM;
         try {
             indexOut = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(path + "index.html"), "UTF-8"));
             StringBuilder index = new StringBuilder();
-            index.append("<head>\n<title>Autopsy Report for case ").append(currentCase.getName()).append("</title>\n");
+            index.append("<head>\n<title>").append(
+                    NbBundle.getMessage(this.getClass(), "ReportHTML.writeIndex.title", currentCase.getName())).append(
+                    "</title>\n");
             index.append("<link rel=\"icon\" type=\"image/ico\" href=\"favicon.ico\" />\n");
             index.append("</head>\n");
             index.append("<frameset cols=\"350px,*\">\n");
             index.append("<frame src=\"nav.html\" name=\"nav\">\n");
             index.append("<frame src=\"summary.html\" name=\"content\">\n");
-            index.append("<noframes>Your browser is not compatible with our frame setup.<br />\n");
-            index.append("Please see <a href=\"nav.html\">the navigation page</a> for artifact links,<br />\n");
-            index.append("and <a href=\"summary.html\">the summary page</a> for a case summary.</noframes>\n");
+            index.append("<noframes>").append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeIndex.noFrames.msg")).append("<br />\n");
+            index.append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeIndex.noFrames.seeNav")).append("<br />\n");
+            index.append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeIndex.seeSum")).append("</noframes>\n");
             index.append("</frameset>\n");
             index.append("</html>");
             indexOut.write(index.toString());
@@ -835,10 +839,14 @@ import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM;
         try {
             navOut = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(path + "nav.html"), "UTF-8"));
             StringBuilder nav = new StringBuilder();
-            nav.append("<html>\n<head>\n\t<title>Report Navigation</title>\n\t<link rel=\"stylesheet\" type=\"text/css\" href=\"index.css\" />\n</head>\n<body>\n");
-            nav.append("<div id=\"content\">\n<h1>Report Navigation</h1>\n");
+            nav.append("<html>\n<head>\n\t<title>").append(
+                    NbBundle.getMessage(this.getClass(), "ReportHTML.writeNav.title"))
+               .append("</title>\n\t<link rel=\"stylesheet\" type=\"text/css\" href=\"index.css\" />\n</head>\n<body>\n");
+            nav.append("<div id=\"content\">\n<h1>").append(
+                    NbBundle.getMessage(this.getClass(), "ReportHTML.writeNav.h1")).append("</h1>\n");
             nav.append("<ul class=\"nav\">\n");
-            nav.append("<li style=\"background: url(summary.png) left center no-repeat;\"><a href=\"summary.html\" target=\"content\">Case Summary</a></li>\n");
+            nav.append("<li style=\"background: url(summary.png) left center no-repeat;\"><a href=\"summary.html\" target=\"content\">")
+               .append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeNav.summary")).append("</a></li>\n");
             
             for (String dataType : dataTypes.keySet()) {
                 String dataTypeEsc = dataTypeToFileName(dataType);
@@ -923,7 +931,8 @@ import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM;
         try {
             out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(path + "summary.html"), "UTF-8"));
             StringBuilder head = new StringBuilder();
-            head.append("<html>\n<head>\n<title>Case Summary</title>\n");
+            head.append("<html>\n<head>\n<title>").append(
+                    NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.title")).append("</title>\n");
             head.append("<style type=\"text/css\">\n");
             head.append("body { padding: 0px; margin: 0px; font: 13px/20px Arial, Helvetica, sans-serif; color: #535353; }\n");
             head.append("#wrapper { width: 90%; margin: 0px auto; margin-top: 35px; }\n");
@@ -964,8 +973,11 @@ import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM;
             final boolean generatorLogoSet = reportBranding.getGeneratorLogoPath() != null && !reportBranding.getGeneratorLogoPath().isEmpty();
             
             summary.append("<div id=\"wrapper\">\n");
-            summary.append("<h1>").append(reportTitle).append(running ? "<span>Warning, this report was run before ingest services completed!</span>" : "").append("</h1>\n");
-            summary.append("<p class=\"subheadding\">HTML Report Generated on ").append(datetime).append("</p>\n");
+            summary.append("<h1>").append(reportTitle)
+                   .append(running ? NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.warningMsg") : "")
+                   .append("</h1>\n");
+            summary.append("<p class=\"subheadding\">").append(
+                    NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.reportGenOn.text", datetime)).append("</p>\n");
             summary.append("<div class=\"title\">\n");
             if (agencyLogoSet) {
                 summary.append("<div class=\"left\">\n");
@@ -975,15 +987,21 @@ import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM;
             final String align = agencyLogoSet?"right":"left";
             summary.append("<div class=\"").append(align).append("\">\n");
             summary.append("<table>\n");
-            summary.append("<tr><td>Case:</td><td>").append(caseName).append("</td></tr>\n");
-            summary.append("<tr><td>Case Number:</td><td>").append(!caseNumber.isEmpty() ? caseNumber : "<i>No case number</i>").append("</td></tr>\n");
-            summary.append("<tr><td>Examiner:</td><td>").append(!examiner.isEmpty() ? examiner : "<i>No examiner</i>").append("</td></tr>\n");
-            summary.append("<tr><td>Number of Images:</td><td>").append(imagecount).append("</td></tr>\n");
+            summary.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.caseName"))
+                   .append("</td><td>").append(caseName).append("</td></tr>\n");
+            summary.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.caseNum"))
+                   .append("</td><td>").append(!caseNumber.isEmpty() ? caseNumber : "<i>No case number</i>").append("</td></tr>\n");
+            summary.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.examiner")).append("</td><td>")
+                   .append(!examiner.isEmpty() ? examiner : NbBundle
+                           .getMessage(this.getClass(), "ReportHTML.writeSum.noExaminer"))
+                   .append("</td></tr>\n");
+            summary.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.numImages"))
+                   .append("</td><td>").append(imagecount).append("</td></tr>\n");
             summary.append("</table>\n");
             summary.append("</div>\n");
             summary.append("<div class=\"clear\"></div>\n");
             summary.append("</div>\n");
-            summary.append("<h2>Image Information:</h2>\n");
+            summary.append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.imageInfoHeading"));
             summary.append("<div class=\"info\">\n");
             try {
                 Image[] images = new Image[imagecount];
@@ -993,9 +1011,13 @@ import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM;
                 for(Image img : images) {
                     summary.append("<p>").append(img.getName()).append("</p>\n");
                     summary.append("<table>\n");
-                    summary.append("<tr><td>Timezone:</td><td>").append(img.getTimeZone()).append("</td></tr>\n");
+                    summary.append("<tr><td>").append(
+                            NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.timezone"))
+                           .append("</td><td>").append(img.getTimeZone()).append("</td></tr>\n");
                     for(String imgPath : img.getPaths()) {
-                        summary.append("<tr><td>Path:</td><td>").append(imgPath).append("</td></tr>\n");
+                        summary.append("<tr><td>").append(
+                                NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.path"))
+                               .append("</td><td>").append(imgPath).append("</td></tr>\n");
                     }
                     summary.append("</table>\n");
                 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java
index af083db23d..559288a0ec 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportProgressPanel.java
@@ -18,6 +18,8 @@
  */
 package org.sleuthkit.autopsy.report;
 
+import org.openide.util.NbBundle;
+
 import java.awt.Color;
 import java.awt.Cursor;
 import java.awt.Desktop;
@@ -52,7 +54,7 @@ public class ReportProgressPanel extends javax.swing.JPanel {
         reportProgressBar.setMaximum(100);
 
         reportLabel.setText(reportName);        
-        processingLabel.setText("Queuing...");
+        processingLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.progress.queuing"));
         STATUS = ReportStatus.QUEUING;
         
         if (reportPath != null) {
@@ -101,7 +103,7 @@ public class ReportProgressPanel extends javax.swing.JPanel {
             });
         }
         else {
-            pathLabel.setText("<html><u>No report file</u></html>");            
+            pathLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.initPathLabel.noFile"));
         }
     }
     
@@ -136,8 +138,9 @@ public class ReportProgressPanel extends javax.swing.JPanel {
             @Override
             public void run() {
                 cancelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/report_cancel.png")));
-                cancelButton.setToolTipText("Cancel");
-                processingLabel.setText("Starting report...");
+                cancelButton.setToolTipText(
+                        NbBundle.getMessage(this.getClass(), "ReportProgressPanel.start.cancelButton.text"));
+                processingLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.start.progress.text"));
                 STATUS = ReportStatus.RUNNING;
             }
         });
@@ -235,10 +238,12 @@ public class ReportProgressPanel extends javax.swing.JPanel {
             public void run() {
                 if (STATUS != ReportStatus.CANCELED) {
                     STATUS = ReportStatus.COMPLETE;
-                    processingLabel.setText("Complete");
+                    processingLabel.setText(
+                            NbBundle.getMessage(this.getClass(), "ReportProgressPanel.complete.processLbl.text"));
                     reportProgressBar.setValue(reportProgressBar.getMaximum());
                     cancelButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/report/images/report_complete.png")));
-                    cancelButton.setToolTipText("Complete");
+                    cancelButton.setToolTipText(
+                            NbBundle.getMessage(this.getClass(), "ReportProgressPanel.complete.cancelButton.text"));
                 }
             }
         });
@@ -349,13 +354,14 @@ public class ReportProgressPanel extends javax.swing.JPanel {
             default:
                 STATUS = ReportStatus.CANCELED;
                 cancelButton.setEnabled(false);
-                cancelButton.setToolTipText("Canceled");
+                cancelButton.setToolTipText(
+                        NbBundle.getMessage(this.getClass(), "ReportProgressPanel.cancel.cancelButton.toolTipText"));
                 reportProgressBar.setIndeterminate(false);
                 reportProgressBar.setValue(0);
                 reportProgressBar.setForeground(Color.RED);
                 reportProgressBar.setBackground(Color.RED);
                 processingLabel.setForeground(Color.RED);
-                processingLabel.setText("Canceled");
+                processingLabel.setText(NbBundle.getMessage(this.getClass(), "ReportProgressPanel.cancel.procLbl.text"));
                 break;
         }
     }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.form b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.form
index aa4e559ef5..b722011981 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.form
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.form
@@ -123,16 +123,14 @@
             <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
               <Color blue="f0" green="f0" red="f0" type="rgb"/>
             </Property>
-            <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor">
-              <StringArray count="5">
-                <StringItem index="0" value="Item 1"/>
-                <StringItem index="1" value="Item 2"/>
-                <StringItem index="2" value="Item 3"/>
-                <StringItem index="3" value="Item 4"/>
-                <StringItem index="4" value="Item 5"/>
-              </StringArray>
+            <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+              <Connection code="new javax.swing.AbstractListModel&lt;ReportModule&gt;() {&#xa;    ReportModule[] modules = {};&#xa;    public int getSize() { return modules.length; }&#xa;    public ReportModule getElementAt(int i) { return modules[i]; }&#xa;}" type="code"/>
             </Property>
           </Properties>
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new javax.swing.JList&lt;&gt;()"/>
+            <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;ReportModule&gt;"/>
+          </AuxValues>
         </Component>
       </SubComponents>
     </Container>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
index dc9cb27b74..39bf9bc7dd 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel1.java
@@ -34,6 +34,7 @@ import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 
  final class ReportVisualPanel1 extends JPanel implements ListSelectionListener {
@@ -92,14 +93,14 @@ import org.sleuthkit.autopsy.coreutils.Logger;
         
         modulesJList.getSelectionModel().addListSelectionListener(this);
         modulesJList.setCellRenderer(new ModuleCellRenderer());
-        modulesJList.setListData(modules.toArray());
+        modulesJList.setListData(modules.toArray(new ReportModule[modules.size()]));
         selectedIndex = 0;
         modulesJList.setSelectedIndex(selectedIndex);
     }
 
     @Override
     public String getName() {
-        return "Select and Configure Report Modules";
+        return NbBundle.getMessage(this.getClass(), "ReportVisualPanel1.getName.text");
     }
     
     public ReportModule getSelectedModule() {
@@ -161,7 +162,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
         descriptionScrollPane = new javax.swing.JScrollPane();
         descriptionTextPane = new javax.swing.JTextPane();
         modulesScrollPane = new javax.swing.JScrollPane();
-        modulesJList = new javax.swing.JList();
+        modulesJList = new javax.swing.JList<>();
 
         setPreferredSize(new java.awt.Dimension(650, 250));
 
@@ -187,10 +188,10 @@ import org.sleuthkit.autopsy.coreutils.Logger;
         descriptionScrollPane.setViewportView(descriptionTextPane);
 
         modulesJList.setBackground(new java.awt.Color(240, 240, 240));
-        modulesJList.setModel(new javax.swing.AbstractListModel() {
-            String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
-            public int getSize() { return strings.length; }
-            public Object getElementAt(int i) { return strings[i]; }
+        modulesJList.setModel(new javax.swing.AbstractListModel<ReportModule>() {
+            ReportModule[] modules = {};
+            public int getSize() { return modules.length; }
+            public ReportModule getElementAt(int i) { return modules[i]; }
         });
         modulesScrollPane.setViewportView(modulesJList);
 
@@ -228,7 +229,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
     private javax.swing.JPanel configurationPanel;
     private javax.swing.JScrollPane descriptionScrollPane;
     private javax.swing.JTextPane descriptionTextPane;
-    private javax.swing.JList modulesJList;
+    private javax.swing.JList<ReportModule> modulesJList;
     private javax.swing.JScrollPane modulesScrollPane;
     private javax.swing.JLabel reportModulesLabel;
     // End of variables declaration//GEN-END:variables
@@ -263,7 +264,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
     private class ModuleCellRenderer extends JRadioButton implements ListCellRenderer<ReportModule> {
 
         @Override
-        public Component getListCellRendererComponent(JList list, ReportModule value, int index, boolean isSelected, boolean cellHasFocus) {
+        public Component getListCellRendererComponent(JList<? extends ReportModule> list, ReportModule value, int index, boolean isSelected, boolean cellHasFocus) {
             this.setText(value.getName());
             this.setEnabled(true);
             this.setSelected(isSelected);
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.form b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.form
index bd00c6e2eb..119000eebe 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.form
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.form
@@ -143,6 +143,10 @@
             <Property name="selectionMode" type="int" value="0"/>
             <Property name="layoutOrientation" type="int" value="1"/>
           </Properties>
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new javax.swing.JList&lt;&gt;()"/>
+            <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
+          </AuxValues>
         </Component>
       </SubComponents>
     </Container>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
index 67a2eb67ae..587dd1ff27 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2013 Basis Technology Corp.
+ * Copyright 2013-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,6 +36,8 @@ import javax.swing.JPanel;
 import javax.swing.ListCellRenderer;
 import javax.swing.ListModel;
 import javax.swing.event.ListDataListener;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.BlackboardArtifact;
@@ -43,16 +45,14 @@ import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
 import org.sleuthkit.datamodel.TagName;
 import org.sleuthkit.datamodel.TskCoreException;
 
- final class ReportVisualPanel2 extends JPanel {
+final class ReportVisualPanel2 extends JPanel {
+
     private ReportWizardPanel2 wizPanel;
-    
     private Map<String, Boolean> tagStates = new LinkedHashMap<>();
     private List<String> tags = new ArrayList<>();
-    
     ArtifactSelectionDialog dialog = new ArtifactSelectionDialog(new JFrame(), true);
     private Map<ARTIFACT_TYPE, Boolean> artifactStates = new EnumMap<>(ARTIFACT_TYPE.class);
     private List<ARTIFACT_TYPE> artifacts = new ArrayList<>();
-    
     private TagsListModel tagsModel;
     private TagsListRenderer tagsRenderer;
 
@@ -69,58 +69,57 @@ import org.sleuthkit.datamodel.TskCoreException;
         allResultsRadioButton.setSelected(true);
         this.wizPanel = wizPanel;
     }
-    
+
     // Initialize the list of Tags
     private void initTags() {
         List<TagName> tagNamesInUse;
         try {
             tagNamesInUse = Case.getCurrentCase().getServices().getTagsManager().getTagNamesInUse();
-        }
-        catch (TskCoreException ex) {
-            Logger.getLogger(ReportVisualPanel2.class.getName()).log(Level.SEVERE, "Failed to get tag names", ex);                    
+        } catch (TskCoreException ex) {
+            Logger.getLogger(ReportVisualPanel2.class.getName()).log(Level.SEVERE, "Failed to get tag names", ex);
             return;
-        }                                    
-                        
-        for(TagName tagName : tagNamesInUse) {
+        }
+
+        for (TagName tagName : tagNamesInUse) {
             tagStates.put(tagName.getDisplayName(), Boolean.FALSE);
         }
         tags.addAll(tagStates.keySet());
-        
+
         tagsModel = new TagsListModel();
         tagsRenderer = new TagsListRenderer();
         tagsList.setModel(tagsModel);
         tagsList.setCellRenderer(tagsRenderer);
         tagsList.setVisibleRowCount(-1);
-        
+
         // Add the ability to enable and disable Tag checkboxes to the list
         tagsList.addMouseListener(new MouseAdapter() {
             @Override
             public void mousePressed(MouseEvent evt) {
                 JList list = (JList) evt.getSource();
                 int index = list.locationToIndex(evt.getPoint());
-                String value = (String) tagsModel.getElementAt(index);
+                String value = tagsModel.getElementAt(index);
                 tagStates.put(value, !tagStates.get(value));
                 list.repaint();
                 updateFinishButton();
             }
-        });        
+        });
     }
-    
+
     // Initialize the list of Artifacts
     private void initArtifactTypes() {
-        
+
         try {
-            ArrayList<BlackboardArtifact.ARTIFACT_TYPE> doNotReport = new ArrayList();
+            ArrayList<BlackboardArtifact.ARTIFACT_TYPE> doNotReport = new ArrayList<>();
             doNotReport.add(BlackboardArtifact.ARTIFACT_TYPE.TSK_GEN_INFO);
             doNotReport.add(BlackboardArtifact.ARTIFACT_TYPE.TSK_TAG_FILE); // Obsolete artifact type
             doNotReport.add(BlackboardArtifact.ARTIFACT_TYPE.TSK_TAG_ARTIFACT); // Obsolete artifact type
-            
+
             artifacts = Case.getCurrentCase().getSleuthkitCase().getBlackboardArtifactTypesInUse();
-            
+
             artifacts.removeAll(doNotReport);
-            
+
             artifactStates = new EnumMap<>(ARTIFACT_TYPE.class);
-            for (ARTIFACT_TYPE type : artifacts) { 
+            for (ARTIFACT_TYPE type : artifacts) {
                 artifactStates.put(type, Boolean.TRUE);
             }
         } catch (TskCoreException ex) {
@@ -130,43 +129,43 @@ import org.sleuthkit.datamodel.TskCoreException;
 
     @Override
     public String getName() {
-        return "Configure Artifact Reports";
+        return NbBundle.getMessage(this.getClass(), "ReportVisualPanel2.getName.text");
     }
-    
+
     /**
      * @return the enabled/disabled state of all Artifacts
      */
     Map<ARTIFACT_TYPE, Boolean> getArtifactStates() {
         return artifactStates;
     }
-    
+
     /**
      * @return the enabled/disabled state of all Tags
      */
     Map<String, Boolean> getTagStates() {
         return tagStates;
     }
-    
+
     private boolean areTagsSelected() {
         boolean result = false;
-        for (Entry<String, Boolean> entry: tagStates.entrySet()) {
+        for (Entry<String, Boolean> entry : tagStates.entrySet()) {
             if (entry.getValue()) {
                 result = true;
             }
         }
         return result;
     }
-    
+
     private boolean areArtifactsSelected() {
         boolean result = false;
-        for (Entry<ARTIFACT_TYPE, Boolean> entry: artifactStates.entrySet()) {
+        for (Entry<ARTIFACT_TYPE, Boolean> entry : artifactStates.entrySet()) {
             if (entry.getValue()) {
                 result = true;
             }
         }
         return result;
     }
-    
+
     private void updateFinishButton() {
         if (taggedResultsRadioButton.isSelected()) {
             wizPanel.setFinish(areTagsSelected());
@@ -174,14 +173,14 @@ import org.sleuthkit.datamodel.TskCoreException;
             wizPanel.setFinish(areArtifactsSelected());
         }
     }
-    
+
     /**
      * @return true if the Tags radio button is selected, false otherwise
      */
     boolean isTaggedResultsRadioButtonSelected() {
         return taggedResultsRadioButton.isSelected();
     }
-    
+
     /**
      * This method is called from within the constructor to initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is always
@@ -197,7 +196,7 @@ import org.sleuthkit.datamodel.TskCoreException;
         selectAllButton = new javax.swing.JButton();
         deselectAllButton = new javax.swing.JButton();
         tagsScrollPane = new javax.swing.JScrollPane();
-        tagsList = new javax.swing.JList();
+        tagsList = new javax.swing.JList<>();
         advancedButton = new javax.swing.JButton();
 
         setPreferredSize(new java.awt.Dimension(650, 250));
@@ -314,7 +313,6 @@ import org.sleuthkit.datamodel.TskCoreException;
         artifactStates = dialog.display();
         wizPanel.setFinish(areArtifactsSelected());
     }//GEN-LAST:event_advancedButtonActionPerformed
-
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton advancedButton;
     private javax.swing.JRadioButton allResultsRadioButton;
@@ -323,11 +321,11 @@ import org.sleuthkit.datamodel.TskCoreException;
     private javax.swing.ButtonGroup optionsButtonGroup;
     private javax.swing.JButton selectAllButton;
     private javax.swing.JRadioButton taggedResultsRadioButton;
-    private javax.swing.JList tagsList;
+    private javax.swing.JList<String> tagsList;
     private javax.swing.JScrollPane tagsScrollPane;
     // End of variables declaration//GEN-END:variables
-    
-    private class TagsListModel implements ListModel {
+
+    private class TagsListModel implements ListModel<String> {
 
         @Override
         public int getSize() {
@@ -335,7 +333,7 @@ import org.sleuthkit.datamodel.TskCoreException;
         }
 
         @Override
-        public Object getElementAt(int index) {
+        public String getElementAt(int index) {
             return tags.get(index);
         }
 
@@ -347,12 +345,12 @@ import org.sleuthkit.datamodel.TskCoreException;
         public void removeListDataListener(ListDataListener l) {
         }
     }
-    
+
     // Render the Tags as JCheckboxes
-    private class TagsListRenderer extends JCheckBox implements ListCellRenderer {
+    private class TagsListRenderer extends JCheckBox implements ListCellRenderer<String> {
 
         @Override
-        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+        public Component getListCellRendererComponent(JList<? extends String> list, String value, int index, boolean isSelected, boolean cellHasFocus) {
             if (value != null) {
                 setEnabled(list.isEnabled());
                 setSelected(tagStates.get(value.toString()));
@@ -363,6 +361,6 @@ import org.sleuthkit.datamodel.TskCoreException;
                 return this;
             }
             return new JLabel();
-        }        
+        }
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
index 9a3942b225..af9aeea288 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java
@@ -51,27 +51,30 @@ import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
 @ActionRegistration(displayName = "#CTL_ReportWizardAction", lazy = false)
 @ActionReferences(value = {
     @ActionReference(path = "Menu/Tools", position = 80)})
-@NbBundle.Messages(value = "CTL_ReportWizardAction=Run Report")
+// moved into Bundle
+//@NbBundle.Messages(value = "CTL_ReportWizardAction=Run Report")
 public final class ReportWizardAction  extends CallableSystemAction implements Presenter.Toolbar, ActionListener {
     private static final Logger logger = Logger.getLogger(ReportWizardAction.class.getName());
     
     private JButton toolbarButton = new JButton();
-    private static final String ACTION_NAME = "Generate Report";
+    private static final String ACTION_NAME = NbBundle.getMessage(ReportWizardAction.class, "ReportWizardAction.actionName.text");
 
     /**
      * When the Generate Report button or menu item is selected, open the reporting wizard.
      * When the wizard is finished, create a ReportGenerator with the wizard information,
      * and start all necessary reports.
      */
+    @SuppressWarnings("unchecked")
     public static void doReportWizard() {
         WizardDescriptor wiz = new WizardDescriptor(new ReportWizardIterator());
         wiz.setTitleFormat(new MessageFormat("{0} {1}"));
-        wiz.setTitle("Generate Report");
+        wiz.setTitle(NbBundle.getMessage(ReportWizardAction.class, "ReportWizardAction.reportWiz.title"));
         if (DialogDisplayer.getDefault().notify(wiz) == WizardDescriptor.FINISH_OPTION) {
+            @SuppressWarnings("unchecked")
             ReportGenerator generator = new ReportGenerator((Map<TableReportModule, Boolean>)wiz.getProperty("tableModuleStates"), 
                     (Map<GeneralReportModule, Boolean>)wiz.getProperty("generalModuleStates"),
                     (Map<FileReportModule, Boolean>)wiz.getProperty("fileModuleStates"));
-            generator.generateBlackboardArtifactsReports((Map<ARTIFACT_TYPE, Boolean>)wiz.getProperty("artifactStates"), (Map<String, Boolean>)wiz.getProperty("tagStates"));
+            generator.generateTableReports((Map<ARTIFACT_TYPE, Boolean>)wiz.getProperty("artifactStates"), (Map<String, Boolean>)wiz.getProperty("tagStates"));
             generator.generateFileListReports((Map<FileReportDataTypes, Boolean>)wiz.getProperty("fileReportOptions"));
             generator.generateGeneralReports();
             generator.displayProgressPanels();
@@ -139,7 +142,7 @@ public final class ReportWizardAction  extends CallableSystemAction implements P
     public Component getToolbarPresenter() {
         ImageIcon icon = new ImageIcon(getClass().getResource("images/btn_icon_generate_report.png"));
         toolbarButton.setIcon(icon);
-        toolbarButton.setText("Generate Report");
+        toolbarButton.setText(NbBundle.getMessage(this.getClass(), "ReportWizardAction.toolBarButton.text"));
         return toolbarButton;
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
index ad56a8dcc8..ffa7b56796 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsPanel.java
@@ -24,6 +24,7 @@ import javax.swing.JButton;
 import javax.swing.event.ChangeListener;
 import org.openide.WizardDescriptor;
 import org.openide.util.HelpCtx;
+import org.openide.util.NbBundle;
 
 /**
  * Wizard panel that allows configuration of File Report options.
@@ -36,7 +37,8 @@ import org.openide.util.HelpCtx;
     private JButton finishButton;
     
     ReportWizardFileOptionsPanel() {
-        finishButton = new JButton("Finish");
+        finishButton = new JButton(
+                NbBundle.getMessage(this.getClass(), "ReportWizardFileOptionsPanel.finishButton.text"));
         finishButton.setEnabled(false);
         
         finishButton.addActionListener(new ActionListener() {
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.form b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.form
index d5f6643eef..bc0dedd038 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.form
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.form
@@ -63,16 +63,14 @@
       <SubComponents>
         <Component class="javax.swing.JList" name="optionsList">
           <Properties>
-            <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor">
-              <StringArray count="5">
-                <StringItem index="0" value="Item 1"/>
-                <StringItem index="1" value="Item 2"/>
-                <StringItem index="2" value="Item 3"/>
-                <StringItem index="3" value="Item 4"/>
-                <StringItem index="4" value="Item 5"/>
-              </StringArray>
+            <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+              <Connection code="new javax.swing.AbstractListModel&lt;FileReportDataTypes&gt;() {&#xa;    FileReportDataTypes[] types = { };&#xa;    public int getSize() { return types.length; }&#xa;    public FileReportDataTypes getElementAt(int i) { return types[i]; }&#xa;}" type="code"/>
             </Property>
           </Properties>
+          <AuxValues>
+            <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new javax.swing.JList&lt;&gt;()"/>
+            <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;FileReportDataTypes&gt;"/>
+          </AuxValues>
         </Component>
       </SubComponents>
     </Container>
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java
index 150905f125..413df5aeda 100755
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardFileOptionsVisualPanel.java
@@ -18,6 +18,8 @@
  */
 package org.sleuthkit.autopsy.report;
 
+import org.openide.util.NbBundle;
+
 import java.awt.Component;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -40,7 +42,7 @@ import javax.swing.event.ListDataListener;
 class ReportWizardFileOptionsVisualPanel extends javax.swing.JPanel {
     private List<FileReportDataTypes> options;
     private Map<FileReportDataTypes, Boolean> optionStates = new EnumMap<>(FileReportDataTypes.class);
-    private ListModel model;
+    private ListModel<FileReportDataTypes> model;
     private ReportWizardFileOptionsPanel wizPanel;
     
     
@@ -52,7 +54,7 @@ class ReportWizardFileOptionsVisualPanel extends javax.swing.JPanel {
     
     @Override
     public String getName() {
-        return "Configure File Report";
+        return NbBundle.getMessage(this.getClass(), "ReportWizardFileOptionsVisualPanel.getName.text");
     }
     
     /**
@@ -78,7 +80,7 @@ class ReportWizardFileOptionsVisualPanel extends javax.swing.JPanel {
             public void mousePressed(MouseEvent evt) {
                 JList list = (JList) evt.getSource();
                 int index = list.locationToIndex(evt.getPoint());
-                FileReportDataTypes value = (FileReportDataTypes) model.getElementAt(index);
+                FileReportDataTypes value = model.getElementAt(index);
                 optionStates.put(value, !optionStates.get(value));
                 list.repaint();
                 boolean anySelected = anySelected();
@@ -132,15 +134,15 @@ class ReportWizardFileOptionsVisualPanel extends javax.swing.JPanel {
     private void initComponents() {
 
         jScrollPane1 = new javax.swing.JScrollPane();
-        optionsList = new javax.swing.JList();
+        optionsList = new javax.swing.JList<>();
         selectAllButton = new javax.swing.JButton();
         deselectAllButton = new javax.swing.JButton();
         jLabel1 = new javax.swing.JLabel();
 
-        optionsList.setModel(new javax.swing.AbstractListModel() {
-            String[] strings = { "Item 1", "Item 2", "Item 3", "Item 4", "Item 5" };
-            public int getSize() { return strings.length; }
-            public Object getElementAt(int i) { return strings[i]; }
+        optionsList.setModel(new javax.swing.AbstractListModel<FileReportDataTypes>() {
+            FileReportDataTypes[] types = { };
+            public int getSize() { return types.length; }
+            public FileReportDataTypes getElementAt(int i) { return types[i]; }
         });
         jScrollPane1.setViewportView(optionsList);
 
@@ -217,11 +219,11 @@ class ReportWizardFileOptionsVisualPanel extends javax.swing.JPanel {
     private javax.swing.JButton deselectAllButton;
     private javax.swing.JLabel jLabel1;
     private javax.swing.JScrollPane jScrollPane1;
-    private javax.swing.JList optionsList;
+    private javax.swing.JList<FileReportDataTypes> optionsList;
     private javax.swing.JButton selectAllButton;
     // End of variables declaration//GEN-END:variables
 
-    private class OptionsListModel implements ListModel {
+    private class OptionsListModel implements ListModel<FileReportDataTypes> {
 
         @Override
         public int getSize() {
@@ -229,7 +231,7 @@ class ReportWizardFileOptionsVisualPanel extends javax.swing.JPanel {
         }
 
         @Override
-        public Object getElementAt(int index) {
+        public FileReportDataTypes getElementAt(int index) {
             return options.get(index);
         }
 
@@ -245,12 +247,12 @@ class ReportWizardFileOptionsVisualPanel extends javax.swing.JPanel {
     /**
      * Render each item in the list to be a selectable check box.
      */
-    private class OptionsListRenderer extends JCheckBox implements ListCellRenderer {
+    private class OptionsListRenderer extends JCheckBox implements ListCellRenderer<FileReportDataTypes> {
 
         @Override
-        public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+        public Component getListCellRendererComponent(JList<? extends FileReportDataTypes> list, FileReportDataTypes value, int index, boolean isSelected, boolean cellHasFocus) {
             if (value != null) {
-                FileReportDataTypes col = (FileReportDataTypes) value;
+                FileReportDataTypes col = value;
                 setEnabled(list.isEnabled());
                 setSelected(optionStates.get(col));
                 setFont(list.getFont());
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
index cfec65ba81..29df382148 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardIterator.java
@@ -49,6 +49,7 @@ import org.openide.util.NbPreferences;
     private WizardDescriptor.Panel<WizardDescriptor>[] fileConfigPanels;
     private String[] fileConfigIndex;
     
+    @SuppressWarnings({"rawtypes", "unchecked"})
     ReportWizardIterator() {
         firstPanel = new ReportWizardPanel1();
         tableConfigPanel = new ReportWizardPanel2();
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
index 576bfbdd7d..abac0b9969 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel1.java
@@ -27,6 +27,7 @@ import javax.swing.JButton;
 import javax.swing.event.ChangeListener;
 import org.openide.WizardDescriptor;
 import org.openide.util.HelpCtx;
+import org.openide.util.NbBundle;
 import org.openide.util.NbPreferences;
 
  class ReportWizardPanel1 implements WizardDescriptor.FinishablePanel<WizardDescriptor> {
@@ -36,8 +37,8 @@ import org.openide.util.NbPreferences;
     private JButton finishButton;
     
     ReportWizardPanel1() {
-        nextButton = new JButton("Next >");
-        finishButton = new JButton("Finish");
+        nextButton = new JButton(NbBundle.getMessage(this.getClass(), "ReportWizardPanel1.nextButton.text"));
+        finishButton = new JButton(NbBundle.getMessage(this.getClass(), "ReportWizardPanel1.finishButton.text"));
         finishButton.setEnabled(false);
         
         // Initialize our custom next and finish buttons
diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
index fec8e3c5a2..767b9266bd 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardPanel2.java
@@ -24,6 +24,7 @@ import javax.swing.JButton;
 import javax.swing.event.ChangeListener;
 import org.openide.WizardDescriptor;
 import org.openide.util.HelpCtx;
+import org.openide.util.NbBundle;
 import org.openide.util.NbPreferences;
 
  class ReportWizardPanel2 implements WizardDescriptor.Panel<WizardDescriptor> {
@@ -33,9 +34,9 @@ import org.openide.util.NbPreferences;
     private WizardDescriptor wiz;
     
     ReportWizardPanel2() {
-        finishButton = new JButton("Finish");
+        finishButton = new JButton(NbBundle.getMessage(this.getClass(), "ReportWizardPanel2.finishButton.text"));
         
-        nextButton = new JButton("Next >");
+        nextButton = new JButton(NbBundle.getMessage(this.getClass(), "ReportWizardPanel2.nextButton.text"));
         nextButton.setEnabled(true);
         
         nextButton.addActionListener(new ActionListener() {
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index 102da52f87..9fbf15e50c 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -5,7 +5,16 @@
         <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
             <code-name-base>org.sleuthkit.autopsy.corelibs</code-name-base>
             <suite-component/>
-            <module-dependencies/>
+            <module-dependencies>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>8.25.1</specification-version>
+                    </run-dependency>
+                </dependency>
+            </module-dependencies>
             <test-dependencies>
                 <test-type>
                     <name>unit</name>
diff --git a/CoreLibs/src/org/sleuthkit/autopsy/corelibs/Bundle.properties b/CoreLibs/src/org/sleuthkit/autopsy/corelibs/Bundle.properties
index 7290d81803..c38a3ae87a 100644
--- a/CoreLibs/src/org/sleuthkit/autopsy/corelibs/Bundle.properties
+++ b/CoreLibs/src/org/sleuthkit/autopsy/corelibs/Bundle.properties
@@ -4,3 +4,4 @@ OpenIDE-Module-Long-Description=\
     The libraries can also be imported by other modules.
 OpenIDE-Module-Name=Autopsy-CoreLibs
 OpenIDE-Module-Short-Description=Autopsy Core module external libraries
+SigarLoader.linkErr.msg=Could not load sigar library for your environment (non-critical), OS-level metrics will be unavailable.
diff --git a/CoreLibs/src/org/sleuthkit/autopsy/corelibs/Bundle_ja.properties b/CoreLibs/src/org/sleuthkit/autopsy/corelibs/Bundle_ja.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/CoreLibs/src/org/sleuthkit/autopsy/corelibs/SigarLoader.java b/CoreLibs/src/org/sleuthkit/autopsy/corelibs/SigarLoader.java
index f0f0859478..8c2878bf16 100644
--- a/CoreLibs/src/org/sleuthkit/autopsy/corelibs/SigarLoader.java
+++ b/CoreLibs/src/org/sleuthkit/autopsy/corelibs/SigarLoader.java
@@ -20,6 +20,7 @@ package org.sleuthkit.autopsy.corelibs;
 
 import com.sun.javafx.PlatformUtil;
 import org.hyperic.sigar.Sigar;
+import org.openide.util.NbBundle;
 
 /**
  * Wrapper over Sigar instrumentation class to facilitate dll loading. Our setup
@@ -51,10 +52,10 @@ public class SigarLoader {
                         sigar.enableLogging(false); //forces a test
 
                     } catch (UnsatisfiedLinkError ex) {
-                        String msg = "Could not load sigar library for your environment (non-critical), OS-level metrics will be unavailable. ";
+                        String msg = NbBundle.getMessage(SigarLoader.class, "SigarLoader.linkErr.msg");
                         System.out.println(msg + ex.toString());
                     } catch (Exception ex) {
-                        String msg = "Could not load sigar library for your environment (non-critical), OS-level metrics will be unavailable. ";
+                        String msg = NbBundle.getMessage(SigarLoader.class, "SigarLoader.linkErr.msg");
                         System.out.println(msg + ex.toString());
                     }
                 }
diff --git a/ExifParser/manifest.mf b/ExifParser/manifest.mf
index 44ad288f51..40668bc3a3 100644
--- a/ExifParser/manifest.mf
+++ b/ExifParser/manifest.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.sleuthkit.autopsy.exifparser/3
-OpenIDE-Module-Implementation-Version: 9
+OpenIDE-Module-Implementation-Version: 10
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/exifparser/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/exifparser/Bundle.properties
diff --git a/ExifParser/nbproject/project.xml b/ExifParser/nbproject/project.xml
index da91e0b898..f9d480830f 100644
--- a/ExifParser/nbproject/project.xml
+++ b/ExifParser/nbproject/project.xml
@@ -6,13 +6,21 @@
             <code-name-base>org.sleuthkit.autopsy.exifparser</code-name-base>
             <suite-component/>
             <module-dependencies>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>8.25.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>9</release-version>
-                        <specification-version>7.0</specification-version>
+                        <specification-version>7.1</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>
diff --git a/ExifParser/src/org/sleuthkit/autopsy/exifparser/Bundle.properties b/ExifParser/src/org/sleuthkit/autopsy/exifparser/Bundle.properties
index 83fe8aeb9d..663a0631ec 100644
--- a/ExifParser/src/org/sleuthkit/autopsy/exifparser/Bundle.properties
+++ b/ExifParser/src/org/sleuthkit/autopsy/exifparser/Bundle.properties
@@ -4,3 +4,6 @@ OpenIDE-Module-Long-Description=\
     The ingest module analyzes image files, extracts Exif information and posts the Exif data as results.
 OpenIDE-Module-Name=ExifParser
 OpenIDE-Module-Short-Description=Exif metadata ingest module
+ExifParserFileIngestModule.moduleName.text=Exif Parser
+ExifParserFileIngestModule.getName.text=Exif Image Parser
+ExifParserFileIngestModule.getDesc.text=Ingests JPEG files and retrieves their EXIF metadata.
diff --git a/ExifParser/src/org/sleuthkit/autopsy/exifparser/Bundle_ja.properties b/ExifParser/src/org/sleuthkit/autopsy/exifparser/Bundle_ja.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserFileIngestModule.java b/ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserFileIngestModule.java
index 5d21b71e3b..8f5ddccf5f 100644
--- a/ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserFileIngestModule.java
+++ b/ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserFileIngestModule.java
@@ -33,6 +33,8 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.ImageUtils;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.Version;
@@ -58,7 +60,8 @@ import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM;
 public final class ExifParserFileIngestModule extends IngestModuleAbstractFile {
 
     private IngestServices services;
-    final public static String MODULE_NAME = "Exif Parser";
+    final public static String MODULE_NAME = NbBundle.getMessage(ExifParserFileIngestModule.class,
+                                                                 "ExifParserFileIngestModule.moduleName.text");
     final public static String MODULE_VERSION = Version.getVersion();
     private static final Logger logger = Logger.getLogger(ExifParserFileIngestModule.class.getName());
     private static ExifParserFileIngestModule defaultInstance = null;
@@ -217,12 +220,12 @@ public final class ExifParserFileIngestModule extends IngestModuleAbstractFile {
 
     @Override
     public String getName() {
-        return "Exif Image Parser";
+        return NbBundle.getMessage(this.getClass(), "ExifParserFileIngestModule.getName.text");
     }
 
     @Override
     public String getDescription() {
-        return "Ingests JPEG files and retrieves their EXIF metadata.";
+        return NbBundle.getMessage(this.getClass(), "ExifParserFileIngestModule.getDesc.text");
     }
 
     @Override
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/AddFileExtensionAction.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/AddFileExtensionAction.java
index a2a9f12747..728d8993cb 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/AddFileExtensionAction.java
+++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/AddFileExtensionAction.java
@@ -20,6 +20,8 @@
 
 package org.sleuthkit.autopsy.fileextmismatch;
 
+import org.openide.util.NbBundle;
+
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -52,7 +54,10 @@ class AddFileExtensionAction extends AbstractAction {
         
         if (!FileExtMismatchXML.getDefault().save(editableMap)) {            
             //error
-            JOptionPane.showMessageDialog(null, "Writing XML configuration file failed.", "Add Mismatch Extension Error", JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null,
+                                          NbBundle.getMessage(this.getClass(), "AddFileExtensionAction.msgDlg.msg"),
+                                          NbBundle.getMessage(this.getClass(), "AddFileExtensionAction.msgDlg.title"),
+                                          JOptionPane.ERROR_MESSAGE);
         } // else //in the future we might want to update the statusbar to give feedback to the user
         
     }      
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle.properties b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle.properties
index f6f7b42ae8..9e235f5f04 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle.properties
+++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle.properties
@@ -1,4 +1,6 @@
 OpenIDE-Module-Name=FileExtMismatch
+OptionsCategory_Name_FileExtMismatchOptions=File Extension Mismatch
+OptionsCategory_FileExtMismatch=File Extension Mismatch
 FileExtMismatchConfigPanel.extHeaderLabel.text=Allowed Extensions:
 FileExtMismatchConfigPanel.userExtTextField.text=
 FileExtMismatchConfigPanel.addExtButton.text=Add Extension
@@ -15,3 +17,36 @@ FileExtMismatchConfigPanel.extRemoveErrLabel.text=\
 FileExtMismatchConfigPanel.saveMsgLabel.text=\ 
 FileExtMismatchSimpleConfigPanel.skipNoExtCheckBox.text=Skip files without extensions
 FileExtMismatchSimpleConfigPanel.skipTextPlain.text=Skip text files
+AddFileExtensionAction.msgDlg.msg=Writing XML configuration file failed.
+AddFileExtensionAction.msgDlg.title=Add Mismatch Extension Error
+AddFileExtensionAction.extHeaderLbl.text=Allowed Extensions for
+FileExtMismatchConfigPanel.name.text=Advanced File Extension Mismatch Configuration
+FileExtMismatchConfigPanel.addExtButton.errLabel.empty=Extension text is empty\!
+FileExtMismatchConfigPanel.addExtButton.errLabel.noMimeType=No MIME type selected\!
+FileExtMismatchConfigPanel.addExtButton.errLabel.extExists=Extension already exists\!
+FileExtMismatchConfigPanel.addExtButton.errLabel.extAdded=Extension {0} added.
+FileExtMismatchConfigPanel.addTypeButton.empty=MIME type text is empty\!
+FileExtMismatchConfigPanel.addTypeButton.mimeTypeNotSupported=MIME type not supported\!
+FileExtMismatchConfigPanel.addTypeButton.mimeTypeExists=MIME type already exists\!
+FileExtMismatchConfigPanel.addTypeButton.mimeTypeNotDetectable=MIME type is not detectable by this module.
+FileExtMismatchConfigPanel.addTypeButton.mimeTypeAdded=MIME type {0} added.
+FileExtMismatchConfigPanel.removeTypeButton.noneSelected=No MIME type selected\!
+FileExtMismatchConfigPanel.remoteTypeButton.deleted=MIME type {0} deleted.
+FileExtMismatchConfigPanel.removeExtButton.noneSelected=No extension selected\!
+FileExtMismatchConfigPanel.removeExtButton.noMimeTypeSelected=No MIME type selected\!
+FileExtMismatchConfigPanel.removeExtButton.deleted=Extension {0} deleted.
+FileExtMismatchConfigPanel.store.msg=Saved.
+FileExtMismatchConfigPanel.store.msgDlg.msg=Writing XML configuration file failed.
+FileExtMismatchConfigPanel.save.msgDlg.title=Save Error
+FileExtMismatchConfigPanel.ok.confDlg.msg=Would you like to save configuration changes?
+FileExtMismatchConfigPanel.confDlg.title=Unsaved Changes
+FileExtMismatchConfigPanel.mimeTableModel.colName=MIME Type
+FileExtMismatchConfigPanel.extTableModel.colName=Extension
+FileExtMismatchContextMenuActionsProvider.menuItemStr=Add extension {0} as matching MIME type {1}
+FileExtMismatchIngestModule.moduleName=Extension Mismatch Detector
+FileExtMismatchIngestModule.moduleDesc.text=Flags files that have a non-standard extension based on their file type.
+FileExtMismatchIngestModule.complete.totalProcTime=Total Processing Time
+FileExtMismatchIngestModule.complete.totalFiles=Total Files Processed
+FileExtMismatchIngestModule.complete.svcMsg.text=File Extension Mismatch Results
+FileExtMismatchOptionsPanelController.moduleErr=Module Error
+FileExtMismatchOptionsPanelController.moduleErr.msg=A module caused an error listening to FileExtMismatchOptionsPanelController updates. See log to determine which module. Some data could be incomplete.
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle_ja.properties b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/Bundle_ja.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchConfigPanel.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchConfigPanel.java
index 4a027b6ba2..77fb8f1bb6 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchConfigPanel.java
+++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchConfigPanel.java
@@ -30,6 +30,8 @@ import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.AbstractTableModel;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.corecomponents.OptionsPanel;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.filetypeid.FileTypeIdIngestModule;
@@ -44,7 +46,8 @@ final class FileExtMismatchConfigPanel extends javax.swing.JPanel implements Opt
     private ArrayList<String> currentExtensions = null;
     private MimeTableModel mimeTableModel;
     private ExtTableModel extTableModel;
-    private final String EXT_HEADER_LABEL = "Allowed Extensions for ";
+    private final String EXT_HEADER_LABEL = NbBundle.getMessage(FileExtMismatchConfigPanel.class,
+                                                                "AddFileExtensionAction.extHeaderLbl.text");
     private String selectedMime = "";
     private String selectedExt = "";
     ListSelectionModel lsm = null;
@@ -58,7 +61,7 @@ final class FileExtMismatchConfigPanel extends javax.swing.JPanel implements Opt
     }
     
     private void customizeComponents() {
-        setName("Advanced File Extension Mismatch Configuration");  
+        setName(NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.name.text"));
                
         // Handle selections on the left table
         lsm = mimeTable.getSelectionModel();
@@ -347,19 +350,22 @@ final class FileExtMismatchConfigPanel extends javax.swing.JPanel implements Opt
         String newExt = userExtTextField.getText();
         if (newExt.isEmpty()) {
             extErrorLabel.setForeground(Color.red);            
-            extErrorLabel.setText("Extension text is empty!");
+            extErrorLabel.setText(
+                    NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.addExtButton.errLabel.empty"));
             return;
         }
         
         if (selectedMime.isEmpty()) {
             extErrorLabel.setForeground(Color.red);  
-            extErrorLabel.setText("No MIME type selected!");
+            extErrorLabel.setText(
+                    NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.addExtButton.errLabel.noMimeType"));
             return;
         }
         
         if (currentExtensions.contains(newExt)) {
             extErrorLabel.setForeground(Color.red);
-            extErrorLabel.setText("Extension already exists!");
+            extErrorLabel.setText(
+                    NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.addExtButton.errLabel.extExists"));
             return;            
         }                
         
@@ -375,7 +381,9 @@ final class FileExtMismatchConfigPanel extends javax.swing.JPanel implements Opt
         
         // user feedback for successful add
         extErrorLabel.setForeground(Color.blue);
-        extErrorLabel.setText("Extension " + newExt + " added.");  
+        extErrorLabel.setText(
+                NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.addExtButton.errLabel.extAdded",
+                                    newExt));
         extRemoveErrLabel.setText(" ");
         userExtTextField.setText("");
         setIsModified();
@@ -389,23 +397,26 @@ final class FileExtMismatchConfigPanel extends javax.swing.JPanel implements Opt
         String newMime = userTypeTextField.getText();
         if (newMime.isEmpty()) {
             mimeErrLabel.setForeground(Color.red);
-            mimeErrLabel.setText("MIME type text is empty!");
+            mimeErrLabel.setText(NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.addTypeButton.empty"));
             return;
         }
         if (newMime.equals( "application/octet-stream")){
             mimeErrLabel.setForeground(Color.red);
-            mimeErrLabel.setText("MIME type not supported!");
+            mimeErrLabel.setText(NbBundle.getMessage(this.getClass(),
+                                                     "FileExtMismatchConfigPanel.addTypeButton.mimeTypeNotSupported"));
             return;   
         }
         if (mimeList.contains(newMime)) {
             mimeErrLabel.setForeground(Color.red);
-            mimeErrLabel.setText("MIME type already exists!");
+            mimeErrLabel.setText(
+                    NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.addTypeButton.mimeTypeExists"));
             return;            
         }
         
         if (!FileTypeIdIngestModule.isMimeTypeDetectable(newMime)) {
             mimeErrLabel.setForeground(Color.red);
-            mimeErrLabel.setText("MIME type is not detectable by this module.");
+            mimeErrLabel.setText(NbBundle.getMessage(this.getClass(),
+                                                     "FileExtMismatchConfigPanel.addTypeButton.mimeTypeNotDetectable"));
             return;                        
         }
         
@@ -418,7 +429,8 @@ final class FileExtMismatchConfigPanel extends javax.swing.JPanel implements Opt
         // user feedback for successful add
         //selectByMimeString(newMime);
         mimeErrLabel.setForeground(Color.blue);
-        mimeErrLabel.setText("MIME type " + newMime + " added.");
+        mimeErrLabel.setText(
+                NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.addTypeButton.mimeTypeAdded", newMime));
         mimeRemoveErrLabel.setText(" ");
         userTypeTextField.setText("");
         setIsModified();
@@ -435,7 +447,8 @@ final class FileExtMismatchConfigPanel extends javax.swing.JPanel implements Opt
     private void removeTypeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeTypeButtonActionPerformed
         if (selectedMime.isEmpty()) {
             mimeRemoveErrLabel.setForeground(Color.red);
-            mimeRemoveErrLabel.setText("No MIME type selected!");
+            mimeRemoveErrLabel.setText(
+                    NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.removeTypeButton.noneSelected"));
             return;
         }        
         
@@ -448,20 +461,23 @@ final class FileExtMismatchConfigPanel extends javax.swing.JPanel implements Opt
                 
         // user feedback for successful add
         mimeRemoveErrLabel.setForeground(Color.blue);
-        mimeRemoveErrLabel.setText("MIME type " + deadMime + " deleted.");        
+        mimeRemoveErrLabel.setText(
+                NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.remoteTypeButton.deleted", deadMime));
         setIsModified();
     }//GEN-LAST:event_removeTypeButtonActionPerformed
 
     private void removeExtButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeExtButtonActionPerformed
         if (selectedExt.isEmpty()) {
             extRemoveErrLabel.setForeground(Color.red);
-            extRemoveErrLabel.setText("No extension selected!");
+            extRemoveErrLabel.setText(
+                    NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.removeExtButton.noneSelected"));
             return;
         }        
              
         if (selectedMime.isEmpty()) {
             extErrorLabel.setForeground(Color.red);  
-            extErrorLabel.setText("No MIME type selected!");
+            extErrorLabel.setText(NbBundle.getMessage(this.getClass(),
+                                                      "FileExtMismatchConfigPanel.removeExtButton.noMimeTypeSelected"));
             return;
         }        
         
@@ -478,7 +494,8 @@ final class FileExtMismatchConfigPanel extends javax.swing.JPanel implements Opt
         
         // user feedback for successful add
         extRemoveErrLabel.setForeground(Color.blue);
-        extRemoveErrLabel.setText("Extension " + deadExt + " deleted.");        
+        extRemoveErrLabel.setText(
+                NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.removeExtButton.deleted", deadExt));
         setIsModified();
     }//GEN-LAST:event_removeExtButtonActionPerformed
 
@@ -518,11 +535,16 @@ final class FileExtMismatchConfigPanel extends javax.swing.JPanel implements Opt
             extRemoveErrLabel.setText(" ");
             extErrorLabel.setText(" ");
             
-            saveMsgLabel.setText("Saved.");
+            saveMsgLabel.setText(NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.store.msg"));
             saveButton.setEnabled(false);
         } else {
             //error
-            JOptionPane.showMessageDialog(this, "Writing XML configuration file failed.", "Save Error", JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(this,
+                                          NbBundle.getMessage(this.getClass(),
+                                                              "FileExtMismatchConfigPanel.store.msgDlg.msg"),
+                                          NbBundle.getMessage(this.getClass(),
+                                                              "FileExtMismatchConfigPanel.save.msgDlg.title"),
+                                          JOptionPane.ERROR_MESSAGE);
         }
     }
 
@@ -539,7 +561,12 @@ final class FileExtMismatchConfigPanel extends javax.swing.JPanel implements Opt
     public void ok() {
         // if data is unsaved
         if (saveButton.isEnabled()) {
-           int choice = JOptionPane.showConfirmDialog(this, "Would you like to save configuration changes?", "Unsaved Changes", JOptionPane.YES_NO_OPTION);
+           int choice = JOptionPane.showConfirmDialog(this,
+                                                      NbBundle.getMessage(this.getClass(),
+                                                                          "FileExtMismatchConfigPanel.ok.confDlg.msg"),
+                                                      NbBundle.getMessage(this.getClass(),
+                                                                          "FileExtMismatchConfigPanel.confDlg.title"),
+                                                      JOptionPane.YES_NO_OPTION);
            if (choice == JOptionPane.YES_OPTION) {
                store();
            }
@@ -594,7 +621,7 @@ final class FileExtMismatchConfigPanel extends javax.swing.JPanel implements Opt
 
             switch (column) {
                 case 0:
-                    colName = "MIME Type";
+                    colName = NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.mimeTableModel.colName");
                     break;
                 default:
                     ;
@@ -658,7 +685,7 @@ final class FileExtMismatchConfigPanel extends javax.swing.JPanel implements Opt
 
             switch (column) {
                 case 0:
-                    colName = "Extension";
+                    colName = NbBundle.getMessage(this.getClass(), "FileExtMismatchConfigPanel.extTableModel.colName");
                     break;
                 default:
                     ;
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchContextMenuActionsProvider.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchContextMenuActionsProvider.java
index 2d6b871321..a6e422472f 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchContextMenuActionsProvider.java
+++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchContextMenuActionsProvider.java
@@ -29,6 +29,7 @@ import java.util.logging.Level;
 import javax.swing.Action;
 import org.openide.util.Exceptions;
 import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
 import org.openide.util.Utilities;
 import org.openide.util.lookup.ServiceProvider;
 import org.sleuthkit.autopsy.corecomponentinterfaces.ContextMenuActionsProvider;
@@ -104,7 +105,9 @@ public class FileExtMismatchContextMenuActionsProvider implements ContextMenuAct
                                 if (mimeTypeStr.length() > 40) {
                                     mimeTypeStr = mimeTypeStr.substring(0, 39);
                                 }                            
-                                String menuItemStr = "Add extension " + extStr + " as matching MIME type " + mimeTypeStr;                    
+                                String menuItemStr = NbBundle.getMessage(this.getClass(),
+                                                                         "FileExtMismatchContextMenuActionsProvider.menuItemStr",
+                                                                         extStr, mimeTypeStr);
                                 actions.add(new AddFileExtensionAction(menuItemStr, extStr, mimeTypeStr));
 
                                 // Check if already added
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java
index ce8e530d29..6243d80530 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java
+++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java
@@ -27,6 +27,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.logging.Level;
 import org.openide.util.Exceptions;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.Version;
 import org.sleuthkit.autopsy.ingest.IngestMessage;
@@ -50,14 +51,15 @@ import org.sleuthkit.datamodel.TskException;
 public class FileExtMismatchIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile {
     private static FileExtMismatchIngestModule defaultInstance = null;
     private static final Logger logger = Logger.getLogger(FileExtMismatchIngestModule.class.getName());   
-    public static final String MODULE_NAME = "Extension Mismatch Detector";
-    public static final String MODULE_DESCRIPTION = "Flags files that have a non-standard extension based on their file type.";
+    public static final String MODULE_NAME = NbBundle.getMessage(FileExtMismatchIngestModule.class,
+                                                                 "FileExtMismatchIngestModule.moduleName");
+    public static final String MODULE_DESCRIPTION = NbBundle.getMessage(FileExtMismatchIngestModule.class,
+                                                                        "FileExtMismatchIngestModule.moduleDesc.text");
     public static final String MODULE_VERSION = Version.getVersion();    
 
     private static long processTime = 0;
     private static int messageId = 0;
     private static long numFiles = 0;
-    private static boolean skipKnown = false;
     private static boolean skipNoExt = true;
     private static boolean skipTextPlain = false;  
      
@@ -106,7 +108,7 @@ public class FileExtMismatchIngestModule extends org.sleuthkit.autopsy.ingest.In
             return ProcessResult.OK;
         }
 
-        if (skipKnown && (abstractFile.getKnown() == FileKnown.KNOWN)) {
+        if (abstractFile.getKnown() == FileKnown.KNOWN) {
             return ProcessResult.OK;
         }
         
@@ -188,11 +190,18 @@ public class FileExtMismatchIngestModule extends org.sleuthkit.autopsy.ingest.In
 
         detailsSb.append("<tr><td>"+MODULE_DESCRIPTION+"</td></tr>");
 
-        detailsSb.append("<tr><td>Total Processing Time</td><td>").append(processTime).append("</td></tr>\n");
-        detailsSb.append("<tr><td>Total Files Processed</td><td>").append(numFiles).append("</td></tr>\n");
+        detailsSb.append("<tr><td>").append(
+                NbBundle.getMessage(this.getClass(), "FileExtMismatchIngestModule.complete.totalProcTime"))
+                 .append("</td><td>").append(processTime).append("</td></tr>\n");
+        detailsSb.append("<tr><td>").append(
+                NbBundle.getMessage(this.getClass(), "FileExtMismatchIngestModule.complete.totalFiles"))
+                 .append("</td><td>").append(numFiles).append("</td></tr>\n");
         detailsSb.append("</table>");
 
-        services.postMessage(IngestMessage.createMessage(++messageId, IngestMessage.MessageType.INFO, this, "File Extension Mismatch Results", detailsSb.toString()));
+        services.postMessage(IngestMessage.createMessage(++messageId, IngestMessage.MessageType.INFO, this,
+                                                         NbBundle.getMessage(this.getClass(),
+                                                                             "FileExtMismatchIngestModule.complete.svcMsg.text"),
+                                                         detailsSb.toString()));
     }
 
     @Override
@@ -257,10 +266,6 @@ public class FileExtMismatchIngestModule extends org.sleuthkit.autopsy.ingest.In
         // we're single threaded...
         return false;
     }
-    
-    public static void setSkipKnown(boolean flag) {
-        skipKnown = flag;
-    }
 
     public static void setSkipNoExt(boolean flag) {
         skipNoExt = flag;
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchOptionsPanelController.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchOptionsPanelController.java
index 453d6a89eb..670d6040e5 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchOptionsPanelController.java
+++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchOptionsPanelController.java
@@ -10,6 +10,7 @@ import javax.swing.JComponent;
 import org.netbeans.spi.options.OptionsPanelController;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -20,7 +21,8 @@ iconBase = "org/sleuthkit/autopsy/fileextmismatch/options-icon.png",
 position = 4,
 keywords = "#OptionsCategory_FileExtMismatch",
 keywordsCategory = "KeywordSearchOptions")
-@org.openide.util.NbBundle.Messages({"OptionsCategory_Name_FileExtMismatchOptions=File Ext Mismatch", "OptionsCategory_FileExtMismatch=File Ext Mismatch"})
+// migrated to Bundle
+//@org.openide.util.NbBundle.Messages({"OptionsCategory_Name_FileExtMismatchOptions=File Ext Mismatch", "OptionsCategory_FileExtMismatch=File Ext Mismatch"})
 public final class FileExtMismatchOptionsPanelController extends OptionsPanelController {
 
     private FileExtMismatchConfigPanel panel;
@@ -91,7 +93,10 @@ public final class FileExtMismatchOptionsPanelController extends OptionsPanelCon
             }
             catch (Exception e) {
                 logger.log(Level.SEVERE, "FileExtMismatchOptionsPanelController listener threw exception", e);
-                MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to FileExtMismatchOptionsPanelController updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                MessageNotifyUtil.Notify.show(
+                        NbBundle.getMessage(this.getClass(), "FileExtMismatchOptionsPanelController.moduleErr"),
+                        NbBundle.getMessage(this.getClass(), "FileExtMismatchOptionsPanelController.moduleErr.msg"),
+                        MessageNotifyUtil.MessageType.ERROR);
             }
         }
         
@@ -100,7 +105,10 @@ public final class FileExtMismatchOptionsPanelController extends OptionsPanelCon
             }
             catch (Exception e) {
                 logger.log(Level.SEVERE, "FileExtMismatchOptionsPanelController listener threw exception", e);
-                MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to FileExtMismatchOptionsPanelController updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                MessageNotifyUtil.Notify.show(
+                        NbBundle.getMessage(this.getClass(), "FileExtMismatchOptionsPanelController.moduleErr"),
+                        NbBundle.getMessage(this.getClass(), "FileExtMismatchOptionsPanelController.moduleErr.msg"),
+                        MessageNotifyUtil.MessageType.ERROR);
             }
     }
 }
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.form b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.form
index 507dc635ba..ac705a68f9 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.form
+++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.form
@@ -58,6 +58,9 @@
       <Events>
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="skipTextPlainActionPerformed"/>
       </Events>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_InitCodePost" type="java.lang.String" value="skipTextPlain.setSelected(true);"/>
+      </AuxValues>
     </Component>
   </SubComponents>
 </Form>
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java
index ff0b7faa60..13068908ba 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java
+++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchSimpleConfigPanel.java
@@ -55,6 +55,7 @@ class FileExtMismatchSimpleConfigPanel extends javax.swing.JPanel {
         });
 
         skipTextPlain.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchSimpleConfigPanel.class, "FileExtMismatchSimpleConfigPanel.skipTextPlain.text")); // NOI18N
+        skipTextPlain.setSelected(true);
         skipTextPlain.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 skipTextPlainActionPerformed(evt);
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java
index a5cdb368e7..b93708308c 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java
+++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java
@@ -120,7 +120,7 @@ class FileExtMismatchXML {
                         Element extEl = (Element)extNList.item(extIndex);
                         extStrings.add(extEl.getTextContent());
                     }
-                    String[] sarray = (String[])extStrings.toArray(new String[0]);
+                    String[] sarray = extStrings.toArray(new String[0]);
                     sigTypeToExtMap.put(mimetype, sarray);
                 } else {
                     sigTypeToExtMap.put(mimetype, null); //ok to have an empty type (the ingest module will not use it)
diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/Bundle.properties b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/Bundle.properties
index 1e7e776d5e..9aa6bb3854 100644
--- a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/Bundle.properties
+++ b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/Bundle.properties
@@ -1,3 +1,8 @@
 OpenIDE-Module-Name=FileTypeId
 FileTypeIdSimpleConfigPanel.skipKnownCheckBox.toolTipText=Depending on how many files have known hashes, checking this box will improve the speed of file type identification.
 FileTypeIdSimpleConfigPanel.skipKnownCheckBox.text=Skip Known Files (NSRL)
+FileTypeIdIngestModule.moduleName.text=File Type Identification
+FileTypeIdIngestModule.moduleDesc.text=Matches file types based on binary signatures.
+FileTypeIdIngestModule.complete.totalProcTime=Total Processing Time
+FileTypeIdIngestModule.complete.totalFiles=Total Files Processed
+FileTypeIdIngestModule.complete.srvMsg.text=File Type Id Results
\ No newline at end of file
diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/Bundle_ja.properties b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/Bundle_ja.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdIngestModule.java b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdIngestModule.java
index a32a7ba109..8be05e8bfe 100644
--- a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdIngestModule.java
+++ b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdIngestModule.java
@@ -20,6 +20,8 @@
 package org.sleuthkit.autopsy.filetypeid;
 
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.Version;
 import org.sleuthkit.autopsy.ingest.IngestMessage;
@@ -41,8 +43,10 @@ import org.sleuthkit.datamodel.TskException;
  */
  public class FileTypeIdIngestModule extends org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile {
     private static FileTypeIdIngestModule defaultInstance = null;
-    public final static String MODULE_NAME = "File Type Identification";
-    public final static String MODULE_DESCRIPTION = "Matches file types based on binary signatures.";
+    public final static String MODULE_NAME = NbBundle.getMessage(FileTypeIdIngestModule.class,
+                                                                 "FileTypeIdIngestModule.moduleName.text");
+    public final static String MODULE_DESCRIPTION = NbBundle.getMessage(FileTypeIdIngestModule.class,
+                                                                        "FileTypeIdIngestModule.moduleDesc.text");
     public final static String MODULE_VERSION = Version.getVersion();    
     private static final Logger logger = Logger.getLogger(FileTypeIdIngestModule.class.getName());
     private static long matchTime = 0;
@@ -132,11 +136,18 @@ import org.sleuthkit.datamodel.TskException;
 
         detailsSb.append("<tr><td>"+MODULE_DESCRIPTION+"</td></tr>");
 
-        detailsSb.append("<tr><td>Total Processing Time</td><td>").append(matchTime).append("</td></tr>\n");
-        detailsSb.append("<tr><td>Total Files Processed</td><td>").append(numFiles).append("</td></tr>\n");
+        detailsSb.append("<tr><td>")
+                 .append(NbBundle.getMessage(this.getClass(), "FileTypeIdIngestModule.complete.totalProcTime"))
+                 .append("</td><td>").append(matchTime).append("</td></tr>\n");
+        detailsSb.append("<tr><td>")
+                 .append(NbBundle.getMessage(this.getClass(), "FileTypeIdIngestModule.complete.totalFiles"))
+                 .append("</td><td>").append(numFiles).append("</td></tr>\n");
         detailsSb.append("</table>");
 
-        services.postMessage(IngestMessage.createMessage(++messageId, IngestMessage.MessageType.INFO, this, "File Type Id Results", detailsSb.toString()));
+        services.postMessage(IngestMessage.createMessage(++messageId, IngestMessage.MessageType.INFO, this,
+                                                         NbBundle.getMessage(this.getClass(),
+                                                                             "FileTypeIdIngestModule.complete.srvMsg.text"),
+                                                         detailsSb.toString()));
     }
 
     @Override
diff --git a/HashDatabase/manifest.mf b/HashDatabase/manifest.mf
index b8c105413c..dc67badd94 100644
--- a/HashDatabase/manifest.mf
+++ b/HashDatabase/manifest.mf
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.sleuthkit.autopsy.hashdatabase/3
-OpenIDE-Module-Implementation-Version: 9
+OpenIDE-Module-Implementation-Version: 10
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/hashdatabase/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/hashdatabase/Bundle.properties
 
diff --git a/HashDatabase/nbproject/project.xml b/HashDatabase/nbproject/project.xml
index 40499aa189..2b64a2d33d 100644
--- a/HashDatabase/nbproject/project.xml
+++ b/HashDatabase/nbproject/project.xml
@@ -78,7 +78,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>9</release-version>
-                        <specification-version>7.0</specification-version>
+                        <specification-version>7.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle.properties b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle.properties
index 1cdf2f77c1..d5f4c47246 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle.properties
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle.properties
@@ -63,11 +63,8 @@ HashDbCreateDatabaseDialog.jLabel1.text=Database Path:
 HashDbCreateDatabaseDialog.saveAsButton.text=Save As...
 HashDbCreateDatabaseDialog.hashSetNameTextField.text=
 HashDbImportDatabaseDialog.jLabel3.text=Database Path:
-HashDbCreateDatabaseDialog.searchDuringIngestCheckbox.text=Search during ingest
-HashDbCreateDatabaseDialog.searchDuringIngestCheckbox.toolTipText=
-HashDbCreateDatabaseDialog.sendIngestMessagesCheckbox.text=Send ingest messages
-HashDbImportDatabaseDialog.searchDuringIngestCheckbox.text=Search during ingest
-HashDbImportDatabaseDialog.sendIngestMessagesCheckbox.text=Send ingest messages
+HashDbCreateDatabaseDialog.sendIngestMessagesCheckbox.text=Send ingest inbox messages for each hit
+HashDbImportDatabaseDialog.sendIngestMessagesCheckbox.text=Send ingest inbox message for each hit
 HashDbImportDatabaseDialog.hashSetNameTextField.text=
 HashDbConfigPanel.createDatabaseButton.text=Create Database
 HashDbImportDatabaseDialog.openButton.text=Open...
@@ -75,8 +72,7 @@ HashDbSimpleConfigPanel.alwaysCalcHashesCheckbox.text=Calculate MD5 even if no h
 HashDbCreateDatabaseDialog.jLabel3.text=Hash Set Name:
 HashDbCreateDatabaseDialog.okButton.text=OK
 HashDbCreateDatabaseDialog.databasePathTextField.text=
-HashDbConfigPanel.searchDuringIngestCheckbox.text=Search during ingest
-HashDbConfigPanel.sendIngestMessagesCheckBox.text=Send ingest messages
+HashDbConfigPanel.sendIngestMessagesCheckBox.text=Send ingest inbox message for each hit
 AddContentToHashDbAction.ContentMenu.noHashDbsConfigd=No hash databases configured
 AddContentToHashDbAction.ContentMenu.createDbItem=Create database...
 AddContentToHashDbAction.addFilesToHashSet.addToHashDbErr=Add to Hash Database Error
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle_ja.properties b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle_ja.properties
index 36016e2499..98df63128a 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle_ja.properties
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/Bundle_ja.properties
@@ -1,196 +1,193 @@
-HashDbSimplePanel.knownLabel.text=NSRL\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
-OpenIDE-Module-Display-Category=\u30E2\u30B8\u30E5\u30FC\u30EB\u633F\u5165
-OpenIDE-Module-Long-Description=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30E2\u30B8\u30E5\u30FC\u30EB\u633F\u5165  \n\n\
-\u30C7\u30A3\u30B9\u30AF\u30A4\u30E1\u30FC\u30B8\u306B\u3042\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u89E3\u6790\u3057\u3001\u300C\u65E2\u77E5\u300D\uFF08NSRL\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u300C\u65E2\u77E5\u300D\u30D5\u30A1\u30A4\u30EB\u30EB\u30C3\u30AF\u30A2\u30C3\u30D7\u3092\u57FA\u306B\uFF09\u307E\u305F\u306F\u300C\u4E0D\u826F\uFF0F\u7591\u308F\u3057\u3044\u300D\uFF08\u30E6\u30FC\u30B6\u30FC\u304C\u6307\u5B9A\u3057\u305F\uFF11\u3064\u307E\u305F\u306F\u8907\u6570\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u57FA\u306B\uFF09\u3068\u30DE\u30FC\u30AF\u3057\u307E\u3059\u3002\n\n\
-\u30CF\u30C3\u30B7\u30E5\u3084\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30B3\u30F3\u30D5\u30A3\u30AE\u30E5\u30EC\u30FC\u30B7\u30E7\u30F3\u306B\u57FA\u3065\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u30EB\u30C3\u30AF\u30A2\u30C3\u30D7\u306A\u3069\u3001\u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306FGUI\u306B\u9023\u643A\u3057\u3066\u3044\u308B\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3057\u306A\u3044\u3001\u8FFD\u52A0\u306E\u30C4\u30FC\u30EB\u304C\u542B\u307E\u308C\u307E\u3059\u3002
-OpenIDE-Module-Name=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
-HashDbSimplePanel.notableLabel.text=\u65E2\u77E5\u306E\u4E0D\u826F\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
-HashDbSearchPanel.hashTable.columnModel.title0=MD5\u30CF\u30C3\u30B7\u30E5
-HashDbSearchPanel.addButton.text=\u30CF\u30C3\u30B7\u30E5\u3092\u8FFD\u52A0
-HashDbSearchPanel.hashLabel.text=MD5\u30CF\u30C3\u30B7\u30E5\uFF1A
-HashDbSearchPanel.searchButton.text=\u691C\u7D22
-HashDbSearchPanel.removeButton.text=\u9078\u629E\u3057\u305F\u3082\u306E\u3092\u524A\u9664
-HashDbSearchPanel.titleLabel.text=\u4E0B\u8A18\u306EMD5\u30CF\u30C3\u30B7\u30E5\u4ED8\u304D\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\uFF1A
-HashDbSearchPanel.errorField.text=\u30A8\u30E9\u30FC\uFF1A\u5168\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u30CF\u30C3\u30B7\u30E5\u3055\u308C\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-HashDbSearchPanel.saveBox.text=\u30CF\u30C3\u30B7\u30E5\u3092\u8A18\u61B6
-HashDbSearchPanel.cancelButton.text=\u30AD\u30E3\u30F3\u30BB\u30EB
-OpenIDE-Module-Short-Description=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u633F\u5165\u30E2\u30B8\u30E5\u30FC\u30EB\u304A\u3088\u3073\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30C4\u30FC\u30EB
-HashDbImportDatabaseDialog.jLabel1.text=\u30CF\u30C3\u30B7\u30E5\u30BB\u30C3\u30C8\u306E\u540D\u524D\uFF1A
-HashDbImportDatabaseDialog.knownBadRadioButton.text=\u65E2\u77E5\u306E\u60AA\u8CEA
-HashDbImportDatabaseDialog.jLabel2.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u7A2E\u985E\uFF1A
+HashDbSimplePanel.knownLabel.text=NSRL\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9
+OpenIDE-Module-Display-Category=\u30e2\u30b8\u30e5\u30fc\u30eb\u633f\u5165
+OpenIDE-Module-Long-Description=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30e2\u30b8\u30e5\u30fc\u30eb\u633f\u5165  \n\n\
+\u30c7\u30a3\u30b9\u30af\u30a4\u30e1\u30fc\u30b8\u306b\u3042\u308b\u30d5\u30a1\u30a4\u30eb\u3092\u89e3\u6790\u3057\u3001\u300c\u65e2\u77e5\u300d\uff08NSRL\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u300c\u65e2\u77e5\u300d\u30d5\u30a1\u30a4\u30eb\u30eb\u30c3\u30af\u30a2\u30c3\u30d7\u3092\u57fa\u306b\uff09\u307e\u305f\u306f\u300c\u4e0d\u826f\uff0f\u7591\u308f\u3057\u3044\u300d\uff08\u30e6\u30fc\u30b6\u30fc\u304c\u6307\u5b9a\u3057\u305f\uff11\u3064\u307e\u305f\u306f\u8907\u6570\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u57fa\u306b\uff09\u3068\u30de\u30fc\u30af\u3057\u307e\u3059\u3002\n\n\
+\u30cf\u30c3\u30b7\u30e5\u3084\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30b3\u30f3\u30d5\u30a3\u30ae\u30e5\u30ec\u30fc\u30b7\u30e7\u30f3\u306b\u57fa\u3065\u3044\u305f\u30d5\u30a1\u30a4\u30eb\u30eb\u30c3\u30af\u30a2\u30c3\u30d7\u306a\u3069\u3001\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306fGUI\u306b\u9023\u643a\u3057\u3066\u3044\u308b\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u3057\u306a\u3044\u3001\u8ffd\u52a0\u306e\u30c4\u30fc\u30eb\u304c\u542b\u307e\u308c\u307e\u3059\u3002
+OpenIDE-Module-Name=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9
+HashDbSimplePanel.notableLabel.text=\u65e2\u77e5\u306e\u4e0d\u826f\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9
+HashDbSearchPanel.hashTable.columnModel.title0=MD5\u30cf\u30c3\u30b7\u30e5
+HashDbSearchPanel.addButton.text=\u30cf\u30c3\u30b7\u30e5\u3092\u8ffd\u52a0
+HashDbSearchPanel.hashLabel.text=MD5\u30cf\u30c3\u30b7\u30e5\uff1a
+HashDbSearchPanel.searchButton.text=\u691c\u7d22
+HashDbSearchPanel.removeButton.text=\u9078\u629e\u3057\u305f\u3082\u306e\u3092\u524a\u9664
+HashDbSearchPanel.titleLabel.text=\u4e0b\u8a18\u306eMD5\u30cf\u30c3\u30b7\u30e5\u4ed8\u304d\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u691c\u7d22\uff1a
+HashDbSearchPanel.errorField.text=\u30a8\u30e9\u30fc\uff1a\u5168\u3066\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u30cf\u30c3\u30b7\u30e5\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+HashDbSearchPanel.saveBox.text=\u30cf\u30c3\u30b7\u30e5\u3092\u8a18\u61b6
+HashDbSearchPanel.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
+OpenIDE-Module-Short-Description=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u633f\u5165\u30e2\u30b8\u30e5\u30fc\u30eb\u304a\u3088\u3073\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30c4\u30fc\u30eb
+HashDbImportDatabaseDialog.jLabel1.text=\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8\u306e\u540d\u524d\uff1a
+HashDbImportDatabaseDialog.knownBadRadioButton.text=\u65e2\u77e5\u306e\u60aa\u8cea
+HashDbImportDatabaseDialog.jLabel2.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u7a2e\u985e\uff1a
 HashDbImportDatabaseDialog.okButton.text=OK
-HashDbImportDatabaseDialog.cancelButton.text=\u30AD\u30E3\u30F3\u30BB\u30EB
-HashDbCreateDatabaseDialog.jLabel2.text=\u7A2E\u985E\uFF1A
-HashDbCreateDatabaseDialog.knownBadRadioButton.text=\u65E2\u77E5\u306E\u60AA\u8CEA
-HashDbCreateDatabaseDialog.cancelButton.text=\u30AD\u30E3\u30F3\u30BB\u30EB
-HashDbConfigPanel.nameLabel.text=\u30CF\u30C3\u30B7\u30E5\u30BB\u30C3\u30C8\u306E\u540D\u524D\uFF1A
-HashDbConfigPanel.hashDbNameLabel.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-HashDbConfigPanel.hashDatabasesLabel.text=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\uFF1A
-HashDbConfigPanel.hashDbLocationLabel.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-HashDbConfigPanel.ingestWarningLabel.text=\u51E6\u7406\u4E2D\u3067\u3059\u3002\u5B8C\u4E86\u3059\u308B\u307E\u3067\u4E00\u90E8\u306E\u8A2D\u5B9A\u306F\u5229\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-HashDbConfigPanel.jButton3.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30A4\u30F3\u30DD\u30FC\u30C8
-HashDbConfigPanel.jLabel6.text=\u7A2E\u985E\uFF1A
-HashDbConfigPanel.jLabel4.text=\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\uFF1A
-HashDbConfigPanel.jLabel2.text=\u540D\u524D\uFF1A
-HashDbConfigPanel.optionsLabel.text=\u30AA\u30D7\u30B7\u30E7\u30F3
-HashDbConfigPanel.typeLabel.text=\u7A2E\u985E\uFF1A
-HashDbConfigPanel.locationLabel.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D1\u30B9\uFF1A
-HashDbConfigPanel.hashDbIndexStatusLabel.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-HashDbConfigPanel.hashDbTypeLabel.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-HashDbConfigPanel.indexButton.text=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
-HashDbConfigPanel.indexLabel.text=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30B9\u30C6\u30FC\u30BF\u30B9\uFF1A
-HashDbConfigPanel.informationLabel.text=\u30A4\u30F3\u30D5\u30A9\u30E1\u30FC\u30B7\u30E7\u30F3
-HashDbConfigPanel.importDatabaseButton.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30A4\u30F3\u30DD\u30FC\u30C8
-HashDbConfigPanel.deleteDatabaseButton.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u524A\u9664
-HashDbConfigPanel.indexPathLabelLabel.text=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30D1\u30B9\uFF1A
-HashDbConfigPanel.indexPathLabel.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-ModalNoButtons.CURRENTLYON_LABEL.text=y\u306Ex\u3092\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u4E2D
-ModalNoButtons.GO_GET_COFFEE_LABEL.text=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u4E2D\u3067\u3059\u3002\u6642\u9593\u304C\u304B\u304B\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002
-ModalNoButtons.CANCEL_BUTTON.text=\u30AD\u30E3\u30F3\u30BB\u30EB
-HashDbSimpleConfigPanel.knownBadHashDbsLabel.text=\u65E2\u77E5\u306E\u60AA\u8CEA\u306A\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u51E6\u7406\u306B\u5229\u7528\uFF1A
-HashDbImportDatabaseDialog.knownRadioButton.text=\u65E2\u77E5\uFF08NSRL\u307E\u305F\u306F\u305D\u306E\u4ED6\uFF09
-HashDbCreateDatabaseDialog.knownRadioButton.text=\u65E2\u77E5
-HashDbCreateDatabaseDialog.jLabel1.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D1\u30B9\uFF1A
-HashDbCreateDatabaseDialog.saveAsButton.text=\u540D\u524D\u3092\u3064\u3051\u3066\u4FDD\u5B58\u2026
-HashDbImportDatabaseDialog.jLabel3.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D1\u30B9\uFF1A
-HashDbCreateDatabaseDialog.searchDuringIngestCheckbox.text=\u51E6\u7406\u4E2D\u306B\u691C\u7D22
-HashDbImportDatabaseDialog.searchDuringIngestCheckbox.text=\u51E6\u7406\u4E2D\u306B\u691C\u7D22
-HashDbCreateDatabaseDialog.sendIngestMessagesCheckbox.text=\u51E6\u7406\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u9001\u308B
-HashDbImportDatabaseDialog.sendIngestMessagesCheckbox.text=\u51E6\u7406\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u9001\u308B
-HashDbConfigPanel.createDatabaseButton.text=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u4F5C\u6210
-HashDbImportDatabaseDialog.openButton.text=\u958B\u304F...
-HashDbSimpleConfigPanel.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
-HashDbCreateDatabaseDialog.jLabel3.text=\u30CF\u30C3\u30B7\u30E5\u30BB\u30C3\u30C8\u306E\u540D\u524D\uFF1A
+HashDbImportDatabaseDialog.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
+HashDbCreateDatabaseDialog.jLabel2.text=\u7a2e\u985e\uff1a
+HashDbCreateDatabaseDialog.knownBadRadioButton.text=\u65e2\u77e5\u306e\u60aa\u8cea
+HashDbCreateDatabaseDialog.cancelButton.text=\u30ad\u30e3\u30f3\u30bb\u30eb
+HashDbConfigPanel.nameLabel.text=\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8\u306e\u540d\u524d\uff1a
+HashDbConfigPanel.hashDbNameLabel.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+HashDbConfigPanel.hashDatabasesLabel.text=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\uff1a
+HashDbConfigPanel.hashDbLocationLabel.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+HashDbConfigPanel.ingestWarningLabel.text=\u51e6\u7406\u4e2d\u3067\u3059\u3002\u5b8c\u4e86\u3059\u308b\u307e\u3067\u4e00\u90e8\u306e\u8a2d\u5b9a\u306f\u5229\u7528\u3067\u304d\u307e\u305b\u3093\u3002
+HashDbConfigPanel.jButton3.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u30a4\u30f3\u30dd\u30fc\u30c8
+HashDbConfigPanel.jLabel6.text=\u7a2e\u985e\uff1a
+HashDbConfigPanel.jLabel4.text=\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3\uff1a
+HashDbConfigPanel.jLabel2.text=\u540d\u524d\uff1a
+HashDbConfigPanel.optionsLabel.text=\u30aa\u30d7\u30b7\u30e7\u30f3
+HashDbConfigPanel.typeLabel.text=\u7a2e\u985e\uff1a
+HashDbConfigPanel.locationLabel.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d1\u30b9\uff1a
+HashDbConfigPanel.hashDbIndexStatusLabel.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+HashDbConfigPanel.hashDbTypeLabel.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+HashDbConfigPanel.indexButton.text=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9
+HashDbConfigPanel.indexLabel.text=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u30b9\u30c6\u30fc\u30bf\u30b9\uff1a
+HashDbConfigPanel.informationLabel.text=\u30a4\u30f3\u30d5\u30a9\u30e1\u30fc\u30b7\u30e7\u30f3
+HashDbConfigPanel.importDatabaseButton.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u30a4\u30f3\u30dd\u30fc\u30c8
+HashDbConfigPanel.deleteDatabaseButton.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u524a\u9664
+HashDbConfigPanel.indexPathLabelLabel.text=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u30d1\u30b9\uff1a
+HashDbConfigPanel.indexPathLabel.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+ModalNoButtons.CURRENTLYON_LABEL.text=y\u306ex\u3092\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u4e2d
+ModalNoButtons.GO_GET_COFFEE_LABEL.text=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u4e2d\u3067\u3059\u3002\u6642\u9593\u304c\u304b\u304b\u308b\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002
+ModalNoButtons.CANCEL_BUTTON.text=\u30ad\u30e3\u30f3\u30bb\u30eb
+HashDbSimpleConfigPanel.knownBadHashDbsLabel.text=\u65e2\u77e5\u306e\u60aa\u8cea\u306a\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u51e6\u7406\u306b\u5229\u7528\uff1a
+HashDbImportDatabaseDialog.knownRadioButton.text=\u65e2\u77e5\uff08NSRL\u307e\u305f\u306f\u305d\u306e\u4ed6\uff09
+HashDbCreateDatabaseDialog.knownRadioButton.text=\u65e2\u77e5
+HashDbCreateDatabaseDialog.jLabel1.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d1\u30b9\uff1a
+HashDbCreateDatabaseDialog.saveAsButton.text=\u540d\u524d\u3092\u3064\u3051\u3066\u4fdd\u5b58\u2026
+HashDbImportDatabaseDialog.jLabel3.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d1\u30b9\uff1a
+HashDbCreateDatabaseDialog.sendIngestMessagesCheckbox.text=\u51e6\u7406\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u9001\u308b
+HashDbImportDatabaseDialog.sendIngestMessagesCheckbox.text=\u51e6\u7406\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u9001\u308b
+HashDbConfigPanel.createDatabaseButton.text=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u4f5c\u6210
+HashDbImportDatabaseDialog.openButton.text=\u958b\u304f...
+HashDbSimpleConfigPanel.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
+HashDbCreateDatabaseDialog.jLabel3.text=\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8\u306e\u540d\u524d\uff1a
 HashDbCreateDatabaseDialog.okButton.text=OK
-HashDbConfigPanel.searchDuringIngestCheckbox.text=\u51E6\u7406\u4E2D\u306B\u691C\u7D22
-HashDbConfigPanel.sendIngestMessagesCheckBox.text=\u51E6\u7406\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u9001\u308B
-AddContentToHashDbAction.ContentMenu.noHashDbsConfigd=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-AddContentToHashDbAction.ContentMenu.createDbItem=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u4F5C\u6210...
-AddContentToHashDbAction.addFilesToHashSet.addToHashDbErr=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30A8\u30E9\u30FC\u306B\u8FFD\u52A0
-AddContentToHashDbAction.addFilesToHashSet.unableToAddFileMsg=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B {0} \u3092\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-AddContentToHashDbAction.addFilesToHashSet.unableToAddFileSzMsg=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B {0} \u3092\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002\u30CF\u30C3\u30B7\u30E5\u5024\u304C\u8A08\u7B97\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u9069\u5207\u306A\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u30E2\u30B8\u30E5\u30FC\u30EB\u3092\u8A2D\u5B9A\u3057\u3001\u5B9F\u884C\u3057\u3066\u4E0B\u3055\u3044\u3002
-HashDatabaseOptionsPanelController.moduleErr=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
-HashDatabaseOptionsPanelController.moduleErrMsg=HashDatabaseOptionsPanelController\u306E\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\u304C\u539F\u56E0\u306A\u306E\u304B\u3092\u30ED\u30B0\u3067\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002\u4E00\u90E8\u306E\u30C7\u30FC\u30BF\u304C\u5B8C\u5168\u3067\u306A\u3044\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
-HashDbConfigPanel.noSelectionText=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u9078\u629E\u3055\u308C\u3066\u3044\u307E\u305B\u3093
-HashDbConfigPanel.errorGettingPathText=\u30D1\u30B9\u306E\u5165\u624B\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-HashDbConfigPanel.errorGettingIndexStatusText=\u30B9\u30C6\u30FC\u30BF\u30B9\u306E\u78BA\u8A8D\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F
-HashDbConfigPanel.setName.hashSetConfig=\u30CF\u30C3\u30B7\u30E5\u30BB\u30C3\u30C8\u8A2D\u5B9A
-HashDbConfigPanel.indexButtonText.index=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
-HashDbConfigPanel.indexButtonText.indexing=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u4E2D
-HashDbConfigPanel.indexStatusText.indexGen=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u3092\u4F5C\u6210\u4E2D\u3067\u3059
-HashDbConfigPanel.indexStatusText.indexOnly=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u306E\u307F
-HashDbConfigPanel.indexStatusText.indexed=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u6E08\u307F
-HashDbConfigPanel.indexButtonText.reIndex=\u518D\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9
-HashDbConfigPanel.indexStatusText.noIndex=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u7121\u3057
-HashDbConfigPanel.dbsNotIndexedMsg=\u4E0B\u8A18\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306F\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3057\u307E\u3059\u304B\uFF1F\
+HashDbConfigPanel.sendIngestMessagesCheckBox.text=\u51e6\u7406\u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u9001\u308b
+AddContentToHashDbAction.ContentMenu.noHashDbsConfigd=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+AddContentToHashDbAction.ContentMenu.createDbItem=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u4f5c\u6210...
+AddContentToHashDbAction.addFilesToHashSet.addToHashDbErr=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30a8\u30e9\u30fc\u306b\u8ffd\u52a0
+AddContentToHashDbAction.addFilesToHashSet.unableToAddFileMsg=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b {0} \u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+AddContentToHashDbAction.addFilesToHashSet.unableToAddFileSzMsg=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b {0} \u3092\u8ffd\u52a0\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30cf\u30c3\u30b7\u30e5\u5024\u304c\u8a08\u7b97\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u9069\u5207\u306a\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u30e2\u30b8\u30e5\u30fc\u30eb\u3092\u8a2d\u5b9a\u3057\u3001\u5b9f\u884c\u3057\u3066\u4e0b\u3055\u3044\u3002
+HashDatabaseOptionsPanelController.moduleErr=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a8\u30e9\u30fc
+HashDatabaseOptionsPanelController.moduleErrMsg=HashDatabaseOptionsPanelController\u306e\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\u304c\u539f\u56e0\u306a\u306e\u304b\u3092\u30ed\u30b0\u3067\u78ba\u8a8d\u3057\u3066\u4e0b\u3055\u3044\u3002\u4e00\u90e8\u306e\u30c7\u30fc\u30bf\u304c\u5b8c\u5168\u3067\u306a\u3044\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002
+HashDbConfigPanel.noSelectionText=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093
+HashDbConfigPanel.errorGettingPathText=\u30d1\u30b9\u306e\u5165\u624b\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+HashDbConfigPanel.errorGettingIndexStatusText=\u30b9\u30c6\u30fc\u30bf\u30b9\u306e\u78ba\u8a8d\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+HashDbConfigPanel.setName.hashSetConfig=\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8\u8a2d\u5b9a
+HashDbConfigPanel.indexButtonText.index=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9
+HashDbConfigPanel.indexButtonText.indexing=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u4e2d
+HashDbConfigPanel.indexStatusText.indexGen=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u3092\u4f5c\u6210\u4e2d\u3067\u3059
+HashDbConfigPanel.indexStatusText.indexOnly=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u306e\u307f
+HashDbConfigPanel.indexStatusText.indexed=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u6e08\u307f
+HashDbConfigPanel.indexButtonText.reIndex=\u518d\u30a4\u30f3\u30c7\u30c3\u30af\u30b9
+HashDbConfigPanel.indexStatusText.noIndex=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u7121\u3057
+HashDbConfigPanel.dbsNotIndexedMsg=\u4e0b\u8a18\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306f\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u3057\u307e\u3059\u304b\uff1f\
  {0}
-HashDbConfigPanel.unindexedDbsMsg=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u3066\u3044\u306A\u3044\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
-HashDbConfigPanel.allUnindexedDbsRmFromListMsg=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u3066\u3044\u306A\u3044\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306F\u30EA\u30B9\u30C8\u304B\u3089\u524A\u9664\u3055\u308C\u307E\u3059
-HashDbConfigPanel.nameColLbl=\u540D\u524D
-HashDbConfigPanel.editingCellsNotSupportedMsg=\u30BB\u30EB\u306F\u7DE8\u96C6\u4E0D\u53EF\u3067\u3059
-HashDbConfigPanel.deleteDbActionConfirmMsg=\u5168\u3066\u306E\u30B1\u30FC\u30B9\u306B\u304A\u3051\u308B\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u524A\u9664\u3057\u307E\u3059\u3002\u5B9F\u884C\u3057\u307E\u3059\u304B\uFF1F
-HashDbConfigPanel.deleteDbActionMsg=\u8A2D\u5B9A\u304B\u3089\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u524A\u9664
-HashDbCreateDatabaseDialog.createHashDbMsg=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u4F5C\u6210
-HashDbCreateDatabaseDialog.hashDbMustHaveFileExtensionMsg=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u306F .{0} \u306E\u62E1\u5F35\u5B50\u304C\u5FC5\u8981\u3067\u3059\u3002
-HashDbCreateDatabaseDialog.fileNameErr=\u30D5\u30A1\u30A4\u30EB\u540D\u30A8\u30E9\u30FC
-HashDbCreateDatabaseDialog.fileNameAlreadyExistsMsg=\u540C\u540D\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u5225\u306E\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u8A2D\u5B9A\u3057\u3066\u4E0B\u3055\u3044\u3002
-HashDbCreateDatabaseDialog.fileExistsErr=\u30D5\u30A1\u30A4\u30EB\u304C\u65E2\u306B\u5B58\u5728\u3057\u3066\u3044\u308B\u30A8\u30E9\u30FC
-HashDbCreateDatabaseDialog.mustEnterHashSetNameMsg=\u30CF\u30C3\u30B7\u30E5\u30BB\u30C3\u30C8\u540D\u306E\u5165\u529B\u304C\u5FC5\u8981\u3067\u3059
-HashDbCreateDatabaseDialog.createHashDbErr=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u4F5C\u6210\u30A8\u30E9\u30FC
-HashDbCreateDatabaseDialog.mustEnterHashDbPathMsg=\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D1\u30B9\u306E\u5165\u529B\u304C\u5FC5\u8981\u3067\u3059\u3002
-HashDbCreateDatabaseDialog.errMsg.hashDbCreationErr=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u4F5C\u6210\u30A8\u30E9\u30FC
-HashDbCreateDatabaseDialog.cannotCreateFileAtLocMsg=\u6307\u5B9A\u3055\u308C\u305F\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u3067\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002
-HashDbCreateDatabaseDialog.failedToCreateHashDbMsg=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u4F5C\u6210\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
-HashDbImportDatabaseDialog.importHashDbMsg=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30A4\u30F3\u30DD\u30FC\u30C8
-HashDbImportDatabaseDialog.fileNameExtFilter.text=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB
-HashDbImportDatabaseDialog.failedToGetDbPathMsg=\u9078\u629E\u3057\u305F\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30D1\u30B9\u306E\u5165\u624B\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
-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
-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\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
-HashDbIngestModule.knownFileSearchWillNotExecuteWarn=\u65E2\u77E5\u306E\u30D5\u30A1\u30A4\u30EB\u691C\u7D22\u304C\u5B9F\u884C\u3055\u308C\u307E\u305B\u3093\u3002
-HashDbIngestModule.noKnownBadHashDbSetMsg=\u65E2\u77E5\u306E\u60AA\u8CEA\u306A\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30BB\u30C3\u30C8\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-HashDbSimpleConfigPanel.knownHashDbsLabel.text=\u65E2\u77E5\u306E\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u51E6\u7406\u306B\u5229\u7528\uFF1A
-HashDbConfigPanel.dbNotIndexedMsg=\u4E0B\u8A18\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306F\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3057\u307E\u3059\u304B\uFF1F\
+HashDbConfigPanel.unindexedDbsMsg=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u3055\u308c\u3066\u3044\u306a\u3044\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9
+HashDbConfigPanel.allUnindexedDbsRmFromListMsg=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u3055\u308c\u3066\u3044\u306a\u3044\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306f\u30ea\u30b9\u30c8\u304b\u3089\u524a\u9664\u3055\u308c\u307e\u3059
+HashDbConfigPanel.nameColLbl=\u540d\u524d
+HashDbConfigPanel.editingCellsNotSupportedMsg=\u30bb\u30eb\u306f\u7de8\u96c6\u4e0d\u53ef\u3067\u3059
+HashDbConfigPanel.deleteDbActionConfirmMsg=\u5168\u3066\u306e\u30b1\u30fc\u30b9\u306b\u304a\u3051\u308b\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u524a\u9664\u3057\u307e\u3059\u3002\u5b9f\u884c\u3057\u307e\u3059\u304b\uff1f
+HashDbConfigPanel.deleteDbActionMsg=\u8a2d\u5b9a\u304b\u3089\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u524a\u9664
+HashDbCreateDatabaseDialog.createHashDbMsg=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u4f5c\u6210
+HashDbCreateDatabaseDialog.hashDbMustHaveFileExtensionMsg=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb\u306f .{0} \u306e\u62e1\u5f35\u5b50\u304c\u5fc5\u8981\u3067\u3059\u3002
+HashDbCreateDatabaseDialog.fileNameErr=\u30d5\u30a1\u30a4\u30eb\u540d\u30a8\u30e9\u30fc
+HashDbCreateDatabaseDialog.fileNameAlreadyExistsMsg=\u540c\u540d\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059\u3002\u5225\u306e\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u8a2d\u5b9a\u3057\u3066\u4e0b\u3055\u3044\u3002
+HashDbCreateDatabaseDialog.fileExistsErr=\u30d5\u30a1\u30a4\u30eb\u304c\u65e2\u306b\u5b58\u5728\u3057\u3066\u3044\u308b\u30a8\u30e9\u30fc
+HashDbCreateDatabaseDialog.mustEnterHashSetNameMsg=\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8\u540d\u306e\u5165\u529b\u304c\u5fc5\u8981\u3067\u3059
+HashDbCreateDatabaseDialog.createHashDbErr=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u4f5c\u6210\u30a8\u30e9\u30fc
+HashDbCreateDatabaseDialog.mustEnterHashDbPathMsg=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d1\u30b9\u306e\u5165\u529b\u304c\u5fc5\u8981\u3067\u3059\u3002
+HashDbCreateDatabaseDialog.errMsg.hashDbCreationErr=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u4f5c\u6210\u30a8\u30e9\u30fc
+HashDbCreateDatabaseDialog.cannotCreateFileAtLocMsg=\u6307\u5b9a\u3055\u308c\u305f\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3\u3067\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3002
+HashDbCreateDatabaseDialog.failedToCreateHashDbMsg=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+HashDbImportDatabaseDialog.importHashDbMsg=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u30a4\u30f3\u30dd\u30fc\u30c8
+HashDbImportDatabaseDialog.fileNameExtFilter.text=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb
+HashDbImportDatabaseDialog.failedToGetDbPathMsg=\u9078\u629e\u3057\u305f\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30d1\u30b9\u306e\u5165\u624b\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+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
+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\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
+HashDbIngestModule.knownFileSearchWillNotExecuteWarn=\u65e2\u77e5\u306e\u30d5\u30a1\u30a4\u30eb\u691c\u7d22\u304c\u5b9f\u884c\u3055\u308c\u307e\u305b\u3093\u3002
+HashDbIngestModule.noKnownBadHashDbSetMsg=\u65e2\u77e5\u306e\u60aa\u8cea\u306a\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30bb\u30c3\u30c8\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+HashDbSimpleConfigPanel.knownHashDbsLabel.text=\u65e2\u77e5\u306e\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u51e6\u7406\u306b\u5229\u7528\uff1a
+HashDbConfigPanel.dbNotIndexedMsg=\u4e0b\u8a18\u306e\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306f\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u3057\u307e\u3059\u304b\uff1f\
  {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.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
-HashDbIngestModule.settingsKnownStateErr={0}\u306E\u30B9\u30C6\u30FC\u30BF\u30B9\u3092\u65E2\u77E5\u3068\u8A2D\u5B9A\u4E2D\u306B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002
-HashDbIngestModule.lookingUpKnownHashValueErr={0}\u306E\u65E2\u77E5\u306E\u4E0D\u826F\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
-HashDbIngestModule.postToBB.fileName=\u30D5\u30A1\u30A4\u30EB\u540D
-HashDbIngestModule.postToBB.md5Hash=MD5\u30CF\u30C3\u30B7\u30E5
-HashDbIngestModule.postToBB.hashsetName=\u30CF\u30C3\u30B7\u30E5\u30BB\u30C3\u30C8\u540D
-HashDbIngestModule.postToBB.knownBadMsg=\u65E2\u77E5\u306E\u60AA\u8CEA\: {0}
-HashDbIngestModule.complete.knownBadsFound=\u767A\u898B\u3055\u308C\u305F\u65E2\u77E5\u306E\u60AA\u8CEA\uFF1A
-HashDbIngestModule.complete.totalCalcTime=\u8A08\u7B97\u6642\u9593\u306E\u5408\u8A08
-HashDbIngestModule.complete.totalLookupTime=\u30EB\u30C3\u30AF\u30A2\u30C3\u30D7\u6642\u9593\u306E\u5408\u8A08
-HashDbIngestModule.complete.databasesUsed=\u5229\u7528\u3057\u305F\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\uFF1A
-HashDbIngestModule.complete.hashLookupResults=\u30CF\u30C3\u30B7\u30E5\u30EB\u30C3\u30AF\u30A2\u30C3\u30D7\u7D50\u679C
-HashDbManager.moduleErrorListeningToUpdatesMsg=HashDbManager\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\u304C\u539F\u56E0\u306A\u306E\u304B\u3092\u30ED\u30B0\u3067\u78BA\u8A8D\u3057\u3066\u4E0B\u3055\u3044\u3002\u4E00\u90E8\u306E\u30C7\u30FC\u30BF\u304C\u5B8C\u5168\u3067\u306A\u3044\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
-HashDbManager.replacingDuplicateHashsetNameMsg=\u8907\u88FD\u306E\u30CF\u30C3\u30B7\u30E5\u30BB\u30C3\u30C8\u540D {0} \u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002\
- {1}\u306B\u66F8\u304D\u63DB\u3048\u307E\u3059\u3002
-HashDbManager.openHashDbErr=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u958B\u304F\u30A8\u30E9\u30FC
-HashDbManager.unableToOpenHashDbMsg=\ {0} \u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u958B\u3051\u307E\u305B\u3093\u3002
+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.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
+HashDbIngestModule.settingsKnownStateErr={0}\u306e\u30b9\u30c6\u30fc\u30bf\u30b9\u3092\u65e2\u77e5\u3068\u8a2d\u5b9a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+HashDbIngestModule.lookingUpKnownHashValueErr={0}\u306e\u65e2\u77e5\u306e\u4e0d\u826f\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
+HashDbIngestModule.postToBB.fileName=\u30d5\u30a1\u30a4\u30eb\u540d
+HashDbIngestModule.postToBB.md5Hash=MD5\u30cf\u30c3\u30b7\u30e5
+HashDbIngestModule.postToBB.hashsetName=\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8\u540d
+HashDbIngestModule.postToBB.knownBadMsg=\u65e2\u77e5\u306e\u60aa\u8cea\: {0}
+HashDbIngestModule.complete.knownBadsFound=\u767a\u898b\u3055\u308c\u305f\u65e2\u77e5\u306e\u60aa\u8cea\uff1a
+HashDbIngestModule.complete.totalCalcTime=\u8a08\u7b97\u6642\u9593\u306e\u5408\u8a08
+HashDbIngestModule.complete.totalLookupTime=\u30eb\u30c3\u30af\u30a2\u30c3\u30d7\u6642\u9593\u306e\u5408\u8a08
+HashDbIngestModule.complete.databasesUsed=\u5229\u7528\u3057\u305f\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\uff1a
+HashDbIngestModule.complete.hashLookupResults=\u30cf\u30c3\u30b7\u30e5\u30eb\u30c3\u30af\u30a2\u30c3\u30d7\u7d50\u679c
+HashDbManager.moduleErrorListeningToUpdatesMsg=HashDbManager\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\u304c\u539f\u56e0\u306a\u306e\u304b\u3092\u30ed\u30b0\u3067\u78ba\u8a8d\u3057\u3066\u4e0b\u3055\u3044\u3002\u4e00\u90e8\u306e\u30c7\u30fc\u30bf\u304c\u5b8c\u5168\u3067\u306a\u3044\u3053\u3068\u304c\u3042\u308a\u307e\u3059\u3002
+HashDbManager.replacingDuplicateHashsetNameMsg=\u8907\u88fd\u306e\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8\u540d {0} \u304c\u898b\u3064\u304b\u308a\u307e\u3057\u305f\u3002\
+ {1}\u306b\u66f8\u304d\u63db\u3048\u307e\u3059\u3002
+HashDbManager.openHashDbErr=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u958b\u304f\u30a8\u30e9\u30fc
+HashDbManager.unableToOpenHashDbMsg=\ {0} \u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u958b\u3051\u307e\u305b\u3093\u3002
 HashDbManager.savedBackupOfOldConfigMsg={0}\
-\u53E4\u3044\u8A2D\u5B9A\u306E\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u30B3\u30D4\u30FC\u304C\u4E0B\u8A18\u306E\u901A\u308A\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F\u3002\
+\u53e4\u3044\u8a2d\u5b9a\u306e\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u30b3\u30d4\u30fc\u304c\u4e0b\u8a18\u306e\u901a\u308a\u4fdd\u5b58\u3055\u308c\u307e\u3057\u305f\u3002\
 {1}
-HashDbManager.baseMessage.updatedFormatHashDbConfig=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u306E\u5F62\u5F0F\u304C\u66F4\u65B0\u3055\u308C\u307E\u3057\u305F\u3002
-HashDbManager.msgBoxTitle.confFileFmtChanged=\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F\u306E\u5909\u66F4\u5B8C\u4E86
-HashDbManager.dlgMsg.dbNotFoundAtLoc=\ {0} \u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306F\u4E0B\u8A18\u306E\u30ED\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u3042\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002\
+HashDbManager.baseMessage.updatedFormatHashDbConfig=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u306e\u5f62\u5f0f\u304c\u66f4\u65b0\u3055\u308c\u307e\u3057\u305f\u3002
+HashDbManager.msgBoxTitle.confFileFmtChanged=\u8a2d\u5b9a\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u306e\u5909\u66f4\u5b8c\u4e86
+HashDbManager.dlgMsg.dbNotFoundAtLoc=\ {0} \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306f\u4e0b\u8a18\u306e\u30ed\u30b1\u30fc\u30b7\u30e7\u30f3\u306b\u3042\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002\
  {1}\
- \u30D5\u30A1\u30A4\u30EB\u3092\u691C\u7D22\u3057\u307E\u3059\u304B\uFF1F
-HashDbManager.dlgTitle.MissingDb=\u6B20\u843D\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
-HashDbManager.progress.indexingHashSet=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u4E2D {0}
-HashDbManager.dlgMsg.errorIndexingHashSet=\ {0} \u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u4E2D\u306E\u30A8\u30E9\u30FC
-HashDbManager.hashDbIndexingErr=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u4E2D\u306E\u30A8\u30E9\u30FC
-HashDbPanelSearchAction.actionName=MD5\u30CF\u30C3\u30B7\u30E5\u306B\u57FA\u3065\u304F\u30D5\u30A1\u30A4\u30EB\u691C\u7D22
-HashDbSearchAction.dlgMsg.noFilesHaveMD5Calculated=MD5\u30CF\u30C3\u30B7\u30E5\u304C\u8A08\u7B97\u3055\u308C\u3066\u3044\u308B\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u307E\u305A\u306FHashDB\u3092\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u3057\u3066\u4E0B\u3055\u3044\u3002
-HashDbSearchManager.MD5HashSearch=MD5\u30CF\u30C3\u30B7\u30E5\u691C\u7D22
-HashDbSearchManager.noResultsFoundMsg=\u4E00\u81F4\u3059\u308B\u3082\u306E\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-HashDbSearchPanel.titleText.ingestOngoing=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u4E2D\uFF1B\u5B8C\u4E86\u3059\u308B\u307E\u3067\u3053\u306E\u30B5\u30FC\u30D3\u30B9\u306F\u5229\u7528\u3067\u304D\u307E\u305B\u3093\u3002
-HashDbSearchPanel.noFilesHaveMD5HashMsg=MD5\u30CF\u30C3\u30B7\u30E5\u4ED8\u304D\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u3042\u308A\u307E\u305B\u3093\u3002
-HashDbSearchPanel.errorText.noHashesAddedMsg=\u30A8\u30E9\u30FC\uFF1A\u30CF\u30C3\u30B7\u30E5\u304C\u8FFD\u52A0\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
-HashDbSearchPanel.errorText.hashAlreadyAddedMsg=\u30A8\u30E9\u30FC\uFF1A\u30CF\u30C3\u30B7\u30E5\u304C\u65E2\u306B\u8FFD\u52A0\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-HashDbSearchPanel.errorText.invalidMD5HashMsg=\u30A8\u30E9\u30FC\uFF1A\u6709\u52B9\u306AMD5\u30CF\u30C3\u30B7\u30E5\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-HashDbSearchThread.progress.cancellingSearch={0}\uFF08\u30AD\u30E3\u30F3\u30BB\u30EB\u4E2D\u2026\uFF09
-HashDbSearchThread.name.searching=\u691C\u7D22\u4E2D
-HashDbSearchThread.noMoreFilesWithMD5Msg=\u540C\u3058MD5\u30CF\u30C3\u30B7\u30E5\u4ED8\u304D\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u4ED6\u306B\u3042\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-HashDbSimpleConfigPanel.dlgMsg.mustIndexDbBeforeUse=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u306B\u5229\u7528\u3059\u308B\u306B\u306F\u3001\u4E8B\u524D\u306B\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-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\u969B\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
-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
-ModalNoButtons.propChg.currentlyIndexingXofN={0}\uFF0F {1}\u3064\u76EE\u3092\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u4E2D
-HashDbManager.duplicateHashSetNameExceptionMsg=\u30CF\u30C3\u30B7\u30E5\u30BB\u30C3\u30C8\u540D''{0}''\u306F\u65E2\u306B\u5225\u306E\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059\u3002
-HashDbManager.hashDbDoesNotExistExceptionMsg=\u4E0B\u8A18\u3067\u306F\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\
+ \u30d5\u30a1\u30a4\u30eb\u3092\u691c\u7d22\u3057\u307e\u3059\u304b\uff1f
+HashDbManager.dlgTitle.MissingDb=\u6b20\u843d\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9
+HashDbManager.progress.indexingHashSet=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u4e2d {0}
+HashDbManager.dlgMsg.errorIndexingHashSet=\ {0} \u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u4e2d\u306e\u30a8\u30e9\u30fc
+HashDbManager.hashDbIndexingErr=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u4e2d\u306e\u30a8\u30e9\u30fc
+HashDbPanelSearchAction.actionName=MD5\u30cf\u30c3\u30b7\u30e5\u306b\u57fa\u3065\u304f\u30d5\u30a1\u30a4\u30eb\u691c\u7d22
+HashDbSearchAction.dlgMsg.noFilesHaveMD5Calculated=MD5\u30cf\u30c3\u30b7\u30e5\u304c\u8a08\u7b97\u3055\u308c\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308a\u307e\u305b\u3093\u3002\u307e\u305a\u306fHashDB\u3092\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u3057\u3066\u4e0b\u3055\u3044\u3002
+HashDbSearchManager.MD5HashSearch=MD5\u30cf\u30c3\u30b7\u30e5\u691c\u7d22
+HashDbSearchManager.noResultsFoundMsg=\u4e00\u81f4\u3059\u308b\u3082\u306e\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+HashDbSearchPanel.titleText.ingestOngoing=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u4e2d\uff1b\u5b8c\u4e86\u3059\u308b\u307e\u3067\u3053\u306e\u30b5\u30fc\u30d3\u30b9\u306f\u5229\u7528\u3067\u304d\u307e\u305b\u3093\u3002
+HashDbSearchPanel.noFilesHaveMD5HashMsg=MD5\u30cf\u30c3\u30b7\u30e5\u4ed8\u304d\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308a\u307e\u305b\u3093\u3002
+HashDbSearchPanel.errorText.noHashesAddedMsg=\u30a8\u30e9\u30fc\uff1a\u30cf\u30c3\u30b7\u30e5\u304c\u8ffd\u52a0\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+HashDbSearchPanel.errorText.hashAlreadyAddedMsg=\u30a8\u30e9\u30fc\uff1a\u30cf\u30c3\u30b7\u30e5\u304c\u65e2\u306b\u8ffd\u52a0\u3055\u308c\u3066\u3044\u307e\u3059\u3002
+HashDbSearchPanel.errorText.invalidMD5HashMsg=\u30a8\u30e9\u30fc\uff1a\u6709\u52b9\u306aMD5\u30cf\u30c3\u30b7\u30e5\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+HashDbSearchThread.progress.cancellingSearch={0}\uff08\u30ad\u30e3\u30f3\u30bb\u30eb\u4e2d\u2026\uff09
+HashDbSearchThread.name.searching=\u691c\u7d22\u4e2d
+HashDbSearchThread.noMoreFilesWithMD5Msg=\u540c\u3058MD5\u30cf\u30c3\u30b7\u30e5\u4ed8\u304d\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u4ed6\u306b\u3042\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+HashDbSimpleConfigPanel.dlgMsg.mustIndexDbBeforeUse=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u306b\u5229\u7528\u3059\u308b\u306b\u306f\u3001\u4e8b\u524d\u306b\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
+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\u969b\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
+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
+ModalNoButtons.propChg.currentlyIndexingXofN={0}\uff0f {1}\u3064\u76ee\u3092\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u4e2d
+HashDbManager.duplicateHashSetNameExceptionMsg=\u30cf\u30c3\u30b7\u30e5\u30bb\u30c3\u30c8\u540d''{0}''\u306f\u65e2\u306b\u5225\u306e\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u4f7f\u308f\u308c\u3066\u3044\u307e\u3059\u3002
+HashDbManager.hashDbDoesNotExistExceptionMsg=\u4e0b\u8a18\u3067\u306f\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\
 {0}
-HashDbManager.hashDbFileExistsExceptionMsg=\u4E0B\u8A18\u306B\u306F\u65E2\u306B\u30D5\u30A1\u30A4\u30EB\u304C\u5B58\u5728\u3057\u307E\u3059\u3002\
+HashDbManager.hashDbFileExistsExceptionMsg=\u4e0b\u8a18\u306b\u306f\u65e2\u306b\u30d5\u30a1\u30a4\u30eb\u304c\u5b58\u5728\u3057\u307e\u3059\u3002\
 {0}
-HashDbManager.hashDbAlreadyAddedExceptionMsg=\u4E0B\u8A18\u306E\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\
+HashDbManager.hashDbAlreadyAddedExceptionMsg=\u4e0b\u8a18\u306e\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\
 {0}\
-\u306F\u65E2\u306B\u4F5C\u6210\u307E\u305F\u306F\u30A4\u30F3\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-HashDbManager.illegalHashDbFileNameExtensionMsg=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB\u540D\u306F.{0}\u306E\u62E1\u5F35\u5B50\u304C\u5FC5\u8981\u3067\u3059\u3002
-HashDbManager.moduleErr=\u30E2\u30B8\u30E5\u30FC\u30EB\u30A8\u30E9\u30FC
-HashDbManager.knownBad.text=\u65E2\u77E5\u306E\u60AA\u8CEA
-HashDbManager.known.text=\u65E2\u77E5
-HashDbManager.fileNameExtensionFilter.title=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u30D5\u30A1\u30A4\u30EB
-HashDbSearchAction.dlgMsg.title=MD5\u30CF\u30C3\u30B7\u30E5\u306B\u57FA\u3065\u3044\u305F\u30D5\u30A1\u30A4\u30EB\u691C\u7D22
-HashDbSearchAction.getName.text=\u30CF\u30C3\u30B7\u30E5\u691C\u7D22
-HashDbSearchPanel.dlgMsg.title=MD5\u30CF\u30C3\u30B7\u30E5\u306B\u57FA\u3065\u304F\u30D5\u30A1\u30A4\u30EB\u691C\u7D22
-AddContentToHashDbAction.singleSelectionName=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u30D5\u30A1\u30A4\u30EB\u3092\u8FFD\u52A0
-AddContentToHashDbAction.multipleSelectionName=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u30D5\u30A1\u30A4\u30EB\u3092\u8FFD\u52A0
-OptionsCategory_Name_HashDatabase=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
-OptionsCategory_Keywords_HashDatabase=\u30CF\u30C3\u30B7\u30E5\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9
-HashDbManager.ingestRunningExceptionMsg=\u30A4\u30F3\u30B8\u30A7\u30B9\u30C8\u4E2D\uFF1B\u5B8C\u4E86\u3059\u308B\u307E\u3067\u3053\u306E\u30B5\u30FC\u30D3\u30B9\u306F\u5229\u7528\u3067\u304D\u307E\u305B\u3093\u3002
+\u306f\u65e2\u306b\u4f5c\u6210\u307e\u305f\u306f\u30a4\u30f3\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u3059\u3002
+HashDbManager.illegalHashDbFileNameExtensionMsg=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb\u540d\u306f.{0}\u306e\u62e1\u5f35\u5b50\u304c\u5fc5\u8981\u3067\u3059\u3002
+HashDbManager.moduleErr=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a8\u30e9\u30fc
+HashDbManager.knownBad.text=\u65e2\u77e5\u306e\u60aa\u8cea
+HashDbManager.known.text=\u65e2\u77e5
+HashDbManager.fileNameExtensionFilter.title=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb
+HashDbSearchAction.dlgMsg.title=MD5\u30cf\u30c3\u30b7\u30e5\u306b\u57fa\u3065\u3044\u305f\u30d5\u30a1\u30a4\u30eb\u691c\u7d22
+HashDbSearchAction.getName.text=\u30cf\u30c3\u30b7\u30e5\u691c\u7d22
+HashDbSearchPanel.dlgMsg.title=MD5\u30cf\u30c3\u30b7\u30e5\u306b\u57fa\u3065\u304f\u30d5\u30a1\u30a4\u30eb\u691c\u7d22
+AddContentToHashDbAction.singleSelectionName=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0
+AddContentToHashDbAction.multipleSelectionName=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306b\u30d5\u30a1\u30a4\u30eb\u3092\u8ffd\u52a0
+OptionsCategory_Name_HashDatabase=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9
+OptionsCategory_Keywords_HashDatabase=\u30cf\u30c3\u30b7\u30e5\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9
+HashDbManager.ingestRunningExceptionMsg=\u30a4\u30f3\u30b8\u30a7\u30b9\u30c8\u4e2d\uff1b\u5b8c\u4e86\u3059\u308b\u307e\u3067\u3053\u306e\u30b5\u30fc\u30d3\u30b9\u306f\u5229\u7528\u3067\u304d\u307e\u305b\u3093\u3002
 
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbConfigPanel.form b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbConfigPanel.form
index a56c3f2b57..d08cc26690 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbConfigPanel.form
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbConfigPanel.form
@@ -62,54 +62,54 @@
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" attributes="0">
                       <Component id="jScrollPane1" min="-2" pref="275" max="-2" attributes="0"/>
-                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
-                          <Group type="102" alignment="0" attributes="0">
-                              <Component id="informationLabel" min="-2" max="-2" attributes="0"/>
-                              <EmptySpace max="-2" attributes="0"/>
-                              <Component id="informationSeparator" max="32767" attributes="0"/>
-                          </Group>
-                          <Component id="ingestWarningLabel" alignment="0" min="-2" max="-2" attributes="0"/>
-                          <Group type="102" alignment="1" attributes="0">
-                              <EmptySpace min="10" pref="10" max="-2" attributes="0"/>
+                          <Group type="102" attributes="0">
+                              <EmptySpace type="unrelated" max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" attributes="0">
                                   <Group type="102" alignment="0" attributes="0">
-                                      <Group type="103" groupAlignment="0" attributes="0">
-                                          <Component id="locationLabel" alignment="0" min="-2" max="-2" attributes="0"/>
-                                          <Component id="indexButton" alignment="0" min="-2" pref="120" max="-2" attributes="0"/>
-                                          <Component id="typeLabel" alignment="0" min="-2" max="-2" attributes="0"/>
-                                          <Component id="indexLabel" alignment="0" min="-2" pref="66" max="-2" attributes="0"/>
-                                          <Component id="indexPathLabelLabel" min="-2" max="-2" attributes="0"/>
-                                      </Group>
+                                      <Component id="informationLabel" min="-2" max="-2" attributes="0"/>
+                                      <EmptySpace max="-2" attributes="0"/>
+                                      <Component id="informationSeparator" max="32767" attributes="0"/>
+                                  </Group>
+                                  <Component id="ingestWarningLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                                  <Group type="102" alignment="1" attributes="0">
                                       <EmptySpace min="10" pref="10" max="-2" attributes="0"/>
-                                      <Group type="103" groupAlignment="0" attributes="0">
-                                          <Component id="hashDbTypeLabel" pref="241" max="32767" attributes="0"/>
-                                          <Component id="hashDbLocationLabel" alignment="0" max="32767" attributes="0"/>
-                                          <Component id="indexPathLabel" max="32767" attributes="0"/>
-                                          <Component id="hashDbIndexStatusLabel" alignment="0" max="32767" attributes="0"/>
-                                      </Group>
-                                  </Group>
-                                  <Group type="102" attributes="0">
                                       <Group type="103" groupAlignment="0" attributes="0">
                                           <Group type="102" alignment="0" attributes="0">
+                                              <Group type="103" groupAlignment="0" attributes="0">
+                                                  <Component id="locationLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                                                  <Component id="indexButton" alignment="0" min="-2" pref="120" max="-2" attributes="0"/>
+                                                  <Component id="typeLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                                                  <Component id="indexLabel" alignment="0" min="-2" pref="66" max="-2" attributes="0"/>
+                                                  <Component id="indexPathLabelLabel" min="-2" max="-2" attributes="0"/>
+                                              </Group>
+                                              <EmptySpace min="10" pref="10" max="-2" attributes="0"/>
+                                              <Group type="103" groupAlignment="0" attributes="0">
+                                                  <Component id="hashDbTypeLabel" pref="241" max="32767" attributes="0"/>
+                                                  <Component id="hashDbLocationLabel" alignment="0" max="32767" attributes="0"/>
+                                                  <Component id="indexPathLabel" max="32767" attributes="0"/>
+                                                  <Component id="hashDbIndexStatusLabel" alignment="0" max="32767" attributes="0"/>
+                                              </Group>
+                                          </Group>
+                                          <Group type="102" attributes="0">
                                               <Component id="nameLabel" min="-2" max="-2" attributes="0"/>
                                               <EmptySpace min="-2" pref="53" max="-2" attributes="0"/>
                                               <Component id="hashDbNameLabel" min="-2" max="-2" attributes="0"/>
-                                          </Group>
-                                          <Component id="searchDuringIngestCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
-                                          <Group type="102" attributes="0">
-                                              <EmptySpace min="21" pref="21" max="-2" attributes="0"/>
-                                              <Component id="sendIngestMessagesCheckBox" min="-2" max="-2" attributes="0"/>
+                                              <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                                           </Group>
                                       </Group>
-                                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                                  </Group>
+                                  <Group type="102" alignment="0" attributes="0">
+                                      <Component id="optionsLabel" min="-2" max="-2" attributes="0"/>
+                                      <EmptySpace max="-2" attributes="0"/>
+                                      <Component id="optionsSeparator" min="-2" pref="324" max="-2" attributes="0"/>
                                   </Group>
                               </Group>
                           </Group>
                           <Group type="102" alignment="0" attributes="0">
-                              <Component id="optionsLabel" min="-2" max="-2" attributes="0"/>
-                              <EmptySpace max="-2" attributes="0"/>
-                              <Component id="optionsSeparator" min="-2" pref="324" max="-2" attributes="0"/>
+                              <EmptySpace min="-2" pref="23" max="-2" attributes="0"/>
+                              <Component id="sendIngestMessagesCheckBox" min="-2" max="-2" attributes="0"/>
+                              <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                           </Group>
                       </Group>
                   </Group>
@@ -180,8 +180,6 @@
                           <Component id="optionsSeparator" min="-2" pref="6" max="-2" attributes="0"/>
                       </Group>
                       <EmptySpace type="separate" max="-2" attributes="0"/>
-                      <Component id="searchDuringIngestCheckbox" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
                       <Component id="sendIngestMessagesCheckBox" min="-2" max="-2" attributes="0"/>
                       <EmptySpace type="separate" max="-2" attributes="0"/>
                       <Component id="ingestWarningLabel" min="-2" max="-2" attributes="0"/>
@@ -360,16 +358,6 @@
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="indexButtonActionPerformed"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JCheckBox" name="searchDuringIngestCheckbox">
-      <Properties>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/hashdatabase/Bundle.properties" key="HashDbConfigPanel.searchDuringIngestCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-      </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="searchDuringIngestCheckboxActionPerformed"/>
-      </Events>
-    </Component>
     <Component class="javax.swing.JCheckBox" name="sendIngestMessagesCheckBox">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbConfigPanel.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbConfigPanel.java
index ae2acfabd6..6393f44452 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbConfigPanel.java
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbConfigPanel.java
@@ -118,8 +118,6 @@ public final class HashDbConfigPanel extends javax.swing.JPanel implements Optio
         indexButton.setEnabled(false);            
 
         // Update ingest options.
-        searchDuringIngestCheckbox.setSelected(false);
-        searchDuringIngestCheckbox.setEnabled(false);
         sendIngestMessagesCheckBox.setSelected(false);
         sendIngestMessagesCheckBox.setEnabled(false);
         optionsLabel.setEnabled(false);
@@ -209,8 +207,6 @@ public final class HashDbConfigPanel extends javax.swing.JPanel implements Optio
         }
 
         // Update ingest option components.        
-        searchDuringIngestCheckbox.setSelected(db.getSearchDuringIngest());
-        searchDuringIngestCheckbox.setEnabled(!ingestIsRunning);
         sendIngestMessagesCheckBox.setSelected(db.getSendIngestMessages());
         sendIngestMessagesCheckBox.setEnabled(!ingestIsRunning && db.getSearchDuringIngest() && db.getKnownFilesType().equals(KnownFilesType.KNOWN_BAD));
         optionsLabel.setEnabled(!ingestIsRunning);
@@ -466,7 +462,6 @@ public final class HashDbConfigPanel extends javax.swing.JPanel implements Optio
         hashDbIndexStatusLabel = new javax.swing.JLabel();
         indexLabel = new javax.swing.JLabel();
         indexButton = new javax.swing.JButton();
-        searchDuringIngestCheckbox = new javax.swing.JCheckBox();
         sendIngestMessagesCheckBox = new javax.swing.JCheckBox();
         informationLabel = new javax.swing.JLabel();
         optionsLabel = new javax.swing.JLabel();
@@ -556,13 +551,6 @@ public final class HashDbConfigPanel extends javax.swing.JPanel implements Optio
             }
         });
 
-        org.openide.awt.Mnemonics.setLocalizedText(searchDuringIngestCheckbox, org.openide.util.NbBundle.getMessage(HashDbConfigPanel.class, "HashDbConfigPanel.searchDuringIngestCheckbox.text")); // NOI18N
-        searchDuringIngestCheckbox.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                searchDuringIngestCheckboxActionPerformed(evt);
-            }
-        });
-
         org.openide.awt.Mnemonics.setLocalizedText(sendIngestMessagesCheckBox, org.openide.util.NbBundle.getMessage(HashDbConfigPanel.class, "HashDbConfigPanel.sendIngestMessagesCheckBox.text")); // NOI18N
         sendIngestMessagesCheckBox.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -598,44 +586,44 @@ public final class HashDbConfigPanel extends javax.swing.JPanel implements Optio
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(layout.createSequentialGroup()
                         .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 275, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addGroup(layout.createSequentialGroup()
-                                .addComponent(informationLabel)
-                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(informationSeparator))
-                            .addComponent(ingestWarningLabel)
-                            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                                .addGap(10, 10, 10)
+                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                     .addGroup(layout.createSequentialGroup()
-                                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                            .addComponent(locationLabel)
-                                            .addComponent(indexButton, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                            .addComponent(typeLabel)
-                                            .addComponent(indexLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 66, javax.swing.GroupLayout.PREFERRED_SIZE)
-                                            .addComponent(indexPathLabelLabel))
+                                        .addComponent(informationLabel)
+                                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                                        .addComponent(informationSeparator))
+                                    .addComponent(ingestWarningLabel)
+                                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                                         .addGap(10, 10, 10)
                                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                            .addComponent(hashDbTypeLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 241, Short.MAX_VALUE)
-                                            .addComponent(hashDbLocationLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                                            .addComponent(indexPathLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                                            .addComponent(hashDbIndexStatusLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
-                                    .addGroup(layout.createSequentialGroup()
-                                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                                            .addGroup(layout.createSequentialGroup()
+                                                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                                                    .addComponent(locationLabel)
+                                                    .addComponent(indexButton, javax.swing.GroupLayout.PREFERRED_SIZE, 120, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                                    .addComponent(typeLabel)
+                                                    .addComponent(indexLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 66, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                                    .addComponent(indexPathLabelLabel))
+                                                .addGap(10, 10, 10)
+                                                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                                                    .addComponent(hashDbTypeLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 241, Short.MAX_VALUE)
+                                                    .addComponent(hashDbLocationLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                                                    .addComponent(indexPathLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                                                    .addComponent(hashDbIndexStatusLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
                                             .addGroup(layout.createSequentialGroup()
                                                 .addComponent(nameLabel)
                                                 .addGap(53, 53, 53)
-                                                .addComponent(hashDbNameLabel))
-                                            .addComponent(searchDuringIngestCheckbox)
-                                            .addGroup(layout.createSequentialGroup()
-                                                .addGap(21, 21, 21)
-                                                .addComponent(sendIngestMessagesCheckBox)))
-                                        .addGap(0, 0, Short.MAX_VALUE))))
+                                                .addComponent(hashDbNameLabel)
+                                                .addGap(0, 0, Short.MAX_VALUE))))
+                                    .addGroup(layout.createSequentialGroup()
+                                        .addComponent(optionsLabel)
+                                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                                        .addComponent(optionsSeparator, javax.swing.GroupLayout.PREFERRED_SIZE, 324, javax.swing.GroupLayout.PREFERRED_SIZE))))
                             .addGroup(layout.createSequentialGroup()
-                                .addComponent(optionsLabel)
-                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(optionsSeparator, javax.swing.GroupLayout.PREFERRED_SIZE, 324, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                                .addGap(23, 23, 23)
+                                .addComponent(sendIngestMessagesCheckBox)
+                                .addGap(0, 0, Short.MAX_VALUE))))
                     .addGroup(layout.createSequentialGroup()
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addComponent(hashDatabasesLabel)
@@ -688,8 +676,6 @@ public final class HashDbConfigPanel extends javax.swing.JPanel implements Optio
                             .addComponent(optionsLabel)
                             .addComponent(optionsSeparator, javax.swing.GroupLayout.PREFERRED_SIZE, 6, javax.swing.GroupLayout.PREFERRED_SIZE))
                         .addGap(18, 18, 18)
-                        .addComponent(searchDuringIngestCheckbox)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                         .addComponent(sendIngestMessagesCheckBox)
                         .addGap(18, 18, 18)
                         .addComponent(ingestWarningLabel)
@@ -760,17 +746,6 @@ public final class HashDbConfigPanel extends javax.swing.JPanel implements Optio
         }                
     }//GEN-LAST:event_hashSetTableKeyPressed
 
-    private void searchDuringIngestCheckboxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_searchDuringIngestCheckboxActionPerformed
-        HashDb hashDb = ((HashSetTable)hashSetTable).getSelection();
-        if (hashDb != null) {
-            hashDb.setSearchDuringIngest(searchDuringIngestCheckbox.isSelected());
-            if (!searchDuringIngestCheckbox.isSelected()) {
-                sendIngestMessagesCheckBox.setSelected(false);
-            }
-            hashDb.setSendIngestMessages(sendIngestMessagesCheckBox.isSelected());            
-        }
-    }//GEN-LAST:event_searchDuringIngestCheckboxActionPerformed
-
     private void sendIngestMessagesCheckBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_sendIngestMessagesCheckBoxActionPerformed
         HashDb hashDb = ((HashSetTable)hashSetTable).getSelection();
         if (hashDb != null) {
@@ -820,7 +795,6 @@ public final class HashDbConfigPanel extends javax.swing.JPanel implements Optio
     private javax.swing.JLabel nameLabel;
     private javax.swing.JLabel optionsLabel;
     private javax.swing.JSeparator optionsSeparator;
-    private javax.swing.JCheckBox searchDuringIngestCheckbox;
     private javax.swing.JCheckBox sendIngestMessagesCheckBox;
     private javax.swing.JLabel typeLabel;
     // End of variables declaration//GEN-END:variables
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbCreateDatabaseDialog.form b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbCreateDatabaseDialog.form
index 047c483d48..cce42f9009 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbCreateDatabaseDialog.form
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbCreateDatabaseDialog.form
@@ -27,55 +27,42 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" attributes="0">
+          <Group type="102" alignment="0" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Group type="102" attributes="0">
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Group type="102" attributes="0">
-                              <EmptySpace min="21" pref="21" max="-2" attributes="0"/>
-                              <Component id="sendIngestMessagesCheckbox" min="-2" max="-2" attributes="0"/>
-                          </Group>
-                          <Component id="searchDuringIngestCheckbox" min="-2" max="-2" attributes="0"/>
-                      </Group>
+                  <Component id="sendIngestMessagesCheckbox" min="-2" max="-2" attributes="0"/>
+                  <Group type="102" alignment="1" attributes="0">
                       <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                      <Component id="okButton" linkSize="2" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="cancelButton" linkSize="2" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <Group type="102" attributes="0">
+                  <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
+                  <Group type="102" alignment="0" attributes="0">
+                      <EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
-                          <Group type="102" alignment="1" attributes="0">
-                              <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                              <Component id="okButton" linkSize="2" min="-2" max="-2" attributes="0"/>
-                              <EmptySpace max="-2" attributes="0"/>
-                              <Component id="cancelButton" linkSize="2" min="-2" max="-2" attributes="0"/>
-                          </Group>
-                          <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
-                          <Group type="102" alignment="0" attributes="0">
-                              <EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
-                              <Group type="103" groupAlignment="0" attributes="0">
-                                  <Component id="knownRadioButton" min="-2" max="-2" attributes="0"/>
-                                  <Component id="knownBadRadioButton" min="-2" max="-2" attributes="0"/>
-                              </Group>
-                          </Group>
-                          <Group type="102" alignment="0" attributes="0">
-                              <Group type="103" groupAlignment="1" max="-2" attributes="0">
-                                  <Group type="102" attributes="0">
-                                      <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-                                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                                      <Component id="databasePathTextField" max="32767" attributes="0"/>
-                                  </Group>
-                                  <Group type="102" alignment="0" attributes="0">
-                                      <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
-                                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                                      <Component id="hashSetNameTextField" min="-2" pref="272" max="-2" attributes="0"/>
-                                  </Group>
-                              </Group>
+                          <Component id="knownRadioButton" min="-2" max="-2" attributes="0"/>
+                          <Component id="knownBadRadioButton" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Group type="103" groupAlignment="1" max="-2" attributes="0">
+                          <Group type="102" attributes="0">
+                              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
                               <EmptySpace type="unrelated" max="-2" attributes="0"/>
-                              <Component id="saveAsButton" min="-2" max="-2" attributes="0"/>
+                              <Component id="databasePathTextField" max="32767" attributes="0"/>
+                          </Group>
+                          <Group type="102" alignment="0" attributes="0">
+                              <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
+                              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                              <Component id="hashSetNameTextField" min="-2" pref="272" max="-2" attributes="0"/>
                           </Group>
                       </Group>
-                      <EmptySpace max="-2" attributes="0"/>
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <Component id="saveAsButton" min="-2" max="-2" attributes="0"/>
                   </Group>
               </Group>
+              <EmptySpace max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -100,10 +87,8 @@
               <EmptySpace max="-2" attributes="0"/>
               <Component id="knownBadRadioButton" min="-2" max="-2" attributes="0"/>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
-              <Component id="searchDuringIngestCheckbox" min="-2" max="-2" attributes="0"/>
-              <EmptySpace max="-2" attributes="0"/>
               <Component id="sendIngestMessagesCheckbox" min="-2" max="-2" attributes="0"/>
-              <EmptySpace min="-2" pref="3" max="-2" attributes="0"/>
+              <EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
                   <Component id="cancelButton" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="okButton" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -182,20 +167,6 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JCheckBox" name="searchDuringIngestCheckbox">
-      <Properties>
-        <Property name="selected" type="boolean" value="true"/>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/hashdatabase/Bundle.properties" key="HashDbCreateDatabaseDialog.searchDuringIngestCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-        <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/hashdatabase/Bundle.properties" key="HashDbCreateDatabaseDialog.searchDuringIngestCheckbox.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-      </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="searchDuringIngestCheckboxActionPerformed"/>
-      </Events>
-    </Component>
     <Component class="javax.swing.JCheckBox" name="sendIngestMessagesCheckbox">
       <Properties>
         <Property name="selected" type="boolean" value="true"/>
@@ -203,6 +174,9 @@
           <ResourceString bundle="org/sleuthkit/autopsy/hashdatabase/Bundle.properties" key="HashDbCreateDatabaseDialog.sendIngestMessagesCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="sendIngestMessagesCheckboxActionPerformed"/>
+      </Events>
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel3">
       <Properties>
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbCreateDatabaseDialog.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbCreateDatabaseDialog.java
index e7e25a25ef..da11fc8a97 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbCreateDatabaseDialog.java
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbCreateDatabaseDialog.java
@@ -127,7 +127,6 @@ final class HashDbCreateDatabaseDialog extends javax.swing.JDialog {
         jLabel1 = new javax.swing.JLabel();
         hashSetNameTextField = new javax.swing.JTextField();
         jLabel2 = new javax.swing.JLabel();
-        searchDuringIngestCheckbox = new javax.swing.JCheckBox();
         sendIngestMessagesCheckbox = new javax.swing.JCheckBox();
         jLabel3 = new javax.swing.JLabel();
         databasePathTextField = new javax.swing.JTextField();
@@ -172,17 +171,13 @@ final class HashDbCreateDatabaseDialog extends javax.swing.JDialog {
 
         org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(HashDbCreateDatabaseDialog.class, "HashDbCreateDatabaseDialog.jLabel2.text")); // NOI18N
 
-        searchDuringIngestCheckbox.setSelected(true);
-        org.openide.awt.Mnemonics.setLocalizedText(searchDuringIngestCheckbox, org.openide.util.NbBundle.getMessage(HashDbCreateDatabaseDialog.class, "HashDbCreateDatabaseDialog.searchDuringIngestCheckbox.text")); // NOI18N
-        searchDuringIngestCheckbox.setToolTipText(org.openide.util.NbBundle.getMessage(HashDbCreateDatabaseDialog.class, "HashDbCreateDatabaseDialog.searchDuringIngestCheckbox.toolTipText")); // NOI18N
-        searchDuringIngestCheckbox.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                searchDuringIngestCheckboxActionPerformed(evt);
-            }
-        });
-
         sendIngestMessagesCheckbox.setSelected(true);
         org.openide.awt.Mnemonics.setLocalizedText(sendIngestMessagesCheckbox, org.openide.util.NbBundle.getMessage(HashDbCreateDatabaseDialog.class, "HashDbCreateDatabaseDialog.sendIngestMessagesCheckbox.text")); // NOI18N
+        sendIngestMessagesCheckbox.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                sendIngestMessagesCheckboxActionPerformed(evt);
+            }
+        });
 
         org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(HashDbCreateDatabaseDialog.class, "HashDbCreateDatabaseDialog.jLabel3.text")); // NOI18N
 
@@ -203,39 +198,31 @@ final class HashDbCreateDatabaseDialog extends javax.swing.JDialog {
             .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(sendIngestMessagesCheckbox)
+                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+                        .addGap(0, 0, Short.MAX_VALUE)
+                        .addComponent(okButton)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(cancelButton))
+                    .addComponent(jLabel2)
                     .addGroup(layout.createSequentialGroup()
+                        .addGap(20, 20, 20)
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addGroup(layout.createSequentialGroup()
-                                .addGap(21, 21, 21)
-                                .addComponent(sendIngestMessagesCheckbox))
-                            .addComponent(searchDuringIngestCheckbox))
-                        .addGap(0, 0, Short.MAX_VALUE))
+                            .addComponent(knownRadioButton)
+                            .addComponent(knownBadRadioButton)))
                     .addGroup(layout.createSequentialGroup()
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
-                                .addGap(0, 0, Short.MAX_VALUE)
-                                .addComponent(okButton)
-                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(cancelButton))
-                            .addComponent(jLabel2)
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
                             .addGroup(layout.createSequentialGroup()
-                                .addGap(20, 20, 20)
-                                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                                    .addComponent(knownRadioButton)
-                                    .addComponent(knownBadRadioButton)))
-                            .addGroup(layout.createSequentialGroup()
-                                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
-                                    .addGroup(layout.createSequentialGroup()
-                                        .addComponent(jLabel1)
-                                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                                        .addComponent(databasePathTextField))
-                                    .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
-                                        .addComponent(jLabel3)
-                                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                                        .addComponent(hashSetNameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 272, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                                .addComponent(jLabel1)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                                .addComponent(saveAsButton)))
-                        .addContainerGap())))
+                                .addComponent(databasePathTextField))
+                            .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+                                .addComponent(jLabel3)
+                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                                .addComponent(hashSetNameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 272, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(saveAsButton)))
+                .addContainerGap())
         );
 
         layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {cancelButton, okButton});
@@ -259,10 +246,8 @@ final class HashDbCreateDatabaseDialog extends javax.swing.JDialog {
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(knownBadRadioButton)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addComponent(searchDuringIngestCheckbox)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(sendIngestMessagesCheckbox)
-                .addGap(3, 3, 3)
+                .addGap(26, 26, 26)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(cancelButton)
                     .addComponent(okButton))
@@ -273,13 +258,11 @@ final class HashDbCreateDatabaseDialog extends javax.swing.JDialog {
     }// </editor-fold>//GEN-END:initComponents
 
     private void knownRadioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_knownRadioButtonActionPerformed
-        searchDuringIngestCheckbox.setSelected(true);
         sendIngestMessagesCheckbox.setSelected(false);
         sendIngestMessagesCheckbox.setEnabled(false);
     }//GEN-LAST:event_knownRadioButtonActionPerformed
 
     private void knownBadRadioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_knownBadRadioButtonActionPerformed
-        searchDuringIngestCheckbox.setSelected(true);
         sendIngestMessagesCheckbox.setSelected(true);
         sendIngestMessagesCheckbox.setEnabled(true);
     }//GEN-LAST:event_knownBadRadioButtonActionPerformed
@@ -309,13 +292,6 @@ final class HashDbCreateDatabaseDialog extends javax.swing.JDialog {
         }        
     }//GEN-LAST:event_saveAsButtonActionPerformed
 
-    private void searchDuringIngestCheckboxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_searchDuringIngestCheckboxActionPerformed
-        sendIngestMessagesCheckbox.setEnabled(searchDuringIngestCheckbox.isSelected());
-        if (!searchDuringIngestCheckbox.isSelected()) {
-            sendIngestMessagesCheckbox.setSelected(false);
-        }
-    }//GEN-LAST:event_searchDuringIngestCheckboxActionPerformed
-
     private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed
         // Note that the error handlers in this method call return without disposing of the 
         // dialog to allow the user to try again, if desired.
@@ -352,7 +328,7 @@ final class HashDbCreateDatabaseDialog extends javax.swing.JDialog {
                 .getMessage(this.getClass(), "HashDbCreateDatabaseDialog.errMsg.hashDbCreationErr");
         try
         {
-            newHashDb = HashDbManager.getInstance().addNewHashDatabaseInternal(hashSetNameTextField.getText(), fileChooser.getSelectedFile().getCanonicalPath(), searchDuringIngestCheckbox.isSelected(), sendIngestMessagesCheckbox.isSelected(), type);       
+            newHashDb = HashDbManager.getInstance().addNewHashDatabaseInternal(hashSetNameTextField.getText(), fileChooser.getSelectedFile().getCanonicalPath(), true, sendIngestMessagesCheckbox.isSelected(), type);       
         } 
         catch (IOException ex) {
             Logger.getLogger(HashDbCreateDatabaseDialog.class.getName()).log(Level.WARNING, errorMessage, ex);
@@ -387,6 +363,10 @@ final class HashDbCreateDatabaseDialog extends javax.swing.JDialog {
         dispose();
     }//GEN-LAST:event_okButtonActionPerformed
 
+    private void sendIngestMessagesCheckboxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_sendIngestMessagesCheckboxActionPerformed
+        // TODO add your handling code here:
+    }//GEN-LAST:event_sendIngestMessagesCheckboxActionPerformed
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.ButtonGroup buttonGroup1;
     private javax.swing.JButton cancelButton;
@@ -399,7 +379,6 @@ final class HashDbCreateDatabaseDialog extends javax.swing.JDialog {
     private javax.swing.JRadioButton knownRadioButton;
     private javax.swing.JButton okButton;
     private javax.swing.JButton saveAsButton;
-    private javax.swing.JCheckBox searchDuringIngestCheckbox;
     private javax.swing.JCheckBox sendIngestMessagesCheckbox;
     // End of variables declaration//GEN-END:variables
 }
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbImportDatabaseDialog.form b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbImportDatabaseDialog.form
index 627f4090ba..a619e26c92 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbImportDatabaseDialog.form
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbImportDatabaseDialog.form
@@ -31,18 +31,27 @@
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" alignment="0" attributes="0">
-                      <Group type="103" groupAlignment="0" attributes="0">
-                          <Group type="102" alignment="0" attributes="0">
-                              <EmptySpace min="21" pref="21" max="-2" attributes="0"/>
-                              <Component id="sendIngestMessagesCheckbox" min="-2" max="-2" attributes="0"/>
-                          </Group>
-                          <Component id="searchDuringIngestCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
-                      </Group>
-                      <EmptySpace max="32767" attributes="0"/>
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                       <Component id="okButton" linkSize="1" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="cancelButton" linkSize="1" min="-2" max="-2" attributes="0"/>
                   </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Group type="103" groupAlignment="1" attributes="0">
+                          <Group type="102" alignment="0" attributes="0">
+                              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+                              <EmptySpace max="-2" attributes="0"/>
+                              <Component id="hashSetNameTextField" pref="303" max="32767" attributes="0"/>
+                          </Group>
+                          <Group type="102" alignment="0" attributes="0">
+                              <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
+                              <EmptySpace max="-2" attributes="0"/>
+                              <Component id="databasePathTextField" max="32767" attributes="0"/>
+                          </Group>
+                      </Group>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="openButton" min="-2" max="-2" attributes="0"/>
+                  </Group>
                   <Group type="102" attributes="0">
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Component id="jLabel2" alignment="0" min="-2" max="-2" attributes="0"/>
@@ -53,24 +62,9 @@
                                   <Component id="knownBadRadioButton" min="-2" max="-2" attributes="0"/>
                               </Group>
                           </Group>
+                          <Component id="sendIngestMessagesCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
                       </Group>
-                      <EmptySpace min="0" pref="307" max="32767" attributes="0"/>
-                  </Group>
-                  <Group type="102" alignment="0" attributes="0">
-                      <Group type="103" groupAlignment="1" attributes="0">
-                          <Group type="102" alignment="0" attributes="0">
-                              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-                              <EmptySpace max="-2" attributes="0"/>
-                              <Component id="hashSetNameTextField" max="32767" attributes="0"/>
-                          </Group>
-                          <Group type="102" alignment="0" attributes="0">
-                              <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
-                              <EmptySpace max="-2" attributes="0"/>
-                              <Component id="databasePathTextField" max="32767" attributes="0"/>
-                          </Group>
-                      </Group>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="openButton" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
                   </Group>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
@@ -107,9 +101,7 @@
                       <Component id="knownRadioButton" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="knownBadRadioButton" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace min="-2" pref="13" max="-2" attributes="0"/>
-                      <Component id="searchDuringIngestCheckbox" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <EmptySpace type="separate" max="-2" attributes="0"/>
                       <Component id="sendIngestMessagesCheckbox" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="32767" attributes="0"/>
                   </Group>
@@ -205,17 +197,6 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JCheckBox" name="searchDuringIngestCheckbox">
-      <Properties>
-        <Property name="selected" type="boolean" value="true"/>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/sleuthkit/autopsy/hashdatabase/Bundle.properties" key="HashDbImportDatabaseDialog.searchDuringIngestCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-      </Properties>
-      <Events>
-        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="searchDuringIngestCheckboxActionPerformed"/>
-      </Events>
-    </Component>
     <Component class="javax.swing.JCheckBox" name="sendIngestMessagesCheckbox">
       <Properties>
         <Property name="selected" type="boolean" value="true"/>
@@ -223,6 +204,9 @@
           <ResourceString bundle="org/sleuthkit/autopsy/hashdatabase/Bundle.properties" key="HashDbImportDatabaseDialog.sendIngestMessagesCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="sendIngestMessagesCheckboxActionPerformed"/>
+      </Events>
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel3">
       <Properties>
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbImportDatabaseDialog.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbImportDatabaseDialog.java
index 5af9f8e57d..67c95b0e67 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbImportDatabaseDialog.java
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbImportDatabaseDialog.java
@@ -112,7 +112,6 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
         jLabel1 = new javax.swing.JLabel();
         hashSetNameTextField = new javax.swing.JTextField();
         jLabel2 = new javax.swing.JLabel();
-        searchDuringIngestCheckbox = new javax.swing.JCheckBox();
         sendIngestMessagesCheckbox = new javax.swing.JCheckBox();
         jLabel3 = new javax.swing.JLabel();
 
@@ -165,16 +164,13 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
 
         org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(HashDbImportDatabaseDialog.class, "HashDbImportDatabaseDialog.jLabel2.text")); // NOI18N
 
-        searchDuringIngestCheckbox.setSelected(true);
-        org.openide.awt.Mnemonics.setLocalizedText(searchDuringIngestCheckbox, org.openide.util.NbBundle.getMessage(HashDbImportDatabaseDialog.class, "HashDbImportDatabaseDialog.searchDuringIngestCheckbox.text")); // NOI18N
-        searchDuringIngestCheckbox.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                searchDuringIngestCheckboxActionPerformed(evt);
-            }
-        });
-
         sendIngestMessagesCheckbox.setSelected(true);
         org.openide.awt.Mnemonics.setLocalizedText(sendIngestMessagesCheckbox, org.openide.util.NbBundle.getMessage(HashDbImportDatabaseDialog.class, "HashDbImportDatabaseDialog.sendIngestMessagesCheckbox.text")); // NOI18N
+        sendIngestMessagesCheckbox.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                sendIngestMessagesCheckboxActionPerformed(evt);
+            }
+        });
 
         org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(HashDbImportDatabaseDialog.class, "HashDbImportDatabaseDialog.jLabel3.text")); // NOI18N
 
@@ -186,15 +182,22 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(layout.createSequentialGroup()
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addGroup(layout.createSequentialGroup()
-                                .addGap(21, 21, 21)
-                                .addComponent(sendIngestMessagesCheckbox))
-                            .addComponent(searchDuringIngestCheckbox))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addGap(0, 0, Short.MAX_VALUE)
                         .addComponent(okButton)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(cancelButton))
+                    .addGroup(layout.createSequentialGroup()
+                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                            .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+                                .addComponent(jLabel1)
+                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                                .addComponent(hashSetNameTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 303, Short.MAX_VALUE))
+                            .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+                                .addComponent(jLabel3)
+                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                                .addComponent(databasePathTextField)))
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(openButton))
                     .addGroup(layout.createSequentialGroup()
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addComponent(jLabel2)
@@ -202,20 +205,9 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
                                 .addGap(19, 19, 19)
                                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                                     .addComponent(knownRadioButton)
-                                    .addComponent(knownBadRadioButton))))
-                        .addGap(0, 307, Short.MAX_VALUE))
-                    .addGroup(layout.createSequentialGroup()
-                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                            .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
-                                .addComponent(jLabel1)
-                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(hashSetNameTextField))
-                            .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
-                                .addComponent(jLabel3)
-                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(databasePathTextField)))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(openButton)))
+                                    .addComponent(knownBadRadioButton)))
+                            .addComponent(sendIngestMessagesCheckbox))
+                        .addGap(0, 0, Short.MAX_VALUE)))
                 .addContainerGap())
         );
 
@@ -247,9 +239,7 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
                         .addComponent(knownRadioButton)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(knownBadRadioButton)
-                        .addGap(13, 13, 13)
-                        .addComponent(searchDuringIngestCheckbox)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addGap(18, 18, 18)
                         .addComponent(sendIngestMessagesCheckbox)
                         .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
         );
@@ -279,13 +269,11 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
     }//GEN-LAST:event_openButtonActionPerformed
 
     private void knownRadioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_knownRadioButtonActionPerformed
-        searchDuringIngestCheckbox.setSelected(true);
         sendIngestMessagesCheckbox.setSelected(false);
         sendIngestMessagesCheckbox.setEnabled(false);
     }//GEN-LAST:event_knownRadioButtonActionPerformed
 
     private void knownBadRadioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_knownBadRadioButtonActionPerformed
-        searchDuringIngestCheckbox.setSelected(true);
         sendIngestMessagesCheckbox.setSelected(true);
         sendIngestMessagesCheckbox.setEnabled(true);
     }//GEN-LAST:event_knownBadRadioButtonActionPerformed
@@ -340,7 +328,7 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
                                                   "HashDbImportDatabaseDialog.errorMessage.failedToOpenHashDbMsg",
                                                   selectedFilePath);
         try {
-            selectedHashDb = HashDbManager.getInstance().addExistingHashDatabaseInternal(hashSetNameTextField.getText(), selectedFilePath, searchDuringIngestCheckbox.isSelected(), sendIngestMessagesCheckbox.isSelected(), type);
+            selectedHashDb = HashDbManager.getInstance().addExistingHashDatabaseInternal(hashSetNameTextField.getText(), selectedFilePath, true, sendIngestMessagesCheckbox.isSelected(), type);
         } 
         catch (HashDbManagerException ex) {
             Logger.getLogger(HashDbImportDatabaseDialog.class.getName()).log(Level.WARNING, errorMessage, ex);
@@ -364,12 +352,9 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
         dispose();
     }//GEN-LAST:event_okButtonActionPerformed
 
-    private void searchDuringIngestCheckboxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_searchDuringIngestCheckboxActionPerformed
-	sendIngestMessagesCheckbox.setEnabled(searchDuringIngestCheckbox.isSelected());
-        if (!searchDuringIngestCheckbox.isSelected()) {
-            sendIngestMessagesCheckbox.setSelected(false);
-        }        
-    }//GEN-LAST:event_searchDuringIngestCheckboxActionPerformed
+    private void sendIngestMessagesCheckboxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_sendIngestMessagesCheckboxActionPerformed
+        // TODO add your handling code here:
+    }//GEN-LAST:event_sendIngestMessagesCheckboxActionPerformed
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.ButtonGroup buttonGroup1;
@@ -383,7 +368,6 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
     private javax.swing.JRadioButton knownRadioButton;
     private javax.swing.JButton okButton;
     private javax.swing.JButton openButton;
-    private javax.swing.JCheckBox searchDuringIngestCheckbox;
     private javax.swing.JCheckBox sendIngestMessagesCheckbox;
     // End of variables declaration//GEN-END:variables
 }
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java
index 172a37e0ae..bd0636458f 100755
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbManager.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  * 
- * Copyright 2011 - 2013 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");
@@ -16,7 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.sleuthkit.autopsy.hashdatabase;
 
 import java.beans.PropertyChangeEvent;
@@ -31,7 +30,6 @@ import javax.swing.filechooser.FileNameExtensionFilter;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 import org.sleuthkit.autopsy.coreutils.XMLUtil;
@@ -48,7 +46,6 @@ import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.FileUtils;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
-import org.openide.util.Exceptions;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
@@ -59,12 +56,13 @@ import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 
 import org.sleuthkit.autopsy.ingest.IngestManager;
+
 /**
- * This class implements a singleton that manages the set of hash databases
- * used to classify files as unknown, known or known bad. 
+ * This class implements a singleton that manages the set of hash databases used
+ * to classify files as unknown, known or known bad.
  */
 public class HashDbManager implements PropertyChangeListener {
-    
+
     private static final String ROOT_ELEMENT = "hash_sets";
     private static final String SET_ELEMENT = "hash_set";
     private static final String SET_NAME_ATTRIBUTE = "name";
@@ -78,25 +76,27 @@ public class HashDbManager implements PropertyChangeListener {
     private static final String ENCODING = "UTF-8";
     private static final String ALWAYS_CALCULATE_HASHES_ELEMENT = "hash_calculate";
     private static final String VALUE_ATTRIBUTE = "value";
-    private static final String HASH_DATABASE_FILE_EXTENSON = "kdb"; 
-    private static HashDbManager instance = null;        
+    private static final String HASH_DATABASE_FILE_EXTENSON = "kdb";
+    private static HashDbManager instance = null;
     private final String configFilePath = PlatformUtil.getUserConfigDirectory() + File.separator + CONFIG_FILE_NAME;
     private List<HashDb> knownHashSets = new ArrayList<>();
     private List<HashDb> knownBadHashSets = new ArrayList<>();
     private Set<String> hashSetNames = new HashSet<>();
     private Set<String> hashSetPaths = new HashSet<>();
-    private boolean alwaysCalculateHashes = true;            
+    private boolean alwaysCalculateHashes = true;
     PropertyChangeSupport changeSupport = new PropertyChangeSupport(HashDbManager.class);
     private static final Logger logger = Logger.getLogger(HashDbManager.class.getName());
+
     /**
-     * Property change event support
-     *  In events: For both of these enums, the old value should be null, and 
-     *  the new value should be the hashset name string.
+     * Property change event support In events: For both of these enums, the old
+     * value should be null, and the new value should be the hashset name
+     * string.
      */
     public enum SetEvt {
+
         DB_ADDED, DB_DELETED
-    };    
-    
+    };
+
     /**
      * Gets the singleton instance of this class.
      */
@@ -109,126 +109,149 @@ public class HashDbManager implements PropertyChangeListener {
 
     public synchronized void addPropertyChangeListener(PropertyChangeListener listener) {
         changeSupport.addPropertyChangeListener(listener);
-    }    
-    
+    }
+
     private HashDbManager() {
         if (hashSetsConfigurationFileExists()) {
-            readHashSetsConfigurationFromDisk();            
+            readHashSetsConfigurationFromDisk();
         }
     }
 
     /**
-     * Gets the extension, without the dot separator, that the SleuthKit requires
-     * for the hash database files that combine a database and an index and can 
-     * therefore be updated.
+     * Gets the extension, without the dot separator, that the SleuthKit
+     * requires for the hash database files that combine a database and an index
+     * and can therefore be updated.
      */
     static String getHashDatabaseFileExtension() {
         return HASH_DATABASE_FILE_EXTENSON;
     }
-    
+
     public class HashDbManagerException extends Exception {
+
         private HashDbManagerException(String message) {
             super(message);
-        }  
+        }
     }
-    
-     /**
-     * Adds an existing hash database to the set of hash databases used to classify files as known or known bad
-     * and saves the configuration. 
-     * @param hashSetName Name used to represent the hash database in user interface components. 
-     * @param path Full path to either a hash database file or a hash database index file.
-     * @param searchDuringIngest A flag indicating whether or not the hash database should be searched during ingest.
-     * @param sendIngestMessages A flag indicating whether hash set hit messages should be sent as ingest messages.
-     * @param knownFilesType The classification to apply to files whose hashes are found in the hash database. 
+
+    /**
+     * Adds an existing hash database to the set of hash databases used to
+     * classify files as known or known bad and saves the configuration.
+     *
+     * @param hashSetName Name used to represent the hash database in user
+     * interface components.
+     * @param path Full path to either a hash database file or a hash database
+     * index file.
+     * @param searchDuringIngest A flag indicating whether or not the hash
+     * database should be searched during ingest.
+     * @param sendIngestMessages A flag indicating whether hash set hit messages
+     * should be sent as ingest messages.
+     * @param knownFilesType The classification to apply to files whose hashes
+     * are found in the hash database.
      * @return A HashDb representing the hash database.
      * @throws HashDbManagerException
-     */   
-    public HashDb addExistingHashDatabase(String hashSetName, String path, boolean searchDuringIngest, boolean sendIngestMessages, HashDb.KnownFilesType knownFilesType) throws HashDbManagerException{
-        HashDb  hashDb = null;
-        try{
-            addExistingHashDatabaseInternal(hashSetName, path, searchDuringIngest, sendIngestMessages, knownFilesType);
-        }
-        catch(TskCoreException ex){
-            throw new HashDbManagerException(ex.getMessage());         
-        }
-        
-        // Save the configuration
-        if(! save()){
-            throw new HashDbManagerException(NbBundle.getMessage(this.getClass(), "HashDbManager.saveErrorExceptionMsg"));
-        }
-        
-        return hashDb;
-    } 
-    
-    /**
-     * Adds an existing hash database to the set of hash databases used to classify files as known or known bad.
-     * Does not save the configuration - the configuration is only saved on demand to support cancellation of 
-     * configuration panels. 
-     * @param hashSetName Name used to represent the hash database in user interface components. 
-     * @param path Full path to either a hash database file or a hash database index file.
-     * @param searchDuringIngest A flag indicating whether or not the hash database should be searched during ingest.
-     * @param sendIngestMessages A flag indicating whether hash set hit messages should be sent as ingest messages.
-     * @param knownFilesType The classification to apply to files whose hashes are found in the hash database. 
-     * @return A HashDb representing the hash database.
-     * @throws HashDbManagerException, TskCoreException 
      */
-    synchronized HashDb addExistingHashDatabaseInternal(String hashSetName, String path, boolean searchDuringIngest, boolean sendIngestMessages, HashDb.KnownFilesType knownFilesType) throws HashDbManagerException, TskCoreException {
-        if (!new File(path).exists()) {
-            throw new HashDbManagerException(NbBundle.getMessage(HashDbManager.class, "HashDbManager.hashDbDoesNotExistExceptionMsg", path));           
-        }
-        
-        if (hashSetPaths.contains(path)) { 
-            throw new HashDbManagerException(NbBundle.getMessage(HashDbManager.class, "HashDbManager.hashDbAlreadyAddedExceptionMsg", path));
-        }
-        
-        if (hashSetNames.contains(hashSetName)) {
-            throw new HashDbManagerException(NbBundle.getMessage(HashDbManager.class, "HashDbManager.duplicateHashSetNameExceptionMsg", hashSetName));
-        }
-        
-        return addHashDatabase(SleuthkitJNI.openHashDatabase(path), hashSetName, searchDuringIngest, sendIngestMessages, knownFilesType);
-    }
-    
-    /**
-     * Adds a new hash database to the set of hash databases used to classify files as known or known bad
-     * and saves the configuration.
-     * @param hashSetName Hash set name used to represent the hash database in user interface components. 
-     * @param path Full path to the database file to be created.
-     * @param searchDuringIngest A flag indicating whether or not the hash database should be searched during ingest.
-     * @param sendIngestMessages A flag indicating whether hash set hit messages should be sent as ingest messages.
-     * @param knownFilesType The classification to apply to files whose hashes are found in the hash database. 
-     * @return A HashDb representing the hash database.
-     * @throws HashDbManagerException 
-     */
-    public HashDb addNewHashDatabase(String hashSetName, String path, boolean searchDuringIngest, boolean sendIngestMessages, 
-            HashDb.KnownFilesType knownFilesType) throws HashDbManagerException{
-        
+    public HashDb addExistingHashDatabase(String hashSetName, String path, boolean searchDuringIngest, boolean sendIngestMessages, HashDb.KnownFilesType knownFilesType) throws HashDbManagerException {
         HashDb hashDb = null;
-        try{
-            hashDb = addNewHashDatabaseInternal(hashSetName, path, searchDuringIngest, sendIngestMessages, knownFilesType);
-        }
-        catch(TskCoreException ex){
+        try {
+            addExistingHashDatabaseInternal(hashSetName, path, searchDuringIngest, sendIngestMessages, knownFilesType);
+        } catch (TskCoreException ex) {
             throw new HashDbManagerException(ex.getMessage());
         }
-                
+
         // Save the configuration
-        if(! save()){
+        if (!save()) {
             throw new HashDbManagerException(NbBundle.getMessage(this.getClass(), "HashDbManager.saveErrorExceptionMsg"));
         }
-        
+
         return hashDb;
     }
 
     /**
-     * Adds a new hash database to the set of hash databases used to classify files as known or known bad.
-     * Does not save the configuration - the configuration is only saved on demand to support cancellation of 
-     * configuration panels. 
-     * @param hashSetName Hash set name used to represent the hash database in user interface components. 
-     * @param path Full path to the database file to be created.
-     * @param searchDuringIngest A flag indicating whether or not the hash database should be searched during ingest.
-     * @param sendIngestMessages A flag indicating whether hash set hit messages should be sent as ingest messages.
-     * @param knownFilesType The classification to apply to files whose hashes are found in the hash database. 
+     * Adds an existing hash database to the set of hash databases used to
+     * classify files as known or known bad. Does not save the configuration -
+     * the configuration is only saved on demand to support cancellation of
+     * configuration panels.
+     *
+     * @param hashSetName Name used to represent the hash database in user
+     * interface components.
+     * @param path Full path to either a hash database file or a hash database
+     * index file.
+     * @param searchDuringIngest A flag indicating whether or not the hash
+     * database should be searched during ingest.
+     * @param sendIngestMessages A flag indicating whether hash set hit messages
+     * should be sent as ingest messages.
+     * @param knownFilesType The classification to apply to files whose hashes
+     * are found in the hash database.
      * @return A HashDb representing the hash database.
-     * @throws HashDbManagerException, TskCoreException 
+     * @throws HashDbManagerException, TskCoreException
+     */
+    synchronized HashDb addExistingHashDatabaseInternal(String hashSetName, String path, boolean searchDuringIngest, boolean sendIngestMessages, HashDb.KnownFilesType knownFilesType) throws HashDbManagerException, TskCoreException {
+        if (!new File(path).exists()) {
+            throw new HashDbManagerException(NbBundle.getMessage(HashDbManager.class, "HashDbManager.hashDbDoesNotExistExceptionMsg", path));
+        }
+
+        if (hashSetPaths.contains(path)) {
+            throw new HashDbManagerException(NbBundle.getMessage(HashDbManager.class, "HashDbManager.hashDbAlreadyAddedExceptionMsg", path));
+        }
+
+        if (hashSetNames.contains(hashSetName)) {
+            throw new HashDbManagerException(NbBundle.getMessage(HashDbManager.class, "HashDbManager.duplicateHashSetNameExceptionMsg", hashSetName));
+        }
+
+        return addHashDatabase(SleuthkitJNI.openHashDatabase(path), hashSetName, searchDuringIngest, sendIngestMessages, knownFilesType);
+    }
+
+    /**
+     * Adds a new hash database to the set of hash databases used to classify
+     * files as known or known bad and saves the configuration.
+     *
+     * @param hashSetName Hash set name used to represent the hash database in
+     * user interface components.
+     * @param path Full path to the database file to be created.
+     * @param searchDuringIngest A flag indicating whether or not the hash
+     * database should be searched during ingest.
+     * @param sendIngestMessages A flag indicating whether hash set hit messages
+     * should be sent as ingest messages.
+     * @param knownFilesType The classification to apply to files whose hashes
+     * are found in the hash database.
+     * @return A HashDb representing the hash database.
+     * @throws HashDbManagerException
+     */
+    public HashDb addNewHashDatabase(String hashSetName, String path, boolean searchDuringIngest, boolean sendIngestMessages,
+            HashDb.KnownFilesType knownFilesType) throws HashDbManagerException {
+
+        HashDb hashDb = null;
+        try {
+            hashDb = addNewHashDatabaseInternal(hashSetName, path, searchDuringIngest, sendIngestMessages, knownFilesType);
+        } catch (TskCoreException ex) {
+            throw new HashDbManagerException(ex.getMessage());
+        }
+
+        // Save the configuration
+        if (!save()) {
+            throw new HashDbManagerException(NbBundle.getMessage(this.getClass(), "HashDbManager.saveErrorExceptionMsg"));
+        }
+
+        return hashDb;
+    }
+
+    /**
+     * Adds a new hash database to the set of hash databases used to classify
+     * files as known or known bad. Does not save the configuration - the
+     * configuration is only saved on demand to support cancellation of
+     * configuration panels.
+     *
+     * @param hashSetName Hash set name used to represent the hash database in
+     * user interface components.
+     * @param path Full path to the database file to be created.
+     * @param searchDuringIngest A flag indicating whether or not the hash
+     * database should be searched during ingest.
+     * @param sendIngestMessages A flag indicating whether hash set hit messages
+     * should be sent as ingest messages.
+     * @param knownFilesType The classification to apply to files whose hashes
+     * are found in the hash database.
+     * @return A HashDb representing the hash database.
+     * @throws HashDbManagerException, TskCoreException
      */
     synchronized HashDb addNewHashDatabaseInternal(String hashSetName, String path, boolean searchDuringIngest, boolean sendIngestMessages, HashDb.KnownFilesType knownFilesType) throws HashDbManagerException, TskCoreException {
         File file = new File(path);
@@ -237,24 +260,24 @@ public class HashDbManager implements PropertyChangeListener {
         }
         if (!FilenameUtils.getExtension(file.getName()).equalsIgnoreCase(HASH_DATABASE_FILE_EXTENSON)) {
             throw new HashDbManagerException(NbBundle.getMessage(HashDbManager.class, "HashDbManager.illegalHashDbFileNameExtensionMsg",
-                                      getHashDatabaseFileExtension()));
+                    getHashDatabaseFileExtension()));
         }
-        
+
         if (hashSetPaths.contains(path)) {
-            throw new HashDbManagerException(NbBundle.getMessage(HashDbManager.class, "HashDbManager.hashDbAlreadyAddedExceptionMsg", path));            
+            throw new HashDbManagerException(NbBundle.getMessage(HashDbManager.class, "HashDbManager.hashDbAlreadyAddedExceptionMsg", path));
         }
-        
+
         if (hashSetNames.contains(hashSetName)) {
             throw new HashDbManagerException(NbBundle.getMessage(HashDbManager.class, "HashDbManager.duplicateHashSetNameExceptionMsg", hashSetName));
         }
-        
+
         return addHashDatabase(SleuthkitJNI.createHashDatabase(path), hashSetName, searchDuringIngest, sendIngestMessages, knownFilesType);
-    }    
+    }
 
     private HashDb addHashDatabase(int handle, String hashSetName, boolean searchDuringIngest, boolean sendIngestMessages, HashDb.KnownFilesType knownFilesType) throws TskCoreException {
         // Wrap an object around the handle.
         HashDb hashDb = new HashDb(handle, hashSetName, searchDuringIngest, sendIngestMessages, knownFilesType);
-        
+
         // Get the indentity data before updating the collections since the 
         // accessor methods may throw. 
         String databasePath = hashDb.getDatabasePath();
@@ -264,25 +287,23 @@ public class HashDbManager implements PropertyChangeListener {
         // and the same database is not added to the configuration more than once.
         hashSetNames.add(hashDb.getHashSetName());
         if (!databasePath.equals("None")) {
-            hashSetPaths.add(databasePath);            
+            hashSetPaths.add(databasePath);
         }
         if (!indexPath.equals("None")) {
-            hashSetPaths.add(indexPath);            
+            hashSetPaths.add(indexPath);
         }
-        
+
         // Add the hash database to the appropriate collection for its type.
         if (hashDb.getKnownFilesType() == HashDb.KnownFilesType.KNOWN) {
             knownHashSets.add(hashDb);
-        }
-        else {
+        } else {
             knownBadHashSets.add(hashDb);
-        }      
-        
+        }
+
         // Let any external listeners know that there's a new set   
         try {
             changeSupport.firePropertyChange(SetEvt.DB_ADDED.toString(), null, hashSetName);
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             logger.log(Level.SEVERE, "HashDbManager listener threw exception", e);
             MessageNotifyUtil.Notify.show(
                     "Module Error",
@@ -291,54 +312,55 @@ public class HashDbManager implements PropertyChangeListener {
         }
         return hashDb;
     }
-        
+
     synchronized void indexHashDatabase(HashDb hashDb) {
         hashDb.addPropertyChangeListener(this);
         HashDbIndexer creator = new HashDbIndexer(hashDb);
-        creator.execute();        
+        creator.execute();
     }
-    
+
     @Override
     public void propertyChange(PropertyChangeEvent event) {
         if (event.getPropertyName().equals(HashDb.Event.INDEXING_DONE.name())) {
-            HashDb hashDb = (HashDb)event.getNewValue();
+            HashDb hashDb = (HashDb) event.getNewValue();
             if (null != hashDb) {
                 try {
                     String indexPath = hashDb.getIndexPath();
                     if (!indexPath.equals("None")) {
-                        hashSetPaths.add(indexPath);            
-                    }                
-                }
-                catch (TskCoreException ex) {
-                    Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error getting index path of " + hashDb.getHashSetName() + " hash database after indexing", ex);                            
+                        hashSetPaths.add(indexPath);
+                    }
+                } catch (TskCoreException ex) {
+                    Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error getting index path of " + hashDb.getHashSetName() + " hash database after indexing", ex);
                 }
             }
         }
     }
-    
+
     /**
-     * Removes a hash database from the set of hash databases used to classify 
+     * Removes a hash database from the set of hash databases used to classify
      * files as known or known bad and saves the configuration.
-     * @param hashDb 
+     *
+     * @param hashDb
      * @throws HashDbManagerException
      */
     public synchronized void removeHashDatabase(HashDb hashDb) throws HashDbManagerException {
         // Don't remove a database if ingest is running
         boolean ingestIsRunning = IngestManager.getDefault().isIngestRunning();
-        if(ingestIsRunning){
+        if (ingestIsRunning) {
             throw new HashDbManagerException(NbBundle.getMessage(this.getClass(), "HashDbManager.ingestRunningExceptionMsg"));
         }
         removeHashDatabaseInternal(hashDb);
-        if(! save()){
+        if (!save()) {
             throw new HashDbManagerException(NbBundle.getMessage(this.getClass(), "HashDbManager.saveErrorExceptionMsg"));
         }
     }
-        
+
     /**
-     * Removes a hash database from the set of hash databases used to classify 
-     * files as known or known bad. Does not save the configuration - the 
-     * configuration is only saved on demand to support cancellation of 
+     * Removes a hash database from the set of hash databases used to classify
+     * files as known or known bad. Does not save the configuration - the
+     * configuration is only saved on demand to support cancellation of
      * configuration panels.
+     *
      * @throws TskCoreException
      */
     synchronized void removeHashDatabaseInternal(HashDb hashDb) {
@@ -354,41 +376,39 @@ public class HashDbManager implements PropertyChangeListener {
         // Now undertake the operations that could throw.
         try {
             hashSetPaths.remove(hashDb.getIndexPath());
-        }
-        catch (TskCoreException ex) {
-            Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error getting index path of " + hashDb.getHashSetName() + " hash database when removing the database", ex);            
+        } catch (TskCoreException ex) {
+            Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error getting index path of " + hashDb.getHashSetName() + " hash database when removing the database", ex);
         }
         try {
             if (!hashDb.hasIndexOnly()) {
                 hashSetPaths.remove(hashDb.getDatabasePath());
-            }    
-        }
-        catch (TskCoreException ex) {
-            Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error getting database path of " + hashDb.getHashSetName() + " hash database when removing the database", ex);            
+            }
+        } catch (TskCoreException ex) {
+            Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error getting database path of " + hashDb.getHashSetName() + " hash database when removing the database", ex);
         }
         try {
-            hashDb.close();            
+            hashDb.close();
+        } catch (TskCoreException ex) {
+            Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error closing " + hashDb.getHashSetName() + " hash database when removing the database", ex);
         }
-        catch (TskCoreException ex) {
-            Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error closing " + hashDb.getHashSetName() + " hash database when removing the database", ex);                        
-        }
-        
+
         // Let any external listeners know that a set has been deleted
-       
+
         try {
-             changeSupport.firePropertyChange(SetEvt.DB_DELETED.toString(), null, hashSetName);  
-        }
-        catch (Exception e) {
+            changeSupport.firePropertyChange(SetEvt.DB_DELETED.toString(), null, hashSetName);
+        } catch (Exception e) {
             logger.log(Level.SEVERE, "HashDbManager listener threw exception", e);
             MessageNotifyUtil.Notify.show(
                     "Module Error",
                     NbBundle.getMessage(this.getClass(), "HashDbManager.moduleErrorListeningToUpdatesMsg"),
                     MessageNotifyUtil.MessageType.ERROR);
         }
-    }     
+    }
 
     /**
-     * Gets all of the hash databases used to classify files as known or known bad.
+     * Gets all of the hash databases used to classify files as known or known
+     * bad.
+     *
      * @return A list, possibly empty, of hash databases.
      */
     public synchronized List<HashDb> getAllHashSets() {
@@ -396,10 +416,11 @@ public class HashDbManager implements PropertyChangeListener {
         hashDbs.addAll(knownHashSets);
         hashDbs.addAll(knownBadHashSets);
         return hashDbs;
-    }    
-    
-    /** 
+    }
+
+    /**
      * Gets all of the hash databases used to classify files as known.
+     *
      * @return A list, possibly empty, of hash databases.
      */
     public synchronized List<HashDb> getKnownFileHashSets() {
@@ -407,9 +428,10 @@ public class HashDbManager implements PropertyChangeListener {
         hashDbs.addAll(knownHashSets);
         return hashDbs;
     }
-        
-    /** 
+
+    /**
      * Gets all of the hash databases used to classify files as known bad.
+     *
      * @return A list, possibly empty, of hash databases.
      */
     public synchronized List<HashDb> getKnownBadFileHashSets() {
@@ -417,14 +439,15 @@ public class HashDbManager implements PropertyChangeListener {
         hashDbs.addAll(knownBadHashSets);
         return hashDbs;
     }
-           
-    /** 
+
+    /**
      * Gets all of the hash databases that accept updates.
+     *
      * @return A list, possibly empty, of hash databases.
      */
     public synchronized List<HashDb> getUpdateableHashSets() {
         List<HashDb> updateableDbs = getUpdateableHashSets(knownHashSets);
-        updateableDbs.addAll(getUpdateableHashSets(knownBadHashSets));        
+        updateableDbs.addAll(getUpdateableHashSets(knownBadHashSets));
         return updateableDbs;
     }
 
@@ -435,33 +458,33 @@ public class HashDbManager implements PropertyChangeListener {
                 if (db.isUpdateable()) {
                     updateableDbs.add(db);
                 }
-            }
-            catch (TskCoreException ex) {
+            } catch (TskCoreException ex) {
                 Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error checking updateable status of " + db.getHashSetName() + " hash database", ex);
             }
-        }   
-        return updateableDbs;        
-    }    
-    
+        }
+        return updateableDbs;
+    }
+
     /**
-     * Sets the value for the flag that indicates whether hashes should be calculated
-     * for content even if no hash databases are configured.
+     * Sets the value for the flag that indicates whether hashes should be
+     * calculated for content even if no hash databases are configured.
      */
     synchronized void setAlwaysCalculateHashes(boolean alwaysCalculateHashes) {
         this.alwaysCalculateHashes = alwaysCalculateHashes;
     }
-    
+
     /**
-     * Gets the flag that indicates whether hashes should be calculated
-     * for content even if no hash databases are configured.
+     * Gets the flag that indicates whether hashes should be calculated for
+     * content even if no hash databases are configured.
      */
     synchronized boolean getAlwaysCalculateHashes() {
         return alwaysCalculateHashes;
     }
-    
+
     /**
-     * Saves the hash sets configuration. Note that the configuration is only 
+     * Saves the hash sets configuration. Note that the configuration is only
      * saved on demand to support cancellation of configuration panels.
+     *
      * @return True on success, false otherwise.
      */
     synchronized boolean save() {
@@ -469,17 +492,17 @@ public class HashDbManager implements PropertyChangeListener {
     }
 
     /**
-     * Restores the last saved hash sets configuration. This supports 
+     * Restores the last saved hash sets configuration. This supports
      * cancellation of configuration panels.
      */
-    public synchronized void loadLastSavedConfiguration() {        
+    public synchronized void loadLastSavedConfiguration() {
         closeHashDatabases(knownHashSets);
         closeHashDatabases(knownBadHashSets);
         hashSetNames.clear();
         hashSetPaths.clear();
-                
+
         if (hashSetsConfigurationFileExists()) {
-            readHashSetsConfigurationFromDisk();            
+            readHashSetsConfigurationFromDisk();
         }
     }
 
@@ -487,14 +510,13 @@ public class HashDbManager implements PropertyChangeListener {
         for (HashDb database : hashDatabases) {
             try {
                 database.close();
-            }
-            catch (TskCoreException ex) {
+            } catch (TskCoreException ex) {
                 Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error closing " + database.getHashSetName() + " hash database", ex);
             }
         }
-        hashDatabases.clear();            
+        hashDatabases.clear();
     }
-    
+
     private boolean writeHashSetConfigurationToDisk() {
         boolean success = false;
         DocumentBuilderFactory dbfac = DocumentBuilderFactory.newInstance();
@@ -506,20 +528,19 @@ public class HashDbManager implements PropertyChangeListener {
 
             writeHashDbsToDisk(doc, rootEl, knownHashSets);
             writeHashDbsToDisk(doc, rootEl, knownBadHashSets);
-            
+
             String calcValue = Boolean.toString(alwaysCalculateHashes);
             Element setCalc = doc.createElement(ALWAYS_CALCULATE_HASHES_ELEMENT);
             setCalc.setAttribute(VALUE_ATTRIBUTE, calcValue);
             rootEl.appendChild(setCalc);
 
             success = XMLUtil.saveDoc(HashDbManager.class, configFilePath, ENCODING, doc);
-        } 
-        catch (ParserConfigurationException ex) {
+        } catch (ParserConfigurationException ex) {
             Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error saving hash databases", ex);
         }
-        return success;        
+        return success;
     }
-    
+
     private static void writeHashDbsToDisk(Document doc, Element rootEl, List<HashDb> hashDbs) {
         for (HashDb db : hashDbs) {
             // Get the path for the hash database before writing anything, in
@@ -528,15 +549,13 @@ public class HashDbManager implements PropertyChangeListener {
             try {
                 if (db.hasIndexOnly()) {
                     path = db.getIndexPath();
-                }
-                else {
+                } else {
                     path = db.getDatabasePath();
-                }                
-            }
-            catch (TskCoreException ex) {
-                Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error getting path of hash database " + db.getHashSetName() + ", discarding from hash database configuration", ex);                
+                }
+            } catch (TskCoreException ex) {
+                Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error getting path of hash database " + db.getHashSetName() + ", discarding from hash database configuration", ex);
                 continue;
-            }            
+            }
 
             Element setElement = doc.createElement(SET_ELEMENT);
             setElement.setAttribute(SET_NAME_ATTRIBUTE, db.getHashSetName());
@@ -545,19 +564,19 @@ public class HashDbManager implements PropertyChangeListener {
             setElement.setAttribute(SEND_INGEST_MESSAGES_ATTRIBUTE, Boolean.toString(db.getSendIngestMessages()));
             Element pathElement = doc.createElement(PATH_ELEMENT);
             pathElement.setTextContent(path);
-            setElement.appendChild(pathElement);            
-            rootEl.appendChild(setElement);                
-        }        
+            setElement.appendChild(pathElement);
+            rootEl.appendChild(setElement);
+        }
     }
-    
+
     private boolean hashSetsConfigurationFileExists() {
         File f = new File(configFilePath);
         return f.exists() && f.canRead() && f.canWrite();
-    }                    
-    
+    }
+
     private boolean readHashSetsConfigurationFromDisk() {
         boolean updatedSchema = false;
-        
+
         // Open the XML document that implements the configuration file.
         final Document doc = XMLUtil.loadDoc(HashDbManager.class, configFilePath, XSD_FILE_NAME);
         if (doc == null) {
@@ -570,147 +589,141 @@ public class HashDbManager implements PropertyChangeListener {
             Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error loading hash sets: invalid file format.");
             return false;
         }
-        
+
         // Get the hash set elements.
         NodeList setsNList = root.getElementsByTagName(SET_ELEMENT);
         int numSets = setsNList.getLength();
-        if(numSets == 0) {
+        if (numSets == 0) {
             Logger.getLogger(HashDbManager.class.getName()).log(Level.WARNING, "No element hash_set exists.");
         }
-        
+
         // Create HashDb objects for each hash set element. Skip to the next hash database if the definition of
         // a particular hash database is not well-formed.
         String attributeErrorMessage = " attribute was not set for hash_set at index {0}, cannot make instance of HashDb class";
         String elementErrorMessage = " element was not set for hash_set at index {0}, cannot make instance of HashDb class";
         for (int i = 0; i < numSets; ++i) {
             Element setEl = (Element) setsNList.item(i);
-                                   
+
             String hashSetName = setEl.getAttribute(SET_NAME_ATTRIBUTE);
             if (hashSetName.isEmpty()) {
                 Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, SET_NAME_ATTRIBUTE + attributeErrorMessage, i);
                 continue;
-            }                                 
-            
+            }
+
             // Handle configurations saved before duplicate hash set names were not permitted.
             if (hashSetNames.contains(hashSetName)) {
                 int suffix = 0;
                 String newHashSetName;
                 do {
                     ++suffix;
-                    newHashSetName = hashSetName + suffix; 
-                }
-                while (hashSetNames.contains(newHashSetName));
+                    newHashSetName = hashSetName + suffix;
+                } while (hashSetNames.contains(newHashSetName));
                 JOptionPane.showMessageDialog(null,
-                                              NbBundle.getMessage(this.getClass(),
-                                                                  "HashDbManager.replacingDuplicateHashsetNameMsg",
-                                                                  hashSetName, newHashSetName),
-                                              NbBundle.getMessage(this.getClass(), "HashDbManager.openHashDbErr"),
-                                              JOptionPane.ERROR_MESSAGE);
+                        NbBundle.getMessage(this.getClass(),
+                        "HashDbManager.replacingDuplicateHashsetNameMsg",
+                        hashSetName, newHashSetName),
+                        NbBundle.getMessage(this.getClass(), "HashDbManager.openHashDbErr"),
+                        JOptionPane.ERROR_MESSAGE);
                 hashSetName = newHashSetName;
             }
-           
+
             String knownFilesType = setEl.getAttribute(SET_TYPE_ATTRIBUTE);
-            if(knownFilesType.isEmpty()) {
+            if (knownFilesType.isEmpty()) {
                 Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, SET_TYPE_ATTRIBUTE + attributeErrorMessage, i);
                 continue;
             }
-            
+
             // Handle legacy known files types.
             if (knownFilesType.equals("NSRL")) {
                 knownFilesType = HashDb.KnownFilesType.KNOWN.toString();
                 updatedSchema = true;
-            }                                    
-            
+            }
+
             final String searchDuringIngest = setEl.getAttribute(SEARCH_DURING_INGEST_ATTRIBUTE);
             if (searchDuringIngest.isEmpty()) {
                 Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, SEARCH_DURING_INGEST_ATTRIBUTE + attributeErrorMessage, i);
-                continue;                
+                continue;
             }
             Boolean seearchDuringIngestFlag = Boolean.parseBoolean(searchDuringIngest);
 
             final String sendIngestMessages = setEl.getAttribute(SEND_INGEST_MESSAGES_ATTRIBUTE);
             if (searchDuringIngest.isEmpty()) {
                 Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, SEND_INGEST_MESSAGES_ATTRIBUTE + attributeErrorMessage, i);
-                continue;                
+                continue;
             }
             Boolean sendIngestMessagesFlag = Boolean.parseBoolean(sendIngestMessages);
 
             String dbPath;
             NodeList pathsNList = setEl.getElementsByTagName(PATH_ELEMENT);
-            if (pathsNList.getLength() > 0) {                
+            if (pathsNList.getLength() > 0) {
                 Element pathEl = (Element) pathsNList.item(0); // Shouldn't be more than one.
-                
+
                 // Check for legacy path number attribute.
-                String legacyPathNumber = pathEl.getAttribute(LEGACY_PATH_NUMBER_ATTRIBUTE); 
+                String legacyPathNumber = pathEl.getAttribute(LEGACY_PATH_NUMBER_ATTRIBUTE);
                 if (null != legacyPathNumber && !legacyPathNumber.isEmpty()) {
-                    updatedSchema =  true;
+                    updatedSchema = true;
                 }
-                
+
                 dbPath = pathEl.getTextContent();
                 if (dbPath.isEmpty()) {
                     Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, PATH_ELEMENT + elementErrorMessage, i);
-                    continue;                                                    
-                }                                
-            }
-            else {
+                    continue;
+                }
+            } else {
                 Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, PATH_ELEMENT + elementErrorMessage, i);
-                continue;                                
+                continue;
             }
             dbPath = getValidFilePath(hashSetName, dbPath);
-                        
+
             if (null != dbPath) {
                 try {
                     addExistingHashDatabaseInternal(hashSetName, dbPath, seearchDuringIngestFlag, sendIngestMessagesFlag, HashDb.KnownFilesType.valueOf(knownFilesType));
-                }
-                catch (HashDbManagerException | TskCoreException ex) {
-                    Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error opening hash database", ex);                
+                } catch (HashDbManagerException | TskCoreException ex) {
+                    Logger.getLogger(HashDbManager.class.getName()).log(Level.SEVERE, "Error opening hash database", ex);
                     JOptionPane.showMessageDialog(null,
-                                                  NbBundle.getMessage(this.getClass(),
-                                                                      "HashDbManager.unableToOpenHashDbMsg", dbPath),
-                                                  NbBundle.getMessage(this.getClass(), "HashDbManager.openHashDbErr"),
-                                                  JOptionPane.ERROR_MESSAGE);
+                            NbBundle.getMessage(this.getClass(),
+                            "HashDbManager.unableToOpenHashDbMsg", dbPath),
+                            NbBundle.getMessage(this.getClass(), "HashDbManager.openHashDbErr"),
+                            JOptionPane.ERROR_MESSAGE);
                 }
-            } 
-            else {
+            } else {
                 Logger.getLogger(HashDbManager.class.getName()).log(Level.WARNING, "No valid path for hash_set at index {0}, cannot make instance of HashDb class", i);
             }
         }
-        
+
         // Get the element that stores the always calculate hashes flag.
         NodeList calcList = root.getElementsByTagName(ALWAYS_CALCULATE_HASHES_ELEMENT);
         if (calcList.getLength() > 0) {
             Element calcEl = (Element) calcList.item(0); // Shouldn't be more than one.
             final String value = calcEl.getAttribute(VALUE_ATTRIBUTE);
-            alwaysCalculateHashes = Boolean.parseBoolean(value);            
-        }
-        else {
+            alwaysCalculateHashes = Boolean.parseBoolean(value);
+        } else {
             Logger.getLogger(HashDbManager.class.getName()).log(Level.WARNING, " element ");
             alwaysCalculateHashes = true;
         }
 
-        if (updatedSchema) {    
+        if (updatedSchema) {
             String backupFilePath = configFilePath + ".v1_backup";
             String messageBoxTitle = NbBundle.getMessage(this.getClass(),
-                                                         "HashDbManager.msgBoxTitle.confFileFmtChanged");
+                    "HashDbManager.msgBoxTitle.confFileFmtChanged");
             String baseMessage = NbBundle.getMessage(this.getClass(),
-                                                     "HashDbManager.baseMessage.updatedFormatHashDbConfig");
+                    "HashDbManager.baseMessage.updatedFormatHashDbConfig");
             try {
-                FileUtils.copyFile(new File(configFilePath), new File (backupFilePath));
+                FileUtils.copyFile(new File(configFilePath), new File(backupFilePath));
                 JOptionPane.showMessageDialog(null,
-                                              NbBundle.getMessage(this.getClass(),
-                                                                  "HashDbManager.savedBackupOfOldConfigMsg",
-                                                                  baseMessage, backupFilePath),
-                                              messageBoxTitle,
-                                              JOptionPane.INFORMATION_MESSAGE);
-            }
-            catch (IOException ex) {
+                        NbBundle.getMessage(this.getClass(),
+                        "HashDbManager.savedBackupOfOldConfigMsg",
+                        baseMessage, backupFilePath),
+                        messageBoxTitle,
+                        JOptionPane.INFORMATION_MESSAGE);
+            } catch (IOException ex) {
                 Logger.getLogger(HashDbManager.class.getName()).log(Level.WARNING, "Failed to save backup of old format configuration file to " + backupFilePath, ex);
-                JOptionPane.showMessageDialog(null, baseMessage, messageBoxTitle, JOptionPane.INFORMATION_MESSAGE);                                
+                JOptionPane.showMessageDialog(null, baseMessage, messageBoxTitle, JOptionPane.INFORMATION_MESSAGE);
             }
-                        
+
             writeHashSetConfigurationToDisk();
         }
-        
+
         return true;
     }
 
@@ -720,31 +733,31 @@ public class HashDbManager implements PropertyChangeListener {
         if (database.exists()) {
             return configuredPath;
         }
-        
+
         // Give the user an opportunity to find the desired file.
         String newPath = null;
         if (JOptionPane.showConfirmDialog(null,
-                                          NbBundle.getMessage(this.getClass(), "HashDbManager.dlgMsg.dbNotFoundAtLoc",
-                                                              hashSetName, configuredPath),
-                                          NbBundle.getMessage(this.getClass(), "HashDbManager.dlgTitle.MissingDb"),
-                                          JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
+                NbBundle.getMessage(this.getClass(), "HashDbManager.dlgMsg.dbNotFoundAtLoc",
+                hashSetName, configuredPath),
+                NbBundle.getMessage(this.getClass(), "HashDbManager.dlgTitle.MissingDb"),
+                JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {
             newPath = searchForFile();
-            if (null != newPath && !newPath.isEmpty()) {                
-                database = new File(newPath); 
+            if (null != newPath && !newPath.isEmpty()) {
+                database = new File(newPath);
                 if (!database.exists()) {
-                    newPath =  null;
-                } 
+                    newPath = null;
+                }
             }
         }
         return newPath;
     }
-    
+
     private String searchForFile() {
         String filePath = null;
         JFileChooser fc = new JFileChooser();
         fc.setDragEnabled(false);
         fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
-        String[] EXTENSION = new String[] { "txt", "idx", "hash", "Hash", "kdb" };
+        String[] EXTENSION = new String[]{"txt", "idx", "hash", "Hash", "kdb"};
         FileNameExtensionFilter filter = new FileNameExtensionFilter(
                 NbBundle.getMessage(this.getClass(), "HashDbManager.fileNameExtensionFilter.title"), EXTENSION);
         fc.setFileFilter(filter);
@@ -753,27 +766,27 @@ public class HashDbManager implements PropertyChangeListener {
             File f = fc.getSelectedFile();
             try {
                 filePath = f.getCanonicalPath();
-            } 
-            catch (IOException ex) {
+            } catch (IOException ex) {
                 Logger.getLogger(HashDbManager.class.getName()).log(Level.WARNING, "Couldn't get selected file path", ex);
-            } 
-        }        
+            }
+        }
         return filePath;
-    }    
-        
+    }
+
     /**
-     * Instances of this class represent hash databases used to classify files as known or know bad. 
+     * Instances of this class represent hash databases used to classify files
+     * as known or know bad.
      */
     public static class HashDb {
 
         /**
-         * Indicates how files with hashes stored in a particular hash database 
+         * Indicates how files with hashes stored in a particular hash database
          * object should be classified.
          */
-        public enum KnownFilesType{
+        public enum KnownFilesType {
+
             KNOWN(NbBundle.getMessage(HashDbManager.class, "HashDbManager.known.text")),
             KNOWN_BAD(NbBundle.getMessage(HashDbManager.class, "HashDbManager.knownBad.text"));
-
             private String displayName;
 
             private KnownFilesType(String displayName) {
@@ -784,21 +797,21 @@ public class HashDbManager implements PropertyChangeListener {
                 return this.displayName;
             }
         }
-            
+
         /**
          * Property change events published by hash database objects.
          */
         public enum Event {
+
             INDEXING_DONE
         }
-
         private int handle;
         private String hashSetName;
         private boolean searchDuringIngest;
         private boolean sendIngestMessages;
         private KnownFilesType knownFilesType;
         private boolean indexing;
-        private final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);    
+        private final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
 
         private HashDb(int handle, String hashSetName, boolean useForIngest, boolean sendHitMessages, KnownFilesType knownFilesType) {
             this.handle = handle;
@@ -810,14 +823,14 @@ public class HashDbManager implements PropertyChangeListener {
         }
 
         /**
-         * Adds a listener for the events defined in HashDb.Event. 
+         * Adds a listener for the events defined in HashDb.Event.
          */
         public void addPropertyChangeListener(PropertyChangeListener pcl) {
             propertyChangeSupport.addPropertyChangeListener(pcl);
         }
 
         /**
-         * Removes a listener for the events defined in HashDb.Event. 
+         * Removes a listener for the events defined in HashDb.Event.
          */
         public void removePropertyChangeListener(PropertyChangeListener pcl) {
             propertyChangeSupport.removePropertyChangeListener(pcl);
@@ -828,7 +841,7 @@ public class HashDbManager implements PropertyChangeListener {
         }
 
         public String getDatabasePath() throws TskCoreException {
-            return SleuthkitJNI.getHashDatabasePath(handle); 
+            return SleuthkitJNI.getHashDatabasePath(handle);
         }
 
         public String getIndexPath() throws TskCoreException {
@@ -857,84 +870,91 @@ public class HashDbManager implements PropertyChangeListener {
 
         /**
          * Indicates whether the hash database accepts updates.
+         *
          * @return True if the database accepts updates, false otherwise.
          */
         public boolean isUpdateable() throws TskCoreException {
-            return SleuthkitJNI.isUpdateableHashDatabase(this.handle);        
+            return SleuthkitJNI.isUpdateableHashDatabase(this.handle);
         }
 
         /**
-         * Adds hashes of content (if calculated) to the hash database. 
-         * @param content The content for which the calculated hashes, if any, are to be added to the hash database.
-         * @throws TskCoreException 
+         * Adds hashes of content (if calculated) to the hash database.
+         *
+         * @param content The content for which the calculated hashes, if any,
+         * are to be added to the hash database.
+         * @throws TskCoreException
          */
         public void addHashes(Content content) throws TskCoreException {
             addHashes(content, null);
-        }    
+        }
 
         /**
-         * Adds hashes of content (if calculated) to the hash database. 
-         * @param content The content for which the calculated hashes, if any, are to be added to the hash database.
-         * @param comment A comment to associate with the hashes, e.g., the name of the case in which the content was encountered.
-         * @throws TskCoreException 
+         * Adds hashes of content (if calculated) to the hash database.
+         *
+         * @param content The content for which the calculated hashes, if any,
+         * are to be added to the hash database.
+         * @param comment A comment to associate with the hashes, e.g., the name
+         * of the case in which the content was encountered.
+         * @throws TskCoreException
          */
         public void addHashes(Content content, String comment) throws TskCoreException {
             // This only works for AbstractFiles and MD5 hashes at present. 
             assert content instanceof AbstractFile;
             if (content instanceof AbstractFile) {
-                AbstractFile file = (AbstractFile)content;
+                AbstractFile file = (AbstractFile) content;
                 if (null != file.getMd5Hash()) {
                     SleuthkitJNI.addToHashDatabase(null, file.getMd5Hash(), null, null, comment, handle);
                 }
             }
         }
-        
+
         /**
          * Adds a list of hashes to the hash database at once
+         *
          * @param hashes List of hashes
          * @throws TskCoreException
          */
-        public void addHashes(List<HashEntry> hashes) throws TskCoreException{
+        public void addHashes(List<HashEntry> hashes) throws TskCoreException {
             SleuthkitJNI.addToHashDatabase(hashes, handle);
         }
 
-         public boolean hasMd5HashOf(Content content) throws TskCoreException {         
-            boolean result = false; 
+        public boolean hasMd5HashOf(Content content) throws TskCoreException {
+            boolean result = false;
             assert content instanceof AbstractFile;
             if (content instanceof AbstractFile) {
-                AbstractFile file = (AbstractFile)content;
+                AbstractFile file = (AbstractFile) content;
                 if (null != file.getMd5Hash()) {
                     result = SleuthkitJNI.lookupInHashDatabase(file.getMd5Hash(), handle);
                 }
-            }         
+            }
             return result;
-         }
+        }
 
         public HashInfo lookUp(Content content) throws TskCoreException {
             HashInfo result = null;
             // This only works for AbstractFiles and MD5 hashes at present. 
             assert content instanceof AbstractFile;
             if (content instanceof AbstractFile) {
-                AbstractFile file = (AbstractFile)content;
+                AbstractFile file = (AbstractFile) content;
                 if (null != file.getMd5Hash()) {
                     result = SleuthkitJNI.lookupInHashDatabaseVerbose(file.getMd5Hash(), handle);
                 }
-            }             
+            }
             return result;
-        }         
+        }
 
         boolean hasIndex() throws TskCoreException {
-            return SleuthkitJNI.hashDatabaseHasLookupIndex(handle);        
+            return SleuthkitJNI.hashDatabaseHasLookupIndex(handle);
         }
 
         boolean hasIndexOnly() throws TskCoreException {
-            return SleuthkitJNI.hashDatabaseIsIndexOnly(handle);        
+            return SleuthkitJNI.hashDatabaseIsIndexOnly(handle);
         }
-        
+
         boolean canBeReIndexed() throws TskCoreException {
             return SleuthkitJNI.hashDatabaseCanBeReindexed(handle);
         }
-        
+
         boolean isIndexing() {
             return indexing;
         }
@@ -943,17 +963,20 @@ public class HashDbManager implements PropertyChangeListener {
             SleuthkitJNI.closeHashDatabase(handle);
         }
     }
-    
+
     /**
      * Worker thread to make an index of a database
      */
     private class HashDbIndexer extends SwingWorker<Object, Void> {
+
         private ProgressHandle progress = null;
         private HashDb hashDb = null;
 
         HashDbIndexer(HashDb hashDb) {
             this.hashDb = hashDb;
-        };
+        }
+
+        ;
 
         @Override
         protected Object doInBackground() {
@@ -964,15 +987,14 @@ public class HashDbManager implements PropertyChangeListener {
             progress.switchToIndeterminate();
             try {
                 SleuthkitJNI.createLookupIndexForHashDatabase(hashDb.handle);
-            }
-            catch (TskCoreException ex) {
-                Logger.getLogger(HashDb.class.getName()).log(Level.SEVERE, "Error indexing hash database", ex);                
+            } catch (TskCoreException ex) {
+                Logger.getLogger(HashDb.class.getName()).log(Level.SEVERE, "Error indexing hash database", ex);
                 JOptionPane.showMessageDialog(null,
-                                              NbBundle.getMessage(this.getClass(),
-                                                                  "HashDbManager.dlgMsg.errorIndexingHashSet",
-                                                                  hashDb.getHashSetName()),
-                                              NbBundle.getMessage(this.getClass(), "HashDbManager.hashDbIndexingErr"),
-                                              JOptionPane.ERROR_MESSAGE);
+                        NbBundle.getMessage(this.getClass(),
+                        "HashDbManager.dlgMsg.errorIndexingHashSet",
+                        hashDb.getHashSetName()),
+                        NbBundle.getMessage(this.getClass(), "HashDbManager.hashDbIndexingErr"),
+                        JOptionPane.ERROR_MESSAGE);
             }
             return null;
         }
@@ -981,21 +1003,20 @@ public class HashDbManager implements PropertyChangeListener {
         protected void done() {
             hashDb.indexing = false;
             progress.finish();
-            
+
             // see if we got any errors
             try {
                 get();
             } catch (InterruptedException | ExecutionException ex) {
                 logger.log(Level.SEVERE, "Error creating index", ex);
                 MessageNotifyUtil.Notify.show("Error creating index",
-                    "Error creating index: " + ex.getMessage(), 
-                    MessageNotifyUtil.MessageType.ERROR);
+                        "Error creating index: " + ex.getMessage(),
+                        MessageNotifyUtil.MessageType.ERROR);
             }
-            
+
             try {
-                 hashDb.propertyChangeSupport.firePropertyChange(HashDb.Event.INDEXING_DONE.toString(), null, hashDb);
-            }
-            catch (Exception e) {
+                hashDb.propertyChangeSupport.firePropertyChange(HashDb.Event.INDEXING_DONE.toString(), null, hashDb);
+            } catch (Exception e) {
                 logger.log(Level.SEVERE, "HashDbManager listener threw exception", e);
                 MessageNotifyUtil.Notify.show(
                         NbBundle.getMessage(this.getClass(), "HashDbManager.moduleErr"),
@@ -1003,5 +1024,5 @@ public class HashDbManager implements PropertyChangeListener {
                         MessageNotifyUtil.MessageType.ERROR);
             }
         }
-    }    
+    }
 }
\ No newline at end of file
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbPanelSearchAction.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbPanelSearchAction.java
index e9989e715f..fec4959e1e 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbPanelSearchAction.java
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbPanelSearchAction.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");
@@ -50,8 +50,7 @@ class HashDbPanelSearchAction extends CallableSystemAction {
                 if(evt.getPropertyName().equals(Case.Events.CURRENT_CASE.toString())){
                     setEnabled(evt.getNewValue() != null);
                 }
-            }
-            
+            }            
         });
     }
     
diff --git a/KeywordSearch/manifest.mf b/KeywordSearch/manifest.mf
index e309652025..3f6b74acf7 100644
--- a/KeywordSearch/manifest.mf
+++ b/KeywordSearch/manifest.mf
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.sleuthkit.autopsy.keywordsearch/5
-OpenIDE-Module-Implementation-Version: 9
+OpenIDE-Module-Implementation-Version: 10
 OpenIDE-Module-Install: org/sleuthkit/autopsy/keywordsearch/Installer.class
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/keywordsearch/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/keywordsearch/Bundle.properties
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index 455c7745da..847ad2aeaa 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -96,7 +96,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>9</release-version>
-                        <specification-version>7.0</specification-version>
+                        <specification-version>7.1</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileChunk.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileChunk.java
index 9e5e0a2da2..cccd6896b0 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileChunk.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileChunk.java
@@ -20,6 +20,8 @@
 package org.sleuthkit.autopsy.keywordsearch;
 
 import java.nio.charset.Charset;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.keywordsearch.Ingester.IngesterException;
 
 /**
@@ -59,7 +61,8 @@ class AbstractFileChunk {
             //logger.log(Level.INFO, "Ingesting string chunk: " + this.getName() + ": " + chunkID);
         } catch (Exception ingEx) {
             success = false;
-            throw new IngesterException("Problem ingesting file string chunk: " + parent.getSourceFile().getId() + ", chunk: " + chunkID, ingEx);
+            throw new IngesterException(NbBundle.getMessage(this.getClass(), "AbstractFileChunk.index.exception.msg",
+                                                            parent.getSourceFile().getId(), chunkID), ingEx);
         }
         return success;
     }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java
index 49ca84aa8b..3255df7593 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileHtmlExtract.java
@@ -45,6 +45,7 @@ import org.sleuthkit.datamodel.ReadContentInputStream;
     private static final int SINGLE_READ_CHARS = 1024;
     private static final int EXTRA_CHARS = 128; //for whitespace
     private static final char[] TEXT_CHUNK_BUF = new char[MAX_EXTR_TEXT_CHARS];
+    private static final int MAX_SIZE = 50000000;
     private KeywordSearchIngestModule module;
     private Ingester ingester;
     private AbstractFile sourceFile;
@@ -217,7 +218,7 @@ import org.sleuthkit.datamodel.ReadContentInputStream;
     public boolean isSupported(AbstractFile file, String detectedFormat) {
         if (detectedFormat == null) {
             return false;
-        } else if (WEB_MIME_TYPES.contains(detectedFormat)) {
+        } else if (WEB_MIME_TYPES.contains(detectedFormat) && file.getSize() <= MAX_SIZE) {
             return true;
         } else {
             return false;
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java
index 63873f9dd3..22c3c5a5fb 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileStringContentStream.java
@@ -23,6 +23,8 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.Charset;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.apache.solr.common.util.ContentStream;
 import org.sleuthkit.datamodel.AbstractContent;
@@ -69,12 +71,13 @@ import org.sleuthkit.datamodel.AbstractFile;
     @Override
     public Long getSize() {
         //return convertedLength;
-        throw new UnsupportedOperationException("Cannot tell how many chars in converted string, until entire string is converted");
+        throw new UnsupportedOperationException(
+                NbBundle.getMessage(this.getClass(), "AbstractFileStringContentStream.getSize.exception.msg"));
     }
 
     @Override
     public String getSourceInfo() {
-        return "File:" + content.getId();
+        return NbBundle.getMessage(this.getClass(), "AbstractFileStringContentStream.getSrcInfo.text", content.getId());
     }
 
     @Override
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java
index 38c93631ca..04b4ad00b9 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractFileTikaTextExtract.java
@@ -279,6 +279,10 @@ class AbstractFileTikaTextExtract implements AbstractFileExtract {
         else if (detectedFormat.contains("video/")
                 && !detectedFormat.equals("video/x-flv")) {
             return false;
+        } else if (detectedFormat.contains("application/x-font-ttf")) {
+            // Tika currently has a bug in the ttf parser in fontbox.
+            // It will throw an out of memory exception
+            return false;
         }
 
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractKeywordSearchPerformer.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractKeywordSearchPerformer.java
index 7e9441c945..3bdd226d17 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractKeywordSearchPerformer.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AbstractKeywordSearchPerformer.java
@@ -30,6 +30,8 @@ import org.openide.util.NbBundle;
 /**
  * Common functionality among keyword search performers / widgets.
  * This is extended by the various panels and interfaces that perform the keyword searches.
+ * This class and extended classes model the user's intentions, not necessarily how the 
+ * search manager and 3rd party tools actually perform the search.
  */
 abstract class AbstractKeywordSearchPerformer extends javax.swing.JPanel implements KeywordSearchPerformerInterface {
 
@@ -66,8 +68,11 @@ abstract class AbstractKeywordSearchPerformer extends javax.swing.JPanel impleme
     public abstract boolean isMultiwordQuery();
 
     @Override
-    public abstract boolean isLuceneQuerySelected();
+    public abstract boolean isRegExQuerySelected();
 
+    @Override
+    public abstract boolean isWholewordQuerySelected();
+    
     @Override
     public abstract String getQueryText();
 
@@ -102,8 +107,10 @@ abstract class AbstractKeywordSearchPerformer extends javax.swing.JPanel impleme
                 return;
             }
         }
-
+        
+        boolean isWholeword = isWholewordQuerySelected();
         KeywordSearchQueryManager man = null;
+        
         if (isMultiwordQuery()) {
             final List<Keyword> keywords = getQueryList();
             if (keywords.isEmpty()) {
@@ -112,13 +119,13 @@ abstract class AbstractKeywordSearchPerformer extends javax.swing.JPanel impleme
                         KeywordSearchUtil.DIALOG_MESSAGE_TYPE.ERROR);
                 return;
             }
-            man = new KeywordSearchQueryManager(keywords, Presentation.FLAT);
+            man = new KeywordSearchQueryManager(keywords, isWholeword, Presentation.FLAT);
         } else {
-            QueryType queryType = null;
-            if (isLuceneQuerySelected()) {
-                queryType = QueryType.WORD;
+            QueryType userQueryType = null;
+            if (isRegExQuerySelected()) {
+                userQueryType = QueryType.REGEX;
             } else {
-                queryType = QueryType.REGEX;
+                userQueryType = QueryType.LITERAL;
             }
             final String queryText = getQueryText();
             if (queryText == null || queryText.trim().equals("")) {
@@ -126,7 +133,7 @@ abstract class AbstractKeywordSearchPerformer extends javax.swing.JPanel impleme
                         "AbstractKeywordSearchPerformer.search.pleaseEnterKeywordBody"), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.ERROR);
                 return;
             }
-            man = new KeywordSearchQueryManager(getQueryText(), queryType, Presentation.FLAT);
+            man = new KeywordSearchQueryManager(getQueryText(), userQueryType, isWholeword, Presentation.FLAT);
         }
 
         if (man.validate()) {
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
index 91b7a67008..406c98509a 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties
@@ -34,17 +34,9 @@ KeywordSearchEditListPanel.deleteListButton.text=Delete List
 KeywordSearchListsManagementPanel.newListButton.text=New List
 KeywordSearchEditListPanel.useForIngestCheckbox.text=Use during ingest
 KeywordSearchListsManagementPanel.importButton.text=Import List
-KeywordSearchPanel.searchBox.text=Search...
-KeywordSearchPanel.regExCheckboxMenuItem.text=Use Regular Expressions
-KeywordSearchPanel.settingsLabel.text=
 KeywordSearchListsViewerPanel.searchAddButton.text=Search
 KeywordSearchListsViewerPanel.manageListsButton.text=Manage Lists
 KeywordSearchListsViewerPanel.ingestIndexLabel.text=Files Indexed:
-KeywordSearchPanel.searchButton.text=
-KeywordSearchPanel.cutMenuItem.text=Cut
-KeywordSearchPanel.copyMenuItem.text=Copy
-KeywordSearchPanel.pasteMenuItem.text=Paste
-KeywordSearchPanel.selectAllMenuItem.text=Select All
 ExtractedContentPanel.pageButtonsLabel.text=Page
 ExtractedContentPanel.pageNextButton.text=
 ExtractedContentPanel.pagePreviousButton.actionCommand=pagePreviousButton
@@ -90,7 +82,6 @@ KeywordSearchListsViewerPanel.manageListsButton.toolTipText=Manage keyword lists
 KeywordSearchConfigurationPanel2.frequencyLabel.text=Results update frequency during ingest:
 KeywordSearchConfigurationPanel2.timeRadioButton4.text_1=1 minute (faster feedback, longest ingest)
 KeywordSearchConfigurationPanel2.timeRadioButton4.toolTipText=1 minute (overall ingest time will be longest)
-KeywordSearchConfigurationPanel2.showSnippetsCB.text=Show Keyword Preview in Keyword Search Results (will result in longer search times)
 AbstractKeywordSearchPerformer.search.dialogErrorHeader=Keyword Search Error
 AbstractKeywordSearchPerformer.search.invalidSyntaxHeader=Invalid query syntax.
 AbstractKeywordSearchPerformer.search.searchIngestInProgressTitle=Keyword Search Ingest in Progress
@@ -150,8 +141,9 @@ KeywordSearchIngestModule.init.tryStopSolrMsg={0}<br />Please try stopping old j
 KeywordSearchIngestModule.init.noKwInLstMsg=No keywords in keyword list.
 KeywordSearchIngestModule.init.onlyIdxKwSkipMsg=Only indexing will be done and and keyword search will be skipped (you can still add keyword lists using the Keyword Lists - Add to Ingest).
 KeywordSearchIngestModule.doInBackGround.displayName=Keyword Search
-KeywordSearchIngestModule.doInBackGround.finalizeMsg=Finalizing...
-KeywordSearchIngestModule.doInBackGround.pendingMsg=Working on Keyword Search...
+KeywordSearchIngestModule.doInBackGround.finalizeMsg= - Finalizing
+KeywordSearchIngestModule.doInBackGround.pendingMsg= (Pending)
+KeywordSearchIngestModule.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
@@ -186,4 +178,89 @@ 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=
+KeywordSearchPanel.searchDropButton.text=Keyword Search
+DropdownSearchPanel.exactRadioButton.text=Exact Match
+DropdownSearchPanel.substringRadioButton.text=Substring Match
+DropdownSearchPanel.regexRadioButton.text=Regular Expression
+DropdownSearchPanel.searchButton.text=Search
+DropdownSearchPanel.cutMenuItem.text=Cut
+DropdownSearchPanel.selectAllMenuItem.text=Select All
+DropdownSearchPanel.pasteMenuItem.text=Paste
+DropdownSearchPanel.copyMenuItem.text=Copy
+AbstractFileChunk.index.exception.msg=Problem ingesting file string chunk\: {0}, chunk\: {1}
+AbstractFileStringContentStream.getSize.exception.msg=Cannot tell how many chars in converted string, until entire string is converted
+AbstractFileStringContentStream.getSrcInfo.text=File\:{0}
+ByteContentStream.getSrcInfo.text=File\:{0}
+ExtractedContentPanel.SetMarkup.progress.loading=Loading text
+ExtractedContentPanel.SetMarkup.progress.displayName=Loading text
+ExtractedContentViewer.nextPage.exception.msg=No next page.
+ExtractedContentViewer.previousPage.exception.msg=No previous page.
+ExtractedContentViewer.hasNextItem.exception.msg=Not supported, not a searchable source.
+ExtractedContentViewer.hasPreviousItem.exception.msg=Not supported, not a searchable source.
+ExtractedContentViewer.nextItem.exception.msg=Not supported, not a searchable source.
+ExtractedContentViewer.previousItem.exception.msg=Not supported, not a searchable source.
+ExtractedContentViewer.currentItem.exception.msg=Not supported, not a searchable source.
+HighlightedMatchesSource.nextPage.exception.msg=No next page.
+HighlightedMatchesSource.previousPage.exception.msg=No previous page.
+HighlightedMatchesSource.nextItem.exception.msg=No next item.
+HighlightedMatchesSource.previousItem.exception.msg=No previous item.
+Ingester.ingest.exception.unknownImgId.msg=Skipping indexing the file, unknown image id, for file\: {0}
+Ingester.ingest.exception.cantReadStream.msg=Could not read content stream\: {0}
+Ingester.ingest.exception.err.msg=Error ingesting document\: {0}
+Ingester.ingestExtract.exception.solrTimeout.msg=Solr index request time out for id\: {0}, name\: {1}
+Ingester.ingestExtract.exception.probPostToSolr.msg=Problem posting content to Solr, id\: {0}, name\: {1}
+Ingester.UpReqestTask.run.exception.sorlNotAvail.msg=No Solr core available, cannot index the content
+Ingester.UpRequestTask.run.exception.probReadFile.msg=Problem reading file.
+Ingester.UpRequestTask.run.exception.solrProb.msg=Problem with Solr
+Ingester.UpRequestTask.run.exception.probPostToSolr.msg=Problem posting file contents to Solr. SolrException error code\: {0}
+Ingester.FscContentStream.getSrcInfo=File\:{0}
+Ingester.FscContentStream.getReader=Not supported yet.
+Ingester.NullContentStream.getSrcInfo.text=File\:{0}
+Ingester.NullContentStream.getReader=Not supported yet.
+Keyword.toString.text=Keyword'{'query\={0}, isLiteral\={1}, keywordType\={2}'}'
+KeywordSearch.moduleErr=Module Error
+KeywordSearch.fireNumIdxFileChg.moduleErr.msg=A module caused an error listening to KeywordSearch updates. See log to determine which module. Some data could be incomplete.
+KeywordSearchIngestModule.init.exception.errConnToSolr.msg=Error connecting to SOLR server\: {0}
+KeywordSearchListsEncase.save.exception.msg=Not supported yet.
+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
+KeywordSearchSettings.properties_options.text={0}_Options
+KeywordSearchSettings.propertiesNSRL.text={0}_NSRL
+KeywordSearchSettings.propertiesScripts.text={0}_Scripts
+NoOpenCoreException.err.noOpenSorlCore.msg=No currently open Solr core.
+Server.start.exception.cantStartSolr.msg=Could not start Solr server process
+Server.start.exception.cantStartSolr.msg2=Could not start Solr server process
+Server.isRunning.exception.errCheckSolrRunning.msg=Error checking if Solr server is running
+Server.isRunning.exception.errCheckSolrRunning.msg2=Error checking if Solr server is running
+Server.openCore.exception.alreadyOpen.msg=Already an open Core\! Explicitely close Core first.
+Server.queryNumIdxFiles.exception.msg=Error querying number of indexed files,
+Server.queryNumIdxChunks.exception.msg=Error querying number of indexed chunks,
+Server.queryNumIdxDocs.exception.msg=Error querying number of indexed documents,
+Server.queryIsIdxd.exception.msg=Error checkign if content is indexed,
+Server.queryNumFileChunks.exception.msg=Error getting number of file chunks,
+Server.query.exception.msg=Error running query\: {0}
+Server.query2.exception.msg=Error running query\: {0}
+Server.queryTerms.exception.msg=Error running terms query\: {0}
+Server.openCore.exception.msg=Core open requested, but server not yet running
+Server.openCore.exception.cantOpen.msg=Could not open Core
+Server.openCore.exception.cantOpen.msg2=Could not open Core
+Server.request.exception.exception.msg=Could not issue Solr request
+Server.commit.exception.msg=Could not commit index
+Server.addDoc.exception.msg=Could not add document to index via update handler\: {0}
+Server.addDoc.exception.msg2=Could not add document to index via update handler\: {0}
+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)
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties
index 993ce3cad9..2b520e0e73 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle_ja.properties
@@ -1,166 +1,258 @@
-OpenIDE-Module-Display-Category=\u30E2\u30B8\u30E5\u30FC\u30EB\u633F\u5165
-OpenIDE-Module-Long-Description=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30E2\u30B8\u30E5\u30FC\u30EB\u633F\u5165\n\n\
-\u633F\u5165\u6642\u306E\u30C7\u30A3\u30B9\u30AF\u30A4\u30E1\u30FC\u30B8\u306B\u3042\u308B\u30D5\u30A1\u30A4\u30EB\u3092\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3057\u307E\u3059\u3002\
-\u305D\u3057\u3066\u3001\u4E00\u3064\u4EE5\u4E0A\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\uFF08\u5358\u8A9E\u3084\u4E00\u822C\u7684\u306A\u8868\u73FE\u3092\u542B\u3080\uFF09\u3092\u5229\u7528\u3057\u3001\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u305F\u30D5\u30A1\u30A4\u30EB\u3092\u5B9A\u671F\u7684\u306B\u691C\u7D22\u3057\u3001\u7D50\u679C\u3092\u8868\u793A\u3057\u307E\u3059\u3002\n\n\
-\u3053\u306E\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u306F\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u8A2D\u5B9A\u3001\u53F3\u4E0A\u9685\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30D0\u30FC\u3001\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u306E\u7D50\u679C\u3092\u30CF\u30A4\u30E9\u30A4\u30C8\u3057\u3066\u8868\u793A\u3059\u308B\u62BD\u51FA\u3055\u308C\u305F\u30C6\u30AD\u30B9\u30C8\u30D3\u30E5\u30FC\u30A2\u3068\u691C\u7D22\u7D50\u679C\u30D3\u30E5\u30FC\u30A2\u306A\u3069\u3001\u30E1\u30A4\u30F3GUI\u3068\u9023\u643A\u3059\u308B\u8FFD\u52A0\u306E\u30C4\u30FC\u30EB\u304C\u542B\u307E\u308C\u307E\u3059\u3002
-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\u4E0A\u306E\u4E00\u81F4
-ExtractedContentPanel.hitCountLabel.text=
-ExtractedContentPanel.hitOfLabel.text=
-ExtractedContentPanel.hitTotalLabel.text=
-ExtractedContentPanel.hitButtonsLabel.text=\u4E00\u81F4
-ExtractedContentPanel.copyMenuItem.text=\u30B3\u30D4\u30FC
-ExtractedContentPanel.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629E
-KeywordSearchEditListPanel.saveListButton.text=\u30EA\u30B9\u30C8\u3092\u30B3\u30D4\u30FC
-KeywordSearchEditListPanel.addWordButton.text=\u8FFD\u52A0
-KeywordSearchEditListPanel.chRegex.text=\u4E00\u822C\u7684\u306A\u8868\u73FE
-KeywordSearchEditListPanel.deleteWordButton.text=\u9078\u629E\u3057\u305F\u3082\u306E\u3092\u524A\u9664
-KeywordSearchEditListPanel.cutMenuItem.text=\u30AB\u30C3\u30C8
-KeywordSearchEditListPanel.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629E
-KeywordSearchEditListPanel.pasteMenuItem.text=\u8CBC\u308A\u4ED8\u3051
-KeywordSearchEditListPanel.copyMenuItem.text=\u30B3\u30D4\u30FC
-KeywordSearchEditListPanel.exportButton.text=\u30EA\u30B9\u30C8\u3092\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
-KeywordSearchEditListPanel.deleteListButton.text=\u30EA\u30B9\u30C8\u3092\u524A\u9664
-KeywordSearchListsManagementPanel.newListButton.text=\u65B0\u898F\u30EA\u30B9\u30C8
-KeywordSearchEditListPanel.useForIngestCheckbox.text=\u51E6\u7406\u4E2D\u306B\u4F7F\u7528
-KeywordSearchListsManagementPanel.importButton.text=\u30EA\u30B9\u30C8\u3092\u30A4\u30F3\u30DD\u30FC\u30C8
-KeywordSearchPanel.searchBox.text=\u691C\u7D22...
-KeywordSearchPanel.regExCheckboxMenuItem.text=\u4E00\u822C\u7684\u306A\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
-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
-KeywordSearchConfigurationPanel2.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
-KeywordSearchConfigurationPanel2.skipNSRLCheckBox.toolTipText=Hash DB\u30B5\u30FC\u30D3\u30B9\u3092\u4E8B\u524D\u306B\u5B9F\u884C\u3059\u308B\u304B\u3001\u6B21\u56DE\u306E\u51E6\u7406\u6642\u306B\u9078\u629E\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
-KeywordSearchConfigurationPanel2.filesIndexedLabel.text=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5185\u306E\u30D5\u30A1\u30A4\u30EB\uFF1A
-KeywordSearchIngestSimplePanel.languagesLabel.text=\u4E0D\u660E\u306A\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F\u304B\u3089\u306E\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA\u3092\u6709\u52B9\u306B\u3057\u305F\u30B9\u30AF\u30EA\u30D7\u30C8\uFF1A
-KeywordSearchIngestSimplePanel.languagesLabel.toolTipText=\u4E0D\u660E\u306A\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F\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\u3067\u5909\u66F4\u304C\u53EF\u80FD\u3067\u3059\u3002
-KeywordSearchConfigurationPanel3.languagesLabel.text=\u6709\u52B9\u306A\u30B9\u30AF\u30EA\u30D7\u30C8\uFF08\u8A00\u8A9E\uFF09\uFF1A
-KeywordSearchConfigurationPanel2.chunksLabel.text=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5185\u306E\u30C1\u30E3\u30F3\u30AF\uFF1A
-KeywordSearchConfigurationPanel3.enableUTF8Checkbox.text=UTF8\u30C6\u30AD\u30B9\u30C8\u62BD\u51FA\u306E\u6709\u52B9\u5316
-KeywordSearchConfigurationPanel3.enableUTF16Checkbox.text=UTF16LE\u3068UTF16BE\u30B9\u30C8\u30EA\u30F3\u30B0\u62BD\u51FA\u306E\u6709\u52B9\u5316
-KeywordSearchEditListPanel.keywordOptionsLabel.text=\u30AD\u30FC\u30EF\u30FC\u30C9\u30AA\u30D7\u30B7\u30E7\u30F3
-KeywordSearchEditListPanel.listOptionsLabel.text=\u30EA\u30B9\u30C8\u30AA\u30D7\u30B7\u30E7\u30F3
-KeywordSearchConfigurationPanel3.ingestSettingsLabel.text=\u4E0D\u660E\u306A\u30D5\u30A1\u30A4\u30EB\u5F62\u5F0F\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
-KeywordSearchConfigurationPanel2.settingsLabel.text=\u8A2D\u5B9A
-KeywordSearchConfigurationPanel2.informationLabel.text=\u30A4\u30F3\u30D5\u30A9\u30E1\u30FC\u30B7\u30E7\u30F3
-KeywordSearchListsManagementPanel.keywordListsLabel.text=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\uFF1A
-KeywordSearchEditListPanel.keywordsLabel.text=\u30AD\u30FC\u30EF\u30FC\u30C9\uFF1A
-KeywordSearchConfigurationPanel2.timeRadioButton1.toolTipText=\uFF12\uFF10\u5206\uFF08\u6700\u77ED\u306E\u51E6\u7406\u6642\u9593\uFF09
-KeywordSearchConfigurationPanel2.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
-KeywordSearchConfigurationPanel2.timeRadioButton2.toolTipText=\uFF11\uFF10\u5206\uFF08\u30C7\u30D5\u30A9\u30EB\u30C8\u3088\u308A\u5168\u4F53\u7684\u306B\u901F\u3044\u51E6\u7406\u6642\u9593\uFF09
-KeywordSearchConfigurationPanel2.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
-KeywordSearchConfigurationPanel2.timeRadioButton3.toolTipText=\uFF15\u5206\uFF08\u5168\u4F53\u7684\u306A\u51E6\u7406\u6642\u9593\u304C\u9577\u304F\u306A\u308A\u307E\u3059\uFF09
-KeywordSearchConfigurationPanel2.timeRadioButton3.text=\uFF15\u5206\uFF08\u30C7\u30D5\u30A9\u30EB\u30C8\uFF09
-KeywordSearchIngestSimplePanel.encodingsLabel.text=\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\uFF1A
-KeywordSearchIngestSimplePanel.titleLabel.text=\u51E6\u7406\u4E2D\u306B\u6709\u52B9\u306A\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u9078\u629E\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
-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
-KeywordSearchConfigurationPanel2.frequencyLabel.text=\u51E6\u7406\u4E2D\u306E\u7D50\u679C\u66F4\u65B0\u306E\u983B\u5EA6\uFF1A
-KeywordSearchConfigurationPanel2.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
-KeywordSearchConfigurationPanel2.timeRadioButton4.toolTipText=\uFF11\u5206\uFF08\u5168\u4F53\u7684\u306A\u51E6\u7406\u6642\u9593\u304C\u9577\u304F\u306A\u308A\u307E\u3059\uFF09
-KeywordSearchConfigurationPanel2.showSnippetsCB.text=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u7D50\u679C\u306B\u30AD\u30FC\u30EF\u30FC\u30C9\u30D7\u30EC\u30D3\u30E5\u30FC\u3092\u8868\u793A\uFF08\u691C\u7D22\u6642\u9593\u304C\u9577\u304F\u306A\u308A\u307E\u3059\uFF09
-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
-AbstractKeywordSearchPerformer.search.searchIngestInProgressTitle=\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3092\u5B9F\u884C\u4E2D
-AbstractKeywordSearchPerformer.search.ingestInProgressBody=<html>\u30AD\u30FC\u30EF\u30FC\u30C9\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3092\u5B9F\u884C\u4E2D<br />\u5168\u3066\u306E\u30D5\u30A1\u30A4\u30EB\u304C\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u691C\u7D22\u7D50\u679C\u304C\u4E0D\u5B8C\u5168\u306B\u306A\u308B\u5834\u5408\u304C\u3042\u308A\u307E\u3059\u3002<br />\u3053\u306E\u691C\u7D22\u3092\u5B9F\u884C\u3057\u307E\u3059\u304B\uFF1F</html>
-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>
-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.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>
-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
-Installer.reportStopPortError=\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30B5\u30FC\u30D0\u30FC\u30B9\u30C8\u30C3\u30D7\u30DD\u30FC\u30C8 {0} \u306F\u5229\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u30E6\u30FC\u30B6\u30FC\u30D5\u30A9\u30EB\u30C0\u30FC\u5185\u306E {1} \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
-Installer.errorInitKsmMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30E2\u30B8\u30E5\u30FC\u30EB\u306E\u8D77\u52D5\u30A8\u30E9\u30FC
-Installer.reportInitError=\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 {2} \u306E {3} \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
-KeywordSearchConfigurationPanel.customizeComponents.title=\u30A2\u30C9\u30D0\u30F3\u30B9\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u8A2D\u5B9A
-KeywordSearchConfigurationPanel.customizeComponents.listTabTitle=\u30EA\u30B9\u30C8
-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.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
-KeywordSearchConfigurationPanel1.customizeComponents.keywordListEmptyErr=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u304C\u7A7A\u767D\u3067\u3059\u306E\u3067\u3001\u4FDD\u5B58\u3067\u304D\u307E\u305B\u3093
-KeywordSearch.newKwListTitle=\u65B0\u898F\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u540D\uFF1A
-KeywordSearchConfigurationPanel1.customizeComponents.noOwDefaultMsg=\u30C7\u30D5\u30A9\u30EB\u30C8\u30EA\u30B9\u30C8\u306F\u4E0A\u66F8\u304D\u3067\u304D\u307E\u305B\u3093
-KeywordSearchConfigurationPanel1.customizeComponents.kwListExistMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8 <{0}> \u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u4E0A\u66F8\u304D\u3057\u307E\u3059\u304B\uFF1F
-KeywordSearchConfigurationPanel1.customizeComponents.kwListSavedMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8 <{0}> \u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F
-KeywordSearchEditListPanel.customizeComponents.kwReToolTip=\u30AD\u30FC\u30EF\u30FC\u30C9\u306F\u4E00\u822C\u7684\u306A\u8868\u73FE\u3067\u3059
-KeywordSearchEditListPanel.customizeComponents.addWordToolTip=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22\u30EA\u30B9\u30C8\u306B\u5358\u8A9E\u3092\u8FFD\u52A0
-KeywordSearchEditListPanel.customizeComponents.enterNewWordToolTip=\u65B0\u898F\u5358\u8A9E\u3084\u4E00\u822C\u7684\u306A\u8868\u73FE\u3092\u5165\u529B
-KeywordSearchEditListPanel.customizeComponents.exportToFile=\u65E2\u5B58\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u30D5\u30A1\u30A4\u30EB\u306B\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8
-KeywordSearchEditListPanel.customizeComponents.saveCurrentWIthNewNameToolTip=\u65E2\u5B58\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u306B\u540D\u524D\u3092\u4ED8\u3051\u3066\u4FDD\u5B58
-KeywordSearchEditListPanel.customizeComponents.removeSelectedMsg=\u9078\u629E\u3057\u305F\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u30EA\u30B9\u30C8\u304B\u3089\u524A\u9664
-KeywordSearchEditListPanel.newKwTitle=\u65B0\u898F\u30AD\u30FC\u30EF\u30FC\u30C9\u30A8\u30F3\u30C8\u30EA\u30FC
-KeywordSearchEditListPanel.addWordButtonAction.kwAlreadyExistsMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u306F\u65E2\u306B\u30EA\u30B9\u30C8\u306B\u5B58\u5728\u3057\u307E\u3059\u3002
-KeywordSearchEditListPanel.invalidKwMsg=\u7121\u52B9\u306A\u30AD\u30FC\u30EF\u30FC\u30C9\u30D1\u30BF\u30FC\u30F3\u3002\u5358\u8A9E\u3082\u3057\u304F\u306F\u6B63\u3057\u3044\u4E00\u822C\u7684\u306A\u8868\u73FE\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-KeywordSearchEditListPanel.removeKwMsg=\u30AD\u30FC\u30EF\u30FC\u30C9\u3092\u524A\u9664
-KeywordSearchEditListPanel.deleteWordButtonActionPerformed.delConfirmMsg=\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
-KeywordSearchEditListPanel.exportButtonActionPerformed.fileFilterLabel=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8XML\u30D5\u30A1\u30A4\u30EB
-KeywordSearchEditListPanel.exportButtonActionPerformed.fileExistPrompt=\ {0} \u30D5\u30A1\u30A4\u30EB\u306F\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\u3002\u4E0A\u66F8\u304D\u3057\u307E\u3059\u304B\uFF1F
-KeywordSearchEditListPanel.exportButtonActionPerformed.kwListExportedMsg=\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305F\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8
-KeywordSearchEditListPanel.kwColName=\u30AD\u30FC\u30EF\u30FC\u30C9
-KeywordSearchEditListPanel.exportButtonActionPerformed.regExColName=\u4E00\u822C\u7684\u306A\u8868\u73FE
-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\u3082\u3057\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.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.postIndexSummary.knowFileHeaderLbl=\u65E2\u77E5\u306E\u7A2E\u985E\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
-KeywordSearchIngestModule.postIndexSummary.idxErrLbl=\u30A8\u30E9\u30FC\uFF08\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u30A8\u30E9\u30FC\uFF09
-KeywordSearchIngestModule.postIndexSummary.errTxtLbl=\u30A8\u30E9\u30FC\uFF08\u30C6\u30AD\u30B9\u30C8\u62BD\u51FA\uFF09
-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\u3042\u308A\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\u3042\u308A\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.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.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
-KeywordSearch.regExColLbl=\u4E00\u822C\u7684\u306A\u8868\u73FE
-KeywordSearchQueryManager.execute.exeWinTitle=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22 {0} - {1}
-KeywordSearch.newKeywordListMsg=\u65B0\u898F\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8
-KeywordSearch.importListFileDialogMsg=\ {0}\u3000\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8\u3092\u30A4\u30F3\u30DD\u30FC\u30C8\u3059\u308B\u306E\u306B\u30A8\u30E9\u30FC\u304C\u3042\u308A\u307E\u3057\u305F
-KeywordSearch.yesOwMsg=\u306F\u3044\u3001\u4E0A\u66F8\u304D\u3057\u307E\u3059
-KeywordSearch.noSkipMsg=\u3044\u3044\u3048\u3001\u30B9\u30AD\u30C3\u30D7\u3057\u307E\u3059
-KeywordSearch.cancelImportMsg=\u30A4\u30F3\u30DD\u30FC\u30C8\u3092\u30AD\u30E3\u30F3\u30BB\u30EB
-KeywordSearch.overwriteListPrompt=\u30AD\u30FC\u30EF\u30FC\u30C9\u30EA\u30B9\u30C8 <{0}> \u306F\u30ED\u30FC\u30AB\u30EB\u306B\u65E2\u306B\u5B58\u5728\u3057\u307E\u3059\u304C\u3001\u4E0A\u66F8\u304D\u3057\u307E\u3059\u304B\uFF1F
-KeywordSearch.importOwConflict=\u30EA\u30B9\u30C8\u30A4\u30F3\u30DD\u30FC\u30C8\u306E\u554F\u984C
-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
-KeywordSearchIngestModule.moduleDescription=\u30EA\u30B9\u30C8\u5185\u306E\u30AD\u30FC\u30EF\u30FC\u30C9\u304A\u3088\u3073\u4E00\u822C\u7684\u306A\u8868\u73FE\u3092\u4F7F\u3044\u3001\u30D5\u30A1\u30A4\u30EB\u306E\u30A4\u30F3\u30C7\u30C3\u30AF\u30B9\u5316\u304A\u3088\u3073\u5B9A\u671F\u7684\u306A\u691C\u7D22\u3092\u5B9F\u884C\u3057\u307E\u3059\u3002
-OptionsCategory_Name_KeywordSearchOptions=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22
-OptionsCategory_Keywords_KeywordSearchOptions=\u30AD\u30FC\u30EF\u30FC\u30C9\u691C\u7D22
\ No newline at end of file
+OpenIDE-Module-Display-Category=\u30e2\u30b8\u30e5\u30fc\u30eb\u633f\u5165
+OpenIDE-Module-Long-Description=\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22\u30e2\u30b8\u30e5\u30fc\u30eb\u633f\u5165\n\n\
+\u633f\u5165\u6642\u306e\u30c7\u30a3\u30b9\u30af\u30a4\u30e1\u30fc\u30b8\u306b\u3042\u308b\u30d5\u30a1\u30a4\u30eb\u3092\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u3057\u307e\u3059\u3002\
+\u305d\u3057\u3066\u3001\u4e00\u3064\u4ee5\u4e0a\u306e\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\uff08\u5358\u8a9e\u3084\u4e00\u822c\u7684\u306a\u8868\u73fe\u3092\u542b\u3080\uff09\u3092\u5229\u7528\u3057\u3001\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u5b9a\u671f\u7684\u306b\u691c\u7d22\u3057\u3001\u7d50\u679c\u3092\u8868\u793a\u3057\u307e\u3059\u3002\n\n\
+\u3053\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u306b\u306f\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u8a2d\u5b9a\u3001\u53f3\u4e0a\u9685\u306e\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22\u30d0\u30fc\u3001\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22\u306e\u7d50\u679c\u3092\u30cf\u30a4\u30e9\u30a4\u30c8\u3057\u3066\u8868\u793a\u3059\u308b\u62bd\u51fa\u3055\u308c\u305f\u30c6\u30ad\u30b9\u30c8\u30d3\u30e5\u30fc\u30a2\u3068\u691c\u7d22\u7d50\u679c\u30d3\u30e5\u30fc\u30a2\u306a\u3069\u3001\u30e1\u30a4\u30f3GUI\u3068\u9023\u643a\u3059\u308b\u8ffd\u52a0\u306e\u30c4\u30fc\u30eb\u304c\u542b\u307e\u308c\u307e\u3059\u3002
+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
+ExtractedContentPanel.hitTotalLabel.text=-
+ExtractedContentPanel.hitButtonsLabel.text=\u4e00\u81f4
+ExtractedContentPanel.copyMenuItem.text=\u30b3\u30d4\u30fc
+ExtractedContentPanel.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629e
+KeywordSearchEditListPanel.saveListButton.text=\u30ea\u30b9\u30c8\u3092\u30b3\u30d4\u30fc
+KeywordSearchEditListPanel.addWordButton.text=\u8ffd\u52a0
+KeywordSearchEditListPanel.chRegex.text=\u6b63\u898f\u8868\u73fe
+KeywordSearchEditListPanel.deleteWordButton.text=\u9078\u629e\u3057\u305f\u3082\u306e\u3092\u524a\u9664
+KeywordSearchEditListPanel.cutMenuItem.text=\u30ab\u30c3\u30c8
+KeywordSearchEditListPanel.selectAllMenuItem.text=\u3059\u3079\u3066\u9078\u629e
+KeywordSearchEditListPanel.pasteMenuItem.text=\u8cbc\u308a\u4ed8\u3051
+KeywordSearchEditListPanel.copyMenuItem.text=\u30b3\u30d4\u30fc
+KeywordSearchEditListPanel.exportButton.text=\u30ea\u30b9\u30c8\u3092\u30a8\u30af\u30b9\u30dd\u30fc\u30c8
+KeywordSearchEditListPanel.deleteListButton.text=\u30ea\u30b9\u30c8\u3092\u524a\u9664
+KeywordSearchListsManagementPanel.newListButton.text=\u65b0\u898f\u30ea\u30b9\u30c8
+KeywordSearchEditListPanel.useForIngestCheckbox.text=\u51e6\u7406\u4e2d\u306b\u4f7f\u7528
+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
+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
+KeywordSearchConfigurationPanel2.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
+KeywordSearchConfigurationPanel2.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
+KeywordSearchConfigurationPanel2.filesIndexedLabel.text=\u30ad\u30fc\u30ef\u30fc\u30c9\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5185\u306e\u30d5\u30a1\u30a4\u30eb\uff1a
+KeywordSearchIngestSimplePanel.languagesLabel.text=\u4e0d\u660e\u306a\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\u304b\u3089\u306e\u30b9\u30c8\u30ea\u30f3\u30b0\u62bd\u51fa\u3092\u6709\u52b9\u306b\u3057\u305f\u30b9\u30af\u30ea\u30d7\u30c8\uff1a
+KeywordSearchIngestSimplePanel.languagesLabel.toolTipText=\u4e0d\u660e\u306a\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\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
+KeywordSearchConfigurationPanel3.languagesLabel.text=\u6709\u52b9\u306a\u30b9\u30af\u30ea\u30d7\u30c8\uff08\u8a00\u8a9e\uff09\uff1a
+KeywordSearchConfigurationPanel2.chunksLabel.text=\u30ad\u30fc\u30ef\u30fc\u30c9\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5185\u306e\u30c1\u30e3\u30f3\u30af\uff1a
+KeywordSearchConfigurationPanel3.enableUTF8Checkbox.text=UTF8\u30c6\u30ad\u30b9\u30c8\u62bd\u51fa\u306e\u6709\u52b9\u5316
+KeywordSearchConfigurationPanel3.enableUTF16Checkbox.text=UTF16LE\u3068UTF16BE\u30b9\u30c8\u30ea\u30f3\u30b0\u62bd\u51fa\u306e\u6709\u52b9\u5316
+KeywordSearchEditListPanel.keywordOptionsLabel.text=\u30ad\u30fc\u30ef\u30fc\u30c9\u30aa\u30d7\u30b7\u30e7\u30f3
+KeywordSearchEditListPanel.listOptionsLabel.text=\u30ea\u30b9\u30c8\u30aa\u30d7\u30b7\u30e7\u30f3
+KeywordSearchConfigurationPanel3.ingestSettingsLabel.text=\u4e0d\u660e\u306a\u30d5\u30a1\u30a4\u30eb\u5f62\u5f0f\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
+KeywordSearchConfigurationPanel2.settingsLabel.text=\u8a2d\u5b9a
+KeywordSearchConfigurationPanel2.informationLabel.text=\u30a4\u30f3\u30d5\u30a9\u30e1\u30fc\u30b7\u30e7\u30f3
+KeywordSearchListsManagementPanel.keywordListsLabel.text=\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\uff1a
+KeywordSearchEditListPanel.keywordsLabel.text=\u30ad\u30fc\u30ef\u30fc\u30c9\uff1a
+KeywordSearchConfigurationPanel2.timeRadioButton1.toolTipText=\uff12\uff10\u5206\uff08\u6700\u77ed\u306e\u51e6\u7406\u6642\u9593\uff09
+KeywordSearchConfigurationPanel2.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
+KeywordSearchConfigurationPanel2.timeRadioButton2.toolTipText=\uff11\uff10\u5206\uff08\u30c7\u30d5\u30a9\u30eb\u30c8\u3088\u308a\u5168\u4f53\u7684\u306b\u901f\u3044\u51e6\u7406\u6642\u9593\uff09
+KeywordSearchConfigurationPanel2.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
+KeywordSearchConfigurationPanel2.timeRadioButton3.toolTipText=\uff15\u5206\uff08\u5168\u4f53\u7684\u306a\u51e6\u7406\u6642\u9593\u304c\u9577\u304f\u306a\u308a\u307e\u3059\uff09
+KeywordSearchConfigurationPanel2.timeRadioButton3.text=\uff15\u5206\uff08\u30c7\u30d5\u30a9\u30eb\u30c8\uff09
+KeywordSearchIngestSimplePanel.encodingsLabel.text=\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0\uff1a
+KeywordSearchIngestSimplePanel.titleLabel.text=\u51e6\u7406\u4e2d\u306b\u6709\u52b9\u306a\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u3092\u9078\u629e\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
+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
+KeywordSearchConfigurationPanel2.frequencyLabel.text=\u51e6\u7406\u4e2d\u306e\u7d50\u679c\u66f4\u65b0\u306e\u983b\u5ea6\uff1a
+KeywordSearchConfigurationPanel2.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
+KeywordSearchConfigurationPanel2.timeRadioButton4.toolTipText=\uff11\u5206\uff08\u5168\u4f53\u7684\u306a\u51e6\u7406\u6642\u9593\u304c\u9577\u304f\u306a\u308a\u307e\u3059\uff09
+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
+AbstractKeywordSearchPerformer.search.searchIngestInProgressTitle=\u30ad\u30fc\u30ef\u30fc\u30c9\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u3092\u5b9f\u884c\u4e2d
+AbstractKeywordSearchPerformer.search.ingestInProgressBody=<html>\u30ad\u30fc\u30ef\u30fc\u30c9\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u3092\u5b9f\u884c\u4e2d<br />\u5168\u3066\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u691c\u7d22\u7d50\u679c\u304c\u4e0d\u5b8c\u5168\u306b\u306a\u308b\u5834\u5408\u304c\u3042\u308a\u307e\u3059\u3002<br />\u3053\u306e\u691c\u7d22\u3092\u5b9f\u884c\u3057\u307e\u3059\u304b\uff1f</html>
+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>
+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.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>
+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
+Installer.reportStopPortError=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u30b5\u30fc\u30d0\u30fc\u30b9\u30c8\u30c3\u30d7\u30dd\u30fc\u30c8 {0} \u306f\u5229\u7528\u3067\u304d\u307e\u305b\u3093\u3002\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u30e6\u30fc\u30b6\u30fc\u30d5\u30a9\u30eb\u30c0\u30fc\u5185\u306e {1} \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
+Installer.errorInitKsmMsg=\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22\u30e2\u30b8\u30e5\u30fc\u30eb\u306e\u8d77\u52d5\u30a8\u30e9\u30fc
+Installer.reportInitError=\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 {2} \u306e {3} \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
+KeywordSearchConfigurationPanel.customizeComponents.title=\u30a2\u30c9\u30d0\u30f3\u30b9\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22\u8a2d\u5b9a
+KeywordSearchConfigurationPanel.customizeComponents.listTabTitle=\u30ea\u30b9\u30c8
+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.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
+KeywordSearchConfigurationPanel1.customizeComponents.keywordListEmptyErr=\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u304c\u7a7a\u767d\u3067\u3059\u306e\u3067\u3001\u4fdd\u5b58\u3067\u304d\u307e\u305b\u3093
+KeywordSearch.newKwListTitle=\u65b0\u898f\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u540d\uff1a
+KeywordSearchConfigurationPanel1.customizeComponents.noOwDefaultMsg=\u30c7\u30d5\u30a9\u30eb\u30c8\u30ea\u30b9\u30c8\u306f\u4e0a\u66f8\u304d\u3067\u304d\u307e\u305b\u3093
+KeywordSearchConfigurationPanel1.customizeComponents.kwListExistMsg=\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8 <{0}> \u306f\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059\u3002\u4e0a\u66f8\u304d\u3057\u307e\u3059\u304b\uff1f
+KeywordSearchConfigurationPanel1.customizeComponents.kwListSavedMsg=\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8 <{0}> \u4fdd\u5b58\u3055\u308c\u307e\u3057\u305f
+KeywordSearchEditListPanel.customizeComponents.kwReToolTip=\u30ad\u30fc\u30ef\u30fc\u30c9\u306f\u6b63\u7fa9\u8868\u73fe\u3067\u3059
+KeywordSearchEditListPanel.customizeComponents.addWordToolTip=\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22\u30ea\u30b9\u30c8\u306b\u5358\u8a9e\u3092\u8ffd\u52a0
+KeywordSearchEditListPanel.customizeComponents.enterNewWordToolTip=\u65b0\u898f\u5358\u8a9e\u3084\u4e00\u6b63\u898f\u8868\u73fe\u3092\u5165\u529b
+KeywordSearchEditListPanel.customizeComponents.exportToFile=\u65e2\u5b58\u306e\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u3092\u30d5\u30a1\u30a4\u30eb\u306b\u30a8\u30af\u30b9\u30dd\u30fc\u30c8
+KeywordSearchEditListPanel.customizeComponents.saveCurrentWIthNewNameToolTip=\u65e2\u5b58\u306e\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u306b\u540d\u524d\u3092\u4ed8\u3051\u3066\u4fdd\u5b58
+KeywordSearchEditListPanel.customizeComponents.removeSelectedMsg=\u9078\u629e\u3057\u305f\u30ad\u30fc\u30ef\u30fc\u30c9\u3092\u30ea\u30b9\u30c8\u304b\u3089\u524a\u9664
+KeywordSearchEditListPanel.newKwTitle=\u65b0\u898f\u30ad\u30fc\u30ef\u30fc\u30c9\u30a8\u30f3\u30c8\u30ea\u30fc
+KeywordSearchEditListPanel.addWordButtonAction.kwAlreadyExistsMsg=\u30ad\u30fc\u30ef\u30fc\u30c9\u306f\u65e2\u306b\u30ea\u30b9\u30c8\u306b\u5b58\u5728\u3057\u307e\u3059\u3002
+KeywordSearchEditListPanel.invalidKwMsg=\u7121\u52b9\u306a\u30ad\u30fc\u30ef\u30fc\u30c9\u30d1\u30bf\u30fc\u30f3\u3002\u5358\u8a9e\u3082\u3057\u304f\u306f\u6b63\u3057\u3044\u6b63\u898f\u8868\u73fe\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+KeywordSearchEditListPanel.removeKwMsg=\u30ad\u30fc\u30ef\u30fc\u30c9\u3092\u524a\u9664
+KeywordSearchEditListPanel.deleteWordButtonActionPerformed.delConfirmMsg=\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
+KeywordSearchEditListPanel.exportButtonActionPerformed.fileFilterLabel=\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8XML\u30d5\u30a1\u30a4\u30eb
+KeywordSearchEditListPanel.exportButtonActionPerformed.fileExistPrompt=\ {0} \u30d5\u30a1\u30a4\u30eb\u306f\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059\u3002\u4e0a\u66f8\u304d\u3057\u307e\u3059\u304b\uff1f
+KeywordSearchEditListPanel.exportButtonActionPerformed.kwListExportedMsg=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u3055\u308c\u305f\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8
+KeywordSearchEditListPanel.kwColName=\u30ad\u30fc\u30ef\u30fc\u30c9
+KeywordSearchEditListPanel.exportButtonActionPerformed.regExColName=\u6b63\u898f\u8868\u73fe
+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\u3082\u3057\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.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.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
+KeywordSearchIngestModule.postIndexSummary.idxErrLbl=\u30a8\u30e9\u30fc\uff08\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u30a8\u30e9\u30fc\uff09
+KeywordSearchIngestModule.postIndexSummary.errTxtLbl=\u30a8\u30e9\u30fc\uff08\u30c6\u30ad\u30b9\u30c8\u62bd\u51fa\uff09
+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\u3042\u308a\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\u3042\u308a\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.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.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
+KeywordSearch.regExColLbl=\u6b63\u898f\u8868\u73fe
+KeywordSearchQueryManager.execute.exeWinTitle=\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22 {0} - {1}
+KeywordSearch.newKeywordListMsg=\u65b0\u898f\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8
+KeywordSearch.importListFileDialogMsg={0}\u30d5\u30a1\u30a4\u30eb\u304b\u3089\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8\u3092\u30a4\u30f3\u30dd\u30fc\u30c8\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u3042\u308a\u307e\u3057\u305f
+KeywordSearch.yesOwMsg=\u306f\u3044\u3001\u4e0a\u66f8\u304d\u3057\u307e\u3059
+KeywordSearch.noSkipMsg=\u3044\u3044\u3048\u3001\u30b9\u30ad\u30c3\u30d7\u3057\u307e\u3059
+KeywordSearch.cancelImportMsg=\u30a4\u30f3\u30dd\u30fc\u30c8\u3092\u30ad\u30e3\u30f3\u30bb\u30eb
+KeywordSearch.overwriteListPrompt=\u30ad\u30fc\u30ef\u30fc\u30c9\u30ea\u30b9\u30c8 <{0}> \u306f\u30ed\u30fc\u30ab\u30eb\u306b\u65e2\u306b\u5b58\u5728\u3057\u307e\u3059\u304c\u3001\u4e0a\u66f8\u304d\u3057\u307e\u3059\u304b\uff1f
+KeywordSearch.importOwConflict=\u30ea\u30b9\u30c8\u30a4\u30f3\u30dd\u30fc\u30c8\u306e\u554f\u984c
+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
+DropdownSearchPanel.copyMenuItem.text=\u30b3\u30d4\u30fc
+DropdownSearchPanel.cutMenuItem.text=\u30ab\u30c3\u30c8
+KeywordSearchIngestModule.moduleDescription=\u30ea\u30b9\u30c8\u5185\u306e\u30ad\u30fc\u30ef\u30fc\u30c9\u304a\u3088\u3073\u6b63\u898f\u8868\u73fe\u3092\u4f7f\u3044\u3001\u30d5\u30a1\u30a4\u30eb\u306e\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u304a\u3088\u3073\u5b9a\u671f\u7684\u306a\u691c\u7d22\u3092\u5b9f\u884c\u3057\u307e\u3059\u3002
+OptionsCategory_Name_KeywordSearchOptions=\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22
+OptionsCategory_Keywords_KeywordSearchOptions=\u30ad\u30fc\u30ef\u30fc\u30c9\u691c\u7d22
+ExtractedContentPanel.pagePreviousButton.actionCommand=
+ExtractedContentPanel.pageOfLabel.text=of
+ExtractedContentPanel.pageCurLabel.text=-
+ExtractedContentPanel.pageTotalLabel.text=-
+KeywordSearchConfigurationPanel2.filesIndexedValue.text=-
+KeywordSearchIngestSimplePanel.languagesValLabel.text=-
+KeywordSearchConfigurationPanel2.chunksValLabel.text=-
+KeywordSearchIngestSimplePanel.keywordSearchEncodings.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}
+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}
+ExtractedContentPanel.SetMarkup.progress.loading=\u30c6\u30ad\u30b9\u30c8\u3092\u8aad\u307f\u8fbc\u307f\u4e2d
+ExtractedContentPanel.SetMarkup.progress.displayName=\u30c6\u30ad\u30b9\u30c8\u3092\u8aad\u307f\u8fbc\u307f\u4e2d
+ExtractedContentViewer.nextPage.exception.msg=\u6b21\u306e\u30da\u30fc\u30b8\u304c\u3042\u308a\u307e\u305b\u3093\u3002
+ExtractedContentViewer.previousPage.exception.msg=\u524d\u306e\u30da\u30fc\u30b8\u304c\u3042\u308a\u307e\u305b\u3093\u3002
+ExtractedContentViewer.hasNextItem.exception.msg=\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u691c\u7d22\u53ef\u80fd\u306a\u30bd\u30fc\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+ExtractedContentViewer.hasPreviousItem.exception.msg=\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u691c\u7d22\u53ef\u80fd\u306a\u30bd\u30fc\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+ExtractedContentViewer.nextItem.exception.msg=\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u691c\u7d22\u53ef\u80fd\u306a\u30bd\u30fc\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+ExtractedContentViewer.previousItem.exception.msg=\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u691c\u7d22\u53ef\u80fd\u306a\u30bd\u30fc\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+ExtractedContentViewer.currentItem.exception.msg=\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u691c\u7d22\u53ef\u80fd\u306a\u30bd\u30fc\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+HighlightedMatchesSource.nextPage.exception.msg=\u6b21\u306e\u30da\u30fc\u30b8\u304c\u3042\u308a\u307e\u305b\u3093\u3002
+HighlightedMatchesSource.previousPage.exception.msg=\u524d\u306e\u30da\u30fc\u30b8\u304c\u3042\u308a\u307e\u305b\u3093\u3002
+HighlightedMatchesSource.nextItem.exception.msg=\u6b21\u306e\u30a2\u30a4\u30c6\u30e0\u304c\u3042\u308a\u307e\u305b\u3093\u3002
+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.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}, name\: {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\u79f0\: {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
+Ingester.UpRequestTask.run.exception.probReadFile.msg=\u30d5\u30a1\u30a4\u30eb\u306e\u8aad\u307f\u53d6\u308a\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+Ingester.UpRequestTask.run.exception.solrProb.msg=Solr\u306b\u306f\u554f\u984c\u304c\u3042\u308a\u307e\u3059
+Ingester.UpRequestTask.run.exception.probPostToSolr.msg=\u30d5\u30a1\u30a4\u30eb\u30b3\u30f3\u30c6\u30f3\u30c4\u3092Solr\u306b\u30dd\u30b9\u30c8\u3059\u308b\u306e\u306b\u554f\u984c\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002SolrException\u30a8\u30e9\u30fc\u30b3\u30fc\u30c9\uff1a{0}
+Ingester.FscContentStream.getSrcInfo=\u30d5\u30a1\u30a4\u30eb\uff1a{0}
+Ingester.FscContentStream.getReader=\u307e\u3060\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+Ingester.NullContentStream.getSrcInfo.text=\u30d5\u30a1\u30a4\u30eb\uff1a{0}
+Ingester.NullContentStream.getReader=\u307e\u3060\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+KeywordSearch.moduleErr=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a8\u30e9\u30fc
+KeywordSearch.fireNumIdxFileChg.moduleErr.msg=KeywordSearch\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
+KeywordSearchIngestModule.init.exception.errConnToSolr.msg=Solr\u30b5\u30fc\u30d0\u3078\u63a5\u7d9a\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a{0}
+KeywordSearchListsEncase.save.exception.msg=\u307e\u3060\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+KeywordSearchListsEncase.save2.exception.msg=\u307e\u3060\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+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
+KeywordSearchSettings.properties_options.text={0}_\u30aa\u30d7\u30b7\u30e7\u30f3
+KeywordSearchSettings.propertiesNSRL.text={0}_NSRL
+KeywordSearchSettings.propertiesScripts.text={0}_\u30b9\u30af\u30ea\u30d7\u30c8
+NoOpenCoreException.err.noOpenSorlCore.msg=\u73fe\u5728\u958b\u3044\u3066\u3044\u308bSolr\u30b3\u30a2\u306f\u3042\u308a\u307e\u305b\u3093\u3002
+Server.start.exception.cantStartSolr.msg=Solr\u30b5\u30fc\u30d0\u30d7\u30ed\u30bb\u30b9\u3092\u958b\u59cb\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
+Server.start.exception.cantStartSolr.msg2=Solr\u30b5\u30fc\u30d0\u30d7\u30ed\u30bb\u30b9\u3092\u958b\u59cb\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
+Server.isRunning.exception.errCheckSolrRunning.msg=Solr\u30b5\u30fc\u30d0\u304c\u7a3c\u50cd\u3057\u3066\u3044\u308b\u304b\u78ba\u8a8d\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+Server.isRunning.exception.errCheckSolrRunning.msg2=Solr\u30b5\u30fc\u30d0\u304c\u7a3c\u50cd\u3057\u3066\u3044\u308b\u304b\u78ba\u8a8d\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+Server.openCore.exception.alreadyOpen.msg=\u3059\u3067\u306b\u958b\u3044\u3066\u3044\u308b\u30b3\u30a2\u3067\u3059\uff01\u307e\u305a\u660e\u793a\u7684\u306b\u30b3\u30a2\u3092\u9589\u3058\u3066\u4e0b\u3055\u3044\u3002
+Server.queryNumIdxFiles.exception.msg=\u8907\u6570\u306e\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb\u306b\u5bfe\u3057\u3066\u306e\u30af\u30a8\u30ea\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+Server.queryNumIdxChunks.exception.msg=\u8907\u6570\u306e\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u3055\u308c\u305f\u30c1\u30e3\u30f3\u30af\u306b\u5bfe\u3057\u3066\u306e\u30af\u30a8\u30ea\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+Server.queryNumIdxDocs.exception.msg=\u8907\u6570\u306e\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u3055\u308c\u305f\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306b\u5bfe\u3057\u3066\u306e\u30af\u30a8\u30ea\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+Server.queryIsIdxd.exception.msg=\u30b3\u30f3\u30c6\u30f3\u30c4\u304c\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u3055\u308c\u305f\u304b\u78ba\u8a8d\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+Server.queryNumFileChunks.exception.msg=\u30d5\u30a1\u30a4\u30eb\u30c1\u30e3\u30f3\u30af\u306e\u6570\u3092\u78ba\u8a8d\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
+Server.query.exception.msg=\u30af\u30a8\u30ea\u306e\u5b9f\u884c\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a{0}
+Server.query2.exception.msg=\u30af\u30a8\u30ea\u306e\u5b9f\u884c\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\uff1a{0}
+Server.queryTerms.exception.msg=Terms\u30af\u30a8\u30ea\u306e\u5b9f\u884c\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f
+Server.openCore.exception.msg=\u30b3\u30a2\u3092\u958b\u304f\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u3057\u307e\u3057\u305f\u304c\u3001\u30b5\u30fc\u30d0\u304c\u307e\u3060\u7a3c\u50cd\u3057\u3066\u3044\u307e\u305b\u3093\u3002
+Server.openCore.exception.cantOpen.msg=\u30b3\u30a2\u3092\u958b\u3051\u307e\u305b\u3093\u3067\u3057\u305f
+Server.openCore.exception.cantOpen.msg2=\u30b3\u30a2\u3092\u958b\u3051\u307e\u305b\u3093\u3067\u3057\u305f
+Server.request.exception.exception.msg=Solr\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u767a\u884c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
+Server.commit.exception.msg=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u3092\u30b3\u30df\u30c3\u30c8\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f
+Server.addDoc.exception.msg=\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}
+Server.close.exception.msg=\u30b3\u30a2\u3092\u9589\u3058\u308c\u307e\u305b\u3093
+Server.close.exception.msg2=\u30b3\u30a2\u3092\u9589\u3058\u308c\u307e\u305b\u3093
+Server.solrServerNoPortException.msg=\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u5316\u306b\u4f7f\u7528\u3057\u3066\u3044\u308b\u30b5\u30fc\u30d0\u306f\u30dd\u30fc\u30c8{0}\u306b\u30d0\u30a4\u30f3\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30dd\u30fc\u30c8\u306f\u4f7f\u7528\u4e0d\u53ef\u3067\u3059\u3002\u30c7\u30d5\u30a9\u30eb\u30c8{1}\u30dd\u30fc\u30c8\u306e\u5909\u66f4\u3092\u691c\u8a0e\u3057\u3066\u4e0b\u3055\u3044\u3002
+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
+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/ByteContentStream.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ByteContentStream.java
index fc8d132596..8dc2b4fe80 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ByteContentStream.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ByteContentStream.java
@@ -24,6 +24,8 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.Charset;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.apache.solr.common.util.ContentStream;
 import org.sleuthkit.datamodel.AbstractContent;
@@ -84,7 +86,7 @@ class ByteContentStream implements ContentStream {
 
     @Override
     public String getSourceInfo() {
-        return "File:" + aContent.getId();
+        return NbBundle.getMessage(this.getClass(), "ByteContentStream.getSrcInfo.text", aContent.getId());
     }
 
     @Override
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ContentHit.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ContentHit.java
index b1e962b055..6ea34c3724 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ContentHit.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ContentHit.java
@@ -31,6 +31,8 @@ class ContentHit {
 
     private AbstractFile content;
     private int chunkID = 0;
+    private String snippet = "";
+    private boolean snippetSet = false;
 
     ContentHit(AbstractFile content) {
         this.content = content;
@@ -57,6 +59,19 @@ class ContentHit {
         return chunkID != 0;
     }
 
+    void setSnippet(String snippet) {
+        this.snippet = snippet;
+        this.snippetSet = true;
+    }
+    
+    String getSnippet() {
+        return snippet;
+    }
+    
+    boolean hasSnippet() {
+        return snippetSet;
+    }
+    
     @Override
     public boolean equals(Object obj) {
         if (obj == null) {
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.form
new file mode 100644
index 0000000000..acd2304cae
--- /dev/null
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.form
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.5" maxVersion="1.8" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+  <NonVisualComponents>
+    <Component class="javax.swing.ButtonGroup" name="queryTypeButtonGroup">
+    </Component>
+    <Container class="javax.swing.JPopupMenu" name="rightClickMenu">
+
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+        <Property name="useNullLayout" type="boolean" value="true"/>
+      </Layout>
+      <SubComponents>
+        <MenuItem class="javax.swing.JMenuItem" name="cutMenuItem">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="DropdownSearchPanel.cutMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </MenuItem>
+        <MenuItem class="javax.swing.JMenuItem" name="copyMenuItem">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="DropdownSearchPanel.copyMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </MenuItem>
+        <MenuItem class="javax.swing.JMenuItem" name="pasteMenuItem">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="DropdownSearchPanel.pasteMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </MenuItem>
+        <MenuItem class="javax.swing.JMenuItem" name="selectAllMenuItem">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="DropdownSearchPanel.selectAllMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </MenuItem>
+      </SubComponents>
+    </Container>
+  </NonVisualComponents>
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+  </AuxValues>
+
+  <Layout>
+    <DimensionLayout dim="0">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" alignment="0" attributes="0">
+              <EmptySpace min="-2" pref="5" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Group type="102" attributes="0">
+                      <Component id="keywordTextField" max="32767" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="searchButton" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Component id="exactRadioButton" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <Component id="substringRadioButton" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="regexRadioButton" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace min="0" pref="27" max="32767" attributes="0"/>
+                  </Group>
+              </Group>
+              <EmptySpace min="-2" pref="5" max="-2" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+    <DimensionLayout dim="1">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" alignment="0" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="keywordTextField" alignment="3" max="32767" attributes="0"/>
+                  <Component id="searchButton" alignment="3" pref="26" max="32767" attributes="0"/>
+              </Group>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="exactRadioButton" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="substringRadioButton" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="regexRadioButton" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace min="-2" max="-2" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+  </Layout>
+  <SubComponents>
+    <Component class="javax.swing.JTextField" name="keywordTextField">
+      <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+          <Font name="Monospaced" size="14" style="0"/>
+        </Property>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="DropdownSearchPanel.keywordTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+          <Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
+            <LineBorder roundedCorners="true">
+              <Color PropertyName="color" blue="c0" green="c0" red="c0" type="rgb"/>
+            </LineBorder>
+          </Border>
+        </Property>
+        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[2, 25]"/>
+        </Property>
+        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[2, 25]"/>
+        </Property>
+      </Properties>
+      <Events>
+        <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="keywordTextFieldMouseClicked"/>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="keywordTextFieldActionPerformed"/>
+      </Events>
+    </Component>
+    <Component class="javax.swing.JButton" name="searchButton">
+      <Properties>
+        <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+          <Image iconType="3" name="/org/sleuthkit/autopsy/keywordsearch/search-icon.png"/>
+        </Property>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="DropdownSearchPanel.searchButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="searchButtonActionPerformed"/>
+      </Events>
+    </Component>
+    <Component class="javax.swing.JRadioButton" name="exactRadioButton">
+      <Properties>
+        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+          <ComponentRef name="queryTypeButtonGroup"/>
+        </Property>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="DropdownSearchPanel.exactRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JRadioButton" name="substringRadioButton">
+      <Properties>
+        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+          <ComponentRef name="queryTypeButtonGroup"/>
+        </Property>
+        <Property name="selected" type="boolean" value="true"/>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="DropdownSearchPanel.substringRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JRadioButton" name="regexRadioButton">
+      <Properties>
+        <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
+          <ComponentRef name="queryTypeButtonGroup"/>
+        </Property>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="DropdownSearchPanel.regexRadioButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+  </SubComponents>
+</Form>
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.java
new file mode 100644
index 0000000000..eb8a7799a7
--- /dev/null
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSearchPanel.java
@@ -0,0 +1,268 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2014 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.keywordsearch;
+
+import java.awt.Cursor;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.util.List;
+import java.util.logging.Level;
+import javax.swing.JMenuItem;
+import org.sleuthkit.autopsy.coreutils.Logger;
+
+/**
+ * A simple UI for finding text after ingest
+ * 
+ * The toolbar uses a different font from the rest of the application, Monospaced 14, 
+ * due to the necessity to find a font that displays both Arabic and Asian fonts at an acceptable size. 
+ * The default, Tahoma 14, could not perform this task at the desired size, and neither could numerous other fonts. 
+ */
+public class DropdownSearchPanel extends AbstractKeywordSearchPerformer {
+    private static final Logger logger = Logger.getLogger(DropdownSearchPanel.class.getName());
+    private static DropdownSearchPanel instance = null;
+    
+    /**
+     * Creates new form DropdownSearchPanel
+     */
+    public DropdownSearchPanel() {
+        initComponents();
+        customizeComponents();
+    }
+    
+    private void customizeComponents() {
+        keywordTextField.addFocusListener(new FocusListener() {
+            @Override
+            public void focusGained(FocusEvent e) {
+                //do nothing
+            }
+
+            @Override
+            public void focusLost(FocusEvent e) {
+                if (keywordTextField.getText().equals("")) {
+                    resetSearchBox();
+                }
+            }
+        });
+        
+        keywordTextField.setComponentPopupMenu(rightClickMenu);
+        ActionListener actList = new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                JMenuItem jmi = (JMenuItem) e.getSource();
+                if (jmi.equals(cutMenuItem)) {
+                    keywordTextField.cut();
+                } else if (jmi.equals(copyMenuItem)) {
+                    keywordTextField.copy();
+                } else if (jmi.equals(pasteMenuItem)) {
+                    keywordTextField.paste();
+                } else if (jmi.equals(selectAllMenuItem)) {
+                    keywordTextField.selectAll();
+                }
+            }
+        };
+        cutMenuItem.addActionListener(actList);
+        copyMenuItem.addActionListener(actList);
+        pasteMenuItem.addActionListener(actList);
+        selectAllMenuItem.addActionListener(actList);        
+    }
+    
+    public static synchronized DropdownSearchPanel getDefault() {
+        if (instance == null) {
+            instance = new DropdownSearchPanel();
+        }
+        return instance;
+    }
+    
+    void addSearchButtonActionListener(ActionListener actionListener) {
+        searchButton.addActionListener(actionListener);
+    }    
+       
+    public void resetSearchBox() {
+        keywordTextField.setText("");
+    }       
+    
+    @Override
+    public String getQueryText() {
+        return keywordTextField.getText();
+    }
+
+    @Override
+    public boolean isRegExQuerySelected() {
+        return regexRadioButton.isSelected();
+    }
+
+    @Override
+    public boolean isWholewordQuerySelected() {
+        return exactRadioButton.isSelected();
+    }
+    
+    @Override
+    public boolean isMultiwordQuery() {
+        return false;
+    }
+
+    @Override
+    public List<Keyword> getQueryList() {
+        throw new UnsupportedOperationException("No list for single-keyword search");
+    }    
+
+    @Override
+    protected void postFilesIndexedChange() {
+        //nothing to update
+    }    
+    
+    /**
+     * This method is called from within the constructor to initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is always
+     * regenerated by the Form Editor.
+     */
+    @SuppressWarnings("unchecked")
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
+
+        queryTypeButtonGroup = new javax.swing.ButtonGroup();
+        rightClickMenu = new javax.swing.JPopupMenu();
+        cutMenuItem = new javax.swing.JMenuItem();
+        copyMenuItem = new javax.swing.JMenuItem();
+        pasteMenuItem = new javax.swing.JMenuItem();
+        selectAllMenuItem = new javax.swing.JMenuItem();
+        keywordTextField = new javax.swing.JTextField();
+        searchButton = new javax.swing.JButton();
+        exactRadioButton = new javax.swing.JRadioButton();
+        substringRadioButton = new javax.swing.JRadioButton();
+        regexRadioButton = new javax.swing.JRadioButton();
+
+        org.openide.awt.Mnemonics.setLocalizedText(cutMenuItem, org.openide.util.NbBundle.getMessage(DropdownSearchPanel.class, "DropdownSearchPanel.cutMenuItem.text")); // NOI18N
+        rightClickMenu.add(cutMenuItem);
+
+        org.openide.awt.Mnemonics.setLocalizedText(copyMenuItem, org.openide.util.NbBundle.getMessage(DropdownSearchPanel.class, "DropdownSearchPanel.copyMenuItem.text")); // NOI18N
+        rightClickMenu.add(copyMenuItem);
+
+        org.openide.awt.Mnemonics.setLocalizedText(pasteMenuItem, org.openide.util.NbBundle.getMessage(DropdownSearchPanel.class, "DropdownSearchPanel.pasteMenuItem.text")); // NOI18N
+        rightClickMenu.add(pasteMenuItem);
+
+        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.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));
+        keywordTextField.setPreferredSize(new java.awt.Dimension(2, 25));
+        keywordTextField.addMouseListener(new java.awt.event.MouseAdapter() {
+            public void mouseClicked(java.awt.event.MouseEvent evt) {
+                keywordTextFieldMouseClicked(evt);
+            }
+        });
+        keywordTextField.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                keywordTextFieldActionPerformed(evt);
+            }
+        });
+
+        searchButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/search-icon.png"))); // NOI18N
+        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) {
+                searchButtonActionPerformed(evt);
+            }
+        });
+
+        queryTypeButtonGroup.add(exactRadioButton);
+        org.openide.awt.Mnemonics.setLocalizedText(exactRadioButton, org.openide.util.NbBundle.getMessage(DropdownSearchPanel.class, "DropdownSearchPanel.exactRadioButton.text")); // NOI18N
+
+        queryTypeButtonGroup.add(substringRadioButton);
+        substringRadioButton.setSelected(true);
+        org.openide.awt.Mnemonics.setLocalizedText(substringRadioButton, org.openide.util.NbBundle.getMessage(DropdownSearchPanel.class, "DropdownSearchPanel.substringRadioButton.text")); // NOI18N
+
+        queryTypeButtonGroup.add(regexRadioButton);
+        org.openide.awt.Mnemonics.setLocalizedText(regexRadioButton, org.openide.util.NbBundle.getMessage(DropdownSearchPanel.class, "DropdownSearchPanel.regexRadioButton.text")); // NOI18N
+
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+        this.setLayout(layout);
+        layout.setHorizontalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addGap(5, 5, 5)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(keywordTextField, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(searchButton))
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(exactRadioButton)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(substringRadioButton)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(regexRadioButton)
+                        .addGap(0, 27, Short.MAX_VALUE)))
+                .addGap(5, 5, 5))
+        );
+        layout.setVerticalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(keywordTextField, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(searchButton, javax.swing.GroupLayout.DEFAULT_SIZE, 26, Short.MAX_VALUE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(exactRadioButton)
+                    .addComponent(substringRadioButton)
+                    .addComponent(regexRadioButton))
+                .addContainerGap())
+        );
+    }// </editor-fold>//GEN-END:initComponents
+
+    private void searchButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_searchButtonActionPerformed
+        keywordTextFieldActionPerformed(evt);
+    }//GEN-LAST:event_searchButtonActionPerformed
+
+    private void keywordTextFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_keywordTextFieldActionPerformed
+        try {
+            search();
+        } catch(Exception e) {
+            logger.log(Level.SEVERE, "search() threw exception", e);
+        }
+    }//GEN-LAST:event_keywordTextFieldActionPerformed
+
+    private void keywordTextFieldMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_keywordTextFieldMouseClicked
+        if(evt.isPopupTrigger()) {
+            rightClickMenu.show(evt.getComponent(), evt.getX(), evt.getY());
+        }
+    }//GEN-LAST:event_keywordTextFieldMouseClicked
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JMenuItem copyMenuItem;
+    private javax.swing.JMenuItem cutMenuItem;
+    private javax.swing.JRadioButton exactRadioButton;
+    private javax.swing.JTextField keywordTextField;
+    private javax.swing.JMenuItem pasteMenuItem;
+    private javax.swing.ButtonGroup queryTypeButtonGroup;
+    private javax.swing.JRadioButton regexRadioButton;
+    private javax.swing.JPopupMenu rightClickMenu;
+    private javax.swing.JButton searchButton;
+    private javax.swing.JMenuItem selectAllMenuItem;
+    private javax.swing.JRadioButton substringRadioButton;
+    // End of variables declaration//GEN-END:variables
+  
+ 
+}
\ No newline at end of file
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.form
index 763e567146..19c373e175 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.form
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.form
@@ -145,15 +145,14 @@
     </Container>
     <Component class="javax.swing.JComboBox" name="sourceComboBox">
       <Properties>
-        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-          <StringArray count="4">
-            <StringItem index="0" value="Item 1"/>
-            <StringItem index="1" value="Item 2"/>
-            <StringItem index="2" value="Item 3"/>
-            <StringItem index="3" value="Item 4"/>
-          </StringArray>
+        <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+          <Connection code="new javax.swing.DefaultComboBoxModel&lt;MarkupSource&gt;()" type="code"/>
         </Property>
       </Properties>
+      <AuxValues>
+        <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value="new javax.swing.JComboBox&lt;&gt;()"/>
+        <AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;MarkupSource&gt;"/>
+      </AuxValues>
     </Component>
     <Component class="javax.swing.JLabel" name="hitLabel">
       <Properties>
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java
index 1718e7cd31..dcb09b03e8 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentPanel.java
@@ -73,14 +73,17 @@ class ExtractedContentPanel extends javax.swing.JPanel {
             public ViewFactory getViewFactory() {
 
                 return new HTMLFactory() {
+                    @Override
                     public View create(Element e) {
                         View v = super.create(e);
                         if (v instanceof InlineView) {
                             return new InlineView(e) {
+                                @Override
                                 public int getBreakWeight(int axis, float pos, float len) {
                                     return GoodBreakWeight;
                                 }
 
+                                @Override
                                 public View breakView(int axis, int p0, float pos, float len) {
                                     if (axis == View.X_AXIS) {
                                         checkPainter();
@@ -95,6 +98,7 @@ class ExtractedContentPanel extends javax.swing.JPanel {
                             };
                         } else if (v instanceof ParagraphView) {
                             return new ParagraphView(e) {
+                                @Override
                                 protected SizeRequirements calculateMinorAxisRequirements(int axis, SizeRequirements r) {
                                     if (r == null) {
                                         r = new SizeRequirements();
@@ -169,7 +173,7 @@ class ExtractedContentPanel extends javax.swing.JPanel {
             public boolean getScrollableTracksViewportWidth() {
                 return (getSize().width < 400);
             }};
-            sourceComboBox = new javax.swing.JComboBox();
+            sourceComboBox = new javax.swing.JComboBox<>();
             hitLabel = new javax.swing.JLabel();
             hitCountLabel = new javax.swing.JLabel();
             hitOfLabel = new javax.swing.JLabel();
@@ -202,7 +206,7 @@ class ExtractedContentPanel extends javax.swing.JPanel {
             extractedTextPane.setPreferredSize(new java.awt.Dimension(700, 400));
             jScrollPane1.setViewportView(extractedTextPane);
 
-            sourceComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" }));
+            sourceComboBox.setModel(new javax.swing.DefaultComboBoxModel<MarkupSource>());
 
             hitLabel.setText(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.hitLabel.text")); // NOI18N
             hitLabel.setToolTipText(org.openide.util.NbBundle.getMessage(ExtractedContentPanel.class, "ExtractedContentPanel.hitLabel.toolTipText")); // NOI18N
@@ -306,7 +310,7 @@ class ExtractedContentPanel extends javax.swing.JPanel {
                     .addComponent(pagePreviousButton)
                     .addGap(0, 0, 0)
                     .addComponent(pageNextButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 71, Short.MAX_VALUE)
+                    .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .addComponent(sourceComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
             );
@@ -332,7 +336,7 @@ class ExtractedContentPanel extends javax.swing.JPanel {
                         .addComponent(pageNextButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addComponent(pagePreviousButton, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE))
                     .addGap(0, 0, 0)
-                    .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 293, Short.MAX_VALUE))
+                    .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 377, Short.MAX_VALUE))
             );
         }// </editor-fold>//GEN-END:initComponents
     // Variables declaration - do not modify//GEN-BEGIN:variables
@@ -355,7 +359,7 @@ class ExtractedContentPanel extends javax.swing.JPanel {
     private javax.swing.JLabel pagesLabel;
     private javax.swing.JPopupMenu rightClickMenu;
     private javax.swing.JMenuItem selectAllMenuItem;
-    private javax.swing.JComboBox sourceComboBox;
+    private javax.swing.JComboBox<MarkupSource> sourceComboBox;
     // End of variables declaration//GEN-END:variables
 
     void refreshCurrentMarkup() {
@@ -374,7 +378,7 @@ class ExtractedContentPanel extends javax.swing.JPanel {
         setPanelText(null, false);
 
         for (MarkupSource ms : sources) {
-            sourceComboBox.<String>addItem(ms);
+            sourceComboBox.addItem(ms);
         }
 
         if (!sources.isEmpty()) {
@@ -391,7 +395,7 @@ class ExtractedContentPanel extends javax.swing.JPanel {
     public List<MarkupSource> getSources() {
         ArrayList<MarkupSource> sources = new ArrayList<>();
         for (int i = 0; i < sourceComboBox.getItemCount(); ++i) {
-            sources.add((MarkupSource) sourceComboBox.getItemAt(i));
+            sources.add(sourceComboBox.getItemAt(i));
         }
         return sources;
     }
@@ -685,8 +689,10 @@ class ExtractedContentPanel extends javax.swing.JPanel {
 
         @Override
         protected Object doInBackground() throws Exception {
-            progress = ProgressHandleFactory.createHandle("Loading text");
-            progress.setDisplayName("Loading text");
+            progress = ProgressHandleFactory.createHandle(
+                    NbBundle.getMessage(this.getClass(), "ExtractedContentPanel.SetMarkup.progress.loading"));
+            progress.setDisplayName(
+                    NbBundle.getMessage(this.getClass(), "ExtractedContentPanel.SetMarkup.progress.displayName"));
             progress.start();
             progress.switchToIndeterminate();
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java
index e8368e14b6..a72b33bd37 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/ExtractedContentViewer.java
@@ -134,7 +134,8 @@ public class ExtractedContentViewer implements DataContentViewer {
             @Override
             public int nextPage() {
                 if (!hasNextPage()) {
-                    throw new IllegalStateException("No next page.");
+                    throw new IllegalStateException(
+                            NbBundle.getMessage(this.getClass(), "ExtractedContentViewer.nextPage.exception.msg"));
                 }
                 ++currentPage;
                 return currentPage;
@@ -143,7 +144,8 @@ public class ExtractedContentViewer implements DataContentViewer {
             @Override
             public int previousPage() {
                 if (!hasPreviousPage()) {
-                    throw new IllegalStateException("No previous page.");
+                    throw new IllegalStateException(
+                            NbBundle.getMessage(this.getClass(), "ExtractedContentViewer.previousPage.exception.msg"));
                 }
                 --currentPage;
                 return currentPage;
@@ -151,27 +153,32 @@ public class ExtractedContentViewer implements DataContentViewer {
 
             @Override
             public boolean hasNextItem() {
-                throw new UnsupportedOperationException("Not supported, not a searchable source.");
+                throw new UnsupportedOperationException(
+                        NbBundle.getMessage(this.getClass(), "ExtractedContentViewer.hasNextItem.exception.msg"));
             }
 
             @Override
             public boolean hasPreviousItem() {
-                throw new UnsupportedOperationException("Not supported, not a searchable source.");
+                throw new UnsupportedOperationException(
+                        NbBundle.getMessage(this.getClass(), "ExtractedContentViewer.hasPreviousItem.exception.msg"));
             }
 
             @Override
             public int nextItem() {
-                throw new UnsupportedOperationException("Not supported, not a searchable source.");
+                throw new UnsupportedOperationException(
+                        NbBundle.getMessage(this.getClass(), "ExtractedContentViewer.nextItem.exception.msg"));
             }
 
             @Override
             public int previousItem() {
-                throw new UnsupportedOperationException("Not supported, not a searchable source.");
+                throw new UnsupportedOperationException(
+                        NbBundle.getMessage(this.getClass(), "ExtractedContentViewer.previousItem.exception.msg"));
             }
 
             @Override
             public int currentItem() {
-                throw new UnsupportedOperationException("Not supported, not a searchable source.");
+                throw new UnsupportedOperationException(
+                        NbBundle.getMessage(this.getClass(), "ExtractedContentViewer.currentItem.exception.msg"));
             }
 
             @Override
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java
index a7d08fdcd3..a94d2865ad 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedMatchesSource.java
@@ -223,7 +223,8 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup {
     @Override
     public int nextPage() {
         if (!hasNextPage()) {
-            throw new IllegalStateException("No next page.");
+            throw new IllegalStateException(
+                    NbBundle.getMessage(this.getClass(), "HighlightedMatchesSource.nextPage.exception.msg"));
         }
         int idx = pages.indexOf(this.currentPage);
         currentPage = pages.get(idx + 1);
@@ -233,7 +234,8 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup {
     @Override
     public int previousPage() {
         if (!hasPreviousPage()) {
-            throw new IllegalStateException("No previous page.");
+            throw new IllegalStateException(
+                    NbBundle.getMessage(this.getClass(), "HighlightedMatchesSource.previousPage.exception.msg"));
         }
         int idx = pages.indexOf(this.currentPage);
         currentPage = pages.get(idx - 1);
@@ -259,7 +261,8 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup {
     @Override
     public int nextItem() {
         if (!hasNextItem()) {
-            throw new IllegalStateException("No next item.");
+            throw new IllegalStateException(
+                    NbBundle.getMessage(this.getClass(), "HighlightedMatchesSource.nextItem.exception.msg"));
         }
         int cur = pagesToHits.get(currentPage) + 1;
         pagesToHits.put(currentPage, cur);
@@ -269,7 +272,8 @@ class HighlightedMatchesSource implements MarkupSource, HighlightLookup {
     @Override
     public int previousItem() {
         if (!hasPreviousItem()) {
-            throw new IllegalStateException("No previous item.");
+            throw new IllegalStateException(
+                    NbBundle.getMessage(this.getClass(), "HighlightedMatchesSource.previousItem.exception.msg"));
         }
         int cur = pagesToHits.get(currentPage) - 1;
         pagesToHits.put(currentPage, cur);
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
index d4a7c2fffc..12d9999b01 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Ingester.java
@@ -41,6 +41,7 @@ import org.apache.solr.common.SolrException.ErrorCode;
 import org.apache.solr.common.util.ContentStream;
 import org.apache.solr.common.SolrInputDocument;
 import org.openide.util.Exceptions;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
@@ -279,7 +280,8 @@ class Ingester {
         
         if (fields.get(Server.Schema.IMAGE_ID.toString()) == null) {
             //skip the file, image id unknown
-            String msg = "Skipping indexing the file, unknown image id, for file: " + cs.getName();
+            String msg = NbBundle.getMessage(this.getClass(),
+                                             "Ingester.ingest.exception.unknownImgId.msg", cs.getName());
             logger.log(Level.SEVERE, msg);
             throw new IngesterException(msg);
         }
@@ -301,7 +303,9 @@ class Ingester {
                 is = cs.getStream();
                 read = is.read(docChunkContentBuf);
             } catch (IOException ex) {
-                throw new IngesterException("Could not read content stream: " + cs.getName());
+                throw new IngesterException(
+                        NbBundle.getMessage(this.getClass(), "Ingester.ingest.exception.cantReadStream.msg",
+                                            cs.getName()));
             } finally {
                 try {
                     is.close();
@@ -333,7 +337,8 @@ class Ingester {
             solrServer.addDocument(updateDoc);
             uncommitedIngests = true;
         } catch (KeywordSearchModuleException ex) {
-            throw new IngesterException("Error ingestint document: " + cs.getName(), ex);
+            throw new IngesterException(
+                    NbBundle.getMessage(this.getClass(), "Ingester.ingest.exception.err.msg", cs.getName()), ex);
         }
 
 
@@ -373,9 +378,13 @@ class Ingester {
             logger.log(Level.WARNING, "Solr timeout encountered, trying to restart Solr");
             //restart may be needed to recover from some error conditions
             hardSolrRestart();
-            throw new IngesterException("Solr index request time out for id: " + fields.get("id") + ", name: " + fields.get("file_name"));
+            throw new IngesterException(
+                    NbBundle.getMessage(this.getClass(), "Ingester.ingestExtract.exception.solrTimeout.msg",
+                                        fields.get("id"), fields.get("file_name")));
         } catch (Exception e) {
-            throw new IngesterException("Problem posting content to Solr, id: " + fields.get("id") + ", name: " + fields.get("file_name"), e);
+            throw new IngesterException(
+                    NbBundle.getMessage(this.getClass(), "Ingester.ingestExtract.exception.probPostToSolr.msg",
+                                        fields.get("id"), fields.get("file_name")), e);
         }
         uncommitedIngests = true;
     }
@@ -443,14 +452,17 @@ class Ingester {
                 up.setMethod(METHOD.POST);
                 solrServer.request(up);
             } catch (NoOpenCoreException ex) {
-                throw new RuntimeException("No Solr core available, cannot index the content", ex);
+                throw new RuntimeException(
+                        NbBundle.getMessage(this.getClass(), "Ingester.UpReqestTask.run.exception.sorlNotAvail.msg"), ex);
             } catch (IllegalStateException ex) {
                 // problems with content
-                throw new RuntimeException("Problem reading file.", ex);
+                throw new RuntimeException(
+                        NbBundle.getMessage(this.getClass(), "Ingester.UpRequestTask.run.exception.probReadFile.msg"), ex);
             } catch (SolrServerException ex) {
                 // If there's a problem talking to Solr, something is fundamentally
                 // wrong with ingest
-                throw new RuntimeException("Problem with Solr", ex);
+                throw new RuntimeException(
+                        NbBundle.getMessage(this.getClass(), "Ingester.UpRequestTask.run.exception.solrProb.msg"), ex);
             } catch (SolrException ex) {
                 // Tika problems result in an unchecked SolrException
                 ErrorCode ec = ErrorCode.getErrorCode(ex.code());
@@ -458,7 +470,10 @@ class Ingester {
                 // When Tika has problems with a document, it throws a server error
                 // but it's okay to continue with other documents
                 if (ec.equals(ErrorCode.SERVER_ERROR)) {
-                    throw new RuntimeException("Problem posting file contents to Solr. SolrException error code: " + ec, ex);
+                    throw new RuntimeException(NbBundle.getMessage(this.getClass(),
+                                                                   "Ingester.UpRequestTask.run.exception.probPostToSolr.msg",
+                                                                   ec),
+                                               ex);
                 } else {
                     // shouldn't get any other error codes
                     throw ex;
@@ -513,7 +528,7 @@ class Ingester {
 
         @Override
         public String getSourceInfo() {
-            return "File:" + f.getId();
+            return NbBundle.getMessage(this.getClass(), "Ingester.FscContentStream.getSrcInfo", f.getId());
         }
 
         @Override
@@ -533,7 +548,8 @@ class Ingester {
 
         @Override
         public Reader getReader() throws IOException {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException(
+                    NbBundle.getMessage(this.getClass(), "Ingester.FscContentStream.getReader"));
         }
     }
 
@@ -555,7 +571,7 @@ class Ingester {
 
         @Override
         public String getSourceInfo() {
-            return "File:" + aContent.getId();
+            return NbBundle.getMessage(this.getClass(), "Ingester.NullContentStream.getSrcInfo.text", aContent.getId());
         }
 
         @Override
@@ -575,7 +591,8 @@ class Ingester {
 
         @Override
         public Reader getReader() throws IOException {
-            throw new UnsupportedOperationException("Not supported yet.");
+            throw new UnsupportedOperationException(
+                    NbBundle.getMessage(this.getClass(), "Ingester.NullContentStream.getReader"));
         }
     }
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java
index 39035a1684..65acb171b1 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Keyword.java
@@ -19,6 +19,7 @@
 
 package org.sleuthkit.autopsy.keywordsearch;
 
+import org.openide.util.NbBundle;
 import org.sleuthkit.datamodel.BlackboardAttribute;
 
 /**
@@ -72,7 +73,7 @@ class Keyword {
 
     @Override
     public String toString() {
-        return "Keyword{" + "query=" + keywordString + ", isLiteral=" + isLiteral + ", keywordType=" + keywordType + '}';
+        return NbBundle.getMessage(this.getClass(), "Keyword.toString.text", keywordString, isLiteral, keywordType);
     }
     
     
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java
index 59f218fc09..dc9a2b6ba3 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearch.java
@@ -28,6 +28,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
 import org.openide.util.Exceptions;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 import org.sleuthkit.autopsy.keywordsearch.KeywordSearchResultFactory.ResultWriter;
@@ -46,8 +47,7 @@ public class KeywordSearch {
     static final Logger TIKA_LOGGER = Logger.getLogger("Tika");
     private static final Logger logger = Logger.getLogger(Case.class.getName());
     public enum QueryType {
-
-        WORD, REGEX
+        LITERAL, REGEX
     };
     public static final String NUM_FILES_CHANGE_EVT = "NUM_FILES_CHANGE_EVT";
     private static PropertyChangeSupport changeSupport = new PropertyChangeSupport(KeywordSearch.class);
@@ -107,7 +107,10 @@ public class KeywordSearch {
         }
         catch (Exception e) {
             logger.log(Level.SEVERE, "KeywordSearch listener threw exception", e);
-            MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to KeywordSearch updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+            MessageNotifyUtil.Notify.show(NbBundle.getMessage(KeywordSearch.class, "KeywordSearch.moduleErr"),
+                                          NbBundle.getMessage(KeywordSearch.class,
+                                                              "KeywordSearch.fireNumIdxFileChg.moduleErr.msg"),
+                                          MessageNotifyUtil.MessageType.ERROR);
         }
     }
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.form
index 62c6648c65..223924e29f 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.form
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.form
@@ -20,7 +20,7 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" alignment="0" attributes="0">
+          <Group type="102" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" alignment="0" attributes="0">
@@ -34,14 +34,15 @@
                       <Component id="informationSeparator" min="-2" pref="309" max="-2" attributes="0"/>
                   </Group>
                   <Group type="102" attributes="0">
-                      <EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
+                      <EmptySpace min="10" pref="10" max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="skipNSRLCheckBox" min="-2" max="-2" attributes="0"/>
+                          <Component id="showSnippetsCB" alignment="0" min="-2" max="-2" attributes="0"/>
                           <Component id="filesIndexedLabel" min="-2" max="-2" attributes="0"/>
-                          <Group type="102" attributes="0">
+                          <Group type="102" alignment="0" attributes="0">
                               <EmptySpace min="-2" pref="141" max="-2" attributes="0"/>
                               <Component id="filesIndexedValue" min="-2" pref="104" max="-2" attributes="0"/>
                           </Group>
-                          <Component id="skipNSRLCheckBox" min="-2" max="-2" attributes="0"/>
                           <Component id="frequencyLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                           <Group type="102" alignment="0" attributes="0">
                               <EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
@@ -74,7 +75,9 @@
               </Group>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
               <Component id="skipNSRLCheckBox" min="-2" max="-2" attributes="0"/>
-              <EmptySpace min="-2" pref="13" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="showSnippetsCB" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
               <Component id="frequencyLabel" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="timeRadioButton1" min="-2" max="-2" attributes="0"/>
@@ -99,7 +102,7 @@
                   <Component id="chunksLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="chunksValLabel" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace pref="30" max="32767" attributes="0"/>
+              <EmptySpace pref="116" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -211,5 +214,12 @@
         </Property>
       </Properties>
     </Component>
+    <Component class="javax.swing.JCheckBox" name="showSnippetsCB">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="KeywordSearchConfigurationPanel2.showSnippetsCB.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
   </SubComponents>
 </Form>
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java
index e0b4dc0d89..641b61caac 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java
@@ -44,6 +44,7 @@ class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel implements Opt
 
     private void activateWidgets() {
         skipNSRLCheckBox.setSelected(KeywordSearchSettings.getSkipKnown());
+        showSnippetsCB.setSelected(KeywordSearchSettings.getShowSnippets());
         boolean enable = !IngestManager.getDefault().isIngestRunning()
                 && !IngestManager.getDefault().isModuleRunning(KeywordSearchIngestModule.getDefault());
         skipNSRLCheckBox.setEnabled(enable);
@@ -96,6 +97,7 @@ class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel implements Opt
         timeRadioButton2 = new javax.swing.JRadioButton();
         timeRadioButton3 = new javax.swing.JRadioButton();
         timeRadioButton4 = new javax.swing.JRadioButton();
+        showSnippetsCB = new javax.swing.JCheckBox();
 
         skipNSRLCheckBox.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.skipNSRLCheckBox.text")); // NOI18N
         skipNSRLCheckBox.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.skipNSRLCheckBox.toolTipText")); // NOI18N
@@ -127,6 +129,8 @@ class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel implements Opt
         timeRadioButton4.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.timeRadioButton4.text_1")); // NOI18N
         timeRadioButton4.setToolTipText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.timeRadioButton4.toolTipText")); // NOI18N
 
+        showSnippetsCB.setText(org.openide.util.NbBundle.getMessage(KeywordSearchConfigurationPanel2.class, "KeywordSearchConfigurationPanel2.showSnippetsCB.text")); // NOI18N
+
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
@@ -145,11 +149,12 @@ class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel implements Opt
                     .addGroup(layout.createSequentialGroup()
                         .addGap(10, 10, 10)
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(skipNSRLCheckBox)
+                            .addComponent(showSnippetsCB)
                             .addComponent(filesIndexedLabel)
                             .addGroup(layout.createSequentialGroup()
                                 .addGap(141, 141, 141)
                                 .addComponent(filesIndexedValue, javax.swing.GroupLayout.PREFERRED_SIZE, 104, javax.swing.GroupLayout.PREFERRED_SIZE))
-                            .addComponent(skipNSRLCheckBox)
                             .addComponent(frequencyLabel)
                             .addGroup(layout.createSequentialGroup()
                                 .addGap(10, 10, 10)
@@ -173,7 +178,9 @@ class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel implements Opt
                     .addComponent(settingsSeparator, javax.swing.GroupLayout.PREFERRED_SIZE, 6, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addComponent(skipNSRLCheckBox)
-                .addGap(13, 13, 13)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(showSnippetsCB)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(frequencyLabel)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(timeRadioButton1)
@@ -195,7 +202,7 @@ class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel implements Opt
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(chunksLabel)
                     .addComponent(chunksValLabel))
-                .addContainerGap(30, Short.MAX_VALUE))
+                .addContainerGap(116, Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
 
@@ -209,6 +216,7 @@ class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel implements Opt
     private javax.swing.JSeparator informationSeparator;
     private javax.swing.JLabel settingsLabel;
     private javax.swing.JSeparator settingsSeparator;
+    private javax.swing.JCheckBox showSnippetsCB;
     private javax.swing.JCheckBox skipNSRLCheckBox;
     private javax.swing.ButtonGroup timeGroup;
     private javax.swing.JRadioButton timeRadioButton1;
@@ -221,6 +229,7 @@ class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel implements Opt
     public void store() {
         KeywordSearchSettings.setSkipKnown(skipNSRLCheckBox.isSelected());
         KeywordSearchSettings.setUpdateFrequency(getSelectedTimeValue());
+        KeywordSearchSettings.setShowSnippets(showSnippetsCB.isSelected());
     }
 
     @Override
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
index a4f0b78921..fc7913cf1f 100755
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java
@@ -377,7 +377,9 @@ public final class KeywordSearchIngestModule extends IngestModuleAbstractFile {
             // we had cases where getStatus was OK, but the connection resulted in a 404
             server.queryNumIndexedDocuments();
         } catch (KeywordSearchModuleException | NoOpenCoreException ex) {
-            throw new IngestModuleException("Error connecting to SOLR server: " + ex.getMessage());
+            throw new IngestModuleException(
+                    NbBundle.getMessage(this.getClass(), "KeywordSearchIngestModule.init.exception.errConnToSolr.msg",
+                                        ex.getMessage()));
         }
 
         //initialize extractors
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsEncase.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsEncase.java
index 9ad11804a3..a8ea8dee9e 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsEncase.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsEncase.java
@@ -18,6 +18,8 @@
  */
 package org.sleuthkit.autopsy.keywordsearch;
 
+import org.openide.util.NbBundle;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -115,12 +117,14 @@ class KeywordSearchListsEncase extends KeywordSearchListsAbstract{
 
     @Override
     public boolean save() {
-        throw new UnsupportedOperationException("Not supported yet.");
+        throw new UnsupportedOperationException(
+                NbBundle.getMessage(this.getClass(), "KeywordSearchListsEncase.save.exception.msg"));
     }
     
     @Override
     public boolean save(boolean isExport) {
-        throw new UnsupportedOperationException("Not supported yet.");
+        throw new UnsupportedOperationException(
+                NbBundle.getMessage(this.getClass(), "KeywordSearchListsEncase.save2.exception.msg"));
     }
 
     @Override
@@ -173,7 +177,10 @@ class KeywordSearchListsEncase extends KeywordSearchListsAbstract{
             } else if(type.equals("")) {
                 return Expression;
             } else {
-                throw new IllegalArgumentException("Unsupported EncaseMetaType: " + type);
+                throw new IllegalArgumentException(
+                        NbBundle.getMessage(KeywordSearchListsEncase.class,
+                                            "KeywordSearchListsEncase.encaseMetaType.exception.msg",
+                                            type));
             }
         }
     }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java
index e406580f7d..225a077610 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsManagementPanel.java
@@ -342,7 +342,7 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel implements Op
 
         @Override
         public String getColumnName(int column) {
-            return "Name";
+            return NbBundle.getMessage(this.getClass(), "KeywordSearchListsManagementPanel.getColName.text");
         }
 
         @Override
@@ -357,7 +357,8 @@ class KeywordSearchListsManagementPanel extends javax.swing.JPanel implements Op
 
         @Override
         public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
-            throw new UnsupportedOperationException("Editing of cells is not supported");
+            throw new UnsupportedOperationException(
+                    NbBundle.getMessage(this.getClass(), "KeywordSearchListsManagementPanel.setValueAt.exception.msg"));
         }
 
         @Override
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java
index 3444d19d16..e76d3689e8 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchListsViewerPanel.java
@@ -321,13 +321,19 @@ class KeywordSearchListsViewerPanel extends AbstractKeywordSearchPerformer {
     }
 
     @Override
-    public boolean isLuceneQuerySelected() {
-        throw new UnsupportedOperationException("Not supported for multi-word queries.");
+    public boolean isRegExQuerySelected() {
+        return true;
     }
 
+    @Override
+    public boolean isWholewordQuerySelected() {
+        return false;
+    }    
+    
     @Override
     public String getQueryText() {
-        throw new UnsupportedOperationException("Not supported for multi-word queries.");
+        throw new UnsupportedOperationException(
+                NbBundle.getMessage(this.getClass(), "KeywordSearchListsViewerPanel.getQueryText.exception.msg"));
     }
 
     void addSearchButtonActionListener(ActionListener al) {
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchOptionsPanelController.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchOptionsPanelController.java
index cf28279578..9d050184df 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchOptionsPanelController.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchOptionsPanelController.java
@@ -10,6 +10,7 @@ import javax.swing.JComponent;
 import org.netbeans.spi.options.OptionsPanelController;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -82,7 +83,10 @@ public final class KeywordSearchOptionsPanelController extends OptionsPanelContr
             }
             catch (Exception e) {
                 logger.log(Level.SEVERE, "KeywordSearchOptionsPanelController listener threw exception", e);
-                MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to KeywordSearchOptionsPanelController updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                MessageNotifyUtil.Notify.show(
+                        NbBundle.getMessage(this.getClass(), "KeywordSearchOptionsPanelController.moduleErr"),
+                        NbBundle.getMessage(this.getClass(), "KeywordSearchOptionsPanelController.moduleErr.msg1"),
+                        MessageNotifyUtil.MessageType.ERROR);
             }
         }
             try {
@@ -90,7 +94,10 @@ public final class KeywordSearchOptionsPanelController extends OptionsPanelContr
             }
             catch (Exception e) {
                 logger.log(Level.SEVERE, "KeywordSearchOptionsPanelController listener threw exception", e);
-                MessageNotifyUtil.Notify.show("Module Error", "A module caused an error listening to KeywordSearchOptionsPanelController updates. See log to determine which module. Some data could be incomplete.", MessageNotifyUtil.MessageType.ERROR);
+                MessageNotifyUtil.Notify.show(
+                        NbBundle.getMessage(this.getClass(), "KeywordSearchOptionsPanelController.moduleErr"),
+                        NbBundle.getMessage(this.getClass(), "KeywordSearchOptionsPanelController.moduleErr.msg2"),
+                        MessageNotifyUtil.MessageType.ERROR);
             }
         
     }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.form
index d9f6c5eed4..10994b34e2 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.form
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.form
@@ -2,62 +2,17 @@
 
 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <NonVisualComponents>
-    <Container class="javax.swing.JPopupMenu" name="settingsMenu">
-
-      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
-        <Property name="useNullLayout" type="boolean" value="true"/>
-      </Layout>
-      <SubComponents>
-        <MenuItem class="javax.swing.JCheckBoxMenuItem" name="regExCheckboxMenuItem">
-          <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="KeywordSearchPanel.regExCheckboxMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-          </Properties>
-        </MenuItem>
-      </SubComponents>
-    </Container>
     <Container class="javax.swing.JPopupMenu" name="listsMenu">
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
         <Property name="useNullLayout" type="boolean" value="true"/>
       </Layout>
     </Container>
-    <Container class="javax.swing.JPopupMenu" name="rightClickMenu">
+    <Container class="javax.swing.JPopupMenu" name="searchMenu">
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
         <Property name="useNullLayout" type="boolean" value="true"/>
       </Layout>
-      <SubComponents>
-        <MenuItem class="javax.swing.JMenuItem" name="cutMenuItem">
-          <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="KeywordSearchPanel.cutMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-          </Properties>
-        </MenuItem>
-        <MenuItem class="javax.swing.JMenuItem" name="copyMenuItem">
-          <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="KeywordSearchPanel.copyMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-          </Properties>
-        </MenuItem>
-        <MenuItem class="javax.swing.JMenuItem" name="pasteMenuItem">
-          <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="KeywordSearchPanel.pasteMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-          </Properties>
-        </MenuItem>
-        <MenuItem class="javax.swing.JMenuItem" name="selectAllMenuItem">
-          <Properties>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="KeywordSearchPanel.selectAllMenuItem.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-          </Properties>
-        </MenuItem>
-      </SubComponents>
     </Container>
   </NonVisualComponents>
   <Properties>
@@ -80,141 +35,32 @@
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
               <Component id="listsButton" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="18" max="32767" attributes="0"/>
-              <Component id="searchBoxPanel" min="-2" pref="244" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jSeparator1" min="-2" pref="7" max="-2" attributes="0"/>
+              <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
+              <Component id="searchDropButton" max="32767" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="listsButton" alignment="1" max="32767" attributes="1"/>
-          <Component id="searchBoxPanel" alignment="0" pref="27" max="32767" attributes="2"/>
+          <Group type="102" attributes="0">
+              <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+              <Group type="103" groupAlignment="0" max="-2" attributes="0">
+                  <Component id="listsButton" max="32767" attributes="1"/>
+                  <Component id="searchDropButton" max="32767" attributes="0"/>
+                  <Component id="jSeparator1" max="32767" attributes="0"/>
+              </Group>
+          </Group>
       </Group>
     </DimensionLayout>
   </Layout>
   <SubComponents>
-    <Container class="javax.swing.JPanel" name="searchBoxPanel">
-      <Properties>
-        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-          <Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
-            <LineBorder roundedCorners="true">
-              <Color PropertyName="color" blue="c0" green="c0" id="lightGray" palette="1" red="c0" type="palette"/>
-            </LineBorder>
-          </Border>
-        </Property>
-        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-          <Dimension value="[255, 18]"/>
-        </Property>
-      </Properties>
-
-      <Layout>
-        <DimensionLayout dim="0">
-          <Group type="103" groupAlignment="0" attributes="0">
-              <Group type="102" alignment="0" attributes="0">
-                  <Component id="settingsLabel" min="-2" pref="9" max="-2" attributes="0"/>
-                  <EmptySpace max="-2" attributes="0"/>
-                  <Component id="searchBox" pref="202" max="32767" attributes="0"/>
-                  <EmptySpace max="-2" attributes="0"/>
-                  <Component id="searchButton" min="-2" max="-2" attributes="0"/>
-              </Group>
-          </Group>
-        </DimensionLayout>
-        <DimensionLayout dim="1">
-          <Group type="103" groupAlignment="0" attributes="0">
-              <Component id="searchBox" alignment="0" max="32767" attributes="3"/>
-              <Component id="settingsLabel" alignment="0" max="32767" attributes="1"/>
-              <Component id="searchButton" alignment="0" max="32767" attributes="1"/>
-          </Group>
-        </DimensionLayout>
-      </Layout>
-      <SubComponents>
-        <Component class="javax.swing.JTextField" name="searchBox">
-          <Properties>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Monospaced" size="14" style="0"/>
-            </Property>
-            <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="c0" green="c0" id="lightGray" palette="1" red="c0" type="palette"/>
-            </Property>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="KeywordSearchPanel.searchBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-            <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-              <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
-                <EmptyBorder bottom="4" left="3" right="1" top="1"/>
-              </Border>
-            </Property>
-            <Property name="enabled" type="boolean" value="false"/>
-          </Properties>
-          <Events>
-            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="searchBoxActionPerformed"/>
-          </Events>
-        </Component>
-        <Component class="javax.swing.JLabel" name="settingsLabel">
-          <Properties>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/org/sleuthkit/autopsy/keywordsearch/dropdown-icon.png"/>
-            </Property>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="KeywordSearchPanel.settingsLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-            <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-              <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
-                <EmptyBorder bottom="1" left="2" right="2" top="1"/>
-              </Border>
-            </Property>
-            <Property name="enabled" type="boolean" value="false"/>
-            <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[23, 20]"/>
-            </Property>
-            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[23, 20]"/>
-            </Property>
-            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[23, 20]"/>
-            </Property>
-          </Properties>
-          <Events>
-            <EventHandler event="mouseEntered" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="settingsLabelMouseEntered"/>
-            <EventHandler event="mouseExited" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="settingsLabelMouseExited"/>
-            <EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="settingsLabelMousePressed"/>
-          </Events>
-        </Component>
-        <Component class="javax.swing.JLabel" name="searchButton">
-          <Properties>
-            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/org/sleuthkit/autopsy/keywordsearch/search-icon.png"/>
-            </Property>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="KeywordSearchPanel.searchButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-            </Property>
-            <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-              <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
-                <EmptyBorder bottom="1" left="2" right="2" top="1"/>
-              </Border>
-            </Property>
-            <Property name="enabled" type="boolean" value="false"/>
-            <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[23, 20]"/>
-            </Property>
-            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[23, 20]"/>
-            </Property>
-            <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[23, 20]"/>
-            </Property>
-          </Properties>
-          <Events>
-            <EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="searchButtonMousePressed"/>
-          </Events>
-        </Component>
-      </SubComponents>
-    </Container>
     <Component class="javax.swing.JButton" name="listsButton">
       <Properties>
         <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-          <Image iconType="3" name="/org/sleuthkit/autopsy/keywordsearch/watchbutton-icon.png"/>
+          <Image iconType="3" name="/org/sleuthkit/autopsy/keywordsearch/dropdown-icon.png"/>
         </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="ListBundleName" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
@@ -223,10 +69,10 @@
         <Property name="contentAreaFilled" type="boolean" value="false"/>
         <Property name="enabled" type="boolean" value="false"/>
         <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-          <Image iconType="3" name="/org/sleuthkit/autopsy/keywordsearch/watchbutton-icon-rollover.png"/>
+          <Image iconType="3" name="/org/sleuthkit/autopsy/keywordsearch/dropdown-icon-rollover.png"/>
         </Property>
         <Property name="rolloverSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-          <Image iconType="3" name="/org/sleuthkit/autopsy/keywordsearch/watchbutton-icon-pressed.png"/>
+          <Image iconType="3" name="/org/sleuthkit/autopsy/keywordsearch/dropdown-icon-pressed.png"/>
         </Property>
       </Properties>
       <Events>
@@ -234,5 +80,41 @@
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="listsButtonActionPerformed"/>
       </Events>
     </Component>
+    <Component class="javax.swing.JButton" name="searchDropButton">
+      <Properties>
+        <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+          <Image iconType="3" name="/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon.png"/>
+        </Property>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/keywordsearch/Bundle.properties" key="KeywordSearchPanel.searchDropButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+        <Property name="borderPainted" type="boolean" value="false"/>
+        <Property name="contentAreaFilled" type="boolean" value="false"/>
+        <Property name="enabled" type="boolean" value="false"/>
+        <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[146, 27]"/>
+        </Property>
+        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[146, 27]"/>
+        </Property>
+        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[146, 27]"/>
+        </Property>
+        <Property name="rolloverIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+          <Image iconType="3" name="/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon-rollover.png"/>
+        </Property>
+        <Property name="rolloverSelectedIcon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+          <Image iconType="3" name="/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon-pressed.png"/>
+        </Property>
+      </Properties>
+      <Events>
+        <EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="searchDropButtonMousePressed"/>
+      </Events>
+    </Component>
+    <Component class="javax.swing.JSeparator" name="jSeparator1">
+      <Properties>
+        <Property name="orientation" type="int" value="1"/>
+      </Properties>
+    </Component>
   </SubComponents>
 </Form>
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java
index 3dd2b3f14f..432d6a98b8 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPanel.java
@@ -23,39 +23,30 @@
  */
 package org.sleuthkit.autopsy.keywordsearch;
 
-import java.awt.Color;
-import java.awt.Cursor;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
 import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.util.List;
 import java.util.logging.Level;
+
 import org.sleuthkit.autopsy.coreutils.Logger;
-import javax.swing.JMenuItem;
 import javax.swing.SwingUtilities;
 import javax.swing.event.PopupMenuEvent;
 import javax.swing.event.PopupMenuListener;
-import org.apache.solr.client.solrj.SolrServerException;
 import org.sleuthkit.autopsy.casemodule.Case;
 
 /**
  * Keyword search toolbar (in upper right, by default) which allows to search for single terms or phrases
  * 
- * The toolbar uses a different font from the rest of the application, Monospaced 14, 
- * due to the necessity to find a font that displays both Arabic and Asian fonts at an acceptable size. 
- * The default, Tahoma 14, could not perform this task at the desired size, and neither could numerous other fonts. 
  */
-class KeywordSearchPanel extends AbstractKeywordSearchPerformer {
+class KeywordSearchPanel extends javax.swing.JPanel {
 
     private static final Logger logger = Logger.getLogger(KeywordSearchPanel.class.getName());
     private KeywordPropertyChangeListener listener;
     private boolean active = false;
-    private boolean entered = false;
     private static KeywordSearchPanel instance;
+    private DropdownSearchPanel dropPanel = null;
 
     /** Creates new form KeywordSearchPanel */
     private KeywordSearchPanel() {
@@ -73,44 +64,13 @@ class KeywordSearchPanel extends AbstractKeywordSearchPerformer {
         return instance;
     }
 
-    @Override
-    protected void postFilesIndexedChange() {
-        //nothing to update
-    }
-
-    
-    
     private void customizeComponents() {
-
         listener = new KeywordPropertyChangeListener();
-
         KeywordSearch.getServer().addServerActionListener(listener);
-
         Case.addPropertyChangeListener(listener);
 
-        searchBox.addFocusListener(new FocusListener() {
-
-            @Override
-            public void focusGained(FocusEvent e) {
-                if (searchBox.getText()
-                             .equals(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class,
-                                                                          "KeywordSearchPanel.searchBox.text"))) {
-                    searchBox.setText("");
-                    searchBox.setForeground(Color.BLACK);
-                    entered = true;
-                }
-            }
-
-            @Override
-            public void focusLost(FocusEvent e) {
-                if (searchBox.getText().equals("")) {
-                    resetSearchBox();
-                }
-            }
-        });
         KeywordSearchListsViewerPanel listsPanel = KeywordSearchListsViewerPanel.getDefault();
         listsPanel.addSearchButtonActionListener(new ActionListener() {
-
             @Override
             public void actionPerformed(ActionEvent e) {
                 listsMenu.setVisible(false);
@@ -120,7 +80,6 @@ class KeywordSearchPanel extends AbstractKeywordSearchPerformer {
         listsMenu.setSize(listsPanel.getPreferredSize().width + 6, listsPanel.getPreferredSize().height + 6);
         listsMenu.add(listsPanel);
         listsMenu.addPopupMenuListener(new PopupMenuListener() {
-
             @Override
             public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
                 listsButton.setSelected(true);
@@ -136,46 +95,36 @@ class KeywordSearchPanel extends AbstractKeywordSearchPerformer {
                 listsButton.setSelected(false);
             }
         });
-
-        searchBox.setComponentPopupMenu(rightClickMenu);
-        ActionListener actList = new ActionListener() {
-
+        
+        dropPanel = DropdownSearchPanel.getDefault();
+        dropPanel.addSearchButtonActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                JMenuItem jmi = (JMenuItem) e.getSource();
-                if (jmi.equals(cutMenuItem)) {
-                    searchBox.cut();
-                } else if (jmi.equals(copyMenuItem)) {
-                    searchBox.copy();
-                } else if (jmi.equals(pasteMenuItem)) {
-                    if (searchBox.getText()
-                                 .equals(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class,
-                                                                              "KeywordSearchPanel.searchBox.text"))) {
-                        searchBox.setText("");
-                        searchBox.setForeground(Color.BLACK);
-                        entered = true;
-                    }
-                    searchBox.paste();
-                } else if (jmi.equals(selectAllMenuItem)) {
-                    searchBox.selectAll();
-                }
+                searchMenu.setVisible(false);
+            }
+        });        
+        searchMenu.setSize(dropPanel.getPreferredSize().width + 6, dropPanel.getPreferredSize().height + 6);
+        searchMenu.add(dropPanel);
+        searchMenu.addPopupMenuListener(new PopupMenuListener() {
+            @Override
+            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+                searchDropButton.setSelected(true);
             }
-        };
-        cutMenuItem.addActionListener(actList);
-        copyMenuItem.addActionListener(actList);
-        pasteMenuItem.addActionListener(actList);
-        selectAllMenuItem.addActionListener(actList);
 
+            @Override
+            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+                searchDropButton.setSelected(false);
+            }
+
+            @Override
+            public void popupMenuCanceled(PopupMenuEvent e) {
+                searchDropButton.setSelected(false);
+            }
+        });        
+        
     }
 
-    private void resetSearchBox() {
-        searchBox.setEditable(true);
-        searchBox.setText(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class,
-                                                               "KeywordSearchPanel.searchBox.text"));
-        searchBox.setForeground(Color.LIGHT_GRAY);
-        regExCheckboxMenuItem.setEnabled(true);
-        entered = false;
-    }
+
 
     /** This method is called from within the constructor to
      * initialize the form.
@@ -186,108 +135,21 @@ class KeywordSearchPanel extends AbstractKeywordSearchPerformer {
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
-        settingsMenu = new javax.swing.JPopupMenu();
-        regExCheckboxMenuItem = new javax.swing.JCheckBoxMenuItem();
         listsMenu = new javax.swing.JPopupMenu();
-        rightClickMenu = new javax.swing.JPopupMenu();
-        cutMenuItem = new javax.swing.JMenuItem();
-        copyMenuItem = new javax.swing.JMenuItem();
-        pasteMenuItem = new javax.swing.JMenuItem();
-        selectAllMenuItem = new javax.swing.JMenuItem();
-        searchBoxPanel = new javax.swing.JPanel();
-        searchBox = new javax.swing.JTextField();
-        settingsLabel = new javax.swing.JLabel();
-        searchButton = new javax.swing.JLabel();
+        searchMenu = new javax.swing.JPopupMenu();
         listsButton = new javax.swing.JButton();
-
-        regExCheckboxMenuItem.setText(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "KeywordSearchPanel.regExCheckboxMenuItem.text")); // NOI18N
-        settingsMenu.add(regExCheckboxMenuItem);
-
-        cutMenuItem.setText(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "KeywordSearchPanel.cutMenuItem.text")); // NOI18N
-        rightClickMenu.add(cutMenuItem);
-
-        copyMenuItem.setText(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "KeywordSearchPanel.copyMenuItem.text")); // NOI18N
-        rightClickMenu.add(copyMenuItem);
-
-        pasteMenuItem.setText(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "KeywordSearchPanel.pasteMenuItem.text")); // NOI18N
-        rightClickMenu.add(pasteMenuItem);
-
-        selectAllMenuItem.setText(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "KeywordSearchPanel.selectAllMenuItem.text")); // NOI18N
-        rightClickMenu.add(selectAllMenuItem);
+        searchDropButton = new javax.swing.JButton();
+        jSeparator1 = new javax.swing.JSeparator();
 
         setOpaque(false);
 
-        searchBoxPanel.setBorder(new javax.swing.border.LineBorder(java.awt.Color.lightGray, 1, true));
-        searchBoxPanel.setPreferredSize(new java.awt.Dimension(255, 18));
-
-        searchBox.setFont(new java.awt.Font("Monospaced", 0, 14)); // NOI18N
-        searchBox.setForeground(java.awt.Color.lightGray);
-        searchBox.setText(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "KeywordSearchPanel.searchBox.text")); // NOI18N
-        searchBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 3, 4, 1));
-        searchBox.setEnabled(false);
-        searchBox.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                searchBoxActionPerformed(evt);
-            }
-        });
-
-        settingsLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/dropdown-icon.png"))); // NOI18N
-        settingsLabel.setText(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "KeywordSearchPanel.settingsLabel.text")); // NOI18N
-        settingsLabel.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 2, 1, 2));
-        settingsLabel.setEnabled(false);
-        settingsLabel.setMaximumSize(new java.awt.Dimension(23, 20));
-        settingsLabel.setMinimumSize(new java.awt.Dimension(23, 20));
-        settingsLabel.setPreferredSize(new java.awt.Dimension(23, 20));
-        settingsLabel.addMouseListener(new java.awt.event.MouseAdapter() {
-            public void mouseEntered(java.awt.event.MouseEvent evt) {
-                settingsLabelMouseEntered(evt);
-            }
-            public void mouseExited(java.awt.event.MouseEvent evt) {
-                settingsLabelMouseExited(evt);
-            }
-            public void mousePressed(java.awt.event.MouseEvent evt) {
-                settingsLabelMousePressed(evt);
-            }
-        });
-
-        searchButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/search-icon.png"))); // NOI18N
-        searchButton.setText(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "KeywordSearchPanel.searchButton.text")); // NOI18N
-        searchButton.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 2, 1, 2));
-        searchButton.setEnabled(false);
-        searchButton.setMaximumSize(new java.awt.Dimension(23, 20));
-        searchButton.setMinimumSize(new java.awt.Dimension(23, 20));
-        searchButton.setPreferredSize(new java.awt.Dimension(23, 20));
-        searchButton.addMouseListener(new java.awt.event.MouseAdapter() {
-            public void mousePressed(java.awt.event.MouseEvent evt) {
-                searchButtonMousePressed(evt);
-            }
-        });
-
-        javax.swing.GroupLayout searchBoxPanelLayout = new javax.swing.GroupLayout(searchBoxPanel);
-        searchBoxPanel.setLayout(searchBoxPanelLayout);
-        searchBoxPanelLayout.setHorizontalGroup(
-            searchBoxPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(searchBoxPanelLayout.createSequentialGroup()
-                .addComponent(settingsLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 9, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(searchBox, javax.swing.GroupLayout.DEFAULT_SIZE, 202, Short.MAX_VALUE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(searchButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-        );
-        searchBoxPanelLayout.setVerticalGroup(
-            searchBoxPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(searchBox)
-            .addComponent(settingsLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-            .addComponent(searchButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-        );
-
-        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/dropdown-icon.png"))); // NOI18N
         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/dropdown-icon-rollover.png"))); // NOI18N
+        listsButton.setRolloverSelectedIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/dropdown-icon-pressed.png"))); // NOI18N
         listsButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mousePressed(java.awt.event.MouseEvent evt) {
                 listsButtonMousePressed(evt);
@@ -299,39 +161,47 @@ class KeywordSearchPanel extends AbstractKeywordSearchPerformer {
             }
         });
 
+        searchDropButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon.png"))); // NOI18N
+        searchDropButton.setText(org.openide.util.NbBundle.getMessage(KeywordSearchPanel.class, "KeywordSearchPanel.searchDropButton.text")); // NOI18N
+        searchDropButton.setBorderPainted(false);
+        searchDropButton.setContentAreaFilled(false);
+        searchDropButton.setEnabled(false);
+        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.addMouseListener(new java.awt.event.MouseAdapter() {
+            public void mousePressed(java.awt.event.MouseEvent evt) {
+                searchDropButtonMousePressed(evt);
+            }
+        });
+
+        jSeparator1.setOrientation(javax.swing.SwingConstants.VERTICAL);
+
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(layout.createSequentialGroup()
                 .addComponent(listsButton)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 18, Short.MAX_VALUE)
-                .addComponent(searchBoxPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 244, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 7, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addGap(0, 0, 0)
+                .addComponent(searchDropButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addContainerGap())
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(listsButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-            .addComponent(searchBoxPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 27, Short.MAX_VALUE)
+            .addGroup(layout.createSequentialGroup()
+                .addGap(0, 0, Short.MAX_VALUE)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+                    .addComponent(listsButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(searchDropButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(jSeparator1)))
         );
     }// </editor-fold>//GEN-END:initComponents
 
-    private void searchBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_searchBoxActionPerformed
-        if (!entered) {
-            return;
-        }
-        getRootPane().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-        try {
-            search();
-        } finally {
-            getRootPane().setCursor(null);
-        }
-    }//GEN-LAST:event_searchBoxActionPerformed
-
-    private void settingsLabelMousePressed(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_settingsLabelMousePressed
-        maybeShowSettingsPopup(evt);
-    }//GEN-LAST:event_settingsLabelMousePressed
-
     private void listsButtonMousePressed(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_listsButtonMousePressed
         maybeShowListsPopup(evt);
     }//GEN-LAST:event_listsButtonMousePressed
@@ -340,53 +210,18 @@ class KeywordSearchPanel extends AbstractKeywordSearchPerformer {
         // TODO add your handling code here:
     }//GEN-LAST:event_listsButtonActionPerformed
 
-    private void searchButtonMousePressed(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_searchButtonMousePressed
-        searchBoxActionPerformed(null);
-    }//GEN-LAST:event_searchButtonMousePressed
+    private void searchDropButtonMousePressed(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_searchDropButtonMousePressed
+        maybeShowSearchPopup(evt);
+    }//GEN-LAST:event_searchDropButtonMousePressed
 
-    private void settingsLabelMouseEntered(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_settingsLabelMouseEntered
-        settingsLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/dropdown-icon-rollover.png")));
-    }//GEN-LAST:event_settingsLabelMouseEntered
-
-    private void settingsLabelMouseExited(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_settingsLabelMouseExited
-        settingsLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/dropdown-icon.png")));
-    }//GEN-LAST:event_settingsLabelMouseExited
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JMenuItem copyMenuItem;
-    private javax.swing.JMenuItem cutMenuItem;
+    private javax.swing.JSeparator jSeparator1;
     private javax.swing.JButton listsButton;
     private javax.swing.JPopupMenu listsMenu;
-    private javax.swing.JMenuItem pasteMenuItem;
-    private javax.swing.JCheckBoxMenuItem regExCheckboxMenuItem;
-    private javax.swing.JPopupMenu rightClickMenu;
-    private javax.swing.JTextField searchBox;
-    private javax.swing.JPanel searchBoxPanel;
-    private javax.swing.JLabel searchButton;
-    private javax.swing.JMenuItem selectAllMenuItem;
-    private javax.swing.JLabel settingsLabel;
-    private javax.swing.JPopupMenu settingsMenu;
+    private javax.swing.JButton searchDropButton;
+    private javax.swing.JPopupMenu searchMenu;
     // End of variables declaration//GEN-END:variables
 
-    @Override
-    public String getQueryText() {
-        return searchBox.getText();
-    }
-
-    @Override
-    public boolean isLuceneQuerySelected() {
-        return !regExCheckboxMenuItem.isSelected();
-    }
-
-    @Override
-    public boolean isMultiwordQuery() {
-        return false;
-    }
-
-    @Override
-    public List<Keyword> getQueryList() {
-        throw new UnsupportedOperationException("No list for single-keyword search");
-    }
-
     private class KeywordPropertyChangeListener implements PropertyChangeListener {
 
         @Override
@@ -396,7 +231,7 @@ class KeywordSearchPanel extends AbstractKeywordSearchPerformer {
             Object newValue = evt.getNewValue();
 
             if (changed.equals(Case.Events.CURRENT_CASE.toString())) {
-                resetSearchBox();
+                dropPanel.resetSearchBox();
                 if (newValue == null) {
                     setFields(false);
                 } else {
@@ -426,26 +261,12 @@ class KeywordSearchPanel extends AbstractKeywordSearchPerformer {
         }
 
         private void setFields(boolean enabled) {
-            searchBox.setEnabled(enabled);
-            regExCheckboxMenuItem.setEnabled(enabled);
-            settingsLabel.setEnabled(enabled);
+            searchDropButton.setEnabled(enabled);
             listsButton.setEnabled(enabled);
-            searchButton.setEnabled(enabled);
             active = enabled;
         }
     }
 
-    private void maybeShowSettingsPopup(MouseEvent evt) {
-        if (!active) {
-            return;
-        }
-        if (evt != null && !SwingUtilities.isLeftMouseButton(evt)) {
-            return;
-        }
-
-        settingsMenu.show(searchBoxPanel, 0, searchBoxPanel.getHeight());
-    }
-
     private void maybeShowListsPopup(MouseEvent evt) {
         if (!active) {
             return;
@@ -455,4 +276,14 @@ class KeywordSearchPanel extends AbstractKeywordSearchPerformer {
         }
         listsMenu.show(listsButton, listsButton.getWidth() - listsMenu.getWidth(), listsButton.getHeight() - 1);
     }
+    
+    private void maybeShowSearchPopup(MouseEvent evt) {
+        if (!active) {
+            return;
+        }
+        if (evt != null && !SwingUtilities.isLeftMouseButton(evt)) {
+            return;
+        }
+        searchMenu.show(searchDropButton, searchDropButton.getWidth() - searchMenu.getWidth(), searchDropButton.getHeight() - 1);
+    }    
 }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPerformerInterface.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPerformerInterface.java
index 01c65a471b..d725a4cfd3 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPerformerInterface.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchPerformerInterface.java
@@ -39,7 +39,13 @@ interface KeywordSearchPerformerInterface {
      * True if the user did not choose to do a regular expression search
      * @return 
      */
-    boolean isLuceneQuerySelected();
+    boolean isRegExQuerySelected();
+    
+    /**
+     * True if the user wants to match substrings instead of just whole words
+     * @return 
+     */    
+    boolean isWholewordQuerySelected();
     
     /**
      * Returns the query/keyword string that the user entered/selected
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQuery.java
index e55ba17cfd..5c3c982431 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQuery.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQuery.java
@@ -61,6 +61,11 @@ interface KeywordSearchQuery {
      */
     public void setField(String field);
     
+    /**
+     * Modify the query string to be searched as a substring instead of a whole word
+     * @param isSubstring 
+     */
+    public void setSubstringQuery();
     
     /**
      * escape the query string and use the escaped string in the query
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java
index b3243cf9b1..f07f4d901c 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchQueryManager.java
@@ -51,6 +51,7 @@ class KeywordSearchQueryManager {
     private Presentation presentation;
     private List<KeywordSearchQuery> queryDelegates;
     private QueryType queryType;
+    private boolean queryWholeword;
     private static int resultWindowCount = 0; //keep track of unique window ids to display
     private static Logger logger = Logger.getLogger(KeywordSearchQueryManager.class.getName());
 
@@ -59,24 +60,26 @@ class KeywordSearchQueryManager {
      * @param queries Keywords to search for
      * @param presentation Presentation layout
      */
-    public KeywordSearchQueryManager(List<Keyword> queries, Presentation presentation) {
-        this.keywords = queries;
-        this.presentation = presentation;
+    public KeywordSearchQueryManager(List<Keyword> queries, boolean wholeword, Presentation presentation) {
         queryType = QueryType.REGEX;
+        queryWholeword = wholeword;
+        this.presentation = presentation;        
+        keywords = queries;
         init();
     }
 
     /**
-     * 
+     * KeywordSearchQueryManager will change a literal keyword to regex unless wholeword is set
      * @param query Keyword to search for
      * @param qt Query type
      * @param presentation Presentation Layout
      */
-    public KeywordSearchQueryManager(String query, QueryType qt, Presentation presentation) {
-        keywords = new ArrayList<>();
-        keywords.add(new Keyword(query, qt == QueryType.REGEX ? false : true));
-        this.presentation = presentation;
+    public KeywordSearchQueryManager(String query, QueryType qt, boolean wholeword, Presentation presentation) {
         queryType = qt;
+        queryWholeword = wholeword;        
+        this.presentation = presentation;
+        keywords = new ArrayList<>();
+        keywords.add(new Keyword(query, ((queryType == QueryType.LITERAL) && queryWholeword) ? true : false));
         init();
     }
 
@@ -86,11 +89,12 @@ class KeywordSearchQueryManager {
      * @param isLiteral false if reg-exp
      * @param presentation Presentation layout
      */
-    public KeywordSearchQueryManager(String query, boolean isLiteral, Presentation presentation) {
+    public KeywordSearchQueryManager(String query, boolean isLiteral, boolean wholeword, Presentation presentation) {
+        queryType = isLiteral ? QueryType.LITERAL : QueryType.REGEX;
+        queryWholeword = wholeword;
         keywords = new ArrayList<>();
         keywords.add(new Keyword(query, isLiteral));
         this.presentation = presentation;
-        queryType = isLiteral ? QueryType.WORD : QueryType.REGEX;
         init();
     }
 
@@ -102,27 +106,33 @@ class KeywordSearchQueryManager {
         queryDelegates = new ArrayList<>();
         for (Keyword keyword : keywords) {
             KeywordSearchQuery query = null;
-            switch (queryType) {
-                case WORD:
-                    query = new LuceneQuery(keyword);
-                    break;
-                case REGEX:
-                    if (keyword.isLiteral()) {
-                        query = new LuceneQuery(keyword);
-                    } else {
-                        query = new TermComponentQuery(keyword);
-                    }
-                    break;
-                default:
-                    ;
-            }
-            if (query != null) {
-                if (keyword.isLiteral()) {
-                    query.escape();
-                }
-                queryDelegates.add(query);
+            
+            /**
+             * There are three usable combinations:             
+             * Substrings (we wrap with substring regex):
+             *     1. Literal query 
+             * Whole words (no wrapping):
+             *     2. Literal query (Lucene search)
+             *     3. Regex query
+             */
+            if (keyword.isLiteral()) {
+                query = new LuceneQuery(keyword);
+            } else {            
+                query = new TermComponentQuery(keyword);
             }
 
+            if (query != null) {
+                if (keyword.isLiteral() || (queryType == QueryType.LITERAL)) {
+                    query.escape();
+                }
+                
+                // Wrap the keyword with wildcards (for substrings)
+                if (!queryWholeword && (queryType == QueryType.LITERAL)) {
+                    query.setSubstringQuery();
+                }
+                
+                queryDelegates.add(query);
+            }
         }
     }
 
@@ -146,8 +156,9 @@ class KeywordSearchQueryManager {
         for (KeywordSearchQuery q : queryDelegates) {
             Map<String, Object> kvs = new LinkedHashMap<>();
             final String queryStr = q.getQueryString();
+            final String escQueryStr = q.getEscapedQueryString();
             queryConcat.append(queryStr).append(" ");
-            things.add(new KeyValueQuery(queryStr, kvs, ++queryID, q));
+            things.add(new KeyValueQuery(escQueryStr, kvs, ++queryID, q));
         }
 
         Node rootNode;
@@ -165,14 +176,14 @@ class KeywordSearchQueryManager {
             rootNode = Node.EMPTY;
         }
 
-        final String pathText = "Keyword search";
+        final String pathText = NbBundle.getMessage(this.getClass(), "KeywordSearchQueryManager.pathText.text");
 
         DataResultTopComponent.initInstance(pathText, rootNode, things.size(), searchResultWin);
 
         searchResultWin.requestActive();
         // }
     }
-
+    
     /**
      * validate the queries before they are run
      * @return false if any are invalid
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java
index 4682ad09d4..8aeb41354d 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java
@@ -28,6 +28,8 @@ import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
@@ -149,7 +151,7 @@ class KeywordSearchResultFactory extends ChildFactory<KeyValueQuery> {
                 initCommonProperties(map);
                 final String query = thing.getName();
                 setCommonProperty(map, CommonPropertyTypes.KEYWORD, query);
-                setCommonProperty(map, CommonPropertyTypes.REGEX, Boolean.valueOf(!thing.getQuery().isEscaped()));
+                setCommonProperty(map, CommonPropertyTypes.REGEX, Boolean.valueOf(!thing.getQuery().isLiteral()));
                 ResultCollapsedChildFactory childFactory = new ResultCollapsedChildFactory(thing);
                 childFactory.createKeysForFlatNodes(toPopulate);
             }            
@@ -174,7 +176,7 @@ class KeywordSearchResultFactory extends ChildFactory<KeyValueQuery> {
                 initCommonProperties(map);
                 final String query = thing.getName();
                 setCommonProperty(map, CommonPropertyTypes.KEYWORD, query);
-                setCommonProperty(map, CommonPropertyTypes.REGEX, Boolean.valueOf(!thing.getQuery().isEscaped()));
+                setCommonProperty(map, CommonPropertyTypes.REGEX, Boolean.valueOf(!thing.getQuery().isLiteral()));
                 toPopulate.add(thing);
             }
         }
@@ -247,7 +249,6 @@ class KeywordSearchResultFactory extends ChildFactory<KeyValueQuery> {
                 logger.log(Level.WARNING, "Could not perform the query. ", ex);
                 return false;
             }
-            final Map<AbstractFile, Integer> hitContents = ContentHit.flattenResults(tcqRes);
 
             //get listname
             String listName = "";
@@ -256,50 +257,16 @@ class KeywordSearchResultFactory extends ChildFactory<KeyValueQuery> {
                 listName = list.getName();
             }
 
-            final boolean literal_query = tcq.isEscaped();
+            final boolean literal_query = tcq.isLiteral();
 
             int resID = 0;
-            for (final AbstractFile f : hitContents.keySet()) {
-                final int previewChunk = hitContents.get(f);
+            for(ContentHit chit : tcqRes.get(tcq.getQueryString())) {
+                AbstractFile f = chit.getContent();
                 //get unique match result files
                 Map<String, Object> resMap = new LinkedHashMap<>();
 
-                try {
-                    String snippet;
-                    
-                    String snippetQuery = null;
-
-                    if (literal_query) {
-                        snippetQuery = tcq.getEscapedQueryString();
-                    } else {
-                        //in regex, to generate the preview snippet
-                        //just pick any term that hit that file (since we are compressing result view)
-                        String hit = null;
-                        //find the first hit for this file 
-                        for (String hitKey : tcqRes.keySet()) {
-                            List<ContentHit> chits = tcqRes.get(hitKey);
-                            for (ContentHit chit : chits) {
-                                if (chit.getContent().equals(f)) {
-                                    hit = hitKey;
-                                    break;
-                                }
-                            }
-                            if (hit != null) {
-                                break;
-                            }
-                        }
-                        if (hit != null) {
-                            snippetQuery = KeywordSearchUtil.escapeLuceneQuery(hit);
-                        }
-                    }
-
-                    if (snippetQuery != null) {
-                        snippet = LuceneQuery.querySnippet(snippetQuery, f.getId(), previewChunk, !literal_query, true);
-                        setCommonProperty(resMap, CommonPropertyTypes.CONTEXT, snippet);
-                    }
-                } catch (NoOpenCoreException ex) {
-                    logger.log(Level.WARNING, "Could not perform the snippet query. ", ex);
-                    return false;
+                if (chit.hasSnippet()) {
+                    setCommonProperty(resMap, CommonPropertyTypes.CONTEXT, chit.getSnippet());
                 }
 
                 if (f.getType() == TSK_DB_FILES_TYPE_ENUM.FS) {
@@ -307,7 +274,7 @@ class KeywordSearchResultFactory extends ChildFactory<KeyValueQuery> {
                 }
 
                 final String highlightQueryEscaped = getHighlightQuery(tcq, literal_query, tcqRes, f);
-                tempList.add(new KeyValueQueryContent(f.getName(), resMap, ++resID, f, highlightQueryEscaped, tcq, previewChunk, tcqRes));
+                tempList.add(new KeyValueQueryContent(f.getName(), resMap, ++resID, f, highlightQueryEscaped, tcq, chit.getChunkId(), tcqRes));
             }
             
             // Add all the nodes to toPopulate at once. Minimizes node creation
@@ -391,7 +358,7 @@ class KeywordSearchResultFactory extends ChildFactory<KeyValueQuery> {
 
             Node kvNode = new KeyValueNode(thingContent, Children.LEAF, Lookups.singleton(content));
             //wrap in KeywordSearchFilterNode for the markup content, might need to override FilterNode for more customization
-            HighlightedMatchesSource highlights = new HighlightedMatchesSource(content, queryStr, !thingContent.getQuery().isEscaped(), false, hits);
+            HighlightedMatchesSource highlights = new HighlightedMatchesSource(content, queryStr, !thingContent.getQuery().isLiteral(), false, hits);
             return new KeywordSearchFilterNode(highlights, kvNode, queryStr, previewChunk);
         }
     }
@@ -482,7 +449,7 @@ class KeywordSearchResultFactory extends ChildFactory<KeyValueQuery> {
 
                 Node kvNode = new KeyValueNode(thingContent, Children.LEAF, Lookups.singleton(content));
                 //wrap in KeywordSearchFilterNode for the markup content
-                HighlightedMatchesSource highlights = new HighlightedMatchesSource(content, query, !thingContent.getQuery().isEscaped(), hits);
+                HighlightedMatchesSource highlights = new HighlightedMatchesSource(content, query, !thingContent.getQuery().isLiteral(), hits);
                 return new KeywordSearchFilterNode(highlights, kvNode, query, previewChunk);
             }
         }
@@ -571,7 +538,8 @@ class KeywordSearchResultFactory extends ChildFactory<KeyValueQuery> {
             try {
                 final String queryStr = query.getQueryString();
                 final String queryDisp = queryStr.length() > QUERY_DISPLAY_LEN ? queryStr.substring(0, QUERY_DISPLAY_LEN - 1) + " ..." : queryStr;
-                progress = ProgressHandleFactory.createHandle("Saving results: " + queryDisp, new Cancellable() {
+                progress = ProgressHandleFactory.createHandle(
+                        NbBundle.getMessage(this.getClass(), "KeywordSearchResultFactory.progress.saving", queryDisp), new Cancellable() {
 
                     @Override
                     public boolean cancel() {
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchSettings.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchSettings.java
index e4b667141e..d6de286665 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchSettings.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchSettings.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2012 Basis Technology Corp.
+ * Copyright 2012-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.sleuthkit.autopsy.keywordsearch;
 
 import java.util.ArrayList;
@@ -25,115 +23,134 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.autopsy.coreutils.StringExtract;
 import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.SCRIPT;
 import org.sleuthkit.autopsy.keywordsearch.KeywordSearchIngestModule.UpdateFrequency;
 
-
 //This file contains constants and settings for KeywordSearch
 class KeywordSearchSettings {
-    public static final String MODULE_NAME = "KeywordSearch";
-    static final String PROPERTIES_OPTIONS = MODULE_NAME+"_Options";
-    static final String PROPERTIES_NSRL = MODULE_NAME+"_NSRL";
-    static final String PROPERTIES_SCRIPTS = MODULE_NAME+"_Scripts";
+
+    public static final String MODULE_NAME = NbBundle.getMessage(KeywordSearchSettings.class, "KeywordSearchSettings.moduleName.text");
+    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 boolean DEFAULT_SHOW_SNIPPETS = true;
     private static boolean skipKnown = true;
     private static final Logger logger = Logger.getLogger(KeywordSearchSettings.class.getName());
     private static UpdateFrequency UpdateFreq = UpdateFrequency.DEFAULT;
-    private static List<StringExtract.StringExtractUnicodeTable.SCRIPT> stringExtractScripts = new ArrayList<StringExtract.StringExtractUnicodeTable.SCRIPT>();
-    private static Map<String,String> stringExtractOptions = new HashMap<String,String>();
-    
+    private static List<StringExtract.StringExtractUnicodeTable.SCRIPT> stringExtractScripts = new ArrayList<>();
+    private static Map<String, String> stringExtractOptions = new HashMap<>();
 
-           
     /**
-     * Gets the update Frequency from  KeywordSearch_Options.properties
+     * Gets the update Frequency from KeywordSearch_Options.properties
+     *
      * @return KeywordSearchIngestModule's update frequency
-     */ 
-    static UpdateFrequency getUpdateFrequency(){
-        if(ModuleSettings.getConfigSetting(PROPERTIES_OPTIONS, "UpdateFrequency") != null){
+     */
+    static UpdateFrequency getUpdateFrequency() {
+        if (ModuleSettings.getConfigSetting(PROPERTIES_OPTIONS, "UpdateFrequency") != null) {
             return UpdateFrequency.valueOf(ModuleSettings.getConfigSetting(PROPERTIES_OPTIONS, "UpdateFrequency"));
         }
         //if it failed, return the default/last known value
         logger.log(Level.WARNING, "Could not read property for UpdateFrequency, returning backup value.");
         return UpdateFrequency.DEFAULT;
     }
-    
-    
+
     /**
      * Sets the update frequency and writes to KeywordSearch_Options.properties
+     *
      * @param freq Sets KeywordSearchIngestModule to this value.
      */
-    static void setUpdateFrequency(UpdateFrequency freq){
+    static void setUpdateFrequency(UpdateFrequency freq) {
         ModuleSettings.setConfigSetting(PROPERTIES_OPTIONS, "UpdateFrequency", freq.name());
         UpdateFreq = freq;
     }
-    
+
     /**
-     * Sets whether or not to skip adding known good files to the search during index.
-     * @param skip 
+     * Sets whether or not to skip adding known good files to the search during
+     * index.
+     *
+     * @param skip
      */
     static void setSkipKnown(boolean skip) {
         ModuleSettings.setConfigSetting(PROPERTIES_NSRL, "SkipKnown", Boolean.toString(skip));
         skipKnown = skip;
     }
-    
-   /**
-     * Gets the setting for whether or not this ingest is skipping adding known good files to the index.
+
+    /**
+     * Gets the setting for whether or not this ingest is skipping adding known
+     * good files to the index.
+     *
      * @return skip setting
      */
     static boolean getSkipKnown() {
-       if(ModuleSettings.getConfigSetting(PROPERTIES_NSRL, "SkipKnown") != null){
+        if (ModuleSettings.getConfigSetting(PROPERTIES_NSRL, "SkipKnown") != null) {
             return Boolean.parseBoolean(ModuleSettings.getConfigSetting(PROPERTIES_NSRL, "SkipKnown"));
         }
-       //if it fails, return the default/last known value
-       logger.log(Level.WARNING, "Could not read property for SkipKnown, returning backup value.");
-       return skipKnown;
+        //if it fails, return the default/last known value
+        logger.log(Level.WARNING, "Could not read property for SkipKnown, returning backup value.");
+        return skipKnown;
     }
-   
 
-    
     /**
      * Sets what scripts to extract during ingest
+     *
      * @param scripts List of scripts to extract
      */
     static void setStringExtractScripts(List<StringExtract.StringExtractUnicodeTable.SCRIPT> scripts) {
         stringExtractScripts.clear();
         stringExtractScripts.addAll(scripts);
-        
+
         //Disabling scripts that weren't selected
-        for(String s : ModuleSettings.getConfigSettings(PROPERTIES_SCRIPTS).keySet()){
-            if (! scripts.contains(StringExtract.StringExtractUnicodeTable.SCRIPT.valueOf(s))){
+        for (String s : ModuleSettings.getConfigSettings(PROPERTIES_SCRIPTS).keySet()) {
+            if (!scripts.contains(StringExtract.StringExtractUnicodeTable.SCRIPT.valueOf(s))) {
                 ModuleSettings.setConfigSetting(PROPERTIES_SCRIPTS, s, "false");
             }
         }
         //Writing and enabling selected scripts
-        for(StringExtract.StringExtractUnicodeTable.SCRIPT s : stringExtractScripts){
+        for (StringExtract.StringExtractUnicodeTable.SCRIPT s : stringExtractScripts) {
             ModuleSettings.setConfigSetting(PROPERTIES_SCRIPTS, s.name(), "true");
         }
 
     }
-    
-   /**
+
+    /**
      * Set / override string extract option
+     *
      * @param key option name to set
      * @param val option value to set
      */
-     static void setStringExtractOption(String key, String val) {
+    static void setStringExtractOption(String key, String val) {
         stringExtractOptions.put(key, val);
         ModuleSettings.setConfigSetting(PROPERTIES_OPTIONS, key, val);
     }
-     
-     /**
+
+    static void setShowSnippets(boolean showSnippets) {
+        ModuleSettings.setConfigSetting(PROPERTIES_OPTIONS, SHOW_SNIPPETS, (showSnippets ? "true" : "false"));
+    }
+
+    static boolean getShowSnippets() {
+        if (ModuleSettings.settingExists(PROPERTIES_OPTIONS, SHOW_SNIPPETS)) {
+            return ModuleSettings.getConfigSetting(PROPERTIES_OPTIONS, SHOW_SNIPPETS).equals("true");
+        } else {
+            return DEFAULT_SHOW_SNIPPETS;
+        }
+    }
+
+    /**
      * gets the currently set scripts to use
      *
      * @return the list of currently used script
      */
-   static  List<SCRIPT> getStringExtractScripts(){
-        if(ModuleSettings.getConfigSettings(PROPERTIES_SCRIPTS) != null && !ModuleSettings.getConfigSettings(PROPERTIES_SCRIPTS).isEmpty()){
-            List<SCRIPT> scripts = new ArrayList<SCRIPT>();
-            for(Map.Entry<String,String> kvp : ModuleSettings.getConfigSettings(PROPERTIES_SCRIPTS).entrySet()){
-                if(kvp.getValue().equals("true")){
+    static List<SCRIPT> getStringExtractScripts() {
+        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")) {
                     scripts.add(SCRIPT.valueOf(kvp.getKey()));
                 }
             }
@@ -141,74 +158,71 @@ class KeywordSearchSettings {
         }
         //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.");
-        return new ArrayList<SCRIPT>(stringExtractScripts);
+        return new ArrayList<>(stringExtractScripts);
     }
-    
- 
-    
+
     /**
      * get string extract option for the key
+     *
      * @param key option name
      * @return option string value, or empty string if the option is not set
      */
     static String getStringExtractOption(String key) {
-        if (ModuleSettings.getConfigSetting(PROPERTIES_OPTIONS, key) != null){
+        if (ModuleSettings.getConfigSetting(PROPERTIES_OPTIONS, key) != null) {
             return ModuleSettings.getConfigSetting(PROPERTIES_OPTIONS, key);
-        }
-        else {
-            logger.log(Level.WARNING, "Could not read property for key "+ key + ", returning backup value.");
+        } else {
+            logger.log(Level.WARNING, "Could not read property for key {0}, returning backup value.", key);
             return stringExtractOptions.get(key);
         }
     }
-    
+
     /**
      * get the map of string extract options.
+     *
      * @return Map<String,String> of extract options.
      */
-    static Map<String,String> getStringExtractOptions(){
-        Map<String,String> settings = ModuleSettings.getConfigSettings(PROPERTIES_OPTIONS);
-        if(settings == null){
-            Map<String,String> settingsv2 = new HashMap<String,String>();
-            logger.log(Level.WARNING, "Could not read properties for " + PROPERTIES_OPTIONS + ".properties, returning backup values");
+    static Map<String, String> getStringExtractOptions() {
+        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);
             settingsv2.putAll(stringExtractOptions);
             return settingsv2;
-        }
-        else {
+        } else {
             return settings;
         }
     }
+
     /**
-     * Sets the default values of the KeywordSearch properties files if none already exist.
+     * Sets the default values of the KeywordSearch properties files if none
+     * already exist.
      */
-    static void setDefaults(){
+    static void setDefaults() {
         logger.log(Level.INFO, "Detecting default settings.");
-             //setting default NSRL
-     if(!ModuleSettings.settingExists(KeywordSearchSettings.PROPERTIES_NSRL, "SkipKnown")){
-         logger.log(Level.INFO, "No configuration for NSRL found, generating default...");
-          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...");
-         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...");
-         KeywordSearchSettings.setStringExtractOption(AbstractFileExtract.ExtractOptions.EXTRACT_UTF8.toString(), Boolean.TRUE.toString());
-         }
+        //setting default NSRL
+        if (!ModuleSettings.settingExists(KeywordSearchSettings.PROPERTIES_NSRL, "SkipKnown")) {
+            logger.log(Level.INFO, "No configuration for NSRL found, generating default...");
+            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...");
+            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...");
+            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...");
-         KeywordSearchSettings.setStringExtractOption(AbstractFileExtract.ExtractOptions.EXTRACT_UTF16.toString(), Boolean.TRUE.toString());
-       }
+        if (!ModuleSettings.settingExists(KeywordSearchSettings.PROPERTIES_OPTIONS, AbstractFileExtract.ExtractOptions.EXTRACT_UTF16.toString())) {
+            logger.log(Level.INFO, "No configuration for UTF16 found, generating defaults...");
+            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...");
-         ModuleSettings.setConfigSetting(KeywordSearchSettings.PROPERTIES_SCRIPTS, SCRIPT.LATIN_1.name(), Boolean.toString(true));
+        if (!ModuleSettings.settingExists(KeywordSearchSettings.PROPERTIES_SCRIPTS, SCRIPT.LATIN_1.name())) {
+            logger.log(Level.INFO, "No configuration for Scripts found, generating defaults...");
+            ModuleSettings.setConfigSetting(KeywordSearchSettings.PROPERTIES_SCRIPTS, SCRIPT.LATIN_1.name(), Boolean.toString(true));
         }
     }
-    
-       
-    
 }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
index 30f30d4252..2c6de4ba7a 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java
@@ -20,9 +20,12 @@ package org.sleuthkit.autopsy.keywordsearch;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.apache.solr.client.solrj.SolrQuery;
@@ -31,6 +34,7 @@ import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.client.solrj.response.TermsResponse.Term;
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
+import org.openide.util.Exceptions;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.EscapeUtil;
 import org.sleuthkit.autopsy.coreutils.Version;
@@ -94,6 +98,13 @@ class LuceneQuery implements KeywordSearchQuery {
         this.field = field;
     }
 
+    @Override
+    public void setSubstringQuery() {
+        // Note that this is not a full substring search. Normally substring
+        // searches will be done with TermComponentQuery objects instead.
+        keywordStringEscaped = keywordStringEscaped + "*";
+    }    
+    
     @Override
     public void escape() {
         keywordStringEscaped = KeywordSearchUtil.escapeLuceneQuery(keywordString);
@@ -129,7 +140,8 @@ class LuceneQuery implements KeywordSearchQuery {
     public Map<String, List<ContentHit>> performQuery() throws NoOpenCoreException {
         Map<String, List<ContentHit>> results = new HashMap<String, List<ContentHit>>();
         //in case of single term literal query there is only 1 term
-        results.put(keywordString, performLuceneQuery());
+        boolean showSnippets = KeywordSearchSettings.getShowSnippets();
+        results.put(keywordString, performLuceneQuery(showSnippets));
 
         return results;
     }
@@ -192,33 +204,13 @@ class LuceneQuery implements KeywordSearchQuery {
      * @return list of ContentHit objects
      * @throws NoOpenCoreException
      */
-    private List<ContentHit> performLuceneQuery() throws NoOpenCoreException {
-
-        List<ContentHit> matches = new ArrayList<ContentHit>();
+    private List<ContentHit> performLuceneQuery(boolean snippets) throws NoOpenCoreException {
 
+        List<ContentHit> matches = new ArrayList<>();
         boolean allMatchesFetched = false;
-
         final Server solrServer = KeywordSearch.getServer();
-
-        SolrQuery q = new SolrQuery();
-        q.setShowDebugInfo(DEBUG); //debug
-
-        //set query, force quotes/grouping around all literal queries
-        final String groupedQuery = KeywordSearchUtil.quoteQuery(keywordStringEscaped);
-        String theQueryStr = groupedQuery;
-        if (field != null) {
-            //use the optional field
-            StringBuilder sb = new StringBuilder();
-            sb.append(field).append(":").append(groupedQuery);
-            theQueryStr = sb.toString();
-        }
         
-        q.setQuery(theQueryStr);
-        q.setRows(MAX_RESULTS);
-        q.setFields(Server.Schema.ID.toString());
-        for (KeywordQueryFilter filter : filters) {
-            q.addFilterQuery(filter.toString());
-        }
+        SolrQuery q = createAndConfigureSolrQuery(snippets);
 
         for (int start = 0; !allMatchesFetched; start = start + MAX_RESULTS) {
             q.setStart(start);
@@ -226,53 +218,29 @@ class LuceneQuery implements KeywordSearchQuery {
             try {
                 QueryResponse response = solrServer.query(q, METHOD.POST);
                 SolrDocumentList resultList = response.getResults();
-                long results = resultList.getNumFound();
-                allMatchesFetched = start + MAX_RESULTS >= results;
-                SleuthkitCase sc = null;
+                Map<String, Map<String, List<String>>> highlightResponse = response.getHighlighting();
+                Set<SolrDocument> solrDocumentsWithMatches = filterDuplicateSolrDocuments(resultList);
+                
+                allMatchesFetched = start + MAX_RESULTS >= resultList.getNumFound();
+                
+                SleuthkitCase sleuthkitCase;
                 try {
-                    sc = Case.getCurrentCase().getSleuthkitCase();
+                    sleuthkitCase = Case.getCurrentCase().getSleuthkitCase();
                 } catch (IllegalStateException ex) {
                     //no case open, must be just closed
                     return matches;
                 }
 
-                for (SolrDocument resultDoc : resultList) {
-                    final String resultID = (String) resultDoc.getFieldValue(Server.Schema.ID.toString());
-
-                    final int sepIndex = resultID.indexOf(Server.ID_CHUNK_SEP);
-
-                    if (sepIndex != -1) {
-                        //file chunk result
-                        final long fileID = Long.parseLong(resultID.substring(0, sepIndex));
-                        final int chunkId = Integer.parseInt(resultID.substring(sepIndex + 1));
-                        //logger.log(Level.INFO, "file id: " + fileID + ", chunkID: " + chunkId);
-
-                        try {
-                            AbstractFile resultAbstractFile = sc.getAbstractFileById(fileID);
-                            matches.add(new ContentHit(resultAbstractFile, chunkId));
-
-                        } catch (TskException ex) {
-                            logger.log(Level.WARNING, "Could not get the AbstractFile for keyword hit, ", ex);
-                            //something wrong with case/db
-                            return matches;
-                        }
-
-                    } else {
-                        final long fileID = Long.parseLong(resultID);
-
-                        try {
-                            AbstractFile resultAbstractFile = sc.getAbstractFileById(fileID);
-                            matches.add(new ContentHit(resultAbstractFile));
-                        } catch (TskException ex) {
-                            logger.log(Level.WARNING, "Could not get the AbstractFile for keyword hit, ", ex);
-                            //something wrong with case/db
-                            return matches;
-                        }
+                for (SolrDocument resultDoc : solrDocumentsWithMatches) {
+                    ContentHit contentHit;
+                    try {
+                        contentHit = createContentHitFromQueryResults(resultDoc, highlightResponse, snippets, sleuthkitCase);
+                    } catch (TskException ex) {
+                        return matches;
                     }
-
+                    matches.add(contentHit);
                 }
-
-
+                
             } catch (NoOpenCoreException ex) {
                 logger.log(Level.WARNING, "Error executing Lucene Solr Query: " + keywordString, ex);
                 throw ex;
@@ -283,6 +251,109 @@ class LuceneQuery implements KeywordSearchQuery {
         }
         return matches;
     }
+    
+    private SolrQuery createAndConfigureSolrQuery(boolean snippets) {
+        SolrQuery q = new SolrQuery();
+        q.setShowDebugInfo(DEBUG); //debug
+        //set query, force quotes/grouping around all literal queries
+        final String groupedQuery = KeywordSearchUtil.quoteQuery(keywordStringEscaped);
+        String theQueryStr = groupedQuery;
+        if (field != null) {
+            //use the optional field
+            StringBuilder sb = new StringBuilder();
+            sb.append(field).append(":").append(groupedQuery);
+            theQueryStr = sb.toString();
+        }
+        q.setQuery(theQueryStr);
+        q.setRows(MAX_RESULTS);
+        
+        if (snippets) {
+            q.setFields(Server.Schema.ID.toString(), Server.Schema.CONTENT.toString());
+        } else {
+            q.setFields(Server.Schema.ID.toString());
+        }
+        
+        for (KeywordQueryFilter filter : filters) {
+            q.addFilterQuery(filter.toString());
+        }
+        
+        if (snippets) {
+            q.addHighlightField(Server.Schema.CONTENT.toString());
+            //q.setHighlightSimplePre("&laquo;"); //original highlighter only
+            //q.setHighlightSimplePost("&raquo;");  //original highlighter only
+            q.setHighlightSnippets(1);
+            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
+
+             //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
+
+            //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);
+        }
+        
+        return q;
+    }
+
+    private Set<SolrDocument> filterDuplicateSolrDocuments(SolrDocumentList resultList) {
+        Set<SolrDocument> solrDocumentsWithMatches = new TreeSet<>(new SolrDocumentComparator());
+        solrDocumentsWithMatches.addAll(resultList);
+        return solrDocumentsWithMatches;
+    }
+
+    private ContentHit createContentHitFromQueryResults(SolrDocument resultDoc, Map<String, Map<String, List<String>>> highlightResponse, boolean snippets, SleuthkitCase sc) throws TskException {
+        ContentHit chit;
+        final String resultID = resultDoc.getFieldValue(Server.Schema.ID.toString()).toString();
+        final int sepIndex = resultID.indexOf(Server.ID_CHUNK_SEP);
+        String snippet = "";
+        if (snippets) {
+            List<String> snippetList = highlightResponse.get(resultID).get(Server.Schema.CONTENT.toString());
+            // list is null if there wasn't a snippet
+            if (snippetList != null) {
+                snippet = EscapeUtil.unEscapeHtml(snippetList.get(0)).trim();
+            }
+        }
+        if (sepIndex != -1) {
+            //file chunk result
+            final long fileID = Long.parseLong(resultID.substring(0, sepIndex));
+            final int chunkId = Integer.parseInt(resultID.substring(sepIndex + 1));
+            //logger.log(Level.INFO, "file id: " + fileID + ", chunkID: " + chunkId);
+
+            try {
+                AbstractFile resultAbstractFile = sc.getAbstractFileById(fileID);
+                chit = new ContentHit(resultAbstractFile, chunkId);
+                if (snippet.isEmpty() == false) {
+                    chit.setSnippet(snippet);
+                }
+            } catch (TskException ex) {
+                logger.log(Level.WARNING, "Could not get the AbstractFile for keyword hit, ", ex);
+                //something wrong with case/db
+                throw ex;
+            }
+
+        } else {
+            final long fileID = Long.parseLong(resultID);
+
+            try {
+                AbstractFile resultAbstractFile = sc.getAbstractFileById(fileID);
+                chit = new ContentHit(resultAbstractFile);
+                if (snippet.isEmpty() == false) {
+                    chit.setSnippet(snippet);
+                }
+            } catch (TskException ex) {
+                logger.log(Level.WARNING, "Could not get the AbstractFile for keyword hit, ", ex);
+                //something wrong with case/db
+                throw ex;
+            }
+        }
+        return chit;
+    }
 
     /**
      * return snippet preview context
@@ -393,4 +464,28 @@ class LuceneQuery implements KeywordSearchQuery {
             return "";
         }
     }
+    
+    /**
+     * Compares SolrDocuments based on their ID's. Two SolrDocuments with
+     * different chunk numbers are considered equal.
+     */
+    private class SolrDocumentComparator implements Comparator<SolrDocument> {
+        @Override
+        public int compare(SolrDocument left, SolrDocument right) {
+            String idName = Server.Schema.ID.toString();
+            String leftID = left.getFieldValue(idName).toString();
+            int index = leftID.indexOf(Server.ID_CHUNK_SEP);
+            if (index != -1) {
+                leftID = leftID.substring(0, index);
+            }
+
+            String rightID = right.getFieldValue(idName).toString();
+            index = rightID.indexOf(Server.ID_CHUNK_SEP);
+            if (index != -1) {
+                rightID = rightID.substring(0, index);
+            }
+
+            return leftID.compareTo(rightID);
+        }
+    }
 }
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/NoOpenCoreException.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/NoOpenCoreException.java
index dc9f0b61ac..8c18f39423 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/NoOpenCoreException.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/NoOpenCoreException.java
@@ -18,6 +18,8 @@
  */
 package org.sleuthkit.autopsy.keywordsearch;
 
+import org.openide.util.NbBundle;
+
 /**
  *
  * Exception thrown when no core is open
@@ -25,7 +27,7 @@ package org.sleuthkit.autopsy.keywordsearch;
 public class NoOpenCoreException extends Exception {
 
     NoOpenCoreException() {
-        super("No currently open Solr core.");
+        super(NbBundle.getMessage(NoOpenCoreException.class, "NoOpenCoreException.err.noOpenSorlCore.msg"));
     }
 
     
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
index 998d25f24c..676ff39ee8 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
@@ -30,7 +30,6 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.lang.Long;
-import java.lang.Long;
 import java.net.ConnectException;
 import java.net.ServerSocket;
 import java.net.SocketException;
@@ -38,9 +37,10 @@ import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import javax.swing.AbstractAction;
 import org.apache.solr.client.solrj.SolrQuery;
@@ -57,7 +57,6 @@ import org.openide.modules.Places;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
-import org.sleuthkit.autopsy.coreutils.Version;
 import org.sleuthkit.datamodel.Content;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.client.solrj.impl.XMLResponseParser;
@@ -388,7 +387,7 @@ public class Server {
                 try {
                     //block, give time to fully start the process
                     //so if it's restarted solr operations can be resumed seamlessly
-                    Thread.sleep(3000);
+                    Thread.sleep(10000);
                 } catch (InterruptedException ex) {
                     logger.log(Level.WARNING, "Timer interrupted");
                 }
@@ -403,10 +402,12 @@ public class Server {
 
             } catch (SecurityException ex) {
                 logger.log(Level.WARNING, "Could not start Solr process!", ex);
-                throw new KeywordSearchModuleException("Could not start Solr server process", ex);
+                throw new KeywordSearchModuleException(
+                        NbBundle.getMessage(this.getClass(), "Server.start.exception.cantStartSolr.msg"), ex);
             } catch (IOException ex) {
                 logger.log(Level.WARNING, "Could not start Solr server process!", ex);
-                throw new KeywordSearchModuleException("Could not start Solr server process", ex);
+                throw new KeywordSearchModuleException(
+                        NbBundle.getMessage(this.getClass(), "Server.start.exception.cantStartSolr.msg2"), ex);
             }
         } else {
             logger.log(Level.WARNING, "Could not start Solr server process, port [" + currentSolrServerPort + "] not available!");
@@ -537,10 +538,12 @@ public class Server {
                 logger.log(Level.INFO, "Solr server is not running, cause: " + cause.getMessage());
                 return false;
             } else {
-                throw new KeywordSearchModuleException("Error checking if Solr server is running", ex);
+                throw new KeywordSearchModuleException(
+                        NbBundle.getMessage(this.getClass(), "Server.isRunning.exception.errCheckSolrRunning.msg"), ex);
             }
         } catch (IOException ex) {
-            throw new KeywordSearchModuleException("Error checking if Solr server is running", ex);
+            throw new KeywordSearchModuleException(
+                    NbBundle.getMessage(this.getClass(), "Server.isRunning.exception.errCheckSolrRunning.msg2"), ex);
         }
 
         return true;
@@ -552,7 +555,8 @@ public class Server {
 
     synchronized void openCore() throws KeywordSearchModuleException {
         if (currentCore != null) {
-            throw new KeywordSearchModuleException("Already an open Core! Explicitely close Core first. ");
+            throw new KeywordSearchModuleException(
+                    NbBundle.getMessage(this.getClass(), "Server.openCore.exception.alreadyOpen.msg"));
         }
 
         Case currentCase = Case.getCurrentCase();
@@ -665,7 +669,8 @@ public class Server {
         try {
             return currentCore.queryNumIndexedFiles();
         } catch (SolrServerException ex) {
-            throw new KeywordSearchModuleException("Error querying number of indexed files, ", ex);
+            throw new KeywordSearchModuleException(
+                    NbBundle.getMessage(this.getClass(), "Server.queryNumIdxFiles.exception.msg"), ex);
         }
 
 
@@ -686,7 +691,8 @@ public class Server {
         try {
             return currentCore.queryNumIndexedChunks();
         } catch (SolrServerException ex) {
-            throw new KeywordSearchModuleException("Error querying number of indexed chunks, ", ex);
+            throw new KeywordSearchModuleException(
+                    NbBundle.getMessage(this.getClass(), "Server.queryNumIdxChunks.exception.msg"), ex);
         }
     }
 
@@ -705,7 +711,8 @@ public class Server {
         try {
             return currentCore.queryNumIndexedDocuments();
         } catch (SolrServerException ex) {
-            throw new KeywordSearchModuleException("Error querying number of indexed documents, ", ex);
+            throw new KeywordSearchModuleException(
+                    NbBundle.getMessage(this.getClass(), "Server.queryNumIdxDocs.exception.msg"), ex);
         }
     }
 
@@ -724,7 +731,8 @@ public class Server {
         try {
             return currentCore.queryIsIndexed(contentID);
         } catch (SolrServerException ex) {
-            throw new KeywordSearchModuleException("Error checkign if content is indexed, ", ex);
+            throw new KeywordSearchModuleException(
+                    NbBundle.getMessage(this.getClass(), "Server.queryIsIdxd.exception.msg"), ex);
         }
     }
 
@@ -744,7 +752,8 @@ public class Server {
         try {
             return currentCore.queryNumFileChunks(fileID);
         } catch (SolrServerException ex) {
-            throw new KeywordSearchModuleException("Error getting number of file chunks, ", ex);
+            throw new KeywordSearchModuleException(
+                    NbBundle.getMessage(this.getClass(), "Server.queryNumFileChunks.exception.msg"), ex);
         }
     }
 
@@ -763,7 +772,8 @@ public class Server {
         try {
             return currentCore.query(sq);
         } catch (SolrServerException ex) {
-            throw new KeywordSearchModuleException("Error running query: " + sq.getQuery(), ex);
+            throw new KeywordSearchModuleException(
+                    NbBundle.getMessage(this.getClass(), "Server.query.exception.msg", sq.getQuery()), ex);
         }
     }
 
@@ -783,7 +793,8 @@ public class Server {
         try {
             return currentCore.query(sq, method);
         } catch (SolrServerException ex) {
-            throw new KeywordSearchModuleException("Error running query: " + sq.getQuery(), ex);
+            throw new KeywordSearchModuleException(
+                    NbBundle.getMessage(this.getClass(), "Server.query2.exception.msg", sq.getQuery()), ex);
         }
     }
 
@@ -802,7 +813,8 @@ public class Server {
         try {
             return currentCore.queryTerms(sq);
         } catch (SolrServerException ex) {
-            throw new KeywordSearchModuleException("Error running terms query: " + sq.getQuery(), ex);
+            throw new KeywordSearchModuleException(
+                    NbBundle.getMessage(this.getClass(), "Server.queryTerms.exception.msg", sq.getQuery()), ex);
         }
     }
 
@@ -873,7 +885,8 @@ 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");
-                throw new KeywordSearchModuleException("Core open requested, but server not yet running");
+                throw new KeywordSearchModuleException(
+                        NbBundle.getMessage(this.getClass(), "Server.openCore.exception.msg"));
             }
 
             CoreAdminRequest.Create createCore = new CoreAdminRequest.Create();
@@ -888,9 +901,11 @@ public class Server {
             return newCore;
 
         } catch (SolrServerException ex) {
-            throw new KeywordSearchModuleException("Could not open Core", ex);
+            throw new KeywordSearchModuleException(
+                    NbBundle.getMessage(this.getClass(), "Server.openCore.exception.cantOpen.msg"), ex);
         } catch (IOException ex) {
-            throw new KeywordSearchModuleException("Could not open Core", ex);
+            throw new KeywordSearchModuleException(
+                    NbBundle.getMessage(this.getClass(), "Server.openCore.exception.cantOpen.msg2"), ex);
         }
     }
 
@@ -931,7 +946,8 @@ public class Server {
                 return solrCore.request(request);
             } catch (IOException e) {
                 logger.log(Level.WARNING, "Could not issue Solr request. ", e);
-                throw new SolrServerException("Could not issue Solr request", e);
+                throw new SolrServerException(
+                        NbBundle.getMessage(this.getClass(), "Server.request.exception.exception.msg"), e);
             }
 
         }
@@ -951,7 +967,7 @@ public class Server {
                 solrCore.commit(true, true);
             } catch (IOException e) {
                 logger.log(Level.WARNING, "Could not commit index. ", e);
-                throw new SolrServerException("Could not commit index", e);
+                throw new SolrServerException(NbBundle.getMessage(this.getClass(), "Server.commit.exception.msg"), e);
             }
         }
 
@@ -960,10 +976,12 @@ public class Server {
                 solrCore.add(doc);
             } catch (SolrServerException ex) {
                 logger.log(Level.SEVERE, "Could not add document to index via update handler: " + doc.getField("id"), ex);
-                throw new KeywordSearchModuleException("Could not add document to index via update handler: " + doc.getField("id"), ex);
+                throw new KeywordSearchModuleException(
+                        NbBundle.getMessage(this.getClass(), "Server.addDoc.exception.msg", doc.getField("id")), ex);
             } catch (IOException ex) {
                 logger.log(Level.SEVERE, "Could not add document to index via update handler: " + doc.getField("id"), ex);
-                throw new KeywordSearchModuleException("Could not add document to index via update handler: " + doc.getField("id"), ex);
+                throw new KeywordSearchModuleException(
+                        NbBundle.getMessage(this.getClass(), "Server.addDoc.exception.msg2", doc.getField("id")), ex);
             }
         }
 
@@ -994,9 +1012,11 @@ public class Server {
             try {
                 CoreAdminRequest.unloadCore(this.name, solrServer);
             } catch (SolrServerException ex) {
-                throw new KeywordSearchModuleException("Cannot close Core", ex);
+                throw new KeywordSearchModuleException(
+                        NbBundle.getMessage(this.getClass(), "Server.close.exception.msg"), ex);
             } catch (IOException ex) {
-                throw new KeywordSearchModuleException("Cannot close Core", ex);
+                throw new KeywordSearchModuleException(
+                        NbBundle.getMessage(this.getClass(), "Server.close.exception.msg2"), ex);
             }
         }
 
@@ -1092,9 +1112,8 @@ public class Server {
         private int port;
 
         SolrServerNoPortException(int port) {
-            super("Indexing server could not bind to port " + port
-                    + ", port is not available, consider change the default "
-                    + Server.PROPERTIES_CURRENT_SERVER_PORT + " port.");
+            super(NbBundle.getMessage(Server.class, "Server.solrServerNoPortException.msg", port,
+                                      Server.PROPERTIES_CURRENT_SERVER_PORT));
             this.port = port;
         }
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java
index 3f08f5900e..f13054b936 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java
@@ -82,6 +82,11 @@ class TermComponentQuery implements KeywordSearchQuery {
         this.field = field;
     }
 
+    @Override
+    public void setSubstringQuery() {
+        queryEscaped = ".*" + queryEscaped + ".*";
+    }
+    
     @Override
     public void escape() {
         queryEscaped = Pattern.quote(termsQuery);
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/notes.txt b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/notes.txt
new file mode 100755
index 0000000000..1c771a55cd
--- /dev/null
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/notes.txt
@@ -0,0 +1,5 @@
+- Tika has a bug in the true type font parser included in fontbox. It should
+  be fixed in the next release of Tika (1.5, or a 1.4 point release). Until then
+  we bypass Tika when it detects a type of "application/x-font-ttf". See
+  AbstractFileTikaTextExtract::isSupported. This should be removed when we
+  update Tika.
\ No newline at end of file
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon-pressed.png b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon-pressed.png
new file mode 100644
index 0000000000..6ae8234815
Binary files /dev/null and b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon-pressed.png differ
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon-rollover.png b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon-rollover.png
new file mode 100644
index 0000000000..371f7dde55
Binary files /dev/null and b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon-rollover.png differ
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon.png b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon.png
new file mode 100644
index 0000000000..16781d7934
Binary files /dev/null and b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/searchbutton-icon.png differ
diff --git a/NEWS.txt b/NEWS.txt
index 848a5709da..0cba2a59f1 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -2,9 +2,30 @@
 ---------------- VERSION 3.0.9  --------------
 Bug Fixes:
 - Regular expression keyword search works on file names.
+- Fixed thunderbird parser for subject and dates
+- Fixed errors in hex viewer 
 
 Improvements:
 - Enhanced reporting on keyword search module errors
+- Updated SQLite to 3.8.0
+- More lazy loading to help performance with big folders and sets of files 
+- Times can be displayed in local time or GMT
+- New "EnCase-style" report that lists files and metadata in tab delimited file
+- Changed report wizard to make one report at a time
+- report improvements (only regnerate if data exists)
+- more error messages if recent activity module fails
+- more error checking in recent activity module and don't bail as quickly
+- Cleanup of recent activity module
+- better handle if ingest module throws exception during init()
+- do not run ingest if any module faile to init()
+- Added FILE_DONE event to ingest manager
+- Added search engine parsers for linkedin, twitter, and facebook
+- HTML text is better formatted
+- Report generation performance
+- HTML parser is skipped for files > 50MB. 
+- Removed xdock definitions -> some claim this helps with memory problems
+
+
 
 
 ---------------- VERSION 3.0.8  --------------
diff --git a/RecentActivity/manifest.mf b/RecentActivity/manifest.mf
index b6f0a41ec0..bf165767bf 100644
--- a/RecentActivity/manifest.mf
+++ b/RecentActivity/manifest.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.sleuthkit.autopsy.recentactivity/5
-OpenIDE-Module-Implementation-Version: 9
+OpenIDE-Module-Implementation-Version: 10
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/recentactivity/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/recentactivity/Bundle.properties
 OpenIDE-Module-Requires: 
diff --git a/RecentActivity/nbproject/project.properties b/RecentActivity/nbproject/project.properties
index 2cb871f415..2203f2cbc1 100644
--- a/RecentActivity/nbproject/project.properties
+++ b/RecentActivity/nbproject/project.properties
@@ -4,4 +4,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
 license.file=../LICENSE-2.0.txt
 nbm.homepage=http://www.sleuthkit.org/autopsy/
 nbm.needs.restart=true
-spec.version.base=3.0
+spec.version.base=3.1
diff --git a/RecentActivity/nbproject/project.xml b/RecentActivity/nbproject/project.xml
index 78526a084c..cf85642dbf 100644
--- a/RecentActivity/nbproject/project.xml
+++ b/RecentActivity/nbproject/project.xml
@@ -30,13 +30,21 @@
                         <specification-version>7.21.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>8.25.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>9</release-version>
-                        <specification-version>7.0</specification-version>
+                        <specification-version>7.1</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties
index 5efcbea3df..68ae7b8987 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties
@@ -6,26 +6,99 @@ OpenIDE-Module-Long-Description=\
     The plugin is also fully functional when deployed on Windows version of Autopsy.
 OpenIDE-Module-Name=RecentActivity
 OpenIDE-Module-Short-Description=Recent Activity finder ingest module
-RecentActivityTopComponent.makeNodesButton.text=Get Recent Activity
-RecentActivityTopComponent.jLabel1.text=Filter Options
-RecentActivityTopComponent.jLabel2.text=Browser Activity
-RecentActivityTopComponent.jLabel3.text=jLabel3
-RecentActivityTopComponent.jLabel4.text=Registry Information
-RecentActivityTopComponent.jLabel5.text=Date/Time
-RecentActivityTopComponent.jLabel6.text=Recent Activity Keyword Filter
-RecentActivityTopComponent.jTextField1.text=
-RecentActivityTopComponent.jLabel5.toolTipText=
-RecentActivityTopComponent.jLabel6.toolTipText=
-RecentActivityTopComponent.jLabel7.text=to
-RecentActivityTopComponent.dateFromTextField.text=
-RecentActivityTopComponent.dateToTextField.text=
-RecentActivityTopComponent.dateToButtonCalendar.text=
-RecentActivityTopComponent.dateFromButtonCalendar.text=
-RecentActivityTopComponent.jTextField1.toolTipText=Enter a word or words you'd like to pattern match against
-RecentActivityTopComponent.jCheckBox1.AccessibleContext.accessibleName=IEhistory
-RecentActivityTopComponent.jCheckBox1.label=
-RecentActivityTopComponent.IEhistory.text=
-RecentActivityTopComponent.FFhistory.text=jCheckBox3
-RecentActivityTopComponent.CHhistory.text=jCheckBox2
-RecentActivityTopComponent.Cookies.text=jCheckBox4
-RecentActivityTopComponent.Bookmarks.text=jCheckBox5
+Chrome.moduleName=Chrome
+Chrome.getHistory.errMsg.errGettingFiles=Error when trying to get Chrome history files.
+Chrome.getHistory.errMsg.couldntFindAnyFiles=Could not find any allocated Chrome history files.
+Chrome.getHistory.errMsg.errAnalyzingFile={0}\: Error while trying to analyze file\:{1}
+Chrome.parentModuleName=Recent Activity
+Chrome.getBookmark.errMsg.errGettingFiles=Error when trying to get Chrome Bookmark files.
+Chrome.getBookmark.errMsg.errAnalyzingFile={0}\: Error while trying to analyze file\:{1}
+Chrome.getBookmark.errMsg.errAnalyzeFile={0}\: Error while trying to analyze file\: {1}
+Chrome.getBookmark.errMsg.errAnalyzingFile3={0}\: Error while trying to analyze file\: {1}
+Chrome.getBookmark.errMsg.errAnalyzingFile4={0}\: Error while trying to analyze file\:{1}
+Chrome.getCookie.errMsg.errGettingFiles=Error when trying to get Chrome history files.
+Chrome.getCookie.errMsg.errAnalyzeFile={0}\: Error while trying to analyze file\:{1}
+Chrome.getDownload.errMsg.errGettingFiles=Error when trying to get Chrome history files.
+Chrome.getDownload.errMsg.errAnalyzeFiles1={0}\: Error while trying to analyze file\:{1}
+Chrome.getLogin.errMsg.errGettingFiles=Error when trying to get Chrome history files.
+Chrome.getLogin.errMsg.errAnalyzingFiles={0}\: Error while trying to analyze file\:{1}
+Chrome.getDesc.text=Extracts activity from the Google Chrome browser.
+Extract.dbConn.errMsg.failedToQueryDb={0}\: Failed to query database.
+ExtractIE.moduleName.text=Internet Explorer
+ExtractIE.getBookmark.errMsg.errGettingBookmarks={0}\: Error getting Internet Explorer Bookmarks.
+ExtractIE.parentModuleName.noSpace=RecentActivity
+ExtractIE.parentModuleName=Recent Activity
+ExtractIE.getURLFromIEBmkFile.errMsg={0}\: Error parsing IE bookmark File {1}
+ExtractIE.getURLFromIEBmkFile.errMsg2={0}\: Error parsing IE bookmark File {1}
+ExtractIE.getCookie.errMsg.errGettingFile={0}\: Error getting Internet Explorer cookie files.
+ExtractIE.getCookie.errMsg.errReadingIECookie={0}\: Error reading Internet Explorer cookie {1}
+ExtractIE.getHistory.errMsg.unableToGetHist={0}\: Unable to get IE History\: pasco not found
+ExtractIE.getHistory.errMsg.errGettingHistFiles={0}\: Error getting Internet Explorer history files
+ExtractIE.getHistory.errMsg.noHistFiles=No InternetExplorer history files found.
+ExtractIE.getHistory.errMsg.errWriteFile={0}\: Error while trying to write file\:{1}
+ExtractIE.getHistory.errMsg.errProcHist={0}\: Error processing Internet Explorer history.
+ExtractIE.parsePascoOutput.errMsg.notFound={0}\: Pasco output not found\: {1}
+ExtractIE.parsePascoOutput.errMsg.errParsing={0}\: Error parsing IE history entry {1}
+ExtractIE.parsePascoOutput.errMsg.errParsingEntry={0}\: Error parsing Internet Explorer History entry.
+ExtractIE.getDesc.text=Extracts activity from Internet Explorer browser, as well as recent documents in windows.
+ExtractRegistry.findRegFiles.errMsg.errReadingFile=Error fetching registry file\: {0}
+ExtractRegistry.analyzeRegFiles.errMsg.errWritingTemp={0}\: Error analyzing registry file {1}
+ExtractRegistry.analyzeRegFiles.failedParsingResults={0}\: Failed parsing registry file results {1}
+ExtractRegistry.parentModuleName.noSpace=RecentActivity
+ExtractRegistry.programName=RegRipper
+ExtractRegistry.analyzeRegFiles.errMsg.errReadingRegFile={0}\: Error reading registry file - {1}
+ExtractRegistry.execRegRip.errMsg.failedAnalyzeRegFile={0}\: Failed to analyze registry file
+ExtractRegistry.execRegRip.errMsg.failedAnalyzeRegFile2={0}\: Failed to analyze registry file
+ExtractRegistry.execRegRip.errMsg.failedAnalyzeRegFile3={0}\: Failed to analyze registry file
+ExtractRegistry.execRegRip.errMsg.failedAnalyzeRegFile4={0}\: Failed to analyze registry file
+ExtractRegistry.getName=Registry
+ExtractRegistry.getDesc=Extracts activity from the Windows registry utilizing RegRipper.
+Firefox.moduleName=FireFox
+Firefox.getHistory.errMsg.errFetchingFiles=Error fetching internet history files for Firefox.
+Firefox.getHistory.errMsg.noFilesFound=No FireFox history files found.
+Firefox.getHistory.errMsg.errAnalyzeFile={0}\: Error while trying to analyze file\:{1}
+Firefox.parentModuleName.noSpace=RecentActivity
+Firefox.parentModuleName=Recent Activity
+Firefox.getBookmark.errMsg.errFetchFiles=Error fetching bookmark files for Firefox.
+Firefox.getBookmark.errMsg.errAnalyzeFile={0}\: Error while trying to analyze file\:{1}
+Firefox.getCookie.errMsg.errFetchFile=Error fetching cookies files for Firefox.
+Firefox.getCookie.errMsg.errAnalyzeFile={0}\: Error while trying to analyze file\:{1}
+Firefox.getDlPre24.errMsg.errFetchFiles=Error fetching 'downloads' files for Firefox.
+Firefox.getDlPre24.errMsg.errAnalyzeFiles={0}\: Error while trying to analyze file\:{1}
+Firefox.getDlPre24.errMsg.errParsingArtifacts={0}\: Error parsing {1} Firefox web history artifacts.
+Firefox.getDlV24.errMsg.errFetchFiles=Error fetching 'downloads' files for Firefox.
+Firefox.getDlV24.errMsg.errAnalyzeFile={0}\: Error while trying to analyze file\:{1}
+Firefox.getDlV24.errMsg.errParsingArtifacts={0}\: Error parsing {1} Firefox web download artifacts.
+Firefox.getDesc.text=Extracts activity from the Mozilla FireFox browser.
+RAImageIngestModule.process.started=Started {0}
+RAImageIngestModule.process.errModFailed={0} failed - see log for details <br>
+RAImageIngestModule.process.errModErrs={0} had errors -- see log
+RAImageIngestModule.process.errMsg.errsEncountered=<p>Errors encountered during analysis\: <ul>\
+RAImageIngestModule.process.errMsgSub.oneErr=1 error found
+RAImageIngestModule.process.errMsgSub.nErrs={0} errors found
+RAImageIngestModule.process.ingestMsg.finished=Finished {0} - {1}
+RAImageIngestModule.process.errMsg.noErrs=<p>No errors encountered.</p>
+RAImageIngestModule.process.errMsgSub.noErrs=No errors reported
+RAImageIngestModule.process.histMsg.title=<p>Browser Data on {0}\:<ul>\
+RAImageIngestModule.process.histMsg.found=\ Found.
+RAImageIngestModule.process.histMsg.notFnd=\ Not Found.
+RAImageIngestModule.process.ingestMsg.results={0} - Browser Results
+RAImageIngestModule.complete.errMsg.failed={0} failed to complete - see log for details <br>
+RAImageIngestModule.getName=Recent Activity
+RAImageIngestModule.getDesc=Extracts recent user activity, such as Web browsing, recently used documents and installed programs.
+RecentDocumentsByLnk.getRecDoc.errMsg.errGetLnkFiles={0}\: Error getting lnk Files.
+RecentDocumentsByLnk.getRecDoc.errParsingFile={0}\: Error parsing Recent File {1}
+RecentDocumentsByLnk.parentModuleName.noSpace=RecentActivity
+RecentDocumentsByLnk.parentModuleName=Recent Activity
+RecentDocumentsByLnk.getDesc.text=Extracts recent documents in windows.
+SearchEngineURLQueryAnalyzer.moduleName.text=Search Engine URL Query Analyzer
+SearchEngineURLQueryAnalyzer.engineName.none=NONE
+SearchEngineURLQueryAnalyzer.domainSubStr.none=NONE
+SearchEngineURLQueryAnalyzer.toString=Name\: {0}\
+ Domain Substring\: {1}\
+ count\: {2}\
+ Split Tokens\: \
+ {3}
+SearchEngineURLQueryAnalyzer.parentModuleName.noSpace=RecentActivity
+SearchEngineURLQueryAnalyzer.getDesc=Extracts search queries on the following search engines\: \
+{0}
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle_ja.properties b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle_ja.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
index 66e2b9a21b..289fd49796 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java
@@ -28,6 +28,7 @@ import com.google.gson.JsonIOException;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.ingest.IngestServices;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
 import java.util.logging.Level;
@@ -71,7 +72,7 @@ class Chrome extends Extract {
 
     //hide public constructor to prevent from instantiation by ingest module loader
     Chrome() {
-        moduleName = "Chrome";
+        moduleName = NbBundle.getMessage(Chrome.class, "Chrome.moduleName");
     }
 
     @Override
@@ -102,7 +103,7 @@ class Chrome extends Extract {
         try {
             historyFiles = fileManager.findFiles(dataSource, "History", "Chrome");
         } catch (TskCoreException ex) {
-            String msg = "Error when trying to get Chrome history files.";
+            String msg = NbBundle.getMessage(this.getClass(), "Chrome.getHistory.errMsg.errGettingFiles");
             logger.log(Level.SEVERE, msg, ex);
             this.addErrorMessage(this.getName() + ": " + msg);
             return;
@@ -118,7 +119,7 @@ class Chrome extends Extract {
         
         // log a message if we don't have any allocated history files
         if (allocatedHistoryFiles.isEmpty()) {
-            String msg = "Could not find any allocated Chrome history files.";
+            String msg = NbBundle.getMessage(this.getClass(), "Chrome.getHistory.errMsg.couldntFindAnyFiles");
             logger.log(Level.INFO, msg);
             return;
         }
@@ -135,7 +136,8 @@ class Chrome extends Extract {
                 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);
-                this.addErrorMessage(this.getName() + ": Error while trying to analyze file:" + historyFile.getName());
+                this.addErrorMessage(NbBundle.getMessage(this.getClass(), "Chrome.getHistory.errMsg.errAnalyzingFile",
+                                                         this.getName(), historyFile.getName()));
                 continue;
             }
             File dbFile = new File(temps);
@@ -149,19 +151,32 @@ class Chrome extends Extract {
             for (HashMap<String, Object> result : tempList) {
 
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(), "Recent Activity", ((result.get("url").toString() != null) ? result.get("url").toString() : "")));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED.getTypeID(), "Recent Activity", ((Long.valueOf(result.get("last_visit_time").toString())) / 10000000)));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_REFERRER.getTypeID(), "Recent Activity", ((result.get("from_visit").toString() != null) ? result.get("from_visit").toString() : "")));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_TITLE.getTypeID(), "Recent Activity", ((result.get("title").toString() != null) ? result.get("title").toString() : "")));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "Recent Activity", "Chrome"));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(), "Recent Activity", (Util.extractDomain((result.get("url").toString() != null) ? result.get("url").toString() : ""))));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
+                                                         ((result.get("url").toString() != null) ? result.get("url").toString() : "")));
+                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)));
+                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() : "")));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_TITLE.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
+                                                         ((result.get("title").toString() != null) ? result.get("title").toString() : "")));
+                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() : ""))));
                 this.addArtifact(ARTIFACT_TYPE.TSK_WEB_HISTORY, historyFile, bbattributes);
 
             }
             dbFile.delete();
         }
 
-        services.fireModuleDataEvent(new ModuleDataEvent("Recent Activity", BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_HISTORY));
+        services.fireModuleDataEvent(new ModuleDataEvent(NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
+                                                         BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_HISTORY));
     }
 
     /**
@@ -176,7 +191,7 @@ class Chrome extends Extract {
         try {
             bookmarkFiles = fileManager.findFiles(dataSource, "Bookmarks", "Chrome");
         } catch (TskCoreException ex) {
-            String msg = "Error when trying to get Chrome Bookmark files.";
+            String msg = NbBundle.getMessage(this.getClass(), "Chrome.getBookmark.errMsg.errGettingFiles");
             logger.log(Level.SEVERE, msg, ex);
             this.addErrorMessage(this.getName() + ": " + msg);
             return;
@@ -200,7 +215,8 @@ class Chrome extends Extract {
                 ContentUtils.writeToFile(bookmarkFile, new File(temps));
             } catch (IOException ex) {
                 logger.log(Level.SEVERE, "Error writing temp sqlite db for Chrome bookmark artifacts.{0}", ex);
-                this.addErrorMessage(this.getName() + ": Error while trying to analyze file:" + bookmarkFile.getName());
+                this.addErrorMessage(NbBundle.getMessage(this.getClass(), "Chrome.getBookmark.errMsg.errAnalyzingFile",
+                                                         this.getName(), bookmarkFile.getName()));
                 continue;
             }
             
@@ -216,7 +232,9 @@ class Chrome extends Extract {
                  tempReader = new FileReader(temps);
             } catch (FileNotFoundException ex) {
                 logger.log(Level.SEVERE, "Error while trying to read into the Bookmarks for Chrome.", ex);
-                this.addErrorMessage(this.getName() + ": Error while trying to analyze file: " + bookmarkFile.getName());
+                this.addErrorMessage(
+                        NbBundle.getMessage(this.getClass(), "Chrome.getBookmark.errMsg.errAnalyzeFile", this.getName(),
+                                            bookmarkFile.getName()));
                 continue;
             }
             
@@ -233,7 +251,8 @@ class Chrome extends Extract {
                 jBookmarkArray = jBookmark.getAsJsonArray("children");
             } catch (JsonIOException | JsonSyntaxException | IllegalStateException ex) {
                 logger.log(Level.WARNING, "Error parsing Json from Chrome Bookmark.", ex);
-                this.addErrorMessage(this.getName() + ": Error while trying to analyze file: " + bookmarkFile.getName());
+                this.addErrorMessage(NbBundle.getMessage(this.getClass(), "Chrome.getBookmark.errMsg.errAnalyzingFile3",
+                                                         this.getName(), bookmarkFile.getName()));
                 continue;
             }
             
@@ -272,21 +291,34 @@ class Chrome extends Extract {
                     Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
                     //TODO Revisit usage of deprecated constructor as per TSK-583
                     //bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_LAST_ACCESSED.getTypeID(), "Recent Activity", "Last Visited", (date / 10000000)));
-                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(), "Recent Activity", url));
-                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_TITLE.getTypeID(), "Recent Activity", name));
-                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_CREATED.getTypeID(), "Recent Activity", (date / 10000000)));
-                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "Recent Activity", "Chrome"));
-                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(), "Recent Activity", domain));
+                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
+                                                             NbBundle.getMessage(this.getClass(),
+                                                                                 "Chrome.parentModuleName"), url));
+                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_TITLE.getTypeID(),
+                                                             NbBundle.getMessage(this.getClass(),
+                                                                                 "Chrome.parentModuleName"), name));
+                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_CREATED.getTypeID(),
+                                                             NbBundle.getMessage(this.getClass(),
+                                                                                 "Chrome.parentModuleName"), (date / 10000000)));
+                    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"), domain));
                     bbart.addAttributes(bbattributes);
                 } catch (TskCoreException ex) {
                     logger.log(Level.SEVERE, "Error while trying to insert Chrome bookmark artifact{0}", ex);
-                    this.addErrorMessage(this.getName() + ": Error while trying to analyze file:" + bookmarkFile.getName());
+                    this.addErrorMessage(
+                            NbBundle.getMessage(this.getClass(), "Chrome.getBookmark.errMsg.errAnalyzingFile4",
+                                                this.getName(), bookmarkFile.getName()));
                 }
             }
             dbFile.delete();
         }
 
-        services.fireModuleDataEvent(new ModuleDataEvent("Recent Activity", BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_BOOKMARK));
+        services.fireModuleDataEvent(new ModuleDataEvent(NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"), BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_BOOKMARK));
     }
 
     /**
@@ -301,7 +333,7 @@ class Chrome extends Extract {
         try {
             cookiesFiles = fileManager.findFiles(dataSource, "Cookies", "Chrome");
         } catch (TskCoreException ex) {
-            String msg = "Error when trying to get Chrome history files.";
+            String msg = NbBundle.getMessage(this.getClass(), "Chrome.getCookie.errMsg.errGettingFiles");
             logger.log(Level.SEVERE, msg, ex);
             this.addErrorMessage(this.getName() + ": " + msg);
             return;
@@ -324,7 +356,9 @@ class Chrome extends Extract {
                 ContentUtils.writeToFile(cookiesFile, new File(temps));
             } catch (IOException ex) {
                 logger.log(Level.SEVERE, "Error writing temp sqlite db for Chrome cookie artifacts.{0}", ex);
-                this.addErrorMessage(this.getName() + ": Error while trying to analyze file:" + cookiesFile.getName());
+                this.addErrorMessage(
+                        NbBundle.getMessage(this.getClass(), "Chrome.getCookie.errMsg.errAnalyzeFile", this.getName(),
+                                            cookiesFile.getName()));
                 continue;
             }
             File dbFile = new File(temps);
@@ -337,21 +371,32 @@ class Chrome extends Extract {
             logger.log(Level.INFO, moduleName + "- Now getting cookies from " + temps + " with " + tempList.size() + "artifacts identified.");
             for (HashMap<String, Object> result : tempList) {
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(), "Recent Activity", ((result.get("host_key").toString() != null) ? result.get("host_key").toString() : "")));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(), "Recent Activity", ((Long.valueOf(result.get("last_access_utc").toString())) / 10000000)));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(), "Recent Activity", ((result.get("name").toString() != null) ? result.get("name").toString() : "")));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_VALUE.getTypeID(), "Recent Activity", ((result.get("value").toString() != null) ? result.get("value").toString() : "")));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "Recent Activity", "Chrome"));
+                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() : "")));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
+                                                         ((Long.valueOf(result.get("last_access_utc").toString())) / 10000000)));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
+                                                         ((result.get("name").toString() != null) ? result.get("name").toString() : "")));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_VALUE.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
+                                                         ((result.get("value").toString() != null) ? result.get("value").toString() : "")));
+                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();
                 domain = domain.replaceFirst("^\\.+(?!$)", "");
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(), "Recent Activity", domain));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"), domain));
                 this.addArtifact(ARTIFACT_TYPE.TSK_WEB_COOKIE, cookiesFile, bbattributes);
             }
 
             dbFile.delete();
         }
 
-        services.fireModuleDataEvent(new ModuleDataEvent("Recent Activity", BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_COOKIE));
+        services.fireModuleDataEvent(new ModuleDataEvent(NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"), BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_COOKIE));
     }
 
     /**
@@ -366,7 +411,7 @@ class Chrome extends Extract {
         try {
             downloadFiles = fileManager.findFiles(dataSource, "History", "Chrome");
         } catch (TskCoreException ex) {
-            String msg = "Error when trying to get Chrome history files.";
+            String msg = NbBundle.getMessage(this.getClass(), "Chrome.getDownload.errMsg.errGettingFiles");
             logger.log(Level.SEVERE, msg, ex);
             this.addErrorMessage(this.getName() + ": " + msg);
             return;
@@ -389,7 +434,8 @@ class Chrome extends Extract {
                 ContentUtils.writeToFile(downloadFile, new File(temps));
             } catch (IOException ex) {
                 logger.log(Level.SEVERE, "Error writing temp sqlite db for Chrome download artifacts.{0}", ex);
-                this.addErrorMessage(this.getName() + ": Error while trying to analyze file:" + downloadFile.getName());
+                this.addErrorMessage(NbBundle.getMessage(this.getClass(), "Chrome.getDownload.errMsg.errAnalyzeFiles1",
+                                                         this.getName(), downloadFile.getName()));
                 continue;
             }
             File dbFile = new File(temps);
@@ -409,29 +455,39 @@ class Chrome extends Extract {
             logger.log(Level.INFO, moduleName + "- Now getting downloads from " + temps + " with " + tempList.size() + "artifacts identified.");
             for (HashMap<String, Object> result : tempList) {
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH.getTypeID(), "Recent Activity", (result.get("full_path").toString())));
+                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()));
                 if (pathID != -1) {
-                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH_ID.getTypeID(), "Recent Activity", pathID));
+                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH_ID.getTypeID(),
+                                                             NbBundle.getMessage(this.getClass(),
+                                                                                 "Chrome.parentModuleName"), pathID));
                 }
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(), "Recent Activity", ((result.get("url").toString() != null) ? result.get("url").toString() : "")));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
+                                                         ((result.get("url").toString() != null) ? result.get("url").toString() : "")));
                 //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()));
                 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(), "Recent Activity", 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() : "");
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(), "Recent Activity", domain));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "Recent Activity", "Chrome"));
+                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(),
+                                                         NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
+                                                         NbBundle.getMessage(this.getClass(), "Chrome.moduleName")));
                 this.addArtifact(ARTIFACT_TYPE.TSK_WEB_DOWNLOAD, downloadFile, bbattributes);
             }
 
             dbFile.delete();
         }
 
-        services.fireModuleDataEvent(new ModuleDataEvent("Recent Activity", BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_DOWNLOAD));
+        services.fireModuleDataEvent(new ModuleDataEvent(NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
+                                                         BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_DOWNLOAD));
     }
 
     /**
@@ -446,7 +502,7 @@ class Chrome extends Extract {
         try {
             signonFiles = fileManager.findFiles(dataSource, "signons.sqlite", "Chrome");
         } catch (TskCoreException ex) {
-            String msg = "Error when trying to get Chrome history files.";
+            String msg = NbBundle.getMessage(this.getClass(), "Chrome.getLogin.errMsg.errGettingFiles");
             logger.log(Level.SEVERE, msg, ex);
             this.addErrorMessage(this.getName() + ": " + msg);
             return;
@@ -469,7 +525,9 @@ class Chrome extends Extract {
                 ContentUtils.writeToFile(signonFile, new File(temps));
             } catch (IOException ex) {
                 logger.log(Level.SEVERE, "Error writing temp sqlite db for Chrome login artifacts.{0}", ex);
-                this.addErrorMessage(this.getName() + ": Error while trying to analyze file:" + signonFile.getName());
+                this.addErrorMessage(
+                        NbBundle.getMessage(this.getClass(), "Chrome.getLogin.errMsg.errAnalyzingFiles", this.getName(),
+                                            signonFile.getName()));
                 continue;
             }
             File dbFile = new File(temps);
@@ -481,24 +539,40 @@ class Chrome extends Extract {
             logger.log(Level.INFO, moduleName + "- Now getting login information from " + temps + " with " + tempList.size() + "artifacts identified.");
             for (HashMap<String, Object> result : tempList) {
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(), "Recent Activity", ((result.get("origin_url").toString() != null) ? result.get("origin_url").toString() : "")));
+                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() : "")));
                 //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(), "Recent Activity", ((Long.valueOf(result.get("last_visit_time").toString())) / 1000000)));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_REFERRER.getTypeID(), "Recent Activity", ((result.get("from_visit").toString() != null) ? result.get("from_visit").toString() : "")));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(), "Recent Activity", ((result.get("title").toString() != null) ? result.get("title").toString() : "")));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "Recent Activity", "Chrome"));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(), "Recent Activity", (Util.extractDomain((result.get("origin_url").toString() != null) ? result.get("url").toString() : ""))));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_USER_NAME.getTypeID(), "Recent Activity", ((result.get("username_value").toString() != null) ? result.get("username_value").toString().replaceAll("'", "''") : "")));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(), "Recent Activity", result.get("signon_realm").toString()));
+                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)));
+                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() : "")));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
+                                                         ((result.get("title").toString() != null) ? result.get("title").toString() : "")));
+                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() : ""))));
+                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("'", "''") : "")));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"),
+                                                         result.get("signon_realm").toString()));
                 this.addArtifact(ARTIFACT_TYPE.TSK_WEB_HISTORY, signonFile, bbattributes);
             }
 
             dbFile.delete();
         }
 
-        services.fireModuleDataEvent(new ModuleDataEvent("Recent Activity", BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_HISTORY));
+        services.fireModuleDataEvent(new ModuleDataEvent(NbBundle.getMessage(this.getClass(), "Chrome.parentModuleName"), BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_HISTORY));
     }
 
     @Override
@@ -516,7 +590,7 @@ class Chrome extends Extract {
 
     @Override
     public String getDescription() {
-        return "Extracts activity from the Google Chrome browser.";
+        return NbBundle.getMessage(this.getClass(), "Chrome.getDesc.text");
     }
 
 
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
index 12b82bbc65..688470d35d 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java
@@ -22,11 +22,14 @@
  */
 package org.sleuthkit.autopsy.recentactivity;
 
+import org.sleuthkit.autopsy.coreutils.SQLiteDBConnect;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.util.*;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.ingest.IngestModuleDataSource;
@@ -103,7 +106,7 @@ abstract class Extract extends IngestModuleDataSource{
             tempdbconnect.closeConnection();
         } catch (SQLException ex) {
             logger.log(Level.SEVERE, "Error while trying to read into a sqlite db." + connectionString, ex);
-            errorMessages.add(getName() + ": Failed to query database.");
+            errorMessages.add(NbBundle.getMessage(this.getClass(), "Extract.dbConn.errMsg.failedToQueryDb", getName()));
             return Collections.<HashMap<String,Object>>emptyList();
         }
         return list;
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
index 5d3c298070..9367986af9 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java
@@ -24,15 +24,15 @@ package org.sleuthkit.autopsy.recentactivity;
 
 //IO imports
 import java.io.BufferedReader;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.ExecUtil;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.Reader;
 import java.io.Writer;
 
 //Util Imports
@@ -44,15 +44,10 @@ import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import java.util.Collection;
 import java.util.Scanner;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 // TSK Imports
 import org.openide.modules.InstalledFileLocator;
 import org.sleuthkit.autopsy.casemodule.Case;
-import org.sleuthkit.autopsy.coreutils.JLNK;
-import org.sleuthkit.autopsy.coreutils.JLnkParser;
-import org.sleuthkit.autopsy.coreutils.JLnkParserException;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
 import org.sleuthkit.autopsy.ingest.IngestDataSourceWorkerController;
 import org.sleuthkit.autopsy.ingest.IngestServices;
@@ -84,7 +79,7 @@ class ExtractIE extends Extract {
 
     //hide public constructor to prevent from instantiation by ingest module loader
     ExtractIE() {
-        moduleName = "Internet Explorer";
+        moduleName = NbBundle.getMessage(ExtractIE.class, "ExtractIE.moduleName.text");
         moduleTempResultsDir = RAImageIngestModule.getRATempPath(Case.getCurrentCase(), "IE") + File.separator + "results";
         JAVA_PATH = PlatformUtil.getJavaPath();
     }
@@ -115,7 +110,9 @@ class ExtractIE extends Extract {
             favoritesFiles = fileManager.findFiles(dataSource, "%.url", "Favorites");
         } catch (TskCoreException ex) {
             logger.log(Level.WARNING, "Error fetching 'url' files for Internet Explorer bookmarks.", ex);
-            this.addErrorMessage(this.getName() + ": Error getting Internet Explorer Bookmarks.");
+            this.addErrorMessage(
+                    NbBundle.getMessage(this.getClass(), "ExtractIE.getBookmark.errMsg.errGettingBookmarks",
+                                                     this.getName()));
             return;
         }
 
@@ -143,14 +140,26 @@ class ExtractIE extends Extract {
             String domain = Util.extractDomain(url);
 
             Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
-            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(), "RecentActivity", url));
-            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_TITLE.getTypeID(), "RecentActivity", name));
-            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_CREATED.getTypeID(), "RecentActivity", datetime));
-            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "RecentActivity", "Internet Explorer"));
-            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(), "RecentActivity", domain));
+            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
+                                                     NbBundle.getMessage(this.getClass(),
+                                                                         "ExtractIE.parentModuleName.noSpace"), url));
+            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_TITLE.getTypeID(),
+                                                     NbBundle.getMessage(this.getClass(),
+                                                                         "ExtractIE.parentModuleName.noSpace"), name));
+            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_CREATED.getTypeID(),
+                                                     NbBundle.getMessage(this.getClass(),
+                                                                         "ExtractIE.parentModuleName.noSpace"), datetime));
+            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),
+                                                     NbBundle.getMessage(this.getClass(),
+                                                                         "ExtractIE.parentModuleName.noSpace"),
+                                                     NbBundle.getMessage(this.getClass(), "ExtractIE.moduleName.text")));
+            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(),
+                                                     NbBundle.getMessage(this.getClass(),
+                                                                         "ExtractIE.parentModuleName.noSpace"), domain));
             this.addArtifact(ARTIFACT_TYPE.TSK_WEB_BOOKMARK, fav, bbattributes);
         }
-        services.fireModuleDataEvent(new ModuleDataEvent("Recent Activity", BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_BOOKMARK));
+        services.fireModuleDataEvent(new ModuleDataEvent(
+                NbBundle.getMessage(this.getClass(), "ExtractIE.parentModuleName"), BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_BOOKMARK));
     }
     
     private String getURLFromIEBookmarkFile(AbstractFile fav) {
@@ -167,10 +176,14 @@ class ExtractIE extends Extract {
             }
         } catch (IOException ex) {
             logger.log(Level.WARNING, "Failed to read from content: " + fav.getName(), ex);
-            this.addErrorMessage(this.getName() + ": Error parsing IE bookmark File " + fav.getName());
+            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);
-            this.addErrorMessage(this.getName() + ": Error parsing IE bookmark File " + fav.getName());
+            this.addErrorMessage(
+                    NbBundle.getMessage(this.getClass(), "ExtractIE.getURLFromIEBmkFile.errMsg2", this.getName(),
+                                        fav.getName()));
         } finally {
             try {
                 reader.close();
@@ -194,7 +207,8 @@ class ExtractIE extends Extract {
             cookiesFiles = fileManager.findFiles(dataSource, "%.txt", "Cookies");
         } catch (TskCoreException ex) {
             logger.log(Level.WARNING, "Error getting cookie files for IE");
-            this.addErrorMessage(this.getName() + ": " + "Error getting Internet Explorer cookie files.");
+            this.addErrorMessage(
+                    NbBundle.getMessage(this.getClass(), "ExtractIE.getCookie.errMsg.errGettingFile", this.getName()));
             return;
         }
 
@@ -217,7 +231,9 @@ class ExtractIE extends Extract {
                 final int bytesRead = cookiesFile.read(t, 0, cookiesFile.getSize());
             } catch (TskCoreException ex) {
                 logger.log(Level.SEVERE, "Error reading bytes of Internet Explorer cookie.", ex);
-                this.addErrorMessage(this.getName() + ": Error reading Internet Explorer cookie " + cookiesFile.getName());
+                this.addErrorMessage(
+                        NbBundle.getMessage(this.getClass(), "ExtractIE.getCookie.errMsg.errReadingIECookie",
+                                            this.getName(), cookiesFile.getName()));
                 continue;
             }
             String cookieString = new String(t);
@@ -231,15 +247,29 @@ class ExtractIE extends Extract {
             String domain = Util.extractDomain(url);
 
             Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
-            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(), "RecentActivity", url));
-            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(), "RecentActivity", datetime));
-            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(), "RecentActivity", (name != null) ? name : ""));
-            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_VALUE.getTypeID(), "RecentActivity", value));
-            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "RecentActivity", "Internet Explorer"));
-            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(), "RecentActivity", domain));
+            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
+                                                     NbBundle.getMessage(this.getClass(),
+                                                                         "ExtractIE.parentModuleName.noSpace"), url));
+            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(),
+                                                     NbBundle.getMessage(this.getClass(),
+                                                                         "ExtractIE.parentModuleName.noSpace"), datetime));
+            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(),
+                                                     NbBundle.getMessage(this.getClass(),
+                                                                         "ExtractIE.parentModuleName.noSpace"), (name != null) ? name : ""));
+            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_VALUE.getTypeID(),
+                                                     NbBundle.getMessage(this.getClass(),
+                                                                         "ExtractIE.parentModuleName.noSpace"), value));
+            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),
+                                                     NbBundle.getMessage(this.getClass(),
+                                                                         "ExtractIE.parentModuleName.noSpace"),
+                                                     NbBundle.getMessage(this.getClass(), "ExtractIE.moduleName.text")));
+            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(),
+                                                     NbBundle.getMessage(this.getClass(),
+                                                                         "ExtractIE.parentModuleName.noSpace"), domain));
             this.addArtifact(ARTIFACT_TYPE.TSK_WEB_COOKIE, cookiesFile, bbattributes);
         }
-        services.fireModuleDataEvent(new ModuleDataEvent("Recent Activity", BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_COOKIE));
+        services.fireModuleDataEvent(new ModuleDataEvent(
+                NbBundle.getMessage(this.getClass(), "ExtractIE.parentModuleName"), BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_COOKIE));
     }
 
     /**
@@ -253,7 +283,8 @@ class ExtractIE extends Extract {
 
         final File pascoRoot = InstalledFileLocator.getDefault().locate("pasco2", ExtractIE.class.getPackage().getName(), false);
         if (pascoRoot == null) {
-            this.addErrorMessage(this.getName() + ": Unable to get IE History: pasco not found");
+            this.addErrorMessage(
+                    NbBundle.getMessage(this.getClass(), "ExtractIE.getHistory.errMsg.unableToGetHist", this.getName()));
             logger.log(Level.SEVERE, "Error finding pasco program ");
             return;
         } 
@@ -273,13 +304,14 @@ class ExtractIE extends Extract {
         try {
             indexFiles = fileManager.findFiles(dataSource, "index.dat");
         } catch (TskCoreException ex) {
-            this.addErrorMessage(this.getName() + ": Error getting Internet Explorer history files");
+            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.");
             return;
         }
 
         if (indexFiles.isEmpty()) {
-            String msg = "No InternetExplorer history files found.";
+            String msg = NbBundle.getMessage(this.getClass(), "ExtractIE.getHistory.errMsg.noHistFiles");
             logger.log(Level.INFO, msg);
             return;
         }
@@ -304,7 +336,9 @@ class ExtractIE extends Extract {
                 ContentUtils.writeToFile(indexFile, datFile);
             } catch (IOException e) {
                 logger.log(Level.SEVERE, "Error while trying to write index.dat file " + datFile.getAbsolutePath(), e);
-                this.addErrorMessage(this.getName() + ": Error while trying to write file:" + datFile.getAbsolutePath());
+                this.addErrorMessage(
+                        NbBundle.getMessage(this.getClass(), "ExtractIE.getHistory.errMsg.errWriteFile", this.getName(),
+                                            datFile.getAbsolutePath()));
                 continue;
             }
 
@@ -321,12 +355,14 @@ class ExtractIE extends Extract {
                 datFile.delete();
             } else {
                 logger.log(Level.WARNING, "pasco execution failed on: " + this.getName());
-                this.addErrorMessage(this.getName() + ": Error processing Internet Explorer history.");
+                this.addErrorMessage(
+                        NbBundle.getMessage(this.getClass(), "ExtractIE.getHistory.errMsg.errProcHist", this.getName()));
             }
         }
         
         if (foundHistory) {
-            services.fireModuleDataEvent(new ModuleDataEvent("Recent Activity", BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_HISTORY));
+            services.fireModuleDataEvent(new ModuleDataEvent(
+                    NbBundle.getMessage(this.getClass(), "ExtractIE.parentModuleName"), BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_HISTORY));
         }
     }
 
@@ -380,7 +416,9 @@ class ExtractIE extends Extract {
 
         File file = new File(fnAbs);
         if (file.exists() == false) {
-            this.addErrorMessage(this.getName() + ": Pasco output not found: " + file.getName());
+            this.addErrorMessage(
+                    NbBundle.getMessage(this.getClass(), "ExtractIE.parsePascoOutput.errMsg.notFound", this.getName(),
+                                        file.getName()));
             logger.log(Level.WARNING, "Pasco Output not found: " + file.getPath());
             return;
         }
@@ -395,7 +433,9 @@ class ExtractIE extends Extract {
         try {
             fileScanner = new Scanner(new FileInputStream(file.toString()));
         } catch (FileNotFoundException ex) {
-            this.addErrorMessage(this.getName() + ": Error parsing IE history entry " + file.getName());
+            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);
             return;
         }
@@ -454,7 +494,9 @@ class ExtractIE extends Extract {
                     ftime = epochtime.longValue();
                     ftime = ftime / 1000;
                 } catch (ParseException e) {
-                    this.addErrorMessage(this.getName() + ": Error parsing Internet Explorer History entry.");
+                    this.addErrorMessage(
+                            NbBundle.getMessage(this.getClass(), "ExtractIE.parsePascoOutput.errMsg.errParsingEntry",
+                                                this.getName()));
                     logger.log(Level.SEVERE, "Error parsing Pasco results.", e);
                 }
             }
@@ -462,15 +504,29 @@ class ExtractIE extends Extract {
             try {
                 BlackboardArtifact bbart = origFile.newArtifact(ARTIFACT_TYPE.TSK_WEB_HISTORY);
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<>();
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(), "RecentActivity", realurl));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(),
+                                                                             "ExtractIE.parentModuleName.noSpace"), realurl));
                 //bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL_DECODED.getTypeID(), "RecentActivity", EscapeUtil.decodeURL(realurl)));
 
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED.getTypeID(), "RecentActivity", ftime));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_REFERRER.getTypeID(), "RecentActivity", ""));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(),
+                                                                             "ExtractIE.parentModuleName.noSpace"), ftime));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_REFERRER.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(),
+                                                                             "ExtractIE.parentModuleName.noSpace"), ""));
                 // @@@ NOte that other browser modules are adding TITLE in hre for the title
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "RecentActivity", "Internet Explorer"));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(), "RecentActivity", domain));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_USER_NAME.getTypeID(), "RecentActivity", user));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(),
+                                                                             "ExtractIE.parentModuleName.noSpace"),
+                                                         NbBundle.getMessage(this.getClass(),
+                                                                             "ExtractIE.moduleName.text")));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(),
+                                                                             "ExtractIE.parentModuleName.noSpace"), domain));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_USER_NAME.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(),
+                                                                             "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);
@@ -501,7 +557,7 @@ class ExtractIE extends Extract {
 
     @Override
     public String getDescription() {
-        return "Extracts activity from Internet Explorer browser, as well as recent documents in windows.";
+        return NbBundle.getMessage(this.getClass(), "ExtractIE.getDesc.text");
     }
 
     @Override
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
index 94b9728b30..595a847299 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
@@ -32,6 +32,7 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import org.openide.modules.InstalledFileLocator;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.ExecUtil;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
@@ -135,7 +136,8 @@ class ExtractRegistry extends Extract {
                 allRegistryFiles.addAll(fileManager.findFiles(dataSource, regFileName, "/system32/config"));
             } 
             catch (TskCoreException ex) {
-                String msg = "Error fetching registry file: " + regFileName;
+                String msg = NbBundle.getMessage(this.getClass(),
+                                                 "ExtractRegistry.findRegFiles.errMsg.errReadingFile", regFileName);
                 logger.log(Level.WARNING, msg);
                 this.addErrorMessage(this.getName() + ": " + msg);
             }
@@ -172,7 +174,9 @@ class ExtractRegistry extends Extract {
                 ContentUtils.writeToFile(regFile, regFileNameLocalFile);
             } catch (IOException ex) {
                 logger.log(Level.SEVERE, "Error writing the temp registry file. {0}", ex);
-                this.addErrorMessage(this.getName() + ": Error analyzing registry file " + regFileName);
+                this.addErrorMessage(
+                        NbBundle.getMessage(this.getClass(), "ExtractRegistry.analyzeRegFiles.errMsg.errWritingTemp",
+                                            this.getName(), regFileName));
                 continue;
             }
             
@@ -199,7 +203,9 @@ class ExtractRegistry extends Extract {
             // parse the autopsy-specific output
             if (regOutputFiles.autopsyPlugins.isEmpty() == false) {
                 if (parseAutopsyPluginOutput(regOutputFiles.autopsyPlugins, regFile.getId(), extrctr) == false) {
-                    this.addErrorMessage(this.getName() + ": Failed parsing registry file results " + regFileName);
+                    this.addErrorMessage(
+                            NbBundle.getMessage(this.getClass(), "ExtractRegistry.analyzeRegFiles.failedParsingResults",
+                                                this.getName(), regFileName));
                 }
             }
 
@@ -207,7 +213,11 @@ class ExtractRegistry extends Extract {
             if (regOutputFiles.fullPlugins.isEmpty() == false) {
                 try {
                     BlackboardArtifact art = regFile.newArtifact(ARTIFACT_TYPE.TSK_TOOL_OUTPUT.getTypeID());
-                    BlackboardAttribute att = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "RecentActivity", "RegRipper");
+                    BlackboardAttribute att = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),
+                                                                      NbBundle.getMessage(this.getClass(),
+                                                                                          "ExtractRegistry.parentModuleName.noSpace"),
+                                                                      NbBundle.getMessage(this.getClass(),
+                                                                                          "ExtractRegistry.programName"));
                     art.addAttribute(att);
 
                     FileReader fread = new FileReader(regOutputFiles.fullPlugins);
@@ -231,10 +241,14 @@ class ExtractRegistry extends Extract {
                             logger.log(Level.WARNING, "Failed to close reader.", ex);
                         }
                     }
-                    att = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_TEXT.getTypeID(), "RecentActivity", sb.toString());
+                    att = new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_TEXT.getTypeID(),
+                                                  NbBundle.getMessage(this.getClass(),
+                                                                      "ExtractRegistry.parentModuleName.noSpace"), sb.toString());
                     art.addAttribute(att);
                 } catch (FileNotFoundException ex) {
-                    this.addErrorMessage(this.getName() + ": Error reading registry file - " + regOutputFiles.fullPlugins);
+                    this.addErrorMessage(NbBundle.getMessage(this.getClass(),
+                                                             "ExtractRegistry.analyzeRegFiles.errMsg.errReadingRegFile",
+                                                             this.getName(), regOutputFiles.fullPlugins));
                     java.util.logging.Logger.getLogger(ExtractRegistry.class.getName()).log(Level.SEVERE, null, ex);
                 } catch (TskCoreException ex) {
                     // TODO - add error message here?
@@ -306,10 +320,14 @@ class ExtractRegistry extends Extract {
                         "-r", regFilePath, "-f", autopsyType);
             } catch (IOException ex) {
                 logger.log(Level.SEVERE, "Unable to RegRipper and process parse some registry files.", ex);
-                this.addErrorMessage(this.getName() + ": Failed to analyze registry file");
+                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);
-                this.addErrorMessage(this.getName() + ": Failed to analyze registry file");
+                this.addErrorMessage(
+                        NbBundle.getMessage(this.getClass(), "ExtractRegistry.execRegRip.errMsg.failedAnalyzeRegFile2",
+                                            this.getName()));
             } finally {
                 if (writer != null) {
                     try {
@@ -333,10 +351,14 @@ class ExtractRegistry extends Extract {
                         "-r", regFilePath, "-f", fullType);
             } catch (IOException ex) {
                 logger.log(Level.SEVERE, "Unable to run full RegRipper and process parse some registry files.", ex);
-                this.addErrorMessage(this.getName() + ": Failed to analyze registry file");
+                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);
-                this.addErrorMessage(this.getName() + ": Failed to analyze registry file");
+                this.addErrorMessage(
+                        NbBundle.getMessage(this.getClass(), "ExtractRegistry.execRegRip.errMsg.failedAnalyzeRegFile4",
+                                            this.getName()));
             } finally {
                 if (writer != null) {
                     try {
@@ -429,18 +451,26 @@ class ExtractRegistry extends Extract {
                                 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(), "RecentActivity", usbMtime));
+                                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(),
+                                                                         NbBundle.getMessage(this.getClass(),
+                                                                                             "ExtractRegistry.parentModuleName.noSpace"), usbMtime));
                                 String dev = artnode.getAttribute("dev");       
                                 String model = dev; 
                                 if (dev.toLowerCase().contains("vid")) {
                                     USBInfo info = extrctr.get(dev);
                                     if(info.getVendor()!=null)
-                                        bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DEVICE_MAKE.getTypeID(), "RecentActivity", info.getVendor()));
+                                        bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DEVICE_MAKE.getTypeID(),
+                                                                                 NbBundle.getMessage(this.getClass(),
+                                                                                                     "ExtractRegistry.parentModuleName.noSpace"), info.getVendor()));
                                     if(info.getProduct() != null)
                                         model = info.getProduct();
                                 }
-                                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DEVICE_MODEL.getTypeID(), "RecentActivity", model));
-                                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DEVICE_ID.getTypeID(), "RecentActivity", value));
+                                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DEVICE_MODEL.getTypeID(),
+                                                                         NbBundle.getMessage(this.getClass(),
+                                                                                             "ExtractRegistry.parentModuleName.noSpace"), model));
+                                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DEVICE_ID.getTypeID(),
+                                                                         NbBundle.getMessage(this.getClass(),
+                                                                                             "ExtractRegistry.parentModuleName.noSpace"), value));
                                 bbart.addAttributes(bbattributes);
                             } catch (TskCoreException ex) {
                                 logger.log(Level.SEVERE, "Error adding device attached artifact to blackboard.");
@@ -457,8 +487,12 @@ class ExtractRegistry extends Extract {
                             }
 
                             try {
-                                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "RecentActivity", value));
-                                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(), "RecentActivity", itemMtime));
+                                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),
+                                                                         NbBundle.getMessage(this.getClass(),
+                                                                                             "ExtractRegistry.parentModuleName.noSpace"), value));
+                                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(),
+                                                                         NbBundle.getMessage(this.getClass(),
+                                                                                             "ExtractRegistry.parentModuleName.noSpace"), itemMtime));
                                 BlackboardArtifact bbart = tempDb.getContentById(orgId).newArtifact(ARTIFACT_TYPE.TSK_INSTALLED_PROG);
                                 bbart.addAttributes(bbattributes);
                             } catch (TskCoreException ex) {
@@ -485,8 +519,12 @@ class ExtractRegistry extends Extract {
                                     logger.log(Level.SEVERE, "RegRipper::Conversion on DateTime -> ", e);
                                 }
                                 try {
-                                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "RecentActivity", winver));
-                                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(), "RecentActivity", installtime));
+                                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),
+                                                                             NbBundle.getMessage(this.getClass(),
+                                                                                                 "ExtractRegistry.parentModuleName.noSpace"), winver));
+                                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(),
+                                                                             NbBundle.getMessage(this.getClass(),
+                                                                                                 "ExtractRegistry.parentModuleName.noSpace"), installtime));
                                     BlackboardArtifact bbart = tempDb.getContentById(orgId).newArtifact(ARTIFACT_TYPE.TSK_INSTALLED_PROG);
                                     bbart.addAttributes(bbattributes);
                                 } catch (TskCoreException ex) {
@@ -501,11 +539,19 @@ class ExtractRegistry extends Extract {
                                 BlackboardArtifact bbart = tempDb.getContentById(orgId).newArtifact(ARTIFACT_TYPE.TSK_RECENT_OBJECT);
                                 // @@@ BC: Consider removing this after some more testing. It looks like an Mtime associated with the root key and not the individual item
                                 if (mtime != null) {
-                                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED.getTypeID(), "RecentActivity", mtime));
+                                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED.getTypeID(),
+                                                                             NbBundle.getMessage(this.getClass(),
+                                                                                                 "ExtractRegistry.parentModuleName.noSpace"), mtime));
                                 }
-                                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(), "RecentActivity", name));
-                                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_VALUE.getTypeID(), "RecentActivity", value));
-                                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "RecentActivity", artnode.getNodeName()));
+                                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(),
+                                                                         NbBundle.getMessage(this.getClass(),
+                                                                                             "ExtractRegistry.parentModuleName.noSpace"), name));
+                                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_VALUE.getTypeID(),
+                                                                         NbBundle.getMessage(this.getClass(),
+                                                                                             "ExtractRegistry.parentModuleName.noSpace"), value));
+                                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),
+                                                                         NbBundle.getMessage(this.getClass(),
+                                                                                             "ExtractRegistry.parentModuleName.noSpace"), artnode.getNodeName()));
                                 bbart.addAttributes(bbattributes);
                             } catch (TskCoreException ex) {
                                 logger.log(Level.SEVERE, "Error adding recent object artifact to blackboard.");
@@ -557,12 +603,12 @@ class ExtractRegistry extends Extract {
 
     @Override
     public String getName() {
-        return "Registry";
+        return NbBundle.getMessage(this.getClass(), "ExtractRegistry.getName");
     }
 
     @Override
     public String getDescription() {
-        return "Extracts activity from the Windows registry utilizing RegRipper.";
+        return NbBundle.getMessage(this.getClass(), "ExtractRegistry.getDesc");
     }
 
     @Override
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java
index fe12e4ae05..1b7efcabc2 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java
@@ -31,6 +31,8 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.services.FileManager;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
 import org.sleuthkit.autopsy.ingest.PipelineContext;
@@ -64,7 +66,7 @@ class Firefox extends Extract {
 
     //hide public constructor to prevent from instantiation by ingest module loader
     Firefox() {
-        moduleName = "FireFox";
+        moduleName = NbBundle.getMessage(Firefox.class, "Firefox.moduleName");
     }
 
     @Override
@@ -91,14 +93,14 @@ class Firefox extends Extract {
         try {
             historyFiles = fileManager.findFiles(dataSource, "%places.sqlite%", "Firefox");
         } catch (TskCoreException ex) {
-            String msg = "Error fetching internet history files for Firefox.";
+            String msg = NbBundle.getMessage(this.getClass(), "Firefox.getHistory.errMsg.errFetchingFiles");
             logger.log(Level.WARNING, msg);
             this.addErrorMessage(this.getName() + ": " + msg);
             return;
         }
         
         if (historyFiles.isEmpty()) {
-            String msg = "No FireFox history files found.";
+            String msg = NbBundle.getMessage(this.getClass(), "Firefox.getHistory.errMsg.noFilesFound");
             logger.log(Level.INFO, msg);
             return;
         }
@@ -117,7 +119,9 @@ class Firefox extends Extract {
                 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);
-                this.addErrorMessage(this.getName() + ": Error while trying to analyze file:" + fileName);
+                this.addErrorMessage(
+                        NbBundle.getMessage(this.getClass(), "Firefox.getHistory.errMsg.errAnalyzeFile", this.getName(),
+                                            fileName));
                 continue;
             }
             File dbFile = new File(temps);
@@ -129,13 +133,30 @@ class Firefox extends Extract {
             logger.log(Level.INFO, moduleName + "- Now getting history from " + temps + " with " + tempList.size() + "artifacts identified.");
             for (HashMap<String, Object> result : tempList) {
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(), "RecentActivity", ((result.get("url").toString() != null) ? result.get("url").toString() : "")));
+                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() : "")));
                 //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(), "RecentActivity", (Long.valueOf(result.get("visit_date").toString()))));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_REFERRER.getTypeID(), "RecentActivity", ((result.get("ref").toString() != null) ? result.get("ref").toString() : "")));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_TITLE.getTypeID(), "RecentActivity", ((result.get("title").toString() != null) ? result.get("title").toString() : "")));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "RecentActivity", "FireFox"));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(), "RecentActivity", (Util.extractDomain((result.get("url").toString() != null) ? 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()))));
+                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() : "")));
+                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() : "")));
+                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() : ""))));
                 this.addArtifact(ARTIFACT_TYPE.TSK_WEB_HISTORY, historyFile, bbattributes);
 
             }
@@ -143,7 +164,8 @@ class Firefox extends Extract {
             dbFile.delete();
         }
 
-        services.fireModuleDataEvent(new ModuleDataEvent("Recent Activity", BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_HISTORY));
+        services.fireModuleDataEvent(new ModuleDataEvent(
+                NbBundle.getMessage(this.getClass(), "Firefox.parentModuleName"), BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_HISTORY));
     }
 
     /**
@@ -158,7 +180,7 @@ class Firefox extends Extract {
         try {
             bookmarkFiles = fileManager.findFiles(dataSource, "places.sqlite", "Firefox");
         } catch (TskCoreException ex) {
-            String msg = "Error fetching bookmark files for Firefox.";
+            String msg = NbBundle.getMessage(this.getClass(), "Firefox.getBookmark.errMsg.errFetchFiles");
             logger.log(Level.WARNING, msg);
             this.addErrorMessage(this.getName() + ": " + msg);
             return;
@@ -182,7 +204,8 @@ class Firefox extends Extract {
                 ContentUtils.writeToFile(bookmarkFile, new File(temps));
             } catch (IOException ex) {
                 logger.log(Level.SEVERE, "Error writing the sqlite db for firefox bookmark artifacts.{0}", ex);
-                this.addErrorMessage(this.getName() + ": Error while trying to analyze file:" + fileName);
+                this.addErrorMessage(NbBundle.getMessage(this.getClass(), "Firefox.getBookmark.errMsg.errAnalyzeFile",
+                                                         this.getName(), fileName));
                 continue;
             }
             File dbFile = new File(temps);
@@ -195,13 +218,28 @@ class Firefox extends Extract {
             for (HashMap<String, Object> result : tempList) {
 
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(), "RecentActivity", ((result.get("url").toString() != null) ? result.get("url").toString() : "")));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_TITLE.getTypeID(), "RecentActivity", ((result.get("title").toString() != null) ? result.get("title").toString() : "")));
+                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() : "")));
+                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) {
-                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_CREATED.getTypeID(), "RecentActivity", (Long.valueOf(result.get("dateAdded").toString()))));
+                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_CREATED.getTypeID(),
+                                                             NbBundle.getMessage(this.getClass(),
+                                                                                 "Firefox.parentModuleName.noSpace"),
+                                                             (Long.valueOf(result.get("dateAdded").toString()))));
                 }
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "RecentActivity", "FireFox"));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(), "RecentActivity", (Util.extractDomain((result.get("url").toString() != null) ? result.get("url").toString() : ""))));
+                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() : ""))));
                 this.addArtifact(ARTIFACT_TYPE.TSK_WEB_BOOKMARK, bookmarkFile, bbattributes);
 
             }
@@ -209,7 +247,8 @@ class Firefox extends Extract {
             dbFile.delete();
         }
 
-        services.fireModuleDataEvent(new ModuleDataEvent("Recent Activity", BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_BOOKMARK));
+        services.fireModuleDataEvent(new ModuleDataEvent(
+                NbBundle.getMessage(this.getClass(), "Firefox.parentModuleName"), BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_BOOKMARK));
     }
 
     /**
@@ -223,7 +262,7 @@ class Firefox extends Extract {
         try {
             cookiesFiles = fileManager.findFiles(dataSource, "cookies.sqlite", "Firefox");
         } catch (TskCoreException ex) {
-            String msg = "Error fetching cookies files for Firefox.";
+            String msg = NbBundle.getMessage(this.getClass(), "Firefox.getCookie.errMsg.errFetchFile");
             logger.log(Level.WARNING, msg);
             this.addErrorMessage(this.getName() + ": " + msg);
             return;
@@ -246,7 +285,9 @@ class Firefox extends Extract {
                 ContentUtils.writeToFile(cookiesFile, new File(temps));
             } catch (IOException ex) {
                 logger.log(Level.SEVERE, "Error writing the sqlite db for firefox cookie artifacts.{0}", ex);
-                this.addErrorMessage(this.getName() + ": Error while trying to analyze file:" + fileName);
+                this.addErrorMessage(
+                        NbBundle.getMessage(this.getClass(), "Firefox.getCookie.errMsg.errAnalyzeFile", this.getName(),
+                                            fileName));
                 continue;
             }
             File dbFile = new File(temps);
@@ -267,25 +308,46 @@ class Firefox extends Extract {
             for (HashMap<String, Object> result : tempList) {
 
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(), "RecentActivity", ((result.get("host").toString() != null) ? result.get("host").toString() : "")));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(), "RecentActivity", (Long.valueOf(result.get("lastAccessed").toString()))));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_NAME.getTypeID(), "RecentActivity", ((result.get("name").toString() != null) ? result.get("name").toString() : "")));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_VALUE.getTypeID(), "RecentActivity", ((result.get("value").toString() != null) ? result.get("value").toString() : "")));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "RecentActivity", "FireFox"));
+                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() : "")));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(),
+                                                                             "Firefox.parentModuleName.noSpace"),
+                                                         (Long.valueOf(result.get("lastAccessed").toString()))));
+                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() : "")));
+                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() : "")));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(),
+                                                                             "Firefox.parentModuleName.noSpace"),
+                                                         NbBundle.getMessage(this.getClass(), "Firefox.moduleName")));
                 
                 if (checkColumn == true) {
-                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_CREATED.getTypeID(), "RecentActivity", (Long.valueOf(result.get("creationTime").toString()))));
+                    bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_CREATED.getTypeID(),
+                                                             NbBundle.getMessage(this.getClass(),
+                                                                                 "Firefox.parentModuleName.noSpace"),
+                                                             (Long.valueOf(result.get("creationTime").toString()))));
                 }
                 String domain = Util.extractDomain(result.get("host").toString());
                 domain = domain.replaceFirst("^\\.+(?!$)", "");
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(), "RecentActivity", domain));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(),
+                                                                             "Firefox.parentModuleName.noSpace"), domain));
                 this.addArtifact(ARTIFACT_TYPE.TSK_WEB_COOKIE, cookiesFile, bbattributes);
             }
             ++j;
             dbFile.delete();
         }
 
-        services.fireModuleDataEvent(new ModuleDataEvent("Recent Activity", BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_COOKIE));
+        services.fireModuleDataEvent(new ModuleDataEvent(
+                NbBundle.getMessage(this.getClass(), "Firefox.parentModuleName"), BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_COOKIE));
     }
     
     /**
@@ -313,7 +375,7 @@ class Firefox extends Extract {
         try {
             downloadsFiles = fileManager.findFiles(dataSource, "downloads.sqlite", "Firefox");
         } catch (TskCoreException ex) {
-            String msg = "Error fetching 'downloads' files for Firefox.";
+            String msg = NbBundle.getMessage(this.getClass(), "Firefox.getDlPre24.errMsg.errFetchFiles");
             logger.log(Level.WARNING, msg);
             this.addErrorMessage(this.getName() + ": " + msg);
             return;
@@ -337,7 +399,8 @@ class Firefox extends Extract {
                 ContentUtils.writeToFile(downloadsFile, new File(temps));
             } catch (IOException ex) {
                 logger.log(Level.SEVERE, "Error writing the sqlite db for firefox download artifacts.{0}", ex);
-                this.addErrorMessage(this.getName() + ": Error while trying to analyze file:" + fileName);
+                this.addErrorMessage(NbBundle.getMessage(this.getClass(), "Firefox.getDlPre24.errMsg.errAnalyzeFiles",
+                                                         this.getName(), fileName));
                 continue;
             }
             File dbFile = new File(temps);
@@ -352,19 +415,31 @@ class Firefox extends Extract {
                 
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
 
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(), "RecentActivity", ((result.get("source").toString() != null) ? result.get("source").toString() : "")));
+                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() : "")));
                 //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(), "RecentActivity", (Long.valueOf(result.get("startTime").toString()))));
+                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED.getTypeID(),
+                                                         NbBundle.getMessage(this.getClass(),
+                                                                             "Firefox.parentModuleName.noSpace"),
+                                                         (Long.valueOf(result.get("startTime").toString()))));
                 
                 String target = result.get("target").toString();
                 
                 if (target != null) {
                     try {
                         String decodedTarget = URLDecoder.decode(target.toString().replaceAll("file:///", ""), "UTF-8");
-                        bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH.getTypeID(), "RecentActivity", decodedTarget));
+                        bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH.getTypeID(),
+                                                                 NbBundle.getMessage(this.getClass(),
+                                                                                     "Firefox.parentModuleName.noSpace"),
+                                                                 decodedTarget));
                         long pathID = Util.findID(dataSource, decodedTarget);
                         if (pathID != -1) {
-                            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH_ID.getTypeID(), "RecentActivity", pathID));
+                            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH_ID.getTypeID(),
+                                                                     NbBundle.getMessage(this.getClass(),
+                                                                                         "Firefox.parentModuleName.noSpace"),
+                                                                     pathID));
                         }
                     } catch (UnsupportedEncodingException ex) {
                         logger.log(Level.SEVERE, "Error decoding Firefox download URL in " + temps, ex);
@@ -372,20 +447,29 @@ class Firefox extends Extract {
                     }
                 }
                     
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "RecentActivity", "FireFox"));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(), "RecentActivity", (Util.extractDomain((result.get("source").toString() != null) ? result.get("source").toString() : ""))));
+                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("source").toString() != null) ? result.get("source").toString() : ""))));
                 this.addArtifact(ARTIFACT_TYPE.TSK_WEB_DOWNLOAD, downloadsFile, bbattributes);
                 
             }
             if (errors > 0) {
-                this.addErrorMessage(this.getName() + ": Error parsing " + errors + " Firefox web history artifacts.");
+                this.addErrorMessage(
+                        NbBundle.getMessage(this.getClass(), "Firefox.getDlPre24.errMsg.errParsingArtifacts",
+                                            this.getName(), errors));
             }
             j++;
             dbFile.delete();
             break;
         }
         
-        services.fireModuleDataEvent(new ModuleDataEvent("Recent Activity", BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_DOWNLOAD));
+        services.fireModuleDataEvent(new ModuleDataEvent(
+                NbBundle.getMessage(this.getClass(), "Firefox.parentModuleName"), BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_DOWNLOAD));
     }
     
     /**
@@ -402,7 +486,7 @@ class Firefox extends Extract {
         try {
             downloadsFiles = fileManager.findFiles(dataSource, "places.sqlite", "Firefox");
         } catch (TskCoreException ex) {
-            String msg = "Error fetching 'downloads' files for Firefox.";
+            String msg = NbBundle.getMessage(this.getClass(), "Firefox.getDlV24.errMsg.errFetchFiles");
             logger.log(Level.WARNING, msg);
             this.addErrorMessage(this.getName() + ": " + msg);
             return;
@@ -426,7 +510,9 @@ class Firefox extends Extract {
                 ContentUtils.writeToFile(downloadsFile, new File(temps));
             } catch (IOException ex) {
                 logger.log(Level.SEVERE, "Error writing the sqlite db for firefox download artifacts.{0}", ex);
-                this.addErrorMessage(this.getName() + ": Error while trying to analyze file:" + fileName);
+                this.addErrorMessage(
+                        NbBundle.getMessage(this.getClass(), "Firefox.getDlV24.errMsg.errAnalyzeFile", this.getName(),
+                                            fileName));
                 continue;
             }
             File dbFile = new File(temps);
@@ -442,7 +528,10 @@ class Firefox extends Extract {
                 
                 Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
 
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL.getTypeID(), "RecentActivity", ((result.get("url").toString() != null) ? result.get("url").toString() : "")));
+                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() : "")));
                 //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()))));
@@ -451,31 +540,48 @@ class Firefox extends Extract {
                 if (target != null) {
                     try {
                         String decodedTarget = URLDecoder.decode(target.toString().replaceAll("file:///", ""), "UTF-8");
-                        bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH.getTypeID(), "RecentActivity", decodedTarget));
+                        bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH.getTypeID(),
+                                                                 NbBundle.getMessage(this.getClass(),
+                                                                                     "Firefox.parentModuleName.noSpace"),
+                                                                 decodedTarget));
                         long pathID = Util.findID(dataSource, decodedTarget);
                         if (pathID != -1) {
-                            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH_ID.getTypeID(), "RecentActivity", pathID));
+                            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH_ID.getTypeID(),
+                                                                     NbBundle.getMessage(this.getClass(),
+                                                                                         "Firefox.parentModuleName.noSpace"),
+                                                                     pathID));
                         }
                     } catch (UnsupportedEncodingException ex) {
                         logger.log(Level.SEVERE, "Error decoding Firefox download URL in " + temps, ex);
                         errors++;
                     }
                 }
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME_ACCESSED.getTypeID(), "RecentActivity", Long.valueOf(result.get("lastModified").toString())));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME.getTypeID(), "RecentActivity", "FireFox"));
-                bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN.getTypeID(), "RecentActivity", (Util.extractDomain((result.get("url").toString() != null) ? 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("lastModified").toString())));
+                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() : ""))));
                 this.addArtifact(ARTIFACT_TYPE.TSK_WEB_DOWNLOAD, downloadsFile, bbattributes);
                 
             }
             if (errors > 0) {
-                this.addErrorMessage(this.getName() + ": Error parsing " + errors + " Firefox web download artifacts.");
+                this.addErrorMessage(NbBundle.getMessage(this.getClass(), "Firefox.getDlV24.errMsg.errParsingArtifacts",
+                                                         this.getName(), errors));
             }
             j++;
             dbFile.delete();
             break;
         }
         
-        services.fireModuleDataEvent(new ModuleDataEvent("Recent Activity", BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_DOWNLOAD));
+        services.fireModuleDataEvent(new ModuleDataEvent(
+                NbBundle.getMessage(this.getClass(), "Firefox.parentModuleName"), BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_DOWNLOAD));
     }
 
     @Override
@@ -493,7 +599,7 @@ class Firefox extends Extract {
 
     @Override
     public String getDescription() {
-        return "Extracts activity from the Mozilla FireFox browser.";
+        return NbBundle.getMessage(this.getClass(), "Firefox.getDesc.text");
     }
 
     @Override
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
index 99f0a6856c..7804d145f9 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
@@ -26,6 +26,8 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.Version;
@@ -61,7 +63,10 @@ public final class RAImageIngestModule extends IngestModuleDataSource {
 
     @Override
     public void process(PipelineContext<IngestModuleDataSource>pipelineContext, Content dataSource, IngestDataSourceWorkerController controller) {
-        services.postMessage(IngestMessage.createMessage(++messageId, MessageType.INFO, this, "Started " + dataSource.getName()));
+        services.postMessage(IngestMessage.createMessage(++messageId, MessageType.INFO, this,
+                                                         NbBundle.getMessage(this.getClass(),
+                                                                             "RAImageIngestModule.process.started",
+                                                                             dataSource.getName())));
         
         controller.switchToDeterminate(modules.size());
         controller.progress(0);
@@ -78,8 +83,10 @@ public final class RAImageIngestModule extends IngestModuleDataSource {
                 module.process(pipelineContext, dataSource, controller);
             } catch (Exception ex) {
                 logger.log(Level.SEVERE, "Exception occurred in " + module.getName(), ex);
-                subCompleted.append(module.getName()).append(" failed - see log for details <br>");
-                errors.add(module.getName() + " had errors -- see log");
+                subCompleted.append(NbBundle.getMessage(this.getClass(), "RAImageIngestModule.process.errModFailed",
+                                                        module.getName()));
+                errors.add(
+                        NbBundle.getMessage(this.getClass(), "RAImageIngestModule.process.errModErrs", module.getName()));
             }
             controller.progress(i + 1);
             errors.addAll(module.getErrorMessages());
@@ -91,33 +98,46 @@ public final class RAImageIngestModule extends IngestModuleDataSource {
         MessageType msgLevel = MessageType.INFO;
         if (errors.isEmpty() == false) {
             msgLevel = MessageType.ERROR;
-            errorMessage.append("<p>Errors encountered during analysis: <ul>\n");
+            errorMessage.append(
+                    NbBundle.getMessage(this.getClass(), "RAImageIngestModule.process.errMsg.errsEncountered"));
             for (String msg : errors) {
                 errorMessage.append("<li>").append(msg).append("</li>\n");
             }
             errorMessage.append("</ul>\n");
 
             if (errors.size() == 1) {
-                errorMsgSubject = "1 error found";
+                errorMsgSubject = NbBundle.getMessage(this.getClass(), "RAImageIngestModule.process.errMsgSub.oneErr");
             } else {
-                errorMsgSubject = errors.size() + " errors found";
+                errorMsgSubject = NbBundle.getMessage(this.getClass(),
+                                                      "RAImageIngestModule.process.errMsgSub.nErrs", errors.size());
             }
         } else {
-            errorMessage.append("<p>No errors encountered.</p>");
-            errorMsgSubject = "No errors reported";
+            errorMessage.append(NbBundle.getMessage(this.getClass(), "RAImageIngestModule.process.errMsg.noErrs"));
+            errorMsgSubject = NbBundle.getMessage(this.getClass(), "RAImageIngestModule.process.errMsgSub.noErrs");
         }
-        final IngestMessage msg = IngestMessage.createMessage(++messageId, msgLevel, this, "Finished " + dataSource.getName()+ " - " + errorMsgSubject, errorMessage.toString());
+        final IngestMessage msg = IngestMessage.createMessage(++messageId, msgLevel, this,
+                                                              NbBundle.getMessage(this.getClass(),
+                                                                                  "RAImageIngestModule.process.ingestMsg.finished",
+                                                                                  dataSource.getName(), errorMsgSubject),
+                                                              errorMessage.toString());
         services.postMessage(msg);
         
         StringBuilder historyMsg = new StringBuilder();
-        historyMsg.append("<p>Browser Data on ").append(dataSource.getName()).append(":<ul>\n");
+        historyMsg.append(
+                NbBundle.getMessage(this.getClass(), "RAImageIngestModule.process.histMsg.title", dataSource.getName()));
         for (Extract module : browserModules) {
             historyMsg.append("<li>").append(module.getName());
-            historyMsg.append(": ").append((module.foundData()) ? " Found." : " Not Found.");
+            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("</ul>");
-        final IngestMessage inboxMsg = IngestMessage.createMessage(++messageId, MessageType.INFO, this, dataSource.getName() + " - Browser Results", historyMsg.toString());
+        final IngestMessage inboxMsg = IngestMessage.createMessage(++messageId, MessageType.INFO, this,
+                                                                   NbBundle.getMessage(this.getClass(),
+                                                                                       "RAImageIngestModule.process.ingestMsg.results",
+                                                                                       dataSource.getName()),
+                                                                   historyMsg.toString());
         services.postMessage(inboxMsg);
     }
 
@@ -132,7 +152,8 @@ public final class RAImageIngestModule extends IngestModuleDataSource {
                 module.complete();
             } catch (Exception ex) {
                 logger.log(Level.SEVERE, "Exception occurred when completing " + module.getName(), ex);
-                subCompleted.append(module.getName()).append(" failed to complete - see log for details <br>");
+                subCompleted.append(NbBundle.getMessage(this.getClass(), "RAImageIngestModule.complete.errMsg.failed",
+                                                        module.getName()));
             }
         }
 
@@ -141,18 +162,18 @@ public final class RAImageIngestModule extends IngestModuleDataSource {
 
     @Override
     public String getName() {
-        return "Recent Activity";
+        return NbBundle.getMessage(this.getClass(), "RAImageIngestModule.getName");
     }
 
     @Override
     public String getDescription() {
-        return "Extracts recent user activity, such as Web browsing, recently used documents and installed programs.";
+        return NbBundle.getMessage(this.getClass(), "RAImageIngestModule.getDesc");
     }
 
     @Override
     public void init(IngestModuleInit initContext) throws IngestModuleException {
         modules = new ArrayList<>();
-        browserModules = new ArrayList();
+        browserModules = new ArrayList<>();
         logger.log(Level.INFO, "init() {0}", this.toString());
         services = IngestServices.getDefault();
 
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentDocumentsByLnk.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentDocumentsByLnk.java
index e304df8c7b..fe6aa4caff 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentDocumentsByLnk.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentDocumentsByLnk.java
@@ -26,6 +26,8 @@ package org.sleuthkit.autopsy.recentactivity;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import java.util.Collection;
 import org.sleuthkit.autopsy.coreutils.JLNK;
@@ -66,7 +68,9 @@ class RecentDocumentsByLnk extends Extract  {
             recentFiles = fileManager.findFiles(dataSource, "%.lnk", "Recent");
         } catch (TskCoreException ex) {
             logger.log(Level.WARNING, "Error searching for .lnk files.");
-            this.addErrorMessage(this.getName() + ": Error getting lnk Files.");
+            this.addErrorMessage(
+                    NbBundle.getMessage(this.getClass(), "RecentDocumentsByLnk.getRecDoc.errMsg.errGetLnkFiles",
+                                        this.getName()));
             return;
         }
 
@@ -94,19 +98,32 @@ class RecentDocumentsByLnk extends Extract  {
                         || 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);
-                    this.addErrorMessage(this.getName() + ": Error parsing Recent File " + recentFile.getName());
+                    this.addErrorMessage(
+                            NbBundle.getMessage(this.getClass(), "RecentDocumentsByLnk.getRecDoc.errParsingFile",
+                                                this.getName(), recentFile.getName()));
                 }
                 continue;
             }
            
             Collection<BlackboardAttribute> bbattributes = new ArrayList<BlackboardAttribute>();
             String path = lnk.getBestPath();
-            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH.getTypeID(), "RecentActivity", path));
-            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH_ID.getTypeID(), "RecentActivity", Util.findID(dataSource, path)));
-            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(), "RecentActivity", recentFile.getCrtime()));
+            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH.getTypeID(),
+                                                     NbBundle.getMessage(this.getClass(),
+                                                                         "RecentDocumentsByLnk.parentModuleName.noSpace"),
+                                                     path));
+            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH_ID.getTypeID(),
+                                                     NbBundle.getMessage(this.getClass(),
+                                                                         "RecentDocumentsByLnk.parentModuleName.noSpace"),
+                                                     Util.findID(dataSource, path)));
+            bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME.getTypeID(),
+                                                     NbBundle.getMessage(this.getClass(),
+                                                                         "RecentDocumentsByLnk.parentModuleName.noSpace"),
+                                                     recentFile.getCrtime()));
             this.addArtifact(ARTIFACT_TYPE.TSK_RECENT_OBJECT, recentFile, bbattributes);
         }
-        services.fireModuleDataEvent(new ModuleDataEvent("Recent Activity", BlackboardArtifact.ARTIFACT_TYPE.TSK_RECENT_OBJECT));
+        services.fireModuleDataEvent(new ModuleDataEvent(
+                NbBundle.getMessage(this.getClass(), "RecentDocumentsByLnk.parentModuleName"),
+                BlackboardArtifact.ARTIFACT_TYPE.TSK_RECENT_OBJECT));
     }
 
     @Override
@@ -137,7 +154,7 @@ class RecentDocumentsByLnk extends Extract  {
 
     @Override
     public String getDescription() {
-        return "Extracts recent documents in windows.";
+        return NbBundle.getMessage(this.getClass(), "RecentDocumentsByLnk.getDesc.text");
     }
 
     @Override
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java
index 24da74feef..4b9f867803 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java
@@ -33,6 +33,8 @@ import java.util.logging.Level;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 import org.sleuthkit.autopsy.coreutils.XMLUtil;
 import org.sleuthkit.autopsy.ingest.PipelineContext;
@@ -66,7 +68,8 @@ class SearchEngineURLQueryAnalyzer extends Extract {
 
     private IngestServices services;
     
-    private static final String MODULE_NAME = "Search Engine URL Query Analyzer";
+    private static final String MODULE_NAME = NbBundle.getMessage(SearchEngineURLQueryAnalyzer.class,
+                                                                  "SearchEngineURLQueryAnalyzer.moduleName.text");
     private final static String MODULE_VERSION = "1.0";
     
     private static final String XMLFILE = "SEUQAMappings.xml";
@@ -76,7 +79,10 @@ class SearchEngineURLQueryAnalyzer extends Extract {
     private static String[] searchEngineNames;
     private static SearchEngineURLQueryAnalyzer.SearchEngine[] engines;
     private static Document xmlinput;
-    private static final SearchEngineURLQueryAnalyzer.SearchEngine NullEngine = new SearchEngineURLQueryAnalyzer.SearchEngine("NONE", "NONE", new HashMap<String,String>());
+    private static final SearchEngineURLQueryAnalyzer.SearchEngine NullEngine = new SearchEngineURLQueryAnalyzer.SearchEngine(
+            NbBundle.getMessage(SearchEngineURLQueryAnalyzer.class, "SearchEngineURLQueryAnalyzer.engineName.none"),
+            NbBundle.getMessage(SearchEngineURLQueryAnalyzer.class, "SearchEngineURLQueryAnalyzer.domainSubStr.none"),
+            new HashMap<String,String>());
 
     
     //hide public constructor to prevent from instantiation by ingest module loader
@@ -123,7 +129,8 @@ class SearchEngineURLQueryAnalyzer extends Extract {
             for(Map.Entry<String,String> kvp : getSplits()){
                 split = split + "[ " + kvp.getKey() + " :: " +  kvp.getValue() + " ]" + ", ";
             }
-            return "Name: " + _engineName + "\n Domain Substring: " + _domainSubstring + "\n count: " + _count + "\n Split Tokens: \n " + split;
+            return NbBundle.getMessage(this.getClass(), "SearchEngineURLQueryAnalyzer.toString",
+                                       _engineName, _domainSubstring, _count, split);
         }
                 
     }
@@ -310,7 +317,9 @@ class SearchEngineURLQueryAnalyzer extends Extract {
             if (controller.isCancelled()) {
                 logger.info("Operation terminated by user.");
             }
-            services.fireModuleDataEvent(new ModuleDataEvent("RecentActivity", BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_SEARCH_QUERY));
+            services.fireModuleDataEvent(new ModuleDataEvent(
+                    NbBundle.getMessage(this.getClass(), "SearchEngineURLQueryAnalyzer.parentModuleName.noSpace"),
+                    BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_SEARCH_QUERY));
             logger.info("Extracted " + totalQueries + " queries from the blackboard");
         }
     }
@@ -395,7 +404,7 @@ class SearchEngineURLQueryAnalyzer extends Extract {
         for(String name : searchEngineNames){
             total += name + "\n";
         }
-        return "Extracts search queries on the following search engines: \n" + total;
+        return NbBundle.getMessage(this.getClass(), "SearchEngineURLQueryAnalyzer.getDesc", total);
     }
 
     @Override
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
index c27d216ae8..9c6ea411ee 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java
@@ -22,6 +22,7 @@
  */
 package org.sleuthkit.autopsy.recentactivity;
 
+import org.sleuthkit.autopsy.coreutils.SQLiteDBConnect;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
diff --git a/ScalpelCarver/nbproject/project.xml b/ScalpelCarver/nbproject/project.xml
index 09a3bb2f87..05eecf644b 100644
--- a/ScalpelCarver/nbproject/project.xml
+++ b/ScalpelCarver/nbproject/project.xml
@@ -6,6 +6,14 @@
             <code-name-base>org.sleuthkit.autopsy.scalpel</code-name-base>
             <suite-component/>
             <module-dependencies>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>8.25.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
                     <build-prerequisite/>
diff --git a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/Bundle.properties b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/Bundle.properties
index 7bef33de95..2b5483a453 100644
--- a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/Bundle.properties
+++ b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/Bundle.properties
@@ -4,3 +4,6 @@ OpenIDE-Module-Long-Description=\
     Carves files from unallocated space at ingest time.\n\
     Carved files are reanalyzed and displayed in the directory tree.
 OpenIDE-Module-Short-Description=Carves files from unallocated space
+ScalpelCarverIngestModule.moduleName=Scalpel Carver
+ScalpelCarverIngestModule.moduleDesc.text=Carves files from unallocated space at ingest time.\
+Carved files are reanalyzed and displayed in the directory tree.
diff --git a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/Bundle_ja.properties b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/Bundle_ja.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverIngestModule.java b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverIngestModule.java
index 98bfbdf29c..619fd17ae7 100644
--- a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverIngestModule.java
+++ b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverIngestModule.java
@@ -23,6 +23,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
@@ -55,8 +57,8 @@ class ScalpelCarverIngestModule { // extends IngestModuleAbstractFile { // disab
     private static final Logger logger = Logger.getLogger(ScalpelCarverIngestModule.class.getName());
     
     private static ScalpelCarverIngestModule instance;
-    private final String MODULE_NAME = "Scalpel Carver";
-    private final String MODULE_DESCRIPTION = "Carves files from unallocated space at ingest time.\nCarved files are reanalyzed and displayed in the directory tree.";
+    private final String MODULE_NAME = NbBundle.getMessage(ScalpelCarverIngestModule.class, "ScalpelCarverIngestModule.moduleName");
+    private final String MODULE_DESCRIPTION = NbBundle.getMessage(ScalpelCarverIngestModule.class,                                                                  "ScalpelCarverIngestModule.moduleDesc.text");
     private final String MODULE_VERSION = Version.getVersion();
     private final String MODULE_OUTPUT_DIR_NAME = "ScalpelCarver";
     private String moduleOutputDirPath;
diff --git a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/Bundle.properties b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/Bundle.properties
new file mode 100644
index 0000000000..846b5613c8
--- /dev/null
+++ b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/Bundle.properties
@@ -0,0 +1,8 @@
+ScalpelCarver.loadLib.errMsg.cannotLoadLib=Could not load library {0} for your environment
+ScalpelCarver.loadLib.errMsg.cannotLoadLib2=Could not load library {0} for your environment
+ScalpelCarver.carve.exception.libNotInit=Scalpel library is not fully initialized.
+ScalpelCarver.carve.exception.invalidArgs=Invalid arguments for scalpel carving.
+ScalpelCarver.carve.exception.cannotReadConfig=Cannot read libscalpel config file\: {0}
+ScalpelCarver.carve.exception.cannotWriteConfig=Cannot write to libscalpel output dir\: {0}
+ScalpelOutputParser.outputStart.text=The following files were carved\:
+ScalpelOutputParser.toString.text=CarvedFileMeta'{'fileName\={0}, start\: {1}, size\: {2}'}'
\ No newline at end of file
diff --git a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/Bundle_ja.properties b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/Bundle_ja.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/ScalpelCarver.java b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/ScalpelCarver.java
index 00a1913bd5..70ea7cd029 100644
--- a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/ScalpelCarver.java
+++ b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/ScalpelCarver.java
@@ -25,6 +25,8 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.scalpel.jni.ScalpelOutputParser.CarvedFileMeta;
 import org.sleuthkit.datamodel.AbstractFile;
@@ -76,11 +78,11 @@ public class ScalpelCarver {
             System.loadLibrary(id);
             success = true;
         } catch (UnsatisfiedLinkError ex) {
-            String msg = "Could not load library " + id + " for your environment ";
+            String msg = NbBundle.getMessage(ScalpelCarver.class, "ScalpelCarver.loadLib.errMsg.cannotLoadLib", id);
             System.out.println(msg + ex.toString());
             logger.log(Level.SEVERE, msg, ex);
         } catch (Exception ex) {
-            String msg = "Could not load library " + id + " for your environment ";
+            String msg = NbBundle.getMessage(ScalpelCarver.class, "ScalpelCarver.loadLib.errMsg.cannotLoadLib2", id);
             System.out.println(msg + ex.toString());
             logger.log(Level.SEVERE, msg, ex);
         }
@@ -113,24 +115,28 @@ public class ScalpelCarver {
      */
     public List<CarvedFileMeta> carve(AbstractFile file, String configFilePath, String outputFolderPath) throws ScalpelException {
         if (!initialized) {
-            throw new ScalpelException("Scalpel library is not fully initialized. ");
+            throw new ScalpelException(NbBundle.getMessage(this.getClass(), "ScalpelCarver.carve.exception.libNotInit"));
         }
 
         //basic check of arguments before going to jni land
         if (file == null || configFilePath == null || configFilePath.isEmpty()
                 || outputFolderPath == null || outputFolderPath.isEmpty()) {
-            throw new ScalpelException("Invalid arguments for scalpel carving. ");
+            throw new ScalpelException(NbBundle.getMessage(this.getClass(), "ScalpelCarver.carve.exception.invalidArgs"));
         }
         
         //validate the paths passed in
         File config = new File(configFilePath);
         if (! config.exists() || ! config.canRead()) {
-            throw new ScalpelException("Cannot read libscalpel config file: " + configFilePath);
+            throw new ScalpelException(
+                    NbBundle.getMessage(this.getClass(), "ScalpelCarver.carve.exception.cannotReadConfig",
+                                        configFilePath));
         }
         
         File outDir = new File(outputFolderPath);
         if (! outDir.exists() || ! outDir.canWrite()) {
-            throw new ScalpelException("Cannot write to libscalpel output dir: " + outputFolderPath);
+            throw new ScalpelException(
+                    NbBundle.getMessage(this.getClass(), "ScalpelCarver.carve.exception.cannotWriteConfig",
+                                        outputFolderPath));
         }
 
         final String carverInputId = file.getId() + ": " + file.getName();
diff --git a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/ScalpelOutputParser.java b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/ScalpelOutputParser.java
index 6b78ee5131..ac18bac6d6 100644
--- a/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/ScalpelOutputParser.java
+++ b/ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/ScalpelOutputParser.java
@@ -25,6 +25,8 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+
+import org.openide.util.NbBundle;
 import org.sleuthkit.datamodel.TskFileRange;
 
 /**
@@ -32,7 +34,8 @@ import org.sleuthkit.datamodel.TskFileRange;
  */
 public class ScalpelOutputParser {
     
-    private static final String OUTPUT_START = "The following files were carved:";
+    private static final String OUTPUT_START = NbBundle.getMessage(ScalpelOutputParser.class,
+                                                                   "ScalpelOutputParser.outputStart.text");
     
     public static class CarvedFileMeta {
 
@@ -62,7 +65,8 @@ public class ScalpelOutputParser {
 
         @Override
         public String toString() {
-            return "CarvedFileMeta{" + "fileName=" + fileName + ", start: " + byteRange.getByteStart() + ", size: " + byteRange.getByteLen() + '}';
+            return NbBundle.getMessage(this.getClass(), "ScalpelOutputParser.toString.text",
+                                       fileName, byteRange.getByteStart(), byteRange.getByteLen());
         }
     }
     
diff --git a/SevenZip/manifest.mf b/SevenZip/manifest.mf
index ca53e48be8..9999013410 100644
--- a/SevenZip/manifest.mf
+++ b/SevenZip/manifest.mf
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.sleuthkit.autopsy.sevenzip/1
-OpenIDE-Module-Implementation-Version: 3
+OpenIDE-Module-Implementation-Version: 4
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/sevenzip/Bundle.properties
 
 
diff --git a/SevenZip/nbproject/project.properties b/SevenZip/nbproject/project.properties
index 1dad6ce7d2..98d7408800 100644
--- a/SevenZip/nbproject/project.properties
+++ b/SevenZip/nbproject/project.properties
@@ -4,5 +4,5 @@ license.file=../LICENSE-2.0.txt
 nbm.homepage=http://www.sleuthkit.org/autopsy/
 nbm.module.author=Brian Carrier
 nbm.needs.restart=true
-spec.version.base=1.0.0
+spec.version.base=1.0
 
diff --git a/SevenZip/nbproject/project.xml b/SevenZip/nbproject/project.xml
index ef6d94d674..726dc97bd9 100644
--- a/SevenZip/nbproject/project.xml
+++ b/SevenZip/nbproject/project.xml
@@ -15,13 +15,21 @@
                         <specification-version>1.32.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>8.25.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>9</release-version>
-                        <specification-version>7.0</specification-version>
+                        <specification-version>7.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/Bundle.properties b/SevenZip/src/org/sleuthkit/autopsy/sevenzip/Bundle.properties
index 1bbc7f018b..f0540e3482 100644
--- a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/Bundle.properties
+++ b/SevenZip/src/org/sleuthkit/autopsy/sevenzip/Bundle.properties
@@ -7,3 +7,25 @@ OpenIDE-Module-Long-Description=\
     The module is supported on Windows, Linux and Mac operating systems.
 OpenIDE-Module-Name=SevenZip
 OpenIDE-Module-Short-Description=7Zip Ingest Module
+SevenZipContentReadStream.seek.exception.invalidOrigin=Invalid seek origin\: {0}
+SevenZipContentReadStream.read.exception.errReadStream=Error reading content stream.
+SevenZipIngestModule.moduleName=Archive Extractor
+SevenZipIngestModule.moduleDesc.text=Extracts archive files (zip, rar, arj, 7z, gzip, bzip2, tar), reschedules them to current ingest and populates directory tree with new files.
+SevenZipIngestModule.encryptionFileLevel=File-level Encryption
+SevenZipIngestModule.encryptionFull=Full Encryption
+SevenZipIngestModule.init.errInitModule.msg=Error initializing {0}
+SevenZipIngestModule.init.errInitModule.details=Error initializing output dir\: {0}\: {1}
+SevenZipIngestModule.init.errCantInitLib=Could not initialize 7-ZIP library\: {0}
+SevenZipIngestModule.isZipBombCheck.warnMsg=Possible ZIP bomb detected in archive\: {0}, item\: {1}
+SevenZipIngestModule.isZipBombCheck.warnDetails=The archive item compression ratio is {0}, skipping processing of this archive item.
+SevenZipIngestModule.unpack.warnMsg.zipBomb=Possible ZIP bomb detected\: {0}
+SevenZipIngestModule.unpack.warnDetails.zipBomb=The archive is {0} levels deep, skipping processing of this archive and its contents
+SevenZipIngestModule.unpack.unknownPath.msg=Unknown item path in archive\: {0}, will use\: {1}
+SevenZipIngestModule.unpack.notEnoughDiskSpace.msg=Not enough disk space to unpack archive item\: {0}, {1}
+SevenZipIngestModule.unpack.notEnoughDiskSpace.details=The archive item is too large to unpack, skipping unpacking this item.
+SevenZipIngestModule.unpack.errUnpacking.msg=Error unpacking {0}
+SevenZipIngestModule.unpack.errUnpacking.details=Error unpacking  {0}. {1}
+SevenZipIngestModule.unpack.encrFileDetected.msg=Encrypted files in archive detected.
+SevenZipIngestModule.unpack.encrFileDetected.details=Some files in archive\: {0} are encrypted. {1} extractor was unable to extract all files from this archive.
+SevenZipIngestModule.UnpackStream.write.exception.msg=Error writing unpacked file to\: {0}
+SevenZipIngestModule.UnpackedTree.exception.msg=Error adding a derived file to db\:{0}
diff --git a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/Bundle_ja.properties b/SevenZip/src/org/sleuthkit/autopsy/sevenzip/Bundle_ja.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipContentReadStream.java b/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipContentReadStream.java
index 8f091f176a..9e180e7829 100644
--- a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipContentReadStream.java
+++ b/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipContentReadStream.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.util.logging.Level;
 import net.sf.sevenzipjbinding.IInStream;
 import net.sf.sevenzipjbinding.SevenZipException;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.ReadContentInputStream;
 
@@ -57,7 +58,9 @@ public class SevenZipContentReadStream implements IInStream {
                 newPosition = wrapped.seek(offset);
                 break;
             default:
-                throw new IllegalArgumentException("Invalid seek origin: " + origin);
+                throw new IllegalArgumentException(
+                        NbBundle.getMessage(this.getClass(), "SevenZipContentReadStream.seek.exception.invalidOrigin",
+                                            origin));
         }
         
         return newPosition;
@@ -82,7 +85,7 @@ public class SevenZipContentReadStream implements IInStream {
             return readBytes;
             
         } catch (IOException ex) {
-            String msg = "Error reading content stream.";
+            String msg = NbBundle.getMessage(this.getClass(), "SevenZipContentReadStream.read.exception.errReadStream");
             logger.log(Level.SEVERE, msg, ex);
             throw new SevenZipException(msg, ex);
         }
diff --git a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java b/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java
index 0d4637221e..3eb6067e57 100644
--- a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java
+++ b/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java
@@ -32,6 +32,7 @@ import java.util.List;
 import java.util.logging.Level;
 import net.sf.sevenzipjbinding.ISequentialOutStream;
 import net.sf.sevenzipjbinding.ISevenZipInArchive;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile;
 import org.sleuthkit.autopsy.ingest.IngestModuleInit;
@@ -69,8 +70,9 @@ import org.sleuthkit.datamodel.TskData;
 public final class SevenZipIngestModule extends IngestModuleAbstractFile {
 
     private static final Logger logger = Logger.getLogger(SevenZipIngestModule.class.getName());
-    public static final String MODULE_NAME = "Archive Extractor";
-    public static final String MODULE_DESCRIPTION = "Extracts archive files (zip, rar, arj, 7z, gzip, bzip2, tar), reschedules them to current ingest and populates directory tree with new files.";
+    public static final String MODULE_NAME = NbBundle.getMessage(SevenZipIngestModule.class, "SevenZipIngestModule.moduleName");
+    public static final String MODULE_DESCRIPTION = NbBundle.getMessage(SevenZipIngestModule.class,
+                                                                        "SevenZipIngestModule.moduleDesc.text");
     final public static String MODULE_VERSION = Version.getVersion();
     private IngestServices services;
     private volatile int messageID = 0;
@@ -82,8 +84,10 @@ public final class SevenZipIngestModule extends IngestModuleAbstractFile {
     private String unpackDirPath; //absolute, to extract to
     private FileManager fileManager;
     //encryption type strings
-    private static final String ENCRYPTION_FILE_LEVEL = "File-level Encryption";
-    private static final String ENCRYPTION_FULL = "Full Encryption";
+    private static final String ENCRYPTION_FILE_LEVEL = NbBundle.getMessage(SevenZipIngestModule.class,
+                                                                            "SevenZipIngestModule.encryptionFileLevel");
+    private static final String ENCRYPTION_FULL = NbBundle.getMessage(SevenZipIngestModule.class,
+                                                                      "SevenZipIngestModule.encryptionFull");
     //zip bomb detection
     private static final int MAX_DEPTH = 4;
     private static final int MAX_COMPRESSION_RATIO = 600;
@@ -130,8 +134,11 @@ public final class SevenZipIngestModule extends IngestModuleAbstractFile {
                 unpackDirPathFile.mkdirs();
             } catch (SecurityException e) {
                 logger.log(Level.SEVERE, "Error initializing output dir: " + unpackDirPath, e);
-                String msg = "Error initializing " + MODULE_NAME;
-                String details = "Error initializing output dir: " + unpackDirPath + ": " + e.getMessage();
+                String msg = NbBundle.getMessage(this.getClass(),
+                                                 "SevenZipIngestModule.init.errInitModule.msg", MODULE_NAME);
+                String details = NbBundle.getMessage(this.getClass(),
+                                                     "SevenZipIngestModule.init.errInitModule.details",
+                                                     unpackDirPath, e.getMessage());
                 //MessageNotifyUtil.Notify.error(msg, details);
                 services.postMessage(IngestMessage.createErrorMessage(++messageID, instance, msg, details));
                 throw e;
@@ -144,8 +151,10 @@ public final class SevenZipIngestModule extends IngestModuleAbstractFile {
             logger.log(Level.INFO, "7-Zip-JBinding library was initialized on supported platform: " + platform);
         } catch (SevenZipNativeInitializationException e) {
             logger.log(Level.SEVERE, "Error initializing 7-Zip-JBinding library", e);
-            String msg = "Error initializing " + MODULE_NAME;
-            String details = "Could not initialize 7-ZIP library: " + e.getMessage();
+            String msg = NbBundle.getMessage(this.getClass(), "SevenZipIngestModule.init.errInitModule.msg",
+                                             MODULE_NAME);
+            String details = NbBundle.getMessage(this.getClass(), "SevenZipIngestModule.init.errCantInitLib",
+                                                 e.getMessage());
             //MessageNotifyUtil.Notify.error(msg, details);
             services.postMessage(IngestMessage.createErrorMessage(++messageID, instance, msg, details));
             throw new RuntimeException(e);
@@ -274,10 +283,10 @@ public final class SevenZipIngestModule extends IngestModuleAbstractFile {
                 String itemName = archiveFileItem.getPath();
                 logger.log(Level.INFO, "Possible zip bomb detected, compression ration: " + cRatio
                         + " for in archive item: " + itemName);
-                String msg = "Possible ZIP bomb detected in archive: " + archiveName
-                        + ", item: " + itemName;
-                String details = "The archive item compression ratio is " + cRatio
-                        + ", skipping processing of this archive item. ";
+                String msg = NbBundle.getMessage(this.getClass(),
+                                                 "SevenZipIngestModule.isZipBombCheck.warnMsg", archiveName, itemName);
+                String details = NbBundle.getMessage(this.getClass(),
+                                                     "SevenZipIngestModule.isZipBombCheck.warnDetails", cRatio);
                 //MessageNotifyUtil.Notify.error(msg, details);
                 services.postMessage(IngestMessage.createWarningMessage(++messageID, instance, msg, details));
 
@@ -308,9 +317,11 @@ public final class SevenZipIngestModule extends IngestModuleAbstractFile {
         if (parentAr == null) {
             parentAr = archiveDepthCountTree.addArchive(null, archiveId);
         } else if (parentAr.getDepth() == MAX_DEPTH) {
-            String msg = "Possible ZIP bomb detected: " + archiveFile.getName();
-            String details = "The archive is " + parentAr.getDepth()
-                    + " levels deep, skipping processing of this archive and its contents ";
+            String msg = NbBundle.getMessage(this.getClass(),
+                                             "SevenZipIngestModule.unpack.warnMsg.zipBomb", archiveFile.getName());
+            String details = NbBundle.getMessage(this.getClass(),
+                                                 "SevenZipIngestModule.unpack.warnDetails.zipBomb",
+                                                 parentAr.getDepth());
             //MessageNotifyUtil.Notify.error(msg, details);
             services.postMessage(IngestMessage.createWarningMessage(++messageID, instance, msg, details));
             return unpackedFiles;
@@ -390,7 +401,8 @@ public final class SevenZipIngestModule extends IngestModuleAbstractFile {
                         extractedPath = "/" + useName;
                     }
                     
-                    String msg = "Unknown item path in archive: " + archiveFile.getName() + ", will use: " + extractedPath;
+                    String msg = NbBundle.getMessage(this.getClass(), "SevenZipIngestModule.unpack.unknownPath.msg",
+                                                     archiveFile.getName(), extractedPath);
                     logger.log(Level.WARNING, msg);
                     
                 }
@@ -432,8 +444,11 @@ public final class SevenZipIngestModule extends IngestModuleAbstractFile {
                 if (freeDiskSpace != IngestMonitor.DISK_FREE_SPACE_UNKNOWN && size > 0) { //if known free space and file not empty
                     long newDiskSpace = freeDiskSpace - size;
                     if (newDiskSpace < MIN_FREE_DISK_SPACE) {
-                        String msg = "Not enough disk space to unpack archive item: " + archiveFile.getName() + ", " + fileName;
-                        String details = "The archive item is too large to unpack, skipping unpacking this item. ";
+                        String msg = NbBundle.getMessage(this.getClass(),
+                                                         "SevenZipIngestModule.unpack.notEnoughDiskSpace.msg",
+                                                         archiveFile.getName(), fileName);
+                        String details = NbBundle.getMessage(this.getClass(),
+                                                             "SevenZipIngestModule.unpack.notEnoughDiskSpace.details");
                         //MessageNotifyUtil.Notify.error(msg, details);
                         services.postMessage(IngestMessage.createErrorMessage(++messageID, instance, msg, details));
                         logger.log(Level.INFO, "Skipping archive item due not sufficient disk space for this item: " + archiveFile.getName() + ", " + fileName);
@@ -528,8 +543,11 @@ public final class SevenZipIngestModule extends IngestModuleAbstractFile {
 
             // print a message if the file is allocated
             if (archiveFile.isMetaFlagSet(TskData.TSK_FS_META_FLAG_ENUM.ALLOC)) {
-                String msg = "Error unpacking " + archiveFile.getName();
-                String details = "Error unpacking  " + fullName + ". " + ex.getMessage();
+                String msg = NbBundle.getMessage(this.getClass(), "SevenZipIngestModule.unpack.errUnpacking.msg",
+                                                 archiveFile.getName());
+                String details = NbBundle.getMessage(this.getClass(),
+                                                     "SevenZipIngestModule.unpack.errUnpacking.details",
+                                                     fullName, ex.getMessage());
                 services.postMessage(IngestMessage.createErrorMessage(++messageID, instance, msg, details));
             }
         } finally {
@@ -565,9 +583,10 @@ public final class SevenZipIngestModule extends IngestModuleAbstractFile {
                 logger.log(Level.SEVERE, "Error creating blackboard artifact for encryption detected for file: " + archiveFile, ex);
             }
 
-            String msg = "Encrypted files in archive detected. ";
-            String details = "Some files in archive: " + archiveFile.getName() + " are encrypted. "
-                    + MODULE_NAME + " extractor was unable to extract all files from this archive.";
+            String msg = NbBundle.getMessage(this.getClass(), "SevenZipIngestModule.unpack.encrFileDetected.msg");
+            String details = NbBundle.getMessage(this.getClass(),
+                                                 "SevenZipIngestModule.unpack.encrFileDetected.details",
+                                                 archiveFile.getName(), MODULE_NAME);
             // MessageNotifyUtil.Notify.info(msg, details);
 
             services.postMessage(IngestMessage.createWarningMessage(++messageID, instance, msg, details));
@@ -693,7 +712,9 @@ public final class SevenZipIngestModule extends IngestModuleAbstractFile {
             try {
                 output.write(bytes);
             } catch (IOException ex) {
-                throw new SevenZipException("Error writing unpacked file to: " + localAbsPath, ex);
+                throw new SevenZipException(
+                        NbBundle.getMessage(this.getClass(), "SevenZipIngestModule.UnpackStream.write.exception.msg",
+                                            localAbsPath), ex);
             }
             return bytes.length;
         }
@@ -833,7 +854,9 @@ public final class SevenZipIngestModule extends IngestModuleAbstractFile {
 
             } catch (TskCoreException ex) {
                 logger.log(Level.SEVERE, "Error adding a derived file to db:" + fileName, ex);
-                throw new TskCoreException("Error adding a derived file to db:" + fileName, ex);
+                throw new TskCoreException(
+                        NbBundle.getMessage(this.getClass(), "SevenZipIngestModule.UnpackedTree.exception.msg",
+                                            fileName), ex);
             }
 
             //recurse
diff --git a/Testing/test/qa-functional/src/org/sleuthkit/autopsy/testing/RegressionTest.java b/Testing/test/qa-functional/src/org/sleuthkit/autopsy/testing/RegressionTest.java
index b331d47518..724f0ac53d 100755
--- a/Testing/test/qa-functional/src/org/sleuthkit/autopsy/testing/RegressionTest.java
+++ b/Testing/test/qa-functional/src/org/sleuthkit/autopsy/testing/RegressionTest.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");
@@ -48,7 +48,9 @@ import org.netbeans.jellytools.MainWindowOperator;
 import org.netbeans.jellytools.NbDialogOperator;
 import org.netbeans.jellytools.WizardOperator;
 import org.netbeans.jemmy.Timeout;
+import org.netbeans.jemmy.Timeouts;
 import org.netbeans.jemmy.operators.JButtonOperator;
+import org.netbeans.jemmy.operators.JListOperator;
 import org.netbeans.jemmy.operators.JCheckBoxOperator;
 import org.netbeans.jemmy.operators.JDialogOperator;
 import org.netbeans.jemmy.operators.JFileChooserOperator;
@@ -117,6 +119,7 @@ public class RegressionTest extends TestCase {
     public void setUp() {
 
         logger.info("########  " + System.getProperty("img_path") + "  #######");
+        Timeouts.setDefault("ComponentOperator.WaitComponentTimeout", 1000000);
     }
 
     /**
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle.properties b/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle.properties
index ac06311ca1..b997744697 100644
--- a/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle.properties
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle.properties
@@ -4,6 +4,29 @@ OpenIDE-Module-Long-Description=\
     Events for a selected day are viewable in the built-in result and content viewers.
 OpenIDE-Module-Name=Timeline
 CTL_MakeTimeline="Make Timeline (Beta)"
+CTL_TimelineView=Generate Timeline
 OpenIDE-Module-Short-Description=Displays user activity timeline
 TimelineProgressDialog.jLabel1.text=Creating timeline . . .
 TimelineFrame.title=Timeline
+Timeline.frameName.text={0} - Autopsy Timeline (Beta)
+Timeline.resultsPanel.title=Timeline Results
+Timeline.getName=Make Timeline (Beta)
+Timeline.runJavaFxThread.progress.creating=Creating timeline . . .
+Timeline.runJavaFxThread.progress.genBodyFile=Generating Bodyfile
+Timeline.runJavaFxThread.progress.genMacTime=Generating Mactime
+Timeline.runJavaFxThread.progress.parseMacTime=Parsing Mactime
+Timeline.zoomOutButton.text=Zoom Out
+Timeline.goToButton.text=Go To\:
+Timeline.yearBarChart.x.years=Years
+Timeline.yearBarChart.y.numEvents=Number of Events
+Timeline.MonthsBarChart.x.monthYY=Month ({0})
+Timeline.MonthsBarChart.y.numEvents=Number of Events
+Timeline.eventsByMoBarChart.x.dayOfMo=Day of Month
+Timeline.eventsByMoBarChart.y.numEvents=Number of Events
+Timeline.node.emptyRoot=Empty Root
+Timeline.resultPanel.loading=Loading...
+Timeline.node.root=Root
+Timeline.propChg.confDlg.timelineOOD.msg=Timeline is out of date. Would you like to regenerate it?
+Timeline.propChg.confDlg.timelineOOD.details=Select an option
+Timeline.initTimeline.confDlg.genBeforeIngest.msg=You are trying to generate a timeline before ingest has been completed. The timeline may be incomplete. Do you want to continue?
+Timeline.initTimeline.confDlg.genBeforeIngest.deails=Timeline
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle_ja.properties b/Timeline/src/org/sleuthkit/autopsy/timeline/Bundle_ja.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Timeline/src/org/sleuthkit/autopsy/timeline/Timeline.java b/Timeline/src/org/sleuthkit/autopsy/timeline/Timeline.java
index 7503d3147b..c21e7a5649 100644
--- a/Timeline/src/org/sleuthkit/autopsy/timeline/Timeline.java
+++ b/Timeline/src/org/sleuthkit/autopsy/timeline/Timeline.java
@@ -108,7 +108,7 @@ import org.sleuthkit.datamodel.TskCoreException;
 @ActionRegistration(displayName = "#CTL_MakeTimeline", lazy = false)
 @ActionReferences(value = {
     @ActionReference(path = "Menu/Tools", position = 100)})
-@NbBundle.Messages(value = "CTL_TimelineView=Generate Timeline")
+//@NbBundle.Messages(value = "CTL_TimelineView=Generate Timeline")
 /**
  * The Timeline Action entry point. Collects data and pushes data to javafx
  * widgets
@@ -132,6 +132,7 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
     private ComboBox<String> fxDropdownSelectYears; //Dropdown box for selecting years. Useful when the charts' scale means some years are unclickable, despite having events.
     private final Stack<BarChart<String, Number>> fxStackPrevCharts = new Stack<BarChart<String, Number>>();  //Stack for storing drill-up information.
     private BarChart<String, Number> fxChartTopLevel; //the topmost chart, used for resetting to default view.
+    private BarChart<String, Number> fxMonthView; //the month chart
     private DataResultPanel dataResultPanel;
     private DataContentPanel dataContentPanel;
     private ProgressHandle progress;
@@ -145,6 +146,8 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
     private EventHandler<MouseEvent> fxMouseExitedListener;
     private SleuthkitCase skCase;
     private boolean fxInited = false;
+    private int monthCounter = 0;
+
     public Timeline() {
         super();
 
@@ -177,7 +180,8 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
                 //Making the main frame *
 
                 mainFrame = new TimelineFrame();
-                mainFrame.setFrameName(Case.getCurrentCase().getName() + " - Autopsy Timeline (Beta)");
+                mainFrame.setFrameName(
+                        NbBundle.getMessage(this.getClass(), "Timeline.frameName.text", Case.getCurrentCase().getName()));
 
                 //use the same icon on jframe as main application
                 mainFrame.setIconImage(WindowManager.getDefault().getMainWindow().getIconImage());
@@ -188,7 +192,9 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
                 //dataContentPanel.setAlignmentX(Component.RIGHT_ALIGNMENT);
                 //dataContentPanel.setPreferredSize(new Dimension(FRAME_WIDTH, (int) (FRAME_HEIGHT * 0.4)));
 
-                dataResultPanel = DataResultPanel.createInstance("Timeline Results", "", Node.EMPTY, 0, dataContentPanel);
+                dataResultPanel = DataResultPanel.createInstance(
+                        NbBundle.getMessage(this.getClass(), "Timeline.resultsPanel.title"),
+                        "", Node.EMPTY, 0, dataContentPanel);
                 dataResultPanel.setContentViewer(dataContentPanel);
                 //dataResultPanel.setAlignmentX(Component.LEFT_ALIGNMENT);
                 //dataResultPanel.setPreferredSize(new Dimension((int)(FRAME_WIDTH * 0.5), (int) (FRAME_HEIGHT * 0.5)));
@@ -213,7 +219,8 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
             public void run() {
                 try {
                     // start the progress bar
-                    progress = ProgressHandleFactory.createHandle("Creating timeline . . .");
+                    progress = ProgressHandleFactory.createHandle(
+                            NbBundle.getMessage(this.getClass(), "Timeline.runJavaFxThread.progress.creating"));
                     progress.start();
 
                     fxChartEvents = null; //important to reset old data
@@ -241,11 +248,13 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
                     if (!mactimeFile.exists()) {
                         progressDialog.setProgressTotal(3); //total 3 units
                         logger.log(Level.INFO, "Creating body file");
-                        progressDialog.updateProgressBar("Generating Bodyfile");
+                        progressDialog.updateProgressBar(
+                                NbBundle.getMessage(this.getClass(), "Timeline.runJavaFxThread.progress.genBodyFile"));
                         String bodyFilePath = makeBodyFile();
                         progressDialog.updateProgressBar(++currentProgress);
                         logger.log(Level.INFO, "Creating mactime file: " + mactimeFile.getAbsolutePath());
-                        progressDialog.updateProgressBar("Generating Mactime");
+                        progressDialog.updateProgressBar(
+                                NbBundle.getMessage(this.getClass(), "Timeline.runJavaFxThread.progress.genMacTime"));
                         makeMacTime(bodyFilePath);
                         progressDialog.updateProgressBar(++currentProgress);
                         data = null;
@@ -255,7 +264,8 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
                     }
 
 
-                    progressDialog.updateProgressBar("Parsing Mactime");
+                    progressDialog.updateProgressBar(
+                            NbBundle.getMessage(this.getClass(), "Timeline.runJavaFxThread.progress.parseMacTime"));
                     if (data == null) {
                         logger.log(Level.INFO, "Parsing mactime file: " + mactimeFile.getAbsolutePath());
                         data = parseMacTime(mactimeFile); //The sum total of the mactime parsing.  YearEpochs contain everything you need to make a timeline.
@@ -271,7 +281,7 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
                     fxDropdownSelectYears = new ComboBox<String>(listSelect);
 
                     //Buttons for navigating up and down the timeline
-                    fxZoomOutButton = new Button("Zoom Out");
+                    fxZoomOutButton = new Button(NbBundle.getMessage(this.getClass(), "Timeline.zoomOutButton.text"));
                     fxZoomOutButton.setOnAction(new EventHandler<ActionEvent>() {
                         @Override
                         public void handle(ActionEvent e) {
@@ -279,7 +289,7 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
                             if (fxStackPrevCharts.size() == 0) {
                                 bc = fxChartTopLevel;
                             } else {
-                                bc = fxStackPrevCharts.pop();
+                                bc = fxStackPrevCharts.pop();                             
                             }
                             fxChartEvents = bc;
                             fxScrollEvents.setContent(fxChartEvents);
@@ -303,7 +313,8 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
 
                     //Adding things to the V and H boxes. 
                     //hBox_Charts stores the pseudo menu bar at the top of the timeline. |Zoom Out|View Year: [Select Year]|►|
-                    fxHBoxCharts.getChildren().addAll(fxZoomOutButton, new Label("Go To:"), fxDropdownSelectYears);
+                    fxHBoxCharts.getChildren().addAll(fxZoomOutButton, new Label(
+                            NbBundle.getMessage(this.getClass(), "Timeline.goToButton.text")), fxDropdownSelectYears);
                     fxVBox.getChildren().addAll(fxHBoxCharts, fxScrollEvents); //FxBox_V holds things in a visual stack. 
                     fxGroupCharts.getChildren().add(fxVBox); //Adding the FxBox to the group. Groups make things easier to manipulate without having to update a hundred things every change.
                     fxPanelCharts.setScene(fxSceneCharts);
@@ -348,8 +359,8 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
         final Label l = new Label("");
         l.setStyle("-fx-font: 24 arial;");
         l.setTextFill(Color.AZURE);
-        xAxis.setLabel("Years");
-        yAxis.setLabel("Number of Events");
+        xAxis.setLabel(NbBundle.getMessage(this.getClass(), "Timeline.yearBarChart.x.years"));
+        yAxis.setLabel(NbBundle.getMessage(this.getClass(), "Timeline.yearBarChart.y.numEvents"));
         //Charts are made up of individual pieces of Chart.Data. In this case, a piece of barData is a single bar on the graph.
         //Data is packaged into a series, which can be assigned custom colors or styling
         //After the series are created, 1 or more series are packaged into a single chart.
@@ -412,11 +423,10 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
      * Always 12 per year, empty months are represented by no bar.
      */
     private BarChart<String, Number> createMonthsWithDrill(final YearEpoch ye) {
-
         final CategoryAxis xAxis = new CategoryAxis();
         final NumberAxis yAxis = new NumberAxis();
-        xAxis.setLabel("Month (" + ye.year + ")");
-        yAxis.setLabel("Number of Events");
+        xAxis.setLabel(NbBundle.getMessage(this.getClass(), "Timeline.MonthsBarChart.x.monthYY", ye.year));
+        yAxis.setLabel(NbBundle.getMessage(this.getClass(), "Timeline.MonthsBarChart.y.numEvents"));
         ObservableList<BarChart.Series<String, Number>> bcData = FXCollections.observableArrayList();
 
         BarChart.Series<String, Number> se = new BarChart.Series<String, Number>();
@@ -467,7 +477,7 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
         bc.autosize();
         bc.setPrefWidth(FRAME_WIDTH);
         bc.setLegendVisible(false);
-        fxStackPrevCharts.push(bc);
+        fxMonthView= bc;
         return bc;
     }
 
@@ -476,11 +486,12 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
      * Displays a chart with events from one month only.
      * Up to 31 days per month, as low as 28 as determined by the specific MonthEpoch
      */
+    @SuppressWarnings("unchecked")
     private BarChart<String, Number> createEventsByMonth(final MonthEpoch me, final YearEpoch ye) {
         final CategoryAxis xAxis = new CategoryAxis();
         final NumberAxis yAxis = new NumberAxis();
-        xAxis.setLabel("Day of Month");
-        yAxis.setLabel("Number of Events");
+        xAxis.setLabel(NbBundle.getMessage(this.getClass(), "Timeline.eventsByMoBarChart.x.dayOfMo"));
+        yAxis.setLabel(NbBundle.getMessage(this.getClass(), "Timeline.eventsByMoBarChart.y.numEvents"));
         ObservableList<BarChart.Data<String, Number>> bcData = makeObservableListByMonthAllDays(me, ye.getYear());
         BarChart.Series<String, Number> series = new BarChart.Series<String, Number>(bcData);
         series.setName(me.getMonthName() + " " + ye.getYear());
@@ -509,9 +520,10 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
                         @Override
                         public void run() {
                             //reset the view and free the current nodes before loading new ones
-                            final FileRootNode d = new FileRootNode("Empty Root", new ArrayList<Long>());
+                            final FileRootNode d = new FileRootNode(
+                                    NbBundle.getMessage(this.getClass(), "Timeline.node.emptyRoot"), new ArrayList<Long>());
                             dataResultPanel.setNode(d);
-                            dataResultPanel.setPath("Loading...");
+                            dataResultPanel.setPath(NbBundle.getMessage(this.getClass(), "Timeline.resultPanel.loading"));
                         }
                     });
                     final int day = (Integer.valueOf((barData.getXValue()).split("-")[1]));
@@ -527,7 +539,8 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
                     SwingUtilities.invokeLater(new Runnable() {
                         @Override
                         public void run() {
-                            final FileRootNode d = new FileRootNode("Root", afs);
+                            final FileRootNode d = new FileRootNode(
+                                    NbBundle.getMessage(this.getClass(), "Timeline.node.root"), afs);
                             dataResultPanel.setNode(d);
                             //set result viewer title path with the current date
                             String dateString = ye.getYear() + "-" + (1 + me.getMonthInt()) + "-" + +de.dayNum;
@@ -540,7 +553,13 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
             });
         }
         bc.autosize();
-        bc.setPrefWidth(FRAME_WIDTH);
+        bc.setPrefWidth(FRAME_WIDTH); 
+        monthCounter++;
+        if (monthCounter==12)
+        {
+        fxStackPrevCharts.push(fxMonthView);
+        monthCounter=0;
+        }
         return bc;
     }
 
@@ -622,7 +641,12 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
                 return;
             }
 
-            int answer = JOptionPane.showConfirmDialog(mainFrame, "Timeline is out of date. Would you like to regenerate it?", "Select an option", JOptionPane.YES_NO_OPTION);
+            int answer = JOptionPane.showConfirmDialog(mainFrame,
+                                                       NbBundle.getMessage(this.getClass(),
+                                                                           "Timeline.propChg.confDlg.timelineOOD.msg"),
+                                                       NbBundle.getMessage(this.getClass(),
+                                                                           "Timeline.propChg.confDlg.timelineOOD.details"),
+                                                       JOptionPane.YES_NO_OPTION);
             if (answer != JOptionPane.YES_OPTION) {
                 return;
             }
@@ -1142,10 +1166,11 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
 
                 if (IngestManager.getDefault().isIngestRunning()) {
                     int answer = JOptionPane.showConfirmDialog(new JFrame(),
-                            "You are trying to generate a timeline before "
-                            + "ingest has been completed. The timeline may be "
-                            + "incomplete. Do you want to continue?", "Timeline",
-                            JOptionPane.YES_NO_OPTION);
+                                                               NbBundle.getMessage(this.getClass(),
+                                                                                   "Timeline.initTimeline.confDlg.genBeforeIngest.msg"),
+                                                               NbBundle.getMessage(this.getClass(),
+                                                                                   "Timeline.initTimeline.confDlg.genBeforeIngest.deails"),
+                                                               JOptionPane.YES_NO_OPTION);
                     if (answer != JOptionPane.YES_OPTION) {
                         return;
                     }
@@ -1196,7 +1221,7 @@ public class Timeline extends CallableSystemAction implements Presenter.Toolbar,
 
     @Override
     public String getName() {
-        return "Make Timeline (Beta)";
+        return NbBundle.getMessage(this.getClass(), "Timeline.getName");
     }
 
     @Override
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 8e777360ff..7e57d709f8 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, 20 Feb 2014 12:30:26 -0500
+#Thu, 13 Mar 2014 18:09:42 -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.8
+currentVersion=Autopsy 3.0.9
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 1ee8ae75a2..4bcee6a939 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, 20 Feb 2014 12:30:26 -0500
+#Thu, 13 Mar 2014 18:09:42 -0400
 
-CTL_MainWindow_Title=Autopsy 3.0.8
-CTL_MainWindow_Title_No_Project=Autopsy 3.0.8
+CTL_MainWindow_Title=Autopsy 3.0.9
+CTL_MainWindow_Title_No_Project=Autopsy 3.0.9
diff --git a/branding_autopsy/hash-autopsy-logo-circle.png b/branding_autopsy/hash-autopsy-logo-circle.png
deleted file mode 100644
index 5bac99e039..0000000000
Binary files a/branding_autopsy/hash-autopsy-logo-circle.png and /dev/null differ
diff --git a/branding_autopsy/hash-autopsy-logo-full-body.png b/branding_autopsy/hash-autopsy-logo-full-body.png
deleted file mode 100644
index 724efe901b..0000000000
Binary files a/branding_autopsy/hash-autopsy-logo-full-body.png and /dev/null differ
diff --git a/branding_autopsy/welcome_logo.png b/branding_autopsy/welcome_logo.png
deleted file mode 100644
index 5bac99e039..0000000000
Binary files a/branding_autopsy/welcome_logo.png and /dev/null differ
diff --git a/branding_autopsy/welcome_logo_old.png b/branding_autopsy/welcome_logo_old.png
deleted file mode 100644
index e7a17e0815..0000000000
Binary files a/branding_autopsy/welcome_logo_old.png and /dev/null differ
diff --git a/build-windows.xml b/build-windows.xml
index 9eb85a06c4..91ac24e78c 100644
--- a/build-windows.xml
+++ b/build-windows.xml
@@ -160,7 +160,7 @@
         
         <!-- Update configuration file to include jre -->
         <property name="inst.property.file" value="${inst-path}/etc/${app.name}.conf" />
-        <property name="jvm.options" value="&quot;--branding ${app.name} -J-Xms24m -J-Xmx512m -J-XX:MaxPermSize=128M -J-Xverify:none -J-Xdock:name=${app.title}&quot;" />
+        <property name="jvm.options" value="&quot;--branding ${app.name} -J-Xms24m -J-Xmx512m -J-XX:MaxPermSize=128M -J-Xverify:none &quot;" />
         <propertyfile file="${inst.property.file}">
             <!-- Note: can be higher on 64 bit systems, should be in sync with project.properties -->
             <entry key="default_options" value="@JVM_OPTIONS" />
@@ -287,7 +287,7 @@
         <!-- Update configuration file to include jre -->
         <property name="inst.property.file" value="${inst-path}/etc/${app.name}.conf" />
         <!-- Sets max heap size to be ${jvm.max.mem} which is set in the run-ai-(32/64) target -->
-        <var name="jvm.args" value="&quot;--branding ${app.name} -J-Xms24m -J-Xmx${jvm.max.mem}m -J-XX:MaxPermSize=128M -J-Xverify:none -J-Xdock:name=${app.title}&quot;" />
+        <var name="jvm.args" value="&quot;--branding ${app.name} -J-Xms24m -J-Xmx${jvm.max.mem}m -J-XX:MaxPermSize=128M -J-Xverify:none &quot;" />
         <propertyfile file="${inst.property.file}">
             <!-- Note: can be higher on 64 bit systems, should be in sync with project.properties -->
             <entry key="default_options" value="@JVM_OPTIONS" />
diff --git a/build.xml b/build.xml
index fc47c751e9..06cef5daf7 100644
--- a/build.xml
+++ b/build.xml
@@ -71,7 +71,7 @@
         <copy file="${basedir}/KNOWN_ISSUES.txt" tofile="${zip-tmp}/${app.name}/KNOWN_ISSUES.txt"/>
          
         <unzip src="${thirdparty.dir}/gstreamer/${os.family}/i386/0.10.7/gstreamer.zip" dest="${zip-tmp}/${app.name}/gstreamer"/>
-        <copy file="${basedir}/branding_${app.name}/icon.ico" tofile="${zip-tmp}/${app.name}/icon.ico" overwrite="true"/>
+        <copy file="${basedir}/icons/icon.ico" tofile="${zip-tmp}/${app.name}/icon.ico" overwrite="true"/>
         <if>
             <equals arg1="${os.family}" arg2="windows"/>
             <then>
@@ -151,15 +151,10 @@
         <property name="disabled.modules" value=""/>
         <property name="enabled.clusters" value=""/>
         <property name="disabled.clusters" value=""/>
-        <condition property="branding.dir" value="branding_${app.name}">
-            <not>
-                <equals arg1="${app.name}" arg2="autopsy"/> 
-            </not>
-        </condition>
+
         <property name="branding.dir" location="branding"/>
         <property name="dist.dir" location="dist"/>
-        <!-- MOVE THE .DLL FILES TO THE NETBEANS DIRECTORY -->
-
+        
         <condition property="run.branding"> <!-- #84689 -->
             <and>
                 <available file="${branding.dir}" type="dir"/>
@@ -174,9 +169,7 @@
     <target name="build-brand" depends="-init">
         
         <echo>${app.name} branding</echo>
-        
-        <copy file="${basedir}/branding_${app.name}/welcome_logo.png" tofile="${basedir}/Core/src/org/sleuthkit/autopsy/casemodule/welcome_logo.png" overwrite="true"/>
-        
+          
         <propertyfile
         file="${branding.dir}/core/core.jar/org/netbeans/core/startup/Bundle.properties" 
         comment="Updated by build script">
@@ -198,10 +191,6 @@
             <entry key="build.type" value="${build.type}" />
         </propertyfile>
         
-        <copy todir="${basedir}" failonerror="false">
-            <fileset dir="${branding.dir}/bundles"
-                    includes="**/*"/>
-        </copy>
     </target>
     
     <target name="jni" depends="build,findTSK">
diff --git a/ewfVerify/nbproject/project.xml b/ewfVerify/nbproject/project.xml
index a3955c75fa..109bd8a1d2 100755
--- a/ewfVerify/nbproject/project.xml
+++ b/ewfVerify/nbproject/project.xml
@@ -6,6 +6,14 @@
             <code-name-base>org.sleuthkit.autopsy.ewfverify</code-name-base>
             <suite-component/>
             <module-dependencies>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>8.25.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
                     <build-prerequisite/>
diff --git a/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/Bundle.properties b/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/Bundle.properties
index 3b02b79f43..6c69f774fa 100755
--- a/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/Bundle.properties
+++ b/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/Bundle.properties
@@ -1 +1,16 @@
 OpenIDE-Module-Name=ewfVerify
+EwfVerifyIngestModule.moduleName.text=EWF Verify
+EwfVerifyIngestModule.moduleDesc.text=Validates the integrity of E01 files.
+EwfVerifyIngestModule.process.errProcImg=Error processing {0}
+EwfVerifyIngestModule.process.skipNonEwf=Skipping non-ewf image {0}
+EwfVerifyIngestModule.process.noStoredHash=Image {0} does not have stored hash.
+EwfVerifyIngestModule.process.startingImg=Starting {0}
+EwfVerifyIngestModule.process.errGetSizeOfImg=Error getting size of {0}. Image will not be processed.
+EwfVerifyIngestModule.process.errReadImgAtChunk=Error reading {0} at chunk {1}
+EwfVerifyIngestModule.init.exception.failGetMd5=Failed to get MD5 algorithm
+EwfVerifyIngestModule.complete.verified=\ verified
+EwfVerifyIngestModule.complete.notVerified=\ not verified
+EwfVerifyIngestModule.complete.verifResultsHead=<p>EWF Verification Results for {0}</p>
+EwfVerifyIngestModule.complete.resultLi=<li>Result\:{0}</li>
+EwfVerifyIngestModule.complete.calcHashLi=<li>Calculated hash\: {0}</li>
+EwfVerifyIngestModule.complete.storedHashLi=<li>Stored hash\: {0}</li>
diff --git a/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/Bundle_ja.properties b/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/Bundle_ja.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/EwfVerifyIngestModule.java b/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/EwfVerifyIngestModule.java
index 2719bf2033..9aa2e52ad9 100755
--- a/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/EwfVerifyIngestModule.java
+++ b/ewfVerify/src/org/sleuthkit/autopsy/ewfverify/EwfVerifyIngestModule.java
@@ -38,6 +38,8 @@ import org.sleuthkit.datamodel.Image;
 import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
+import org.openide.util.NbBundle;
+
 
 /**
  * Data Source Ingest Module that generates a hash of an E01 image file and
@@ -46,9 +48,11 @@ import org.sleuthkit.datamodel.TskData;
  * @author jwallace
  */
 public class EwfVerifyIngestModule extends IngestModuleDataSource {
-    private static final String MODULE_NAME = "EWF Verify";
+    private static final String MODULE_NAME = NbBundle.getMessage(EwfVerifyIngestModule.class,
+                                                                  "EwfVerifyIngestModule.moduleName.text");
     private static final String MODULE_VERSION = Version.getVersion();
-    private static final String MODULE_DESCRIPTION = "Validates the integrity of E01 files.";
+    private static final String MODULE_DESCRIPTION = NbBundle.getMessage(EwfVerifyIngestModule.class,
+                                                                         "EwfVerifyIngestModule.moduleDesc.text");
     private static final long DEFAULT_CHUNK_SIZE = 32 * 1024;
     private IngestServices services;
     private volatile boolean running = false;
@@ -74,8 +78,10 @@ public class EwfVerifyIngestModule extends IngestModuleDataSource {
         } catch (TskCoreException ex) {
             img = null;
             logger.log(Level.SEVERE, "Failed to get image from Content.", ex);
-            services.postMessage(IngestMessage.createMessage(++messageId, MessageType.ERROR, this, 
-                    "Error processing " + imgName));
+            services.postMessage(IngestMessage.createMessage(++messageId, MessageType.ERROR, this,
+                                                             NbBundle.getMessage(this.getClass(),
+                                                                                 "EwfVerifyIngestModule.process.errProcImg",
+                                                                                 imgName)));
             return;
         }
         
@@ -83,8 +89,10 @@ public class EwfVerifyIngestModule extends IngestModuleDataSource {
         if (img.getType() != TskData.TSK_IMG_TYPE_ENUM.TSK_IMG_TYPE_EWF_EWF) {
             img = null;
             logger.log(Level.INFO, "Skipping non-ewf image " + imgName);
-            services.postMessage(IngestMessage.createMessage(++messageId, MessageType.INFO, this, 
-                    "Skipping non-ewf image " + imgName));
+            services.postMessage(IngestMessage.createMessage(++messageId, MessageType.INFO, this,
+                                                             NbBundle.getMessage(this.getClass(),
+                                                                                 "EwfVerifyIngestModule.process.skipNonEwf",
+                                                                                 imgName)));
             skipped = true;
             return;
         }
@@ -97,20 +105,26 @@ public class EwfVerifyIngestModule extends IngestModuleDataSource {
             
          }           
          else {
-            services.postMessage(IngestMessage.createMessage(++messageId, MessageType.ERROR, this, 
-                    "Image " + imgName + " does not have stored hash."));
+            services.postMessage(IngestMessage.createMessage(++messageId, MessageType.ERROR, this,
+                                                             NbBundle.getMessage(this.getClass(),
+                                                                                 "EwfVerifyIngestModule.process.noStoredHash",
+                                                                                 imgName)));
             return;
         }
 
         logger.log(Level.INFO, "Starting ewf verification of " + img.getName());
-        services.postMessage(IngestMessage.createMessage(++messageId, MessageType.INFO, this, 
-                "Starting " + imgName));
+        services.postMessage(IngestMessage.createMessage(++messageId, MessageType.INFO, this,
+                                                         NbBundle.getMessage(this.getClass(),
+                                                                             "EwfVerifyIngestModule.process.startingImg",
+                                                                             imgName)));
         
         long size = img.getSize();
         if (size == 0) {
             logger.log(Level.WARNING, "Size of image " + imgName + " was 0 when queried.");
-            services.postMessage(IngestMessage.createMessage(++messageId, MessageType.ERROR, this, 
-                    "Error getting size of " + imgName + ". Image will not be processed."));
+            services.postMessage(IngestMessage.createMessage(++messageId, MessageType.ERROR, this,
+                                                             NbBundle.getMessage(this.getClass(),
+                                                                                 "EwfVerifyIngestModule.process.errGetSizeOfImg",
+                                                                                 imgName)));
         }
         
         // Libewf uses a sector size of 64 times the sector size, which is the
@@ -136,7 +150,8 @@ public class EwfVerifyIngestModule extends IngestModuleDataSource {
             try {
                 read = img.read(data, i * chunkSize, chunkSize);
             } catch (TskCoreException ex) {
-                String msg = "Error reading " + imgName + " at chunk " + i;
+                String msg = NbBundle.getMessage(this.getClass(),
+                                                 "EwfVerifyIngestModule.process.errReadImgAtChunk", imgName, i);
                 services.postMessage(IngestMessage.createMessage(++messageId, MessageType.ERROR, this, msg));
                 logger.log(Level.SEVERE, msg, ex);
                 return;
@@ -173,7 +188,8 @@ public class EwfVerifyIngestModule extends IngestModuleDataSource {
                 messageDigest = MessageDigest.getInstance("MD5");
             } catch (NoSuchAlgorithmException ex) {
                 logger.log(Level.WARNING, "Error getting md5 algorithm", ex);
-                throw new RuntimeException("Failed to get MD5 algorithm");
+                throw new RuntimeException(
+                        NbBundle.getMessage(this.getClass(), "EwfVerifyIngestModule.init.exception.failGetMd5"));
             }
         } else {
             messageDigest.reset();
@@ -184,11 +200,13 @@ public class EwfVerifyIngestModule extends IngestModuleDataSource {
     public void complete() {
         logger.info("complete() " + this.getName());
         if (skipped == false) {
-            String msg = verified ? " verified" : " not verified";
-            String extra = "<p>EWF Verification Results for " + imgName + "</p>";
-            extra += "<li>Result:" + msg + "</li>";
-            extra += "<li>Calculated hash: " + calculatedHash + "</li>";
-            extra += "<li>Stored hash: " + storedHash + "</li>";
+            String msg = verified ? NbBundle.getMessage(this.getClass(), "EwfVerifyIngestModule.complete.verified") : NbBundle
+                    .getMessage(this.getClass(), "EwfVerifyIngestModule.complete.notVerified");
+            String extra = NbBundle
+                    .getMessage(this.getClass(), "EwfVerifyIngestModule.complete.verifResultsHead", imgName);
+            extra += NbBundle.getMessage(this.getClass(), "EwfVerifyIngestModule.complete.resultLi", msg);
+            extra += NbBundle.getMessage(this.getClass(), "EwfVerifyIngestModule.complete.calcHashLi", calculatedHash);
+            extra += NbBundle.getMessage(this.getClass(), "EwfVerifyIngestModule.complete.storedHashLi", storedHash);
             services.postMessage(IngestMessage.createMessage(++messageId, MessageType.INFO, this, imgName +  msg, extra));
             logger.info(imgName + msg);
         }
diff --git a/branding_autopsy/icon.icns b/icons/icon.icns
similarity index 100%
rename from branding_autopsy/icon.icns
rename to icons/icon.icns
diff --git a/branding_autopsy/icon.ico b/icons/icon.ico
similarity index 100%
rename from branding_autopsy/icon.ico
rename to icons/icon.ico
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 20e2a4c162..438c7afb74 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -2,9 +2,9 @@ app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif
 ### Title of the application
 app.title=Autopsy
 ### lowercase version of above
-app.name=autopsy
+app.name=${branding.token}
 ### if left unset, version will default to today's date
-app.version=3.0.8
+app.version=3.0.9
 ### Build type isn't used at this point, but it may be useful
 ### Must be one of: DEVELOPMENT, RELEASE
 build.type=RELEASE
@@ -22,7 +22,6 @@ auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=false
 auxiliary.org-netbeans-modules-apisupport-installer.os-solaris=false
 auxiliary.org-netbeans-modules-apisupport-installer.os-windows=true
 auxiliary.org-netbeans-modules-apisupport-installer.pack200-enabled=false
-branding.token=${app.name}
 modules=\
     ${project.org.sleuthkit.autopsy.keywordsearch}:\
     ${project.org.sleuthkit.autopsy.hashdatabase}:\
diff --git a/test/script/regression_utils.py b/test/script/regression_utils.py
index 025086f1ae..53f10da281 100644
--- a/test/script/regression_utils.py
+++ b/test/script/regression_utils.py
@@ -21,7 +21,7 @@ def make_path(*dirs):
 
 # Fix a standard os.path by making it Windows format
 def path_fix(path):
-	return path.replace("/", "\\")
+	return os.path.normcase(os.path.normpath(path))
 
 # Gets the true current working directory instead of Cygwin's
 def wgetcwd():
diff --git a/test/script/srcupdater.py b/test/script/srcupdater.py
index 7d341de84c..f270500944 100755
--- a/test/script/srcupdater.py
+++ b/test/script/srcupdater.py
@@ -165,7 +165,7 @@ def antBuild(which, Build, branch):
             open(chk)
         except IOError as e:
             if(not tryredo):
-                errorem += "DataModel Java build failed. on branch " + branch + "\n"
+                errorem += "DataModel Java build failed on branch " + branch + ".\n"
                 attachl.append(antpth)
                 if email_enabled: 
                     Emailer.send_email(to, server, subj, errorem, attachl)
diff --git a/test/script/tskdbdiff.py b/test/script/tskdbdiff.py
index 10bfcf73d2..0e3d313db3 100644
--- a/test/script/tskdbdiff.py
+++ b/test/script/tskdbdiff.py
@@ -136,37 +136,40 @@ class TskDbDiff(object):
         """
         unsorted_dump = TskDbDiff._get_tmp_file("dump_data", ".txt")
         conn = sqlite3.connect(db_file)
-        autopsy_cur2 = conn.cursor()
+        conn.text_factory = lambda x: x.decode("utf-8", "ignore")
+        conn.row_factory = sqlite3.Row
+        artifact_cursor = conn.cursor()
         # Get the list of all artifacts
         # @@@ Could add a SORT by parent_path in here since that is how we are going to later sort it.
-        autopsy_cur2.execute("SELECT tsk_files.parent_path, tsk_files.name, blackboard_artifact_types.display_name, blackboard_artifacts.artifact_id FROM blackboard_artifact_types INNER JOIN blackboard_artifacts ON blackboard_artifact_types.artifact_type_id = blackboard_artifacts.artifact_type_id INNER JOIN tsk_files ON tsk_files.obj_id = blackboard_artifacts.obj_id")
+        artifact_cursor.execute("SELECT tsk_files.parent_path, tsk_files.name, blackboard_artifact_types.display_name, blackboard_artifacts.artifact_id FROM blackboard_artifact_types INNER JOIN blackboard_artifacts ON blackboard_artifact_types.artifact_type_id = blackboard_artifacts.artifact_type_id INNER JOIN tsk_files ON tsk_files.obj_id = blackboard_artifacts.obj_id")
         database_log = codecs.open(unsorted_dump, "wb", "utf_8")
-        rw = autopsy_cur2.fetchone()
+        row = artifact_cursor.fetchone()
         appnd = False
         counter = 0
         artifact_count = 0
         artifact_fail = 0
         # Cycle through artifacts
         try:
-            while (rw != None):
+            while (row != None):
                 # File Name and artifact type
-                if(rw[0] != None):
-                    database_log.write(rw[0] + rw[1] + ' <artifact type="' + rw[2] + '" > ')
+                if(row["parent_path"] != None):
+                    database_log.write(row["parent_path"] + row["name"] + ' <artifact type="' + row["display_name"] + '" > ')
                 else:
-                    database_log.write(rw[1] + ' <artifact type="' + rw[2] + '" > ')
+                    database_log.write(row["name"] + ' <artifact type="' + row["display_name"] + '" > ')
 
                 # Get attributes for this artifact
-                autopsy_cur1 = conn.cursor()
+                attribute_cursor = conn.cursor()
                 looptry = True
                 artifact_count += 1
                 try:
-                    key = ""
-                    key = str(rw[3])
-                    key = key,
-                    autopsy_cur1.execute("SELECT blackboard_attributes.source, blackboard_attribute_types.display_name, blackboard_attributes.value_type, blackboard_attributes.value_text, blackboard_attributes.value_int32, blackboard_attributes.value_int64, blackboard_attributes.value_double FROM blackboard_attributes INNER JOIN blackboard_attribute_types ON blackboard_attributes.attribute_type_id = blackboard_attribute_types.attribute_type_id WHERE artifact_id =? ORDER BY blackboard_attributes.source, blackboard_attribute_types.display_name, blackboard_attributes.value_type, blackboard_attributes.value_text, blackboard_attributes.value_int32, blackboard_attributes.value_int64, blackboard_attributes.value_double", key)
-                    attributes = autopsy_cur1.fetchall()
+                    art_id = ""
+                    art_id = str(row["artifact_id"])
+                    attribute_cursor.execute("SELECT blackboard_attributes.source, blackboard_attribute_types.display_name, blackboard_attributes.value_type, blackboard_attributes.value_text, blackboard_attributes.value_int32, blackboard_attributes.value_int64, blackboard_attributes.value_double FROM blackboard_attributes INNER JOIN blackboard_attribute_types ON blackboard_attributes.attribute_type_id = blackboard_attribute_types.attribute_type_id WHERE artifact_id =? ORDER BY blackboard_attributes.source, blackboard_attribute_types.display_name, blackboard_attributes.value_type, blackboard_attributes.value_text, blackboard_attributes.value_int32, blackboard_attributes.value_int64, blackboard_attributes.value_double", [art_id])
+                    attributes = attribute_cursor.fetchall()
                 except sqlite3.Error as e:
-                    msg ="Attributes in artifact id (in output DB)# " + str(rw[3]) + " encountered an error: " + str(e) +" .\n"
+                    msg = "Attributes in artifact id (in output DB)# " + str(row["artifact_id"]) + " encountered an error: " + str(e) +" .\n"
+                    print("Attributes in artifact id (in output DB)# ", str(row["artifact_id"]), " encountered an error: ", str(e))
+                    print() 
                     looptry = False
                     artifact_fail += 1
                     database_log.write('Error Extracting Attributes')
@@ -175,35 +178,35 @@ class TskDbDiff(object):
 
                 # Print attributes
                 if(looptry == True):
+                    if (len(attributes) == 0):
+                       database_log.write(' <artifact/>\n')
+                       row = artifact_cursor.fetchone()
+                       continue
                     src = attributes[0][0]
                     for attr in attributes:
-                        val = 3 + attr[2]
+                        attr_value_index = 3 + attr["value_type"]
                         numvals = 0
                         for x in range(3, 6):
                             if(attr[x] != None):
                                 numvals += 1
                         if(numvals > 1):
-                            msg = "There were too many values for attribute type: " + attr[1] + " for artifact with id #" + str(rw[3]) + ".\n"
-                        if(not attr[0] == src):
-                            msg ="There were inconsistent sources for artifact with id #" + str(rw[3]) + ".\n"
+                            msg = "There were too many values for attribute type: " + attr["display_name"] + " for artifact with id #" + str(row["artifact_id"]) + ".\n"
+                        if(not attr["source"] == src):
+                            msg = "There were inconsistent sources for artifact with id #" + str(row["artifact_id"]) + ".\n"
                         try:
-                            database_log.write('<attribute source="' + attr[0] + '" type="' + attr[1] + '" value="')
-                            inpval = attr[val]
-                            if((type(inpval) != 'unicode') or (type(inpval) != 'str')):
-                                inpval = str(inpval)
-                            patrn = re.compile("[\n\0\a\b\r\f\e]")
-                            inpval = re.sub(patrn, ' ', inpval)
-                            database_log.write(inpval)
+                            attr_value_as_string = str(attr[attr_value_index])
+                            #if((type(attr_value_as_string) != 'unicode') or (type(attr_value_as_string) != 'str')):
+                            #    attr_value_as_string = str(attr_value_as_string)
+                            patrn = re.compile("[\n\0\a\b\r\f]")
+                            attr_value_as_string = re.sub(patrn, ' ', attr_value_as_string)
+                            database_log.write('<attribute source="' + attr["source"] + '" type="' + attr["display_name"] + '" value="' + attr_value_as_string + '" />')
                         except IOError as e:
+                            print("IO error")
                             raise TskDbDiffException("Unexpected IO error while writing to database log." + str(e))
-
-                        database_log.write('" />')
+                
                 database_log.write(' <artifact/>\n')
-                rw = autopsy_cur2.fetchone()
+                row = artifact_cursor.fetchone()
 
-            # Now sort the file
-            srtcmdlst = ["sort", unsorted_dump, "-o", bb_dump_file]
-            subprocess.call(srtcmdlst)
             print(artifact_fail)
             if(artifact_fail > 0):
                 msg ="There were " + str(artifact_count) + " artifacts and " + str(artifact_fail) + " threw an exception while loading.\n"
@@ -211,6 +214,10 @@ class TskDbDiff(object):
             raise TskDbDiffException("Unexpected error while dumping blackboard database: " + str(e))
         finally:
             database_log.close()
+        
+        # Now sort the file
+        srtcmdlst = ["sort", unsorted_dump, "-o", bb_dump_file]
+        subprocess.call(srtcmdlst)
 
     def _dump_output_db_nonbb(db_file, dump_file):
         """Dumps a database to a text file.
@@ -224,7 +231,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)
-
+        conn.text_factory = lambda x: x.decode("utf-8", "ignore")
         # Delete the blackboard tables
         conn.execute("DROP TABLE blackboard_artifacts")
         conn.execute("DROP TABLE blackboard_attributes")
@@ -266,14 +273,14 @@ def main():
         print("usage: tskdbdiff [OUPUT DB PATH] [GOLD DB PATH]")
         sys.exit()
 
-    db_diff = TskDbDiff(output_db, gold_db)
+    db_diff = TskDbDiff(output_db, gold_db, output_dir=".")
     dump_passed, bb_dump_passed = db_diff.run_diff()
 
     if dump_passed and bb_dump_passed:
         print("Database comparison passed.")
-    elif not dump_passed:
+    if not dump_passed:
         print("Non blackboard database comparison failed.")
-    elif not bb_dump_passed:
+    if not bb_dump_passed:
         print("Blackboard database comparison failed.")
 
     return 0
diff --git a/thunderbirdparser/manifest.mf b/thunderbirdparser/manifest.mf
index fc34c0e90a..f25afa6886 100644
--- a/thunderbirdparser/manifest.mf
+++ b/thunderbirdparser/manifest.mf
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.sleuthkit.autopsy.thunderbirdparser/3
-OpenIDE-Module-Implementation-Version: 9
+OpenIDE-Module-Implementation-Version: 10
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/thunderbirdparser/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties
 
diff --git a/thunderbirdparser/nbproject/project.xml b/thunderbirdparser/nbproject/project.xml
index 950a9d78b0..d729dcf6b1 100644
--- a/thunderbirdparser/nbproject/project.xml
+++ b/thunderbirdparser/nbproject/project.xml
@@ -6,13 +6,21 @@
             <code-name-base>org.sleuthkit.autopsy.thunderbirdparser</code-name-base>
             <suite-component/>
             <module-dependencies>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>8.25.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.sleuthkit.autopsy.core</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>9</release-version>
-                        <specification-version>7.0</specification-version>
+                        <specification-version>7.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties
index c94d63cf4f..9c51c0edd4 100644
--- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties
+++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/Bundle.properties
@@ -1,6 +1,28 @@
 OpenIDE-Module-Display-Category=Ingest Module
 OpenIDE-Module-Long-Description=\
-    Thunderbird Parser ingest module.\n\n\
-    The module extracts Thunderbird e-mail folder hierarchy from the ingested disk image and posts the folder hierarchy and e-mail messages found as results.
-OpenIDE-Module-Name=ThunderbirdParser
-OpenIDE-Module-Short-Description=Thunderbird Parser e-mail extractor  ingest module
+    Email Parser ingest module.\n\n\
+    The module extracts MBOX and PST e-mail files and posts the results to the blackboard.  \
+    It knows about the Thunderbird folder structure for MBOX files.
+OpenIDE-Module-Name=Email Parser
+OpenIDE-Module-Short-Description=Parses MBOX and PST files
+MboxParser.parse.errMsg.failedToReadFile=Failed to read mbox file from disk.
+MboxParser.parse.errMsg.couldntFindCharset=Couldn't find appropriate charset encoder.
+MboxParser.parse.errMsg.failedToParseNMsgs=Failed to extract {0} email messages.
+MboxParser.handleAttch.errMsg.failedToCreateOnDisk=Failed to extract attachment to disk\: {0}
+MboxParser.handleAttch.failedWriteToDisk=Failed to extract attachment to disk\: {0}
+PstParser.parse.errMsg.failedToParseNMsgs=Failed to extract {0} email messages.
+PstParser.extractAttch.errMsg.failedToExtractToDisk=Failed to extract attachment to disk\: {0}
+ThunderbirdMboxFileIngestModule.moduleName=Email Parser
+ThunderbirdMboxFileIngestModule.hashDbModuleName=Hash Lookup
+ThunderbirdMboxFileIngestModule.processPst.errMsg.outOfDiskSpace=Out of disk space. Can''t copy {0} to parse.
+ThunderbirdMboxFileIngestModule.encryptionFileLevel=File-level Encryption
+ThunderbirdMboxFileIngestModule.processPst.errProcFile.msg=Error while processing {0}
+ThunderbirdMboxFileIngestModule.processPst.errProcFile.details=Only files from Outlook 2003 and later are supported.
+ThunderbirdMboxFileIngestModule.processPst.errProcFile.msg2=Error while processing {0}
+ThunderbirdMboxFileIngestModule.processMBox.errProcFile.msg=Error while processing {0}
+ThunderbirdMboxFileIngestModule.processMBox.errProfFile.details=Out of disk space. Can't copy file to parse.
+ThunderbirdMboxFileIngestModule.processMBox.errProcFile.msg2=Error while processing {0}
+ThunderbirdMboxFileIngestModule.getDesc.text=This module detects and parses mbox and pst/ost files and populates email artifacts in the blackboard.
+ThunderbirdMboxFileIngestModule.handleAttch.errMsg=Error processing {0}
+ThunderbirdMboxFileIngestModule.handleAttch.errMsg.details=Failed to add attachment named {0} to the case.
+ThunderbirdMboxFileIngestModule.notAvail=Not available
diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/Bundle_ja.properties b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/Bundle_ja.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java
index 05086b1ee6..f2ab914821 100755
--- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java
+++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MboxParser.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2013 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");
@@ -33,7 +33,6 @@ import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -54,6 +53,7 @@ import org.apache.james.mime4j.message.DefaultMessageBuilder;
 import org.apache.james.mime4j.stream.MimeConfig;
 import org.apache.tika.parser.txt.CharsetDetector;
 import org.apache.tika.parser.txt.CharsetMatch;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.ingest.IngestServices;
 
 /**
@@ -116,15 +116,15 @@ import org.sleuthkit.autopsy.ingest.IngestServices;
                 // Not the right encoder
             } catch (IOException ex) {
                 logger.log(Level.WARNING, "couldn't find mbox file.", ex);
-                addErrorMessage("Failed to read mbox file from disk.");
-                return Collections.EMPTY_LIST;
+                addErrorMessage(NbBundle.getMessage(this.getClass(), "MboxParser.parse.errMsg.failedToReadFile"));
+                return new ArrayList<>();
             }
         }
         
         // If no encoders work, post an error message and return.
         if (mboxIterator == null || theEncoder == null) {
-            addErrorMessage("Couldn't find appropriate charset encoder.");
-            return Collections.EMPTY_LIST;
+            addErrorMessage(NbBundle.getMessage(this.getClass(), "MboxParser.parse.errMsg.couldntFindCharset"));
+            return new ArrayList<>();
         }
         
         List<EmailMessage> emails = new ArrayList<>();
@@ -136,13 +136,14 @@ 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: " + ex.getMessage());
+                logger.log(Level.WARNING, "Failed to get message from mbox: {0}", ex.getMessage());
                 failCount++;
             }
         }
         
         if (failCount > 0) {
-            addErrorMessage("Failed to extract " + failCount + " email messages.");
+            addErrorMessage(
+                    NbBundle.getMessage(this.getClass(), "MboxParser.parse.errMsg.failedToParseNMsgs", failCount));
         }
         return emails;
     }
@@ -218,7 +219,7 @@ import org.sleuthkit.autopsy.ingest.IngestServices;
         try {
             r = new BufferedReader(tb.getReader());
             StringBuilder bodyString = new StringBuilder();
-            String line = "";
+            String line;
             while ((line = r.readLine()) != null) {
                 bodyString.append(line).append("\n");
             }
@@ -255,7 +256,9 @@ import org.sleuthkit.autopsy.ingest.IngestServices;
         try {
             fos = new FileOutputStream(outPath);
         } catch (FileNotFoundException ex) {
-            addErrorMessage("Failed to extract attachment to disk: " + filename);
+            addErrorMessage(
+                    NbBundle.getMessage(this.getClass(),
+                                        "MboxParser.handleAttch.errMsg.failedToCreateOnDisk", filename));
             logger.log(Level.INFO, "Failed to create file output stream for: " + outPath, ex);
             return;
         }
@@ -270,7 +273,7 @@ import org.sleuthkit.autopsy.ingest.IngestServices;
             }
         } catch (IOException ex) {
             logger.log(Level.INFO, "Failed to write mbox email attachment to disk.", ex);
-            addErrorMessage("Failed to extract attachment to disk: " + filename);
+            addErrorMessage(NbBundle.getMessage(this.getClass(), "MboxParser.handleAttch.failedWriteToDisk", filename));
             return;
         } finally {
             try {
diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java
index a43aef5dc9..be37525a78 100755
--- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java
+++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2013 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");
@@ -29,21 +29,22 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.ingest.IngestServices;
 import static org.sleuthkit.autopsy.thunderbirdparser.ThunderbirdMboxFileIngestModule.getRelModuleOutputPath;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.TskCoreException;
 
 /**
- * Parser for extracting emails from  pst/ost Mircosoft Outlook data files.
- * 
+ * Parser for extracting emails from pst/ost Mircosoft Outlook data files.
+ *
  * @author jwallace
  */
 class PstParser {
+
     private static final Logger logger = Logger.getLogger(PstParser.class.getName());
     /**
      * First four bytes of a pst file.
@@ -51,36 +52,39 @@ class PstParser {
     private static int PST_HEADER = 0x2142444E;
     private IngestServices services;
     /**
-     * A map of PSTMessages to their Local path within the file's internal 
+     * A map of PSTMessages to their Local path within the file's internal
      * directory structure.
      */
     private List<EmailMessage> results;
     private StringBuilder errors;
-    
+
     PstParser(IngestServices services) {
         results = new ArrayList<>();
         this.services = services;
         errors = new StringBuilder();
     }
-    
+
     enum ParseResult {
+
         OK, ERROR, ENCRYPT;
     }
-    
+
     /**
      * Parse and extract email messages from the pst/ost file.
-     * 
+     *
      * @param file A pst or ost file.
-     * @return ParseResult: OK on success, ERROR on an error, ENCRYPT if failed because the file is encrypted.
+     * @return ParseResult: OK on success, ERROR on an error, ENCRYPT if failed
+     * because the file is encrypted.
      */
     ParseResult parse(File file) {
         PSTFile pstFile;
-        long failures = 0L;
+        long failures;
         try {
             pstFile = new PSTFile(file);
             failures = processFolder(pstFile.getRootFolder(), "\\", true);
             if (failures > 0) {
-                addErrorMessage("Failed to extract " + failures + " email messages.");
+                addErrorMessage(
+                        NbBundle.getMessage(this.getClass(), "PstParser.parse.errMsg.failedToParseNMsgs", failures));
             }
             return ParseResult.OK;
         } catch (PSTException | IOException ex) {
@@ -92,46 +96,48 @@ class PstParser {
             return ParseResult.ENCRYPT;
         }
     }
-    
+
     /**
      * Get the results of the parsing.
-     * 
-     * @return 
+     *
+     * @return
      */
     List<EmailMessage> getResults() {
         return results;
     }
-    
+
     String getErrors() {
         return errors.toString();
     }
 
     /**
-     * Process this folder and all subfolders, adding every email found to results.
-     * Accumulates the folder hierarchy path as it navigates the folder structure.
-     * 
+     * Process this folder and all subfolders, adding every email found to
+     * results. Accumulates the folder hierarchy path as it navigates the folder
+     * structure.
+     *
      * @param folder The folder to navigate and process
-     * @param path The path to the folder within the pst/ost file's directory structure
+     * @param path The path to the folder within the pst/ost file's directory
+     * structure
      * @throws PSTException
-     * @throws IOException 
+     * @throws IOException
      */
     private long processFolder(PSTFolder folder, String path, boolean root) {
-        String newPath =  (root ? path : path + "\\" + folder.getDisplayName());
+        String newPath = (root ? path : path + "\\" + folder.getDisplayName());
         long failCount = 0L; // Number of emails that failed
         if (folder.hasSubfolders()) {
             List<PSTFolder> subFolders;
             try {
                 subFolders = folder.getSubFolders();
             } catch (PSTException | IOException ex) {
-                subFolders = Collections.EMPTY_LIST;
-                logger.log(Level.INFO, "java-libpst exception while getting subfolders: " + ex.getMessage());
+                subFolders = new ArrayList<>();
+                logger.log(Level.INFO, "java-libpst exception while getting subfolders: {0}", ex.getMessage());
             }
-            
+
             for (PSTFolder f : subFolders) {
                 failCount += processFolder(f, newPath, false);
             }
         }
-        
+
         if (folder.getContentCount() != 0) {
             PSTMessage email;
             // A folder's children are always emails, never other folders.
@@ -141,19 +147,19 @@ class PstParser {
                 }
             } catch (PSTException | IOException ex) {
                 failCount++;
-                logger.log(Level.INFO, "java-libpst exception while getting emails from a folder: " + ex.getMessage());
+                logger.log(Level.INFO, "java-libpst exception while getting emails from a folder: {0}", ex.getMessage());
             }
         }
-        
+
         return failCount;
     }
-    
+
     /**
      * Create an EmailMessage from a PSTMessage.
-     * 
+     *
      * @param msg
      * @param localPath
-     * @return 
+     * @return
      */
     private EmailMessage extractEmailMessage(PSTMessage msg, String localPath) {
         EmailMessage email = new EmailMessage();
@@ -166,7 +172,7 @@ class PstParser {
         email.setHtmlBody(msg.getBodyHTML());
         String rtf = "";
         try {
-             rtf = msg.getRTFBody();
+            rtf = msg.getRTFBody();
         } catch (PSTException | IOException ex) {
             logger.log(Level.INFO, "Failed to get RTF content from pst email.");
         }
@@ -174,18 +180,19 @@ class PstParser {
         email.setLocalPath(localPath);
         email.setSubject(msg.getSubject());
         email.setId(msg.getDescriptorNodeId());
-        
+
         if (msg.hasAttachments()) {
             extractAttachments(email, msg);
         }
-        
+
         return email;
     }
-    
+
     /**
      * Add the attachments within the PSTMessage to the EmailMessage.
+     *
      * @param email
-     * @param msg 
+     * @param msg
      */
     private void extractAttachments(EmailMessage email, PSTMessage msg) {
         int numberOfAttachments = msg.getNumberOfAttachments();
@@ -206,9 +213,9 @@ class PstParser {
                 String uniqueFilename = msg.getDescriptorNodeId() + "-" + filename;
                 String outPath = outputDirPath + uniqueFilename;
                 saveAttachmentToDisk(attach, outPath);
-                
+
                 Attachment attachment = new Attachment();
-                
+
                 long crTime = attach.getCreationTime().getTime() / 1000;
                 long mTime = attach.getModificationTime().getTime() / 1000;
                 String relPath = getRelModuleOutputPath() + File.separator + uniqueFilename;
@@ -219,44 +226,45 @@ class PstParser {
                 attachment.setSize(attach.getFilesize());
                 email.addAttachment(attachment);
             } catch (PSTException | IOException ex) {
-                addErrorMessage("Failed to extract attachment to disk: " + filename);
+                addErrorMessage(
+                        NbBundle.getMessage(this.getClass(), "PstParser.extractAttch.errMsg.failedToExtractToDisk",
+                        filename));
                 logger.log(Level.WARNING, "Failed to extract attachment from pst file.", ex);
             }
         }
     }
-    
+
     /**
      * Extracts a PSTAttachment to the module output directory.
-     * 
+     *
      * @param attach
      * @param outPath
      * @return
      * @throws IOException
-     * @throws PSTException 
+     * @throws PSTException
      */
-    private void saveAttachmentToDisk(PSTAttachment attach, String outPath) throws IOException, PSTException{
-        InputStream attachmentStream = attach.getFileInputStream();
-        FileOutputStream out = new FileOutputStream(outPath);
-        // 8176 is the block size used internally and should give the best performance
-        int bufferSize = 8176;
-        byte[] buffer = new byte[bufferSize];
-        int count = attachmentStream.read(buffer);
-        while (count == bufferSize) {
-            out.write(buffer);
-            count = attachmentStream.read(buffer);
+    private void saveAttachmentToDisk(PSTAttachment attach, String outPath) throws IOException, PSTException {
+        try (InputStream attachmentStream = attach.getFileInputStream(); FileOutputStream out = new FileOutputStream(outPath)) {
+            // 8176 is the block size used internally and should give the best performance
+            int bufferSize = 8176;
+            byte[] buffer = new byte[bufferSize];
+            int count = attachmentStream.read(buffer);
+            while (count == bufferSize) {
+                out.write(buffer);
+                count = attachmentStream.read(buffer);
+            }
+            byte[] endBuffer = new byte[count];
+            System.arraycopy(buffer, 0, endBuffer, 0, count);
+            out.write(endBuffer);
         }
-        byte[] endBuffer = new byte[count];
-        System.arraycopy(buffer, 0, endBuffer, 0, count);
-        out.write(endBuffer);
-        out.close();
-        attachmentStream.close();
     }
-    
+
     /**
      * Pretty-Print "From" field of an outlook email message.
+     *
      * @param name Sender's Name
      * @param addr Sender's Email address
-     * @return 
+     * @return
      */
     private String getSender(String name, String addr) {
         if (name.isEmpty() && addr.isEmpty()) {
@@ -268,13 +276,13 @@ class PstParser {
         } else {
             return name + ": " + addr;
         }
-     }
-    
+    }
+
     /**
      * Identify a file as a pst/ost file by it's header.
-     * 
+     *
      * @param file
-     * @return 
+     * @return
      */
     public static boolean isPstFile(AbstractFile file) {
         byte[] buffer = new byte[4];
@@ -284,13 +292,13 @@ class PstParser {
                 return false;
             }
             ByteBuffer bb = ByteBuffer.wrap(buffer);
-            return  bb.getInt() == PST_HEADER;
+            return bb.getInt() == PST_HEADER;
         } catch (TskCoreException ex) {
             logger.log(Level.WARNING, "Exception while detecting if a file is a pst file.");
             return false;
         }
     }
-    
+
     private void addErrorMessage(String msg) {
         errors.append("<li>").append(msg).append("</li>");
     }
diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
index 82a4ffcb6e..d772f25b33 100644
--- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
+++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2013 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");
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
+import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.services.FileManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -53,8 +54,10 @@ public class ThunderbirdMboxFileIngestModule extends IngestModuleAbstractFile {
     private static final Logger logger = Logger.getLogger(ThunderbirdMboxFileIngestModule.class.getName());
     private static ThunderbirdMboxFileIngestModule instance = null;
     private IngestServices services;
-    private static final String MODULE_NAME = "Email Parser";
-    private final String hashDBModuleName = "Hash Lookup";
+    private static final String MODULE_NAME = NbBundle.getMessage(ThunderbirdMboxFileIngestModule.class,
+                                                                  "ThunderbirdMboxFileIngestModule.moduleName");
+    private final String hashDBModuleName = NbBundle.getMessage(ThunderbirdMboxFileIngestModule.class,
+                                                                "ThunderbirdMboxFileIngestModule.hashDbModuleName");
     final public static String MODULE_VERSION = Version.getVersion();
     private int messageId = 0;
     private FileManager fileManager;
@@ -110,8 +113,6 @@ public class ThunderbirdMboxFileIngestModule extends IngestModuleAbstractFile {
             return processMBox(abstractFile, ingestContext);
         }
         
-        int extIndex = abstractFile.getName().lastIndexOf(".");
-        String ext = (extIndex == -1 ? "" : abstractFile.getName().substring(extIndex));
         if (PstParser.isPstFile(abstractFile)) {
             return processPst(ingestContext, abstractFile);
         }
@@ -132,7 +133,10 @@ public class ThunderbirdMboxFileIngestModule extends IngestModuleAbstractFile {
         
         if (abstractFile.getSize() >= services.getFreeDiskSpace()) {
             logger.log(Level.WARNING, "Not enough disk space to write file to disk.");
-            IngestMessage msg = IngestMessage.createErrorMessage(messageId++, this, getName(), "Out of disk space. Can't copy " + abstractFile.getName() + " to parse.");
+            IngestMessage msg = IngestMessage.createErrorMessage(messageId++, this, getName(),
+                                                                 NbBundle.getMessage(this.getClass(),
+                                                                                     "ThunderbirdMboxFileIngestModule.processPst.errMsg.outOfDiskSpace",
+                                                                                     abstractFile.getName()));
             services.postMessage(msg);
             return ProcessResult.OK;
         }
@@ -155,25 +159,31 @@ public class ThunderbirdMboxFileIngestModule extends IngestModuleAbstractFile {
             try {
                 BlackboardArtifact generalInfo = abstractFile.getGenInfoArtifact();
                 generalInfo.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_ENCRYPTION_DETECTED.getTypeID(),
-                        MODULE_NAME, "File-level Encryption"));
+                        MODULE_NAME,
+                        NbBundle.getMessage(this.getClass(), "ThunderbirdMboxFileIngestModule.encryptionFileLevel")));
             } catch (TskCoreException ex) {
-                logger.log(Level.INFO, "Failed to add encryption attribute to file: " + abstractFile.getName());
+                logger.log(Level.INFO, "Failed to add encryption attribute to file: {0}", abstractFile.getName());
             }
         } else {
             // parsing error: log message
-            postErrorMessage("Error while processing " + abstractFile.getName(),
-                    "Only files from Outlook 2003 and later are supported.");
-            logger.log(Level.INFO, "PSTParser failed to parse " + abstractFile.getName());
+            postErrorMessage(
+                    NbBundle.getMessage(this.getClass(), "ThunderbirdMboxFileIngestModule.processPst.errProcFile.msg",
+                                        abstractFile.getName()),
+                    NbBundle.getMessage(this.getClass(),
+                                        "ThunderbirdMboxFileIngestModule.processPst.errProcFile.details"));
+            logger.log(Level.INFO, "PSTParser failed to parse {0}", abstractFile.getName());
             return ProcessResult.ERROR;
         }
         
         if (file.delete() == false) {
-            logger.log(Level.INFO, "Failed to delete temp file: " + file.getName());
+            logger.log(Level.INFO, "Failed to delete temp file: {0}", file.getName());
         }
         
         String errors = parser.getErrors();
         if (errors.isEmpty() == false) {
-            postErrorMessage("Error while processing " + abstractFile.getName(), errors);
+            postErrorMessage(
+                    NbBundle.getMessage(this.getClass(), "ThunderbirdMboxFileIngestModule.processPst.errProcFile.msg2",
+                                        abstractFile.getName()), errors);
         }
 
         return ProcessResult.OK;
@@ -206,8 +216,11 @@ public class ThunderbirdMboxFileIngestModule extends IngestModuleAbstractFile {
         
         if (abstractFile.getSize() >= services.getFreeDiskSpace()) {
             logger.log(Level.WARNING, "Not enough disk space to write file to disk.");
-            postErrorMessage("Error while processing " + abstractFile.getName(),
-                    "Out of disk space. Can't copy file to parse.");
+            postErrorMessage(
+                    NbBundle.getMessage(this.getClass(), "ThunderbirdMboxFileIngestModule.processMBox.errProcFile.msg",
+                                        abstractFile.getName()),
+                    NbBundle.getMessage(this.getClass(),
+                                        "ThunderbirdMboxFileIngestModule.processMBox.errProfFile.details"));
             return ProcessResult.OK;
         }
         
@@ -229,7 +242,9 @@ public class ThunderbirdMboxFileIngestModule extends IngestModuleAbstractFile {
         
         String errors = parser.getErrors();
         if (errors.isEmpty() == false) {
-            postErrorMessage("Error while processing " + abstractFile.getName(), errors);
+            postErrorMessage(
+                    NbBundle.getMessage(this.getClass(), "ThunderbirdMboxFileIngestModule.processMBox.errProcFile.msg2",
+                                        abstractFile.getName()), errors);
         }
         
         return ProcessResult.OK;
@@ -275,7 +290,7 @@ public class ThunderbirdMboxFileIngestModule extends IngestModuleAbstractFile {
 
     @Override
     public String getDescription() {
-        return "This module detects and parses mbox and pst/ost files and populates email artifacts in the blackboard.";
+        return NbBundle.getMessage(this.getClass(), "ThunderbirdMboxFileIngestModule.getDesc.text");
     }
 
     @Override
@@ -347,8 +362,11 @@ public class ThunderbirdMboxFileIngestModule extends IngestModuleAbstractFile {
                         MODULE_NAME, MODULE_VERSION, "");
                 files.add(df);
             } catch (TskCoreException ex) {
-                postErrorMessage("Error processing " + abstractFile.getName(), 
-                        "Failed to add attachment named " + filename + " to the case.");
+                postErrorMessage(
+                        NbBundle.getMessage(this.getClass(), "ThunderbirdMboxFileIngestModule.handleAttch.errMsg",
+                                            abstractFile.getName()),
+                        NbBundle.getMessage(this.getClass(),
+                                            "ThunderbirdMboxFileIngestModule.handleAttch.errMsg.details", filename));
                 logger.log(Level.INFO, "", ex);
             }
         }
@@ -399,7 +417,8 @@ public class ThunderbirdMboxFileIngestModule extends IngestModuleAbstractFile {
         if (rtf.isEmpty() == false) {
             bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_EMAIL_CONTENT_RTF.getTypeID(), MODULE_NAME, rtf));
         }
-        bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_MSG_ID.getTypeID(), MODULE_NAME, ((id < 0L) ? "Not available" : String.valueOf(id))));
+        bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_MSG_ID.getTypeID(), MODULE_NAME, ((id < 0L) ? NbBundle
+                .getMessage(this.getClass(), "ThunderbirdMboxFileIngestModule.notAvail") : String.valueOf(id))));
         if (subject.isEmpty() == false) {
             bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_SUBJECT.getTypeID(), MODULE_NAME, subject));
         }